diff -Nru redshift-1.11/aclocal.m4 redshift-1.12/aclocal.m4 --- redshift-1.11/aclocal.m4 2016-01-02 22:53:18.000000000 +0000 +++ redshift-1.12/aclocal.m4 2018-05-21 01:20:44.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,32 +20,63 @@ 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'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 12 (pkg-config-0.29.2) -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29.2]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) @@ -67,18 +98,19 @@ PKG_CONFIG="" fi fi[]dnl -])# PKG_PROG_PKG_CONFIG +])dnl PKG_PROG_PKG_CONFIG -# 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 -# -------------------------------------------------------------- +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ @@ -88,8 +120,10 @@ $3])dnl fi]) -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. m4_define([_PKG_CONFIG], [if test -n "$$1"; then pkg_cv_[]$1="$$1" @@ -101,10 +135,11 @@ else pkg_failed=untried fi[]dnl -])# _PKG_CONFIG +])dnl _PKG_CONFIG -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -112,26 +147,24 @@ else _pkg_short_errors_supported=no fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +])dnl _PKG_SHORT_ERRORS_SUPPORTED -# 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 -# -# -# -------------------------------------------------------------- +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl 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 pkg_failed=no -AC_MSG_CHECKING([for $1]) +AC_MSG_CHECKING([for $2]) _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) @@ -141,11 +174,11 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -162,7 +195,7 @@ _PKG_TEXT])[]dnl ]) elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) + 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 @@ -178,16 +211,40 @@ AC_MSG_RESULT([yes]) $3 fi[]dnl -])# PKG_CHECK_MODULES +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. AC_DEFUN([PKG_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -198,16 +255,18 @@ AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR +])dnl PKG_INSTALLDIR -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. AC_DEFUN([PKG_NOARCH_INSTALLDIR], [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) m4_pushdef([pkg_description], @@ -218,13 +277,15 @@ AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) m4_popdef([pkg_default]) m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR +])dnl PKG_NOARCH_INSTALLDIR -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. AC_DEFUN([PKG_CHECK_VAR], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl @@ -233,9 +294,9 @@ AS_VAR_COPY([$1], [pkg_cv_][$1]) AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR +])dnl PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -247,10 +308,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,14 +327,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -318,15 +379,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -357,7 +417,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -548,7 +608,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -624,7 +684,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -714,8 +774,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). 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 @@ -788,7 +848,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) 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 @@ -817,7 +881,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -828,7 +892,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -838,7 +902,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -859,7 +923,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -909,7 +973,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -946,7 +1010,7 @@ fi ]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -980,7 +1044,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1009,7 +1073,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1056,7 +1120,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1089,8 +1153,9 @@ [ dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). + dnl FIXME: Remove the need to hard-code Python versions here. m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -1291,7 +1356,7 @@ sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1310,7 +1375,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1391,7 +1456,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1451,7 +1516,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1479,7 +1544,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1498,7 +1563,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2017 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru redshift-1.11/compile redshift-1.12/compile --- redshift-1.11/compile 2016-01-02 19:04:54.000000000 +0000 +++ redshift-1.12/compile 2017-07-28 21:58:10.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru redshift-1.11/config.guess redshift-1.12/config.guess --- redshift-1.11/config.guess 2016-01-02 19:04:54.000000000 +0000 +++ redshift-1.12/config.guess 2017-07-28 21:58:10.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2017-05-27' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -168,19 +168,29 @@ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. + # to ELF recently (or will in the future) and ABI. case "${UNAME_MACHINE_ARCH}" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ @@ -197,6 +207,13 @@ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -207,13 +224,13 @@ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -223,6 +240,10 @@ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -235,6 +256,9 @@ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -251,42 +275,42 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 @@ -359,16 +383,16 @@ exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval $set_cc_for_build - SUN_ARCH="i386" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` @@ -393,7 +417,7 @@ exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos${UNAME_RELEASE} @@ -579,8 +603,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -617,13 +642,13 @@ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi @@ -662,11 +687,11 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ ${HP_ARCH} = hppa2.0w ] then eval $set_cc_for_build @@ -679,12 +704,12 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} @@ -789,14 +814,14 @@ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) @@ -812,10 +837,11 @@ UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -878,7 +904,7 @@ exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix @@ -901,7 +927,7 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) @@ -932,6 +958,9 @@ crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +973,9 @@ ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -969,6 +1001,9 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + mips64el:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-${LIBC} exit ;; @@ -1001,6 +1036,9 @@ ppcle:Linux:*:*) echo powerpcle-unknown-linux-${LIBC} exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; @@ -1020,7 +1058,7 @@ echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1099,7 +1137,7 @@ # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1248,6 +1286,9 @@ SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux${UNAME_RELEASE} exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1261,16 +1302,23 @@ UNAME_PROCESSOR=powerpc fi if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1285,7 +1333,7 @@ exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi @@ -1294,15 +1342,18 @@ *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) + NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk${UNAME_RELEASE} + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; @@ -1316,7 +1367,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" @@ -1358,7 +1409,7 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` exit ;; i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos @@ -1369,23 +1420,25 @@ x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp diff -Nru redshift-1.11/config.h.in redshift-1.12/config.h.in --- redshift-1.11/config.h.in 2016-01-02 22:53:27.000000000 +0000 +++ redshift-1.12/config.h.in 2018-05-21 01:21:04.000000000 +0000 @@ -6,9 +6,6 @@ /* Define to 1 to enable DRM method */ #undef ENABLE_DRM -/* Define to 1 to enable Geoclue location provider */ -#undef ENABLE_GEOCLUE - /* Define to 1 to enable Geoclue2 location provider */ #undef ENABLE_GEOCLUE2 @@ -97,8 +94,7 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -Nru redshift-1.11/config.sub redshift-1.12/config.sub --- redshift-1.11/config.sub 2016-01-02 19:04:54.000000000 +0000 +++ redshift-1.12/config.sub 2017-07-28 21:58:10.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2014-07-28' +timestamp='2017-04-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,8 +53,7 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -117,8 +116,8 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -255,15 +254,16 @@ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ + | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -301,10 +301,12 @@ | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -312,6 +314,8 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -326,6 +330,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -371,17 +378,18 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -422,13 +430,15 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -436,6 +446,8 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -512,6 +524,9 @@ basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -632,6 +647,14 @@ basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -773,6 +796,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -924,6 +950,9 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -1008,7 +1037,7 @@ ppc-* | ppcbe-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) @@ -1016,9 +1045,9 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) @@ -1219,6 +1248,9 @@ basic_machine=a29k-wrs os=-vxworks ;; + wasm32) + basic_machine=wasm32-unknown + ;; w65*) basic_machine=w65-wdc os=-none @@ -1364,18 +1396,18 @@ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ @@ -1384,7 +1416,8 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1516,6 +1549,8 @@ ;; -nacl*) ;; + -ios) + ;; -none) ;; *) @@ -1611,6 +1646,9 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; diff -Nru redshift-1.11/configure redshift-1.12/configure --- redshift-1.11/configure 2016-01-02 22:53:20.000000000 +0000 +++ redshift-1.12/configure 2018-05-21 01:20:46.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for redshift 1.11. +# Generated by GNU Autoconf 2.69 for redshift 1.12. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='redshift' PACKAGE_TARNAME='redshift' -PACKAGE_VERSION='1.11' -PACKAGE_STRING='redshift 1.11' +PACKAGE_VERSION='1.12' +PACKAGE_STRING='redshift 1.12' PACKAGE_BUGREPORT='https://github.com/jonls/redshift/issues' PACKAGE_URL='' @@ -637,6 +637,8 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +ENABLE_APPARMOR_FALSE +ENABLE_APPARMOR_TRUE ENABLE_SYSTEMD_FALSE ENABLE_SYSTEMD_TRUE systemduserunitdir @@ -650,8 +652,6 @@ ENABLE_CORELOCATION_TRUE ENABLE_GEOCLUE2_FALSE ENABLE_GEOCLUE2_TRUE -ENABLE_GEOCLUE_FALSE -ENABLE_GEOCLUE_TRUE ENABLE_WINGDI_FALSE ENABLE_WINGDI_TRUE QUARTZ_LIBS @@ -675,8 +675,6 @@ PYTHON GEOCLUE2_LIBS GEOCLUE2_CFLAGS -GEOCLUE_LIBS -GEOCLUE_CFLAGS GLIB_LIBS GLIB_CFLAGS XCB_RANDR_LIBS @@ -705,9 +703,10 @@ GMSGFMT_015 MSGFMT_015 GETTEXT_MACRO_VERSION -DATADIRNAME +ENABLE_WINDOWS_RESOURCE_FALSE +ENABLE_WINDOWS_RESOURCE_TRUE +WINDRES ALL_LINGUAS -INTLTOOL_PERL GMSGFMT MSGFMT MSGMERGE @@ -748,6 +747,7 @@ OBJCFLAGS OBJC CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -868,6 +868,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -880,12 +881,12 @@ enable_vidmode enable_quartz enable_wingdi -enable_geoclue enable_geoclue2 enable_corelocation enable_gui enable_ubuntu with_systemduserunitdir +enable_apparmor ' ac_precious_vars='build_alias host_alias @@ -895,6 +896,7 @@ LDFLAGS LIBS CPPFLAGS +LT_SYS_LIBRARY_PATH CPP OBJC OBJCFLAGS @@ -913,8 +915,6 @@ XCB_RANDR_LIBS GLIB_CFLAGS GLIB_LIBS -GEOCLUE_CFLAGS -GEOCLUE_LIBS GEOCLUE2_CFLAGS GEOCLUE2_LIBS PYTHON' @@ -1458,7 +1458,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 redshift 1.11 to adapt to many kinds of systems. +\`configure' configures redshift 1.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1528,7 +1528,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of redshift 1.11:";; + short | recursive ) echo "Configuration of redshift 1.12:";; esac cat <<\_ACEOF @@ -1552,22 +1552,25 @@ --enable-drm enable DRM method --enable-randr enable RANDR method --enable-vidmode enable VidMode method - --enable-quartz enable Quartz (OSX) method + --enable-quartz enable Quartz (macOS) method --enable-wingdi enable WinGDI method - --enable-geoclue enable Geoclue location provider --enable-geoclue2 enable Geoclue2 location provider - --enable-corelocation enable CoreLocation (OSX) provider + --enable-corelocation enable CoreLocation (macOS) provider --enable-gui enable GUI status icon --enable-ubuntu enable Ubuntu icons + --enable-apparmor enable AppArmor profile Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --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-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir @@ -1584,6 +1587,8 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor OBJC Objective C compiler command OBJCFLAGS Objective C compiler flags @@ -1607,10 +1612,6 @@ linker flags for XCB_RANDR, overriding pkg-config GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config GLIB_LIBS linker flags for GLIB, overriding pkg-config - GEOCLUE_CFLAGS - C compiler flags for GEOCLUE, overriding pkg-config - GEOCLUE_LIBS - linker flags for GEOCLUE, overriding pkg-config GEOCLUE2_CFLAGS C compiler flags for GEOCLUE2, overriding pkg-config GEOCLUE2_LIBS @@ -1683,7 +1684,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -redshift configure 1.11 +redshift configure 1.12 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2144,7 +2145,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by redshift $as_me 1.11, which was +It was created by redshift $as_me 1.12, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2497,7 +2498,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2698,8 +2699,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2718,7 +2719,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3012,7 +3013,7 @@ # Define the identity of the package. PACKAGE='redshift' - VERSION='1.11' + VERSION='1.12' cat >>confdefs.h <<_ACEOF @@ -3046,8 +3047,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3105,6 +3106,7 @@ fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4370,8 +4372,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -4385,7 +4387,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -4505,7 +4507,7 @@ $ECHO "" } -case "$ECHO" in +case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 $as_echo "printf" >&6; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 @@ -4828,19 +4830,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -4854,7 +4856,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -4865,7 +4867,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -4876,32 +4878,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -4944,33 +4946,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -4981,15 +4988,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -5095,9 +5102,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -5105,8 +5112,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -5157,7 +5164,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -5197,7 +5204,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5247,22 +5254,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -5280,7 +5288,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -5298,30 +5306,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -5444,13 +5428,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5578,13 +5562,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5611,8 +5595,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -5648,10 +5631,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5690,7 +5669,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5712,8 +5691,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -5766,6 +5745,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -5923,8 +5905,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -5936,7 +5918,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -6091,7 +6073,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -6099,7 +6081,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -6112,7 +6094,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -6329,7 +6311,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6419,7 +6401,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6452,14 +6434,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6477,21 +6489,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6539,11 +6554,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6569,7 +6584,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6589,13 +6604,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6616,7 +6631,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6669,6 +6684,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -6681,9 +6706,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6693,8 +6718,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -6706,18 +6731,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6726,24 +6832,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -6772,9 +6879,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6788,7 +6936,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -6833,7 +6988,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -6873,13 +7028,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6891,7 +7047,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -6900,7 +7056,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -6916,7 +7072,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -7027,7 +7183,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7530,7 +7686,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7548,7 +7704,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7587,7 +7743,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -7616,7 +7772,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7629,32 +7785,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7662,6 +7818,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -7965,14 +8156,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -7996,14 +8187,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8027,14 +8218,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8042,8 +8233,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -8059,14 +8248,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8080,11 +8269,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8133,7 +8374,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -8172,7 +8413,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -8183,14 +8424,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -8199,15 +8440,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8222,22 +8456,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8260,13 +8494,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8288,22 +8522,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8326,13 +8560,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8353,7 +8587,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8415,7 +8649,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8431,7 +8665,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8461,7 +8695,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8479,17 +8713,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8500,8 +8735,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8517,6 +8752,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8587,7 +8827,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8595,10 +8835,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8614,7 +8873,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8623,9 +8882,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8650,6 +8909,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -8747,7 +9012,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -8776,7 +9041,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -8808,7 +9073,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8838,7 +9103,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -8870,7 +9135,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -8889,13 +9154,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -9015,8 +9280,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -9028,9 +9293,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9073,9 +9338,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -9090,7 +9355,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -9098,7 +9363,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -9108,7 +9373,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -9130,24 +9395,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -9160,7 +9425,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -9179,7 +9444,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9195,7 +9460,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9205,7 +9470,7 @@ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, # as there is no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9213,61 +9478,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag' ;; pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group f77 and f90 compilers - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9278,42 +9571,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; esac case `$CC -V 2>&1 | sed 5q` in *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi ;; esac @@ -9327,8 +9625,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9346,8 +9644,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9359,7 +9657,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9374,9 +9672,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9393,15 +9691,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9417,7 +9715,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9425,34 +9723,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9471,13 +9792,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9496,35 +9825,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9559,7 +9895,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9567,17 +9903,17 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" + archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9612,7 +9948,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9620,21 +9956,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive' else # Exported symbols can be pulled into shared objects from archives whole_archive_flag_spec='$convenience' fi archive_cmds_need_lc=yes - # This is similar to how AIX traditionally builds its shared libraries. - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9643,7 +9991,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9673,16 +10021,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -9691,18 +10040,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -9711,7 +10060,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -9730,24 +10079,24 @@ hardcode_direct=no hardcode_automatic=yes hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + if test yes = "$lt_cv_ld_force_load"; then + whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' else whole_archive_flag_spec='' fi link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" + module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" + archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9789,33 +10138,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -9823,25 +10172,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -9853,7 +10202,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -b" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -9872,14 +10221,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 $as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' +if test yes = "$lt_cv_prog_compiler__b"; then + archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi @@ -9887,8 +10236,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -9899,7 +10248,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -9910,8 +10259,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. @@ -9921,8 +10270,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -9934,24 +10283,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -9966,7 +10325,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -9974,27 +10333,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -10005,33 +10356,53 @@ hardcode_libdir_flag_spec='-L$libdir' hardcode_minus_L=yes allow_undefined_flag=unsupported - archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' else allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ - $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' + $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp' # Both c and cxx compiler support -rpath directly hardcode_libdir_flag_spec='-rpath $libdir' @@ -10042,24 +10413,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -10069,11 +10440,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -10083,10 +10454,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -10135,43 +10506,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -10186,10 +10557,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -10197,7 +10568,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10223,7 +10594,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10438,14 +10809,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -10461,28 +10832,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10496,7 +10874,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10505,7 +10883,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10522,14 +10900,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10537,41 +10917,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10581,18 +11011,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10600,8 +11030,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10613,7 +11043,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10622,8 +11052,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -10639,17 +11069,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -10658,8 +11088,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -10686,7 +11116,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -10699,8 +11129,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -10713,7 +11143,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -10726,8 +11156,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -10740,8 +11170,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -10759,12 +11189,13 @@ 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}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -10789,26 +11220,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10826,14 +11246,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -10841,8 +11262,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -10851,8 +11272,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -10865,8 +11286,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10877,7 +11298,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -10885,8 +11306,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -10905,8 +11326,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -10915,13 +11336,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10965,14 +11406,15 @@ # 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 + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + 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 @@ -10989,12 +11431,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -11004,7 +11446,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -11013,58 +11455,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -11075,8 +11527,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -11086,11 +11538,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -11098,8 +11550,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -11120,24 +11572,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -11155,7 +11607,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -11163,8 +11615,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -11174,20 +11626,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -11284,15 +11751,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11307,12 +11774,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11322,7 +11789,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11332,23 +11799,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11386,10 +11853,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -11397,10 +11864,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -11439,11 +11914,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -11482,7 +11957,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -11521,7 +11996,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -11560,7 +12035,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11581,21 +12056,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11603,7 +12078,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11650,9 +12125,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11682,7 +12157,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11702,14 +12177,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11756,9 +12231,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11788,7 +12263,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11809,9 +12284,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -11855,7 +12330,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -11883,7 +12358,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -11891,13 +12366,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -11905,8 +12380,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -11916,7 +12395,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -11930,7 +12409,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -12330,7 +12809,7 @@ am__fastdepOBJC_FALSE= fi - # For OSX support modules + # For macOS support modules ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12809,26 +13288,43 @@ as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 +# Substitute ALL_LINGUAS so we can use it in po/Makefile + + + + + + + + +# Test host platform +build_windows=no +case "${host_os}" in + mingw*) + build_windows=yes + ;; +esac + +# Test whether to compile Windows resources +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. +set dummy ${ac_tool_prefix}windres; 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 ${ac_cv_prog_WINDRES+:} false; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_PERL in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$WINDRES"; then + ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_WINDRES="${ac_tool_prefix}windres" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12836,88 +13332,91 @@ done IFS=$as_save_IFS - ;; -esac fi -INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL -if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 -$as_echo "$INTLTOOL_PERL" >&6; } +fi +WINDRES=$ac_cv_prog_WINDRES +if test -n "$WINDRES"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5 +$as_echo "$WINDRES" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test -z "$INTLTOOL_PERL"; then - as_fn_error $? "perl not found" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 -$as_echo_n "checking for perl >= 5.8.1... " >&6; } -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 -$as_echo "$IT_PERL_VERSION" >&6; } -fi -if test "x" != "xno-xml"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 -$as_echo_n "checking for XML::Parser... " >&6; } - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } - else - as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 - fi +if test -z "$ac_cv_prog_WINDRES"; then + ac_ct_WINDRES=$WINDRES + # Extract the first word of "windres", so it can be a program name with args. +set dummy windres; 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_WINDRES+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_WINDRES"; then + ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_WINDRES="windres" + $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_WINDRES=$ac_cv_prog_ac_ct_WINDRES +if test -n "$ac_ct_WINDRES"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5 +$as_echo "$ac_ct_WINDRES" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# Substitute ALL_LINGUAS so we can use it in po/Makefile + if test "x$ac_ct_WINDRES" = x; then + WINDRES="" + 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 + WINDRES=$ac_ct_WINDRES + fi +else + WINDRES="$ac_cv_prog_WINDRES" +fi +if test "x$build_windows" = "xyes" -a -n "x$WINDRES"; then : -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + enable_windows_resource=yes -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share else - DATADIRNAME=lib -fi - ;; - *) - DATADIRNAME=lib - ;; - esac + enable_windows_resource=no + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + if test "x$enable_windows_resource" = xyes; then + ENABLE_WINDOWS_RESOURCE_TRUE= + ENABLE_WINDOWS_RESOURCE_FALSE='#' +else + ENABLE_WINDOWS_RESOURCE_TRUE='#' + ENABLE_WINDOWS_RESOURCE_FALSE= fi - - - # Test whether Objective C compiler works { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Objective C compiler works" >&5 $as_echo_n "checking whether Objective C compiler works... " >&6; } @@ -14990,8 +15489,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DRM" >&5 -$as_echo_n "checking for DRM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdrm" >&5 +$as_echo_n "checking for libdrm... " >&6; } if test -n "$DRM_CFLAGS"; then pkg_cv_DRM_CFLAGS="$DRM_CFLAGS" @@ -15031,7 +15530,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -15049,7 +15548,7 @@ have_drm=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_drm=no else @@ -15062,8 +15561,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5 -$as_echo_n "checking for X11... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11" >&5 +$as_echo_n "checking for x11... " >&6; } if test -n "$X11_CFLAGS"; then pkg_cv_X11_CFLAGS="$X11_CFLAGS" @@ -15103,7 +15602,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -15121,7 +15620,7 @@ have_x11=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_x11=no else @@ -15133,8 +15632,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VM" >&5 -$as_echo_n "checking for XF86VM... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xxf86vm" >&5 +$as_echo_n "checking for xxf86vm... " >&6; } if test -n "$XF86VM_CFLAGS"; then pkg_cv_XF86VM_CFLAGS="$XF86VM_CFLAGS" @@ -15174,7 +15673,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -15192,7 +15691,7 @@ have_xf86vm=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_xf86vm=no else @@ -15204,8 +15703,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB" >&5 -$as_echo_n "checking for XCB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcb" >&5 +$as_echo_n "checking for xcb... " >&6; } if test -n "$XCB_CFLAGS"; then pkg_cv_XCB_CFLAGS="$XCB_CFLAGS" @@ -15245,7 +15744,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -15263,7 +15762,7 @@ have_xcb=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_xcb=no else @@ -15275,8 +15774,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCB_RANDR" >&5 -$as_echo_n "checking for XCB_RANDR... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcb-randr" >&5 +$as_echo_n "checking for xcb-randr... " >&6; } if test -n "$XCB_RANDR_CFLAGS"; then pkg_cv_XCB_RANDR_CFLAGS="$XCB_RANDR_CFLAGS" @@ -15316,7 +15815,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -15334,7 +15833,7 @@ have_xcb_randr=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_xcb_randr=no else @@ -15347,8 +15846,8 @@ pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 gobject-2.0" >&5 +$as_echo_n "checking for glib-2.0 gobject-2.0... " >&6; } if test -n "$GLIB_CFLAGS"; then pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" @@ -15388,7 +15887,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -15406,7 +15905,7 @@ have_glib=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_glib=no else @@ -15418,79 +15917,8 @@ fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEOCLUE" >&5 -$as_echo_n "checking for GEOCLUE... " >&6; } - -if test -n "$GEOCLUE_CFLAGS"; then - pkg_cv_GEOCLUE_CFLAGS="$GEOCLUE_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geoclue\""; } >&5 - ($PKG_CONFIG --exists --print-errors "geoclue") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GEOCLUE_CFLAGS=`$PKG_CONFIG --cflags "geoclue" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GEOCLUE_LIBS"; then - pkg_cv_GEOCLUE_LIBS="$GEOCLUE_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"geoclue\""; } >&5 - ($PKG_CONFIG --exists --print-errors "geoclue") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GEOCLUE_LIBS=`$PKG_CONFIG --libs "geoclue" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -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 - GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "geoclue" 2>&1` - else - GEOCLUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "geoclue" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GEOCLUE_PKG_ERRORS" >&5 - - have_geoclue=no -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - have_geoclue=no -else - GEOCLUE_CFLAGS=$pkg_cv_GEOCLUE_CFLAGS - GEOCLUE_LIBS=$pkg_cv_GEOCLUE_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - have_geoclue=yes -fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GEOCLUE2" >&5 -$as_echo_n "checking for GEOCLUE2... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 gio-2.0 >= 2.26" >&5 +$as_echo_n "checking for glib-2.0 gio-2.0 >= 2.26... " >&6; } if test -n "$GEOCLUE2_CFLAGS"; then pkg_cv_GEOCLUE2_CFLAGS="$GEOCLUE2_CFLAGS" @@ -15530,7 +15958,7 @@ if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then @@ -15548,7 +15976,7 @@ have_geoclue2=no elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } have_geoclue2=no else @@ -15559,7 +15987,7 @@ have_geoclue2=yes fi -# OSX headers +# macOS headers ac_fn_c_check_header_mongrel "$LINENO" "ApplicationServices/ApplicationServices.h" "ac_cv_header_ApplicationServices_ApplicationServices_h" "$ac_includes_default" if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" = xyes; then : have_appserv_h=yes @@ -15675,7 +16103,7 @@ $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break prog="import sys # split strings by '.' and convert to numeric. Append some zeros @@ -16046,7 +16474,7 @@ fi -# Check Quartz (OSX) method +# Check Quartz (macOS) method { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Quartz method" >&5 $as_echo_n "checking whether to enable Quartz method... " >&6; } # Check whether --enable-quartz was given. @@ -16151,56 +16579,6 @@ -# Check Geoclue location provider -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Geoclue location provider" >&5 -$as_echo_n "checking whether to enable Geoclue location provider... " >&6; } -# Check whether --enable-geoclue was given. -if test "${enable_geoclue+set}" = set; then : - enableval=$enable_geoclue; enable_geoclue=$enableval -else - enable_geoclue=maybe -fi - -if test "x$enable_geoclue" != xno; then : - - if test "x$have_geoclue" = xyes -a "x$have_glib" = xyes; then : - - -$as_echo "#define ENABLE_GEOCLUE 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - enable_geoclue=yes - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing dependencies" >&5 -$as_echo "missing dependencies" >&6; } - if test "x$enable_geoclue" = xyes; then : - - as_fn_error $? "missing dependencies for Geoclue location provider" "$LINENO" 5 - -fi - enable_geoclue=no - -fi - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - enable_geoclue=no - -fi - if test "x$enable_geoclue" = xyes; then - ENABLE_GEOCLUE_TRUE= - ENABLE_GEOCLUE_FALSE='#' -else - ENABLE_GEOCLUE_TRUE='#' - ENABLE_GEOCLUE_FALSE= -fi - - # Check Geoclue2 location provider { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Geoclue2 location provider" >&5 $as_echo_n "checking whether to enable Geoclue2 location provider... " >&6; } @@ -16251,7 +16629,7 @@ fi -# Check CoreLocation (OSX) provider +# Check CoreLocation (macOS) provider { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable CoreLocation method" >&5 $as_echo_n "checking whether to enable CoreLocation method... " >&6; } # Check whether --enable-corelocation was given. @@ -16266,7 +16644,7 @@ if test "x$have_corelocation_h" = xyes; then : CORELOCATION_CFLAGS="" - CORELOCATION_LIBS="-framework Foundation -framework CoreLocation" + CORELOCATION_LIBS="-framework Foundation -framework Cocoa -framework CoreLocation" $as_echo "#define ENABLE_CORELOCATION 1" >>confdefs.h @@ -16540,6 +16918,39 @@ +# Check for AppArmor +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable AppArmor profile" >&5 +$as_echo_n "checking whether to enable AppArmor profile... " >&6; } +# Check whether --enable-apparmor was given. +if test "${enable_apparmor+set}" = set; then : + enableval=$enable_apparmor; enable_apparmor=$enableval +else + enable_apparmor=no +fi + +if test "x$enable_apparmor" != xno; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_apparmor=yes + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_apparmor=no + +fi + if test "x$enable_apparmor" != xno; then + ENABLE_APPARMOR_TRUE= + ENABLE_APPARMOR_FALSE='#' +else + ENABLE_APPARMOR_TRUE='#' + ENABLE_APPARMOR_FALSE= +fi + + + # Checks for header files. for ac_header in locale.h stdint.h stdlib.h string.h unistd.h signal.h do : @@ -16838,6 +17249,10 @@ ac_config_commands="$ac_config_commands po/stamp-it" +if test -z "${ENABLE_WINDOWS_RESOURCE_TRUE}" && test -z "${ENABLE_WINDOWS_RESOURCE_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_WINDOWS_RESOURCE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_DRM_TRUE}" && test -z "${ENABLE_DRM_FALSE}"; then as_fn_error $? "conditional \"ENABLE_DRM\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16858,10 +17273,6 @@ as_fn_error $? "conditional \"ENABLE_WINGDI\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_GEOCLUE_TRUE}" && test -z "${ENABLE_GEOCLUE_FALSE}"; then - as_fn_error $? "conditional \"ENABLE_GEOCLUE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${ENABLE_GEOCLUE2_TRUE}" && test -z "${ENABLE_GEOCLUE2_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GEOCLUE2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16882,6 +17293,10 @@ as_fn_error $? "conditional \"ENABLE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_APPARMOR_TRUE}" && test -z "${ENABLE_APPARMOR_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_APPARMOR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -17279,7 +17694,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by redshift $as_me 1.11, which was +This file was extended by redshift $as_me 1.12, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17345,7 +17760,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -redshift config.status 1.11 +redshift config.status 1.12 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17480,6 +17895,7 @@ 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"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -17529,10 +17945,13 @@ GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`' +lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`' lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`' objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`' MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`' lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`' @@ -17597,7 +18016,8 @@ finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`' hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' -sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`' @@ -17648,9 +18068,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -17685,7 +18108,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17712,10 +18135,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -17724,19 +18148,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -18457,55 +18878,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -18525,6 +18944,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -18642,18 +19064,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -18744,8 +19175,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -18838,13 +19272,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -18896,13 +19330,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -18911,7 +19404,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -18921,165 +19414,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -19270,15 +19604,15 @@ DRM: ${enable_drm} RANDR: ${enable_randr} VidMode: ${enable_vidmode} - Quartz (OSX): ${enable_quartz} + Quartz (macOS): ${enable_quartz} WinGDI (Windows): ${enable_wingdi} Location providers: - Geoclue: ${enable_geoclue} - Geoclue2: ${enable_geoclue2} - CoreLocation (OSX) ${enable_corelocation} + Geoclue2: ${enable_geoclue2} + CoreLocation (macOS): ${enable_corelocation} GUI: ${enable_gui} Ubuntu icons: ${enable_ubuntu} systemd units: ${enable_systemd} ${systemduserunitdir} + AppArmor profile: ${enable_apparmor} " diff -Nru redshift-1.11/configure.ac redshift-1.12/configure.ac --- redshift-1.11/configure.ac 2016-01-02 22:00:09.000000000 +0000 +++ redshift-1.12/configure.ac 2018-05-21 01:19:53.000000000 +0000 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.69]) -AC_INIT([redshift], [1.11], [https://github.com/jonls/redshift/issues]) +AC_INIT([redshift], [1.12], [https://github.com/jonls/redshift/issues]) AC_CONFIG_SRCDIR([src/redshift.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -13,11 +13,32 @@ # Checks for programs. AC_PROG_CC_C99 AC_PROG_LIBTOOL -AC_PROG_OBJC # For OSX support modules +AC_PROG_OBJC # For macOS support modules AC_LANG([C]) AC_PROG_INTLTOOL([0.50]) +AC_CANONICAL_HOST + +# Test host platform +build_windows=no +case "${host_os}" in + mingw*) + build_windows=yes + ;; +esac + +# Test whether to compile Windows resources +AC_CHECK_TOOL([WINDRES], [windres], []) +AS_IF([test "x$build_windows" = "xyes" -a -n "x$WINDRES"], [ + enable_windows_resource=yes +], [ + enable_windows_resource=no +]) +AM_CONDITIONAL([ENABLE_WINDOWS_RESOURCE], + [test "x$enable_windows_resource" = xyes]) + + # Test whether Objective C compiler works AC_MSG_CHECKING([whether Objective C compiler works]) AC_LANG_PUSH([Objective C]) @@ -48,10 +69,9 @@ [have_xcb_randr=yes], [have_xcb_randr=no]) PKG_CHECK_MODULES([GLIB], [glib-2.0 gobject-2.0], [have_glib=yes], [have_glib=no]) -PKG_CHECK_MODULES([GEOCLUE], [geoclue], [have_geoclue=yes], [have_geoclue=no]) PKG_CHECK_MODULES([GEOCLUE2], [glib-2.0 gio-2.0 >= 2.26], [have_geoclue2=yes], [have_geoclue2=no]) -# OSX headers +# macOS headers AC_CHECK_HEADER([ApplicationServices/ApplicationServices.h], [have_appserv_h=yes], [have_appserv_h=no]) # CoreLocation.h is an Objective C header. Only test if @@ -128,7 +148,7 @@ ]) AM_CONDITIONAL([ENABLE_RANDR], [test "x$enable_randr" = xyes]) -# Check VidMode method +# Check VidMode method AC_MSG_CHECKING([whether to enable VidMode method]) AC_ARG_ENABLE([vidmode], [AC_HELP_STRING([--enable-vidmode], [enable VidMode method])], @@ -152,10 +172,10 @@ ]) AM_CONDITIONAL([ENABLE_VIDMODE], [test "x$enable_vidmode" = xyes]) -# Check Quartz (OSX) method +# Check Quartz (macOS) method AC_MSG_CHECKING([whether to enable Quartz method]) AC_ARG_ENABLE([quartz], [AC_HELP_STRING([--enable-quartz], - [enable Quartz (OSX) method])], + [enable Quartz (macOS) method])], [enable_quartz=$enableval],[enable_quartz=maybe]) AS_IF([test "x$enable_quartz" != xno], [ AS_IF([test $have_appserv_h = yes], [ @@ -180,7 +200,7 @@ AC_SUBST([QUARTZ_CFLAGS]) AC_SUBST([QUARTZ_LIBS]) -# Check Windows GDI method +# Check Windows GDI method AC_MSG_CHECKING([whether to enable WinGDI method]) AC_ARG_ENABLE([wingdi], [AC_HELP_STRING([--enable-wingdi], [enable WinGDI method])], @@ -205,30 +225,6 @@ AM_CONDITIONAL([ENABLE_WINGDI], [test "x$enable_wingdi" = xyes]) -# Check Geoclue location provider -AC_MSG_CHECKING([whether to enable Geoclue location provider]) -AC_ARG_ENABLE([geoclue], [AC_HELP_STRING([--enable-geoclue], - [enable Geoclue location provider])], - [enable_geoclue=$enableval],[enable_geoclue=maybe]) -AS_IF([test "x$enable_geoclue" != xno], [ - AS_IF([test "x$have_geoclue" = xyes -a "x$have_glib" = xyes], [ - AC_DEFINE([ENABLE_GEOCLUE], 1, - [Define to 1 to enable Geoclue location provider]) - AC_MSG_RESULT([yes]) - enable_geoclue=yes - ], [ - AC_MSG_RESULT([missing dependencies]) - AS_IF([test "x$enable_geoclue" = xyes], [ - AC_MSG_ERROR([missing dependencies for Geoclue location provider]) - ]) - enable_geoclue=no - ]) -], [ - AC_MSG_RESULT([no]) - enable_geoclue=no -]) -AM_CONDITIONAL([ENABLE_GEOCLUE], [test "x$enable_geoclue" = xyes]) - # Check Geoclue2 location provider AC_MSG_CHECKING([whether to enable Geoclue2 location provider]) AC_ARG_ENABLE([geoclue2], [AC_HELP_STRING([--enable-geoclue2], @@ -253,15 +249,15 @@ ]) AM_CONDITIONAL([ENABLE_GEOCLUE2], [test "x$enable_geoclue2" = xyes]) -# Check CoreLocation (OSX) provider +# Check CoreLocation (macOS) provider AC_MSG_CHECKING([whether to enable CoreLocation method]) AC_ARG_ENABLE([corelocation], [AC_HELP_STRING([--enable-corelocation], - [enable CoreLocation (OSX) provider])], + [enable CoreLocation (macOS) provider])], [enable_corelocation=$enableval],[enable_corelocation=maybe]) AS_IF([test "x$enable_corelocation" != xno], [ AS_IF([test "x$have_corelocation_h" = xyes], [ CORELOCATION_CFLAGS="" - CORELOCATION_LIBS="-framework Foundation -framework CoreLocation" + CORELOCATION_LIBS="-framework Foundation -framework Cocoa -framework CoreLocation" AC_DEFINE([ENABLE_CORELOCATION], 1, [Define to 1 to enable CoreLocation provider]) AC_MSG_RESULT([yes]) @@ -335,6 +331,21 @@ AM_CONDITIONAL([ENABLE_SYSTEMD], [test "x$enable_systemd" != xno]) +# Check for AppArmor +AC_MSG_CHECKING([whether to enable AppArmor profile]) +AC_ARG_ENABLE([apparmor], [AC_HELP_STRING([--enable-apparmor], + [enable AppArmor profile])], + [enable_apparmor=$enableval],[enable_apparmor=no]) +AS_IF([test "x$enable_apparmor" != xno], [ + AC_MSG_RESULT([yes]) + enable_apparmor=yes +], [ + AC_MSG_RESULT([no]) + enable_apparmor=no +]) +AM_CONDITIONAL([ENABLE_APPARMOR], [test "x$enable_apparmor" != xno]) + + # Checks for header files. AC_CHECK_HEADERS([locale.h stdint.h stdlib.h string.h unistd.h signal.h]) @@ -367,15 +378,15 @@ DRM: ${enable_drm} RANDR: ${enable_randr} VidMode: ${enable_vidmode} - Quartz (OSX): ${enable_quartz} + Quartz (macOS): ${enable_quartz} WinGDI (Windows): ${enable_wingdi} Location providers: - Geoclue: ${enable_geoclue} - Geoclue2: ${enable_geoclue2} - CoreLocation (OSX) ${enable_corelocation} + Geoclue2: ${enable_geoclue2} + CoreLocation (macOS): ${enable_corelocation} GUI: ${enable_gui} Ubuntu icons: ${enable_ubuntu} systemd units: ${enable_systemd} ${systemduserunitdir} + AppArmor profile: ${enable_apparmor} " diff -Nru redshift-1.11/CONTRIBUTING.md redshift-1.12/CONTRIBUTING.md --- redshift-1.11/CONTRIBUTING.md 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/CONTRIBUTING.md 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1,169 @@ + +Build from repository +--------------------- + +``` shell +$ ./bootstrap +$ ./configure +``` + +The bootstrap script will use autotools to set up the build environment +and create the `configure` script. + +Use `./configure --help` for options. Use `--prefix` to make an install in +your home directory. This is necessary to test python scripts. The systemd +user unit directory should be set to avoid writing to the system location. + +Systemd will look for the unit files in `~/.config/systemd/user` so this +directory can be used as a target if the unit files will be used. Otherwise +the location can be set to `no` to disable the systemd files. + +Example: + +``` shell +$ ./configure --prefix=$HOME/redshift/root \ + --with-systemduserunitdir=$HOME/.config/systemd/user +``` + +Now, build the files: + +``` shell +$ make +``` + +The main redshift program can be run at this point. To install to the +prefix directory run: + +``` shell +$ make install +``` + +You can now run the python script. Example: + +``` shell +$ $HOME/redshift/root/bin/redshift-gtk +``` + +Dependencies +------------ + +* autotools, gettext +* intltool, libtool +* libdrm (Optional, for DRM support) +* libxcb, libxcb-randr (Optional, for RandR support) +* libX11, libXxf86vm (Optional, for VidMode support) +* Glib 2 (Optional, for GeoClue2 support) + +* python3, pygobject, pyxdg (Optional, for GUI support) +* appindicator (Optional, for Ubuntu-style GUI status icon) + +Ubuntu users will find all these dependencies in the packages listed in ``.travis.yml``. + +Coding style +------------ + +Redshift follows roughly the Linux coding style +. Some specific rules to +note are: + +* Lines should not be much longer than 80 chars but this is not strictly + enforced. If lines are much longer than this the code could likely be improved + by moving some parts to a smaller function. +* All structures are typedef'ed. +* Avoid Yoda conditions; they make the logic unnecessarily hard to comprehend. +* Avoid multiline if-statements without braces; either use a single line or add + the braces. +* Use only C-style comments (`/* */`). + + +Creating a pull request +----------------------- + +1. Create a topic branch for your specific changes. You can base this off the + master branch or a specific version tag if you prefer (`git co -b topic master`). +2. Create a commit for each logical change on the topic branch. The commit log + must contain a one line description (max 80 chars). If you cannot describe + the commit in 80 characters you should probably split it up into multiple + commits. The first line can be followed by a blank line and a longer + description (split lines at 80 chars) for more complex commits. If the commit + fixes a known issue, mention the issue number in the first line (`Fix #11: + ...`). +3. The topic branch itself should tackle one problem. Feel free to create many + topic branches and pull requests if you have many different patches. Putting + them into one branch makes it harder to review the code. +4. Push the topic branch to Github, find it on github.com and create a pull + request to the master branch. If you are making a bug fix for a specific + release you can create a pull request to the release branch instead + (e.g. `release-1.9`). +5. Discussion will ensue. If you are not prepared to partake in the discussion + or further improve your patch for inclusion, please say so and someone else + may be able to take on responsibility for your patch. Otherwise we will + assume that you will be open to critisism and suggestions for improvements + and that you will take responsibility for further improving the patch. You + can add further commits to your topic branch and they will automatically be + added to the pull request when you push them to Github. +6. You may be asked to rebase the patch on the master branch if your patch + conflicts with recent changes to the master branch. However, if there is no + conflict, there is no reason to rebase. Please do not merge the master back + into your topic branch as that will convolute the history unnecessarily. +7. Finally, when your patch has been refined, you may be asked to squash small + commits into larger commits. This is simply so that the project history is + clean and easy to follow. Remember that each commit should be able to stand + on its own, be able to compile and function normally. Commits that fix a + small error or adds a few comments to a previous commit should normally just + be squashed into that larger commit. + +If you want to learn more about the Git branching model that we use please see + but note that we use +the `master` branch as `develop`. + + +Creating a new release +---------------------- + +1. Select a commit in master to branch from, or if making a bugfix release + use previous release tag as base (e.g. for 1.9.1 use 1.9 as base) +2. Create release branch `release-X.Y` +3. Apply any bugfixes for release +4. Import updated translations from launchpad and commit. Remember to update + `po/LINGUAS` if new languages were added +5. Update version in `configure.ac` and create entry in NEWS +6. Run `make distcheck` +7. Commit and tag release (`vX.Y` or `vX.Y.Z`) +8. Push tag to Github and also upload source dist file to Github + +Also remember to check before release that + +* Windows build is ok +* Build files for distributions are updated + + +Build Fedora RPMs +----------------- + +Run `make dist-xz` and copy the `.tar.xz` file to `~/rpmbuild/SOURCES`. Then run + +``` shell +$ rpmbuild -ba contrib/redshift.spec +``` + +If successful this will place RPMs in `~/rpmbuild/RPMS`. + + +Cross-compile for Windows +------------------------- + +Install MinGW and run `configure` using the following command line. Use +`i686-w64-mingw32` as host for 32-bit builds. + +``` shell +$ ./configure --disable-drm --disable-randr --disable-vidmode --enable-wingdi \ + --disable-quartz --disable-geoclue2 --disable-corelocation --disable-gui \ + --disable-ubuntu --host=x86_64-w64-mingw32 +``` + + +Notes +----- +* verbose flag is (currently) only held in redshift.c; thus, write all + verbose messages there. diff -Nru redshift-1.11/data/apparmor/usr.bin.redshift.in redshift-1.12/data/apparmor/usr.bin.redshift.in --- redshift-1.11/data/apparmor/usr.bin.redshift.in 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/data/apparmor/usr.bin.redshift.in 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1,42 @@ +# ------------------------------------------------------------------ +# +# Copyright (C) 2015 Cameron Norman +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# ------------------------------------------------------------------ + +#include +@bindir@/redshift { + #include + #include + #include + #include + + dbus send + bus=system + path=/org/freedesktop/GeoClue2/Client/[0-9]*, + + dbus receive + bus=system + path=/org/freedesktop/GeoClue2/Manager, + + # Allow but log any other dbus activity + audit dbus bus=system, + + owner @{HOME}/.config/redshift.conf r, + + # Site-specific additions and overrides. See local/README for details. + #include +} diff -Nru redshift-1.11/data/appdata/redshift-gtk.appdata.xml.in redshift-1.12/data/appdata/redshift-gtk.appdata.xml.in --- redshift-1.11/data/appdata/redshift-gtk.appdata.xml.in 2014-12-28 03:49:55.000000000 +0000 +++ redshift-1.12/data/appdata/redshift-gtk.appdata.xml.in 2017-10-11 04:43:42.000000000 +0000 @@ -11,7 +11,7 @@ - http://jonls.dk/wp-content/uploads/screenshot1.png + http://jonls.dk/assets/screenshot1.png <_caption>The Redshift information window overlaid with an example of the redness effect diff -Nru redshift-1.11/debian/changelog redshift-1.12/debian/changelog --- redshift-1.11/debian/changelog 2018-05-14 00:05:29.000000000 +0000 +++ redshift-1.12/debian/changelog 2018-10-02 08:38:56.000000000 +0000 @@ -1,9 +1,25 @@ -redshift (1.11-2ubuntu1) cosmic; urgency=medium +redshift (1.12-2) unstable; urgency=medium - * Sync with Debian. Remaining change: - - Build with --enable-unity for extra icons + [ Ondřej Nový ] + * d/changelog: Remove trailing whitespaces + * d/control: Remove trailing whitespaces + * d/watch: Use https protocol - -- Jeremy Bicha Sun, 13 May 2018 20:05:29 -0400 + [ Ritesh Raj Sarraf ] + * [b2405eb0] Enable Ubuntu icons + + -- Ritesh Raj Sarraf Tue, 02 Oct 2018 14:08:56 +0530 + +redshift (1.12-1) unstable; urgency=medium + + * [69589335] New upstream version 1.12 (Closes: #908289) + * [d6d037aa] Use gbp changelog + * [46f5da03] Switch packaging to salsa + * [45f056cf] Delete patches not needed any more + * [05d8c485] Drop obsolete X-Python3-Version + * [7a596a2d] Switch priority to optional + + -- Ritesh Raj Sarraf Sat, 08 Sep 2018 17:52:32 +0545 redshift (1.11-2) unstable; urgency=medium @@ -185,10 +201,10 @@ * Upgrade to Standards-Verions 3.9.2, no changes needed * Updated the manpages * Removed autostart of gtk-redshift because of freedesktop.org standard - violation (Closes: #619699) + added README.Debian + violation (Closes: #619699) + added README.Debian * Removed /usr/share/pyshared/gtk_redshift/utils.py from package as autostart is disabled - * Migrated from dh_pysupport to dh_python2 (added dependency to python + * Migrated from dh_pysupport to dh_python2 (added dependency to python (>= 2.6.6-3~)) * Added Vcs + Vcs-Browser entry to debian/control @@ -202,14 +218,14 @@ redshift (1.5-2) unstable; urgency=low - * Enabling option for automatic location updates from GNOME clock applet + * Enabling option for automatic location updates from GNOME clock applet * Add build-dependency libgconf2-dev for GNOME clock applet support * Add dependency for gtk-redshift python-xdg - * Add versioned dependency autotools-dev (>= 20100122.1~) due to use of + * Add versioned dependency autotools-dev (>= 20100122.1~) due to use of "dh --with autotools_dev $@" in debian/rules * Upgrade to Standards-Verions 3.9.1, no changes needed * Include NEWS and basic README from upstream (Closes: #595342) - * Install .desktop and .menu file for gtk-redshift + * Install .desktop and .menu file for gtk-redshift -- Franziska Lichtblau Tue, 05 Oct 2010 00:38:23 +0200 @@ -221,12 +237,12 @@ redshift (1.2-3) unstable; urgency=low - * Add Franziska Lichtblau to uploaders + * Add Franziska Lichtblau to uploaders * Add python dependency (Closes:#589211,#589494,#571149) thanks to Jakub Wilk - for patch + for patch * Add dependency for pkg-config (>= 0.25) older version fails with - XF86VM (Closes:#581895) - * Add manpages for redshift and gtk-redshift (Closes:#589210) + XF86VM (Closes:#581895) + * Add manpages for redshift and gtk-redshift (Closes:#589210) -- Franziska Lichtblau Fri, 23 Jul 2010 00:01:00 +0200 diff -Nru redshift-1.11/debian/control redshift-1.12/debian/control --- redshift-1.11/debian/control 2018-05-14 00:05:29.000000000 +0000 +++ redshift-1.12/debian/control 2018-10-02 08:26:17.000000000 +0000 @@ -1,14 +1,12 @@ Source: redshift Section: x11 -Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ritesh Raj Sarraf +Priority: optional +Maintainer: Ritesh Raj Sarraf Uploaders: Franziska Lichtblau Build-Depends: debhelper (>= 9), autotools-dev (>= 20100122.1~), pkg-config (>= 0.25), dpkg-dev (>= 1.16.1~), libxcb-randr0-dev, libxxf86vm-dev, libglib2.0-dev, python3, libxext-dev, libdrm-dev [!hurd-any], intltool, dh-python, dh-autoreconf -X-Python3-Version: >= 3.2 -Standards-Version: 3.9.3 -Vcs-Git: https://anonscm.debian.org/git/collab-maint/redshift.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/redshift.git +Standards-Version: 3.9.3 +Vcs-Git: https://salsa.debian.org/debian/redshift.git +Vcs-Browser: https://salsa.debian.org/debian/redshift.git Homepage: http://jonls.dk/redshift/ Package: redshift diff -Nru redshift-1.11/debian/gbp.conf redshift-1.12/debian/gbp.conf --- redshift-1.11/debian/gbp.conf 2018-05-14 00:05:29.000000000 +0000 +++ redshift-1.12/debian/gbp.conf 2018-09-08 04:26:30.000000000 +0000 @@ -1,2 +1,5 @@ [DEFAULT] pristine-tar = True + +[dch] +id-length = 8 diff -Nru redshift-1.11/debian/patches/add-desktop-file.patch redshift-1.12/debian/patches/add-desktop-file.patch --- redshift-1.11/debian/patches/add-desktop-file.patch 2018-05-14 00:05:29.000000000 +0000 +++ redshift-1.12/debian/patches/add-desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Add .desktop file until next release, when we can then drop it ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,6 +28,7 @@ - data/icons/ubuntu-mono-light/scalable/apps/redshift-status-off.svg - - DESKTOP_IN_FILES = \ -+ data/applications/redshift.desktop.in \ - data/applications/redshift-gtk.desktop.in - - SYSTEMD_USER_UNIT_IN_FILES = \ ---- /dev/null -+++ b/data/applications/redshift.desktop.in -@@ -0,0 +1,10 @@ -+[Desktop Entry] -+Version=1.0 -+_Name=Redshift -+_GenericName=Color temperature adjustment -+_Comment=Color temperature adjustment tool -+Exec=redshift -+Icon=redshift -+Terminal=true -+Type=Application -+NoDisplay=true ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1,6 +1,7 @@ - # List of source files containing translatable strings - - data/appdata/redshift-gtk.appdata.xml.in -+data/applications/redshift.desktop.in - data/applications/redshift-gtk.desktop.in - - src/redshift.c diff -Nru redshift-1.11/debian/patches/remove_autostart.patch redshift-1.12/debian/patches/remove_autostart.patch --- redshift-1.11/debian/patches/remove_autostart.patch 2018-05-14 00:05:29.000000000 +0000 +++ redshift-1.12/debian/patches/remove_autostart.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -This patch removes the invocation of get_autostart() and -set_autostart(active). So gtk-redshift won't autostart (see #619699) ---- a/src/redshift-gtk/statusicon.py -+++ b/src/redshift-gtk/statusicon.py -@@ -273,18 +273,6 @@ - suspend_menu_item.set_submenu(suspend_menu) - self.status_menu.append(suspend_menu_item) - -- # Add autostart option -- autostart_item = Gtk.CheckMenuItem.new_with_label(_('Autostart')) -- try: -- autostart_item.set_active(utils.get_autostart()) -- except IOError as strerror: -- print(strerror) -- autostart_item.set_property('sensitive', False) -- else: -- autostart_item.connect('toggled', self.autostart_cb) -- finally: -- self.status_menu.append(autostart_item) -- - # Add info action - info_item = Gtk.MenuItem.new_with_label(_('Info')) - info_item.connect('activate', self.show_info_cb) diff -Nru redshift-1.11/debian/rules redshift-1.12/debian/rules --- redshift-1.11/debian/rules 2018-05-14 00:05:29.000000000 +0000 +++ redshift-1.12/debian/rules 2018-10-02 08:28:24.000000000 +0000 @@ -12,7 +12,7 @@ override_dh_auto_configure: intltoolize --force - dh_auto_configure -- --enable-randr --enable-vidmode --enable-geoclue2 --disable-geoclue --with-systemduserunitdir=/usr/lib/systemd/user/ --enable-unity + dh_auto_configure -- --enable-randr --enable-vidmode --enable-geoclue2 --enable-ubuntu --disable-geoclue --with-systemduserunitdir=/usr/lib/systemd/user/ override_dh_installchangelogs: dh_installchangelogs NEWS diff -Nru redshift-1.11/debian/watch redshift-1.12/debian/watch --- redshift-1.11/debian/watch 2018-05-14 00:05:29.000000000 +0000 +++ redshift-1.12/debian/watch 2018-10-02 08:26:17.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://launchpad.net/redshift/+download .*/redshift-(.*).tar.bz2 +https://launchpad.net/redshift/+download .*/redshift-(.*).tar.bz2 diff -Nru redshift-1.11/depcomp redshift-1.12/depcomp --- redshift-1.11/depcomp 2016-01-02 19:04:55.000000000 +0000 +++ redshift-1.12/depcomp 2017-07-28 21:58:10.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2013-05-30.07; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -786,6 +786,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru redshift-1.11/DESIGN redshift-1.12/DESIGN --- redshift-1.11/DESIGN 2014-05-07 21:14:33.000000000 +0000 +++ redshift-1.12/DESIGN 2017-10-19 02:36:21.000000000 +0000 @@ -64,8 +64,8 @@ temperature. There's also "wingdi" which is for the Windows version, and "drm" which allows manipulation of gamma ramps in a TTY in Linux. -Then there are location providers: "manual", "gnome-clock" and -"geoclue". Some time ago there was only one way to specify the +Then there are location providers: "manual", "geoclue2" and "corelocation". +Some time ago there was only one way to specify the location which had to be done manually with the argument "-l LAT:LON". Then later, automatic "location providers" were added and the syntax had to be changed to "-l PROVIDER:OPTIONS" where OPTIONS are arguments diff -Nru redshift-1.11/HACKING redshift-1.12/HACKING --- redshift-1.11/HACKING 2016-01-02 19:01:20.000000000 +0000 +++ redshift-1.12/HACKING 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ - -Build from repository ---------------------- - -``` shell -$ ./bootstrap -$ ./configure -``` - -The bootstrap script will use autotools to set up the build environment -and create the `configure` script. - -Use `./configure --help` for options. Use `--prefix` to make an install in -your home directory. This is necessary to test python scripts. The systemd -user unit directory should be set to avoid writing to the system location. - -Systemd will look for the unit files in `~/.config/systemd/user` so this -directory can be used as a target if the unit files will be used. Otherwise -the location can be set to `no` to disable the systemd files. - -Example: - -``` shell -$ ./configure --prefix=$HOME/redshift/root \ - --with-systemduserunitdir=$HOME/.config/systemd/user -``` - -Now, build the files: - -``` shell -$ make -``` - -The main redshift program can be run at this point. To install to the -prefix directory run: - -``` shell -$ make install -``` - -You can now run the python script. Example: - -``` shell -$ $HOME/redshift/root/bin/redshift-gtk -``` - -Dependencies ------------- - -* autotools, gettext -* intltool, libtool -* libdrm (Optional, for DRM support) -* libxcb, libxcb-randr (Optional, for RandR support) -* libX11, libXxf86vm (Optional, for VidMode support) -* geoclue (Optional, for geoclue support) - -* python3, pygobject, pyxdg (Optional, for GUI support) -* appindicator (Optional, for Ubuntu-style GUI status icon) - -Ubuntu users will find all these dependencies in the packages listed in ``.travis.yml``. - -Coding style ------------- - -Redshift follows roughly the Linux coding style -. Some specific rules to -note are: - -* Lines should not be much longer than 80 chars but this is not strictly - enforced. If lines are much longer than this the code could likely be improved - by moving some parts to a smaller function. -* All structures are typedef'ed. -* Avoid Yoda conditions; they make the logic unnecessarily hard to comprehend. -* Avoid multiline if-statements without braces; either use a single line or add - the braces. -* Use only C-style comments (`/* */`). - - -Creating a pull request ------------------------ - -1. Create a topic branch for your specific changes. You can base this off the - master branch or a specific version tag if you prefer (`git co -b topic master`). -2. Create a commit for each logical change on the topic branch. The commit log - must contain a one line description (max 80 chars). If you cannot describe - the commit in 80 characters you should probably split it up into multiple - commits. The first line can be followed by a blank line and a longer - description (split lines at 80 chars) for more complex commits. If the commit - fixes a known issue, mention the issue number in the first line (`Fix #11: - ...`). -3. The topic branch itself should tackle one problem. Feel free to create many - topic branches and pull requests if you have many different patches. Putting - them into one branch makes it harder to review the code. -4. Push the topic branch to Github, find it on github.com and create a pull - request to the master branch. If you are making a bug fix for a specific - release you can create a pull request to the release branch instead - (e.g. `release-1.9`). -5. Discussion will ensue. If you are not prepared to partake in the discussion - or further improve your patch for inclusion, please say so and someone else - may be able to take on responsibility for your patch. Otherwise we will - assume that you will be open to critisism and suggestions for improvements - and that you will take responsibility for further improving the patch. You - can add further commits to your topic branch and they will automatically be - added to the pull request when you push them to Github. -6. You may be asked to rebase the patch on the master branch if your patch - conflicts with recent changes to the master branch. However, if there is no - conflict, there is no reason to rebase. Please do not merge the master back - into your topic branch as that will convolute the history unnecessarily. -7. Finally, when your patch has been refined, you may be asked to squash small - commits into larger commits. This is simply so that the project history is - clean and easy to follow. Remember that each commit should be able to stand - on its own, be able to compile and function normally. Commits that fix a - small error or adds a few comments to a previous commit should normally just - be squashed into that larger commit. - -If you want to learn more about the Git branching model that we use please see - but note that we use -the `master` branch as `develop`. - - -Creating a new release ----------------------- - -1. Select a commit in master to branch from, or if making a bugfix release - use previous release tag as base (e.g. for 1.9.1 use 1.9 as base) -2. Create release branch `release-X.Y` -3. Apply any bugfixes for release -4. Import updated translations from launchpad and commit. Remember to update - `po/LINGUAS` if new languages were added -5. Update version in `configure.ac` and create entry in NEWS -6. Run `make distcheck` -7. Commit and tag release (`vX.Y` or `vX.Y.Z`) -8. Push tag to Github and also upload source dist file to Github - -Also remember to check before release that - -* Windows build is ok -* Build files for distributions are updated - - -Build Fedora RPMs ------------------ - -Run `make dist-xz` and copy the `.tar.xz` file to `~/rpmbuild/SOURCES`. Then run - -``` shell -$ rpmbuild -ba contrib/redshift.spec -``` - -If successful this will place RPMs in `~/rpmbuild/RPMS`. - - -Cross-compile for Windows -------------------------- - -Install MinGW and run `configure` using the following command line. Use -`i686-w64-migw32` as host for 32-bit builds. - -``` shell -$ ./configure --disable-drm --disable-randr --disable-vidmode --enable-wingdi \ - --disable-geoclue --disable-gui --disable-ubuntu \ - --host=x86_64-w64-mingw32 -``` - - -Notes ------ -* verbose flag is (currently) only held in redshift.c; thus, write all - verbose messages there. diff -Nru redshift-1.11/install-sh redshift-1.12/install-sh --- redshift-1.11/install-sh 2016-01-02 19:04:54.000000000 +0000 +++ redshift-1.12/install-sh 2017-07-28 21:58:10.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2016-01-11.22; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -522,6 +496,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru redshift-1.11/ltmain.sh redshift-1.12/ltmain.sh --- redshift-1.11/ltmain.sh 2016-01-02 19:04:46.000000000 +0000 +++ redshift-1.12/ltmain.sh 2017-07-28 21:58:02.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# Provide generalized library-building support services. -# -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --no-quiet, --no-silent -# print informational messages (default) -# --no-warn don't display warning messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print more informational messages than default -# --no-verbose don't print the extra informational messages -# --version print version information -# -h, --help, --help-all print short, long, or detailed help message -# -# MODE must be one of the following: -# -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory -# -# MODE-ARGS vary depending on the MODE. When passed as first option, -# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. -# Try `$progname --help --mode=MODE' for a more detailed description of MODE. -# -# When reporting a bug, please describe a test case to reproduce it and -# include the following information: -# -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' -} -# NLS nuisances: We save the old values to restore during execute mode. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='s|\([`"$\\]\)|\\\1|g' +# Same as above, but do not quote variable references. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath=$0 -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed="${SED}"' -e 1s/^X//' -sed_quote_subst='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} -# func_error arg... -# Echo program name prefixed message to standard error. -func_error () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# func_normal_abspath PATH +# ------------------------ +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"` + while :; do + # Processed it all yet? + if test / = "$func_normal_abspath_tpath"; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result"; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent" + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + + +# func_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=$func_dirname_result + if test -z "$func_relative_path_tlibdir"; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. + +# func_help +# --------- +# Echo long help message to standard output and exit. func_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --config show all configuration variables + --debug enable verbose shell tracing + -n, --dry-run display commands without modifying any files + --features display basic configuration information and exit + --mode=MODE use operation mode MODE + --no-warnings equivalent to '-Wnone' + --preserve-dup-deps don't remove duplicate dependency libraries + --quiet, --silent don't print informational messages + --tag=TAG use configuration variables from tag TAG + -v, --verbose print more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +MODE must be one of the following: + + clean remove files from the build directory + compile compile a source file into a libtool object + execute automatically set library path, then run a program + finish complete the installation of libtool libraries + install install libraries or executables + link create a library or an executable + uninstall remove libraries from an installed directory + +MODE-ARGS vary depending on the MODE. When passed as first option, +'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that. +Try '$progname --help --mode=MODE' for a more detailed description of MODE. + +When reporting a bug, please describe a test case to reproduce it and +include the following information: + + host-triplet: $host + shell: $SHELL + compiler: $LTCC + compiler flags: $LTCFLAGS + linker: $LD (gnu? $with_gnu_ld) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # Calculate the filename of the output object if compiler does # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -no-suppress do not suppress compiler output for multiple passes -prefer-pic try to build PIC objects only -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -shared do not build a '.o' file suitable for static linking + -static only build a '.o' file suitable for static linking -Wc,FLAG pass FLAG directly to the compiler -COMPILE-COMMAND is a command to be used in creating a \`standard' object file +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -avoid-version do not add a version suffix if possible -bindir BINDIR specify path to binaries directory (for systems where libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) -All other options (arguments beginning with \`-') are ignored. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ echo echo "If you ever happen to want to link against installed libraries" echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "specify the full pathname of the library, or use the '-LLIBDIR'" echo "flag during linking and do at least one of the following:" if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " - add LIBDIR to the '$shlibpath_var' environment variable" echo " during execution" fi if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + test -n "$relink_command" && srcname=${realname}T # Install the shared library and build the symlinks. func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; then lockfile=$f_ex_an_ar_oldlib.lock until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" @@ -3724,7 +5097,7 @@ fi func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR # variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # Very basic option parsing. These options are (a) specific to # the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # ifdef __STRICT_ANSI__ char *realpath (const char *, char *); int putenv (char *); int setenv (const char *, const char *, int); # endif -/* #elif defined (other platforms) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#if defined _MSC_VER # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv # define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,48 @@ # -m*, -t[45]*, -txscale* architecture-specific flags for GCC # -F/path path to uninstalled frameworks, gcc on darwin # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang memory and address sanitizer -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -fsanitize=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7329,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7354,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7362,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7386,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7394,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7410,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7429,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7441,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7452,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7491,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7499,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7531,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7539,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7551,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7594,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7623,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7637,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7660,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7681,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7712,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7734,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7758,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7769,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7796,13 @@ echo "*** shared version of the library, which you do not appear to have" echo "*** because the file extensions .$libext of this argument makes me believe" echo "*** that it is just a static archive that I should not use here." - else - echo - $ECHO "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7813,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7829,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7872,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7909,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7942,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7984,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8032,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8044,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8063,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8080,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8117,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8128,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8150,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8195,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8239,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + if test -z "$old_library"; then echo echo "*** And there doesn't seem to be a static archive available" echo "*** The link will probably fail, sorry" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8299,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8310,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8320,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8337,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8372,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8383,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot link to static lib archive $lib." echo "*** I have the capability to make that library automatically link in when" echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then + if test yes = "$module"; then echo "*** But as you try to build a module library, libtool will still create " echo "*** a static module, that should work as long as the dlopening application" echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8432,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8450,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8465,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8474,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8487,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8500,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8540,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8566,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8629,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8724,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8741,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8751,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8774,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8795,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8838,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8876,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8916,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8997,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9044,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9061,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9086,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9102,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9111,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9135,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9151,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9182,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9225,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9275,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9310,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9336,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9359,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9390,7 @@ echo "*** you link to this library. But I can only do this if you have a" echo "*** shared version of the library, which you do not appear to have" echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9406,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; then + for i in $predeps $postdeps; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9441,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9451,12 @@ if test -z "$global_symbol_pipe"; then echo echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** lists from a program, using 'nm' or equivalent, but libtool could" echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." + echo "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9467,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; then echo echo "*** Since this library must not contain undefined symbols," echo "*** because either the platform does not support them or" echo "*** it was explicitly requested with -no-undefined," echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9520,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9528,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9571,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9585,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9596,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9622,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9631,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9669,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9680,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9703,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9712,16 @@ fi if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9740,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9755,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9764,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9793,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9826,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9839,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9861,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9873,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9889,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9904,9 @@ # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ reload_objs="$objlist $last_robj" - eval concat_cmds=\"\${concat_cmds}$reload_cmds\" + eval concat_cmds=\"\$concat_cmds$reload_cmds\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9914,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9925,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9942,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9951,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9959,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + tmp_export_symbols=$export_symbols + test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9979,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9993,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10015,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10023,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10036,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10045,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10068,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10108,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10121,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10142,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10159,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10169,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10191,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10212,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10252,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10276,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10299,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10316,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10327,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10352,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; then # Transform all the library objects into standard objects. compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10401,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10436,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10455,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10533,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10555,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10578,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10606,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10633,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10642,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10711,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10739,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10754,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10794,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10820,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10863,9 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10874,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10888,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10914,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10929,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10964,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10990,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11008,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11019,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11040,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11079,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11093,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11103,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11124,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11147,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru redshift-1.11/m4/intltool.m4 redshift-1.12/m4/intltool.m4 --- redshift-1.11/m4/intltool.m4 2016-01-02 19:04:39.000000000 +0000 +++ redshift-1.12/m4/intltool.m4 2017-07-28 21:57:54.000000000 +0000 @@ -131,55 +131,9 @@ 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]) ]) Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/m4/._libtool.m4 and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/m4/._libtool.m4 differ diff -Nru redshift-1.11/m4/libtool.m4 redshift-1.12/m4/libtool.m4 --- redshift-1.11/m4/libtool.m4 2016-01-02 19:04:46.000000000 +0000 +++ redshift-1.12/m4/libtool.m4 2017-07-28 21:58:02.000000000 +0000 @@ -1,8 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# 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. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This is free software; see the source for copying conditions. There is NO +# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[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-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# 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, +# '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" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # 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' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _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 +# 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"`']) @@ -446,7 +456,7 @@ # 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 +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# 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], @@ -500,8 +510,8 @@ # 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 +# 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], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], 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=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # 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 +# '#!' 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). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # 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 && +test yes = "$silent" && lt_config_lt_args="$lt_config_lt_args --quiet" exec AS_MESSAGE_LOG_FD>/dev/null $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false @@ -705,27 +715,31 @@ _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 + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ 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" @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ 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 + 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 @@ -992,7 +1014,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib' fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _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\"`' + if test yes = "$lt_cv_ld_force_load"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _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" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _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}" + _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}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # 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 +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _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" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # 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). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ 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).], +[AS_HELP_STRING([--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 #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + 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.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [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 +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,7 +1386,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1369,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + 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 + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1389,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1398,7 +1468,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1414,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1433,11 +1503,11 @@ [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 + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1445,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1476,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1512,7 +1582,7 @@ [$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" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1539,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1561,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + 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 @@ -1580,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1604,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1644,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1694,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1725,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1753,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1800,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1828,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + 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 @@ -1849,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1859,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [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"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1905,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1929,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1939,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2033,8 +2112,8 @@ 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 +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2044,8 +2123,8 @@ 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]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2072,8 +2151,8 @@ _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.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2085,15 +2164,15 @@ _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 + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2107,12 +2186,12 @@ 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 +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2136,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2154,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2164,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + darwin*) lt_awk_arg='/^libraries:/,/LR/' ;; + *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; + mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` case $lt_search_path_spec in @@ -2190,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" fi done lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2225,7 +2353,7 @@ # for these hosts. case $host_os in mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([[A-Za-z]]:\),\1,g'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2234,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2251,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2266,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2310,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; m68k) library_names_spec='$libname.ixlibrary $libname.a' # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ;; esac ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2329,8 +2510,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2342,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2351,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2368,17 +2549,17 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' 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}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2387,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2415,7 +2596,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2428,8 +2609,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2442,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2455,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2469,8 +2650,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2488,12 +2669,13 @@ 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}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2518,26 +2700,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2555,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2570,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2580,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2594,8 +2766,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2606,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2614,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2634,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2644,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2675,14 +2867,15 @@ # 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 + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" - + 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 @@ -2699,12 +2892,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2714,7 +2907,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2723,58 +2916,68 @@ version_type=qnx need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes dynamic_linker='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2785,8 +2988,8 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes @@ -2796,11 +2999,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2808,8 +3011,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH case $host_vendor in sni) @@ -2830,24 +3033,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2865,7 +3068,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2873,8 +3076,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH ;; @@ -2883,20 +3086,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2929,39 +3142,41 @@ [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_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR 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" + 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 -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" + 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 : @@ -2984,11 +3199,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3006,7 +3221,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3033,16 +3248,16 @@ 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], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # 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` ;; @@ -3056,7 +3271,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3067,37 +3282,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3183,13 +3435,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3216,8 +3468,7 @@ # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + if ( file / ) >/dev/null 2>&1; then lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' lt_cv_file_magic_cmd='func_win32_libid' else @@ -3253,10 +3504,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3295,7 +3542,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3317,8 +3564,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3371,6 +3618,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3411,33 +3661,38 @@ 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" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3448,21 +3703,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3470,8 +3725,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3517,8 +3772,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3530,7 +3785,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3557,13 +3812,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3575,11 +3845,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3598,7 +3868,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3650,7 +3920,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3683,14 +3953,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3708,21 +4008,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3762,11 +4065,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3792,7 +4095,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3812,9 +4115,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3835,7 +4138,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3862,12 +4165,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,17 +4190,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; 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 + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3904,8 +4212,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3921,6 +4229,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3970,7 +4283,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4011,14 +4324,14 @@ 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_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4047,7 +4360,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4055,7 +4368,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # 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' @@ -4200,17 +4513,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; 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 + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4221,8 +4535,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4239,6 +4553,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4309,7 +4628,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4317,11 +4636,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4337,7 +4675,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4346,9 +4684,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4373,6 +4711,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4470,7 +4814,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4499,7 +4843,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4565,17 +4909,21 @@ 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". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4621,9 +4969,9 @@ # 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'. + # 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 @@ -4639,7 +4987,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4647,7 +4995,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4657,7 +5005,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4679,24 +5027,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _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' + _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 + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4709,7 +5057,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4728,7 +5076,7 @@ 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_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4744,7 +5092,7 @@ _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' + _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 @@ -4754,7 +5102,7 @@ # _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(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 @@ -4762,61 +5110,89 @@ _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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + 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' + _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' + _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 + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' tmp_sharedflag='-shared' case $cc_basename,$host_cpu in pgcc*) # Portland Group C compiler - _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(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' + _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' ;; @@ -4827,42 +5203,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; nvcc*) # Cuda Compiler Driver 2.2 - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive' + _LT_TAGVAR(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(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_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 + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + 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 @@ -4876,8 +5257,8 @@ _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' + _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 ;; @@ -4895,8 +5276,8 @@ _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' + _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 @@ -4908,7 +5289,7 @@ _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 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4923,9 +5304,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _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' + _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 @@ -4942,15 +5323,15 @@ *) 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' + _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 + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4966,7 +5347,7 @@ # 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 + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4974,34 +5355,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - _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' + _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5020,13 +5424,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5045,61 +5457,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _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 + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _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" + _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 + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _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' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5108,7 +5539,7 @@ 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_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5138,16 +5569,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _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=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5156,18 +5588,18 @@ # 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' + 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 @@ -5176,7 +5608,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _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. @@ -5226,33 +5658,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_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' + _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' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _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 @@ -5260,25 +5692,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _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+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' + _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' + _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' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5286,14 +5718,14 @@ # (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)='$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']) + [_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' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5304,7 +5736,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _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. @@ -5315,16 +5747,16 @@ ;; 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' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # Try to use the -exported_symbol ld option, if it does not # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [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; }]], @@ -5337,21 +5769,31 @@ 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' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' + _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_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + 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 @@ -5366,7 +5808,7 @@ 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_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5374,27 +5816,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _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 + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5405,33 +5839,53 @@ _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' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; osf3*) - if test "$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' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _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_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' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' else _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_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' + $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' @@ -5442,24 +5896,24 @@ 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' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $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_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' + $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' + 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' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5469,11 +5923,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5483,10 +5937,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _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 @@ -5535,43 +5989,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _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' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _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 + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(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_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' + _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' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _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 ;; @@ -5586,17 +6040,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _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 +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5613,7 +6067,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5693,12 +6147,12 @@ _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 + [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 + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5739,10 +6193,10 @@ # ------------------------ # 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'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5782,18 +6236,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what 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 + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5801,8 +6255,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5810,13 +6268,13 @@ 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 + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5824,14 +6282,14 @@ # -------------------------- # 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'. +# 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 +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5873,7 +6331,7 @@ # 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 +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5915,35 +6373,35 @@ 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 + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; 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' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _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}' + 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' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5979,18 +6437,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6000,6 +6470,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6018,13 +6495,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6042,64 +6527,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _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 + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_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" + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag else - if test "$host_cpu" = ia64; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _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" + _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 + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; then # We only use this code for GNU lds that support --whole-archive. - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _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' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6109,7 +6614,7 @@ _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' + _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 @@ -6137,57 +6642,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _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=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + 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(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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6198,6 +6704,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6232,18 +6766,15 @@ _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(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_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _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 @@ -6255,7 +6786,7 @@ _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' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6264,11 +6795,11 @@ # 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; 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' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6278,15 +6809,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; 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' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6312,13 +6843,13 @@ 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' + _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+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' + _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 @@ -6329,20 +6860,20 @@ # 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; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _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+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' + _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 @@ -6357,22 +6888,22 @@ 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' + _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' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in CC*) # SGI C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib' + _LT_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 @@ -6381,22 +6912,22 @@ _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' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _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_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) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6404,8 +6935,8 @@ # 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' + _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. @@ -6414,10 +6945,10 @@ # 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; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _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. @@ -6431,59 +6962,59 @@ # 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' + _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' + _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' + _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`"' + 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' + 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' + 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' + 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' + _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' + _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' + _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' @@ -6497,18 +7028,18 @@ # 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=`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(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + 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 ;; *) @@ -6516,10 +7047,10 @@ *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(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(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 @@ -6577,22 +7108,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || 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' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' fi output_verbose_link_cmd=func_echo_all else @@ -6608,9 +7134,9 @@ # 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_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_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6628,17 +7154,17 @@ 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)=' $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_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' + 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 @@ -6653,21 +7179,21 @@ # 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=`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}\*' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' case $host in osf3*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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' + _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_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6713,9 +7239,9 @@ # 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_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' + $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 @@ -6723,7 +7249,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # 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' ;; @@ -6740,30 +7266,30 @@ ;; 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' + _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 test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # 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 + # 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_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6771,11 +7297,11 @@ 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' + _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' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6784,52 +7310,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _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 -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' + _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 + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(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_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' + _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(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(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_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' + _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 ;; @@ -6860,10 +7386,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6890,7 +7416,7 @@ 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 +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6912,13 +7438,14 @@ 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}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7002,13 +7529,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + 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 + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7024,16 +7551,16 @@ 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 + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _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}" + _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 @@ -7041,9 +7568,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7058,15 +7585,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _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" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7097,51 +7624,6 @@ _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 ]) @@ -7150,7 +7632,7 @@ 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!^ !!'` + _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]) @@ -7170,10 +7652,10 @@ # -------------------------- # 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'. +# 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 +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7210,7 +7692,7 @@ # 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 +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7232,7 +7714,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7246,21 +7728,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7268,11 +7754,11 @@ 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 + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7289,9 +7775,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7301,11 +7787,11 @@ # ------------------------- # 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'. +# 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 +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7342,7 +7828,7 @@ # 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 +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7364,7 +7850,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7380,21 +7866,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7402,11 +7892,11 @@ 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 + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _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 @@ -7426,7 +7916,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7436,7 +7926,7 @@ # -------------------------- # 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'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7470,7 +7960,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7507,7 +7997,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7541,7 +8031,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7578,7 +8068,7 @@ # ------------------------- # 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'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7594,7 +8084,7 @@ 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" +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 @@ -7604,7 +8094,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7633,7 +8123,7 @@ [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" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7744,7 +8234,7 @@ # 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 + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7761,9 +8251,9 @@ $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 + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7787,27 +8277,7 @@ # 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 +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7831,102 +8301,9 @@ ])# _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 +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/m4/._lt~obsolete.m4 and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/m4/._lt~obsolete.m4 differ diff -Nru redshift-1.11/m4/lt~obsolete.m4 redshift-1.12/m4/lt~obsolete.m4 --- redshift-1.11/m4/lt~obsolete.m4 2016-01-02 19:04:47.000000000 +0000 +++ redshift-1.12/m4/lt~obsolete.m4 2017-07-28 21:58:02.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# 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. # @@ -25,7 +26,7 @@ # 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. +# 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 Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/m4/._ltoptions.m4 and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/m4/._ltoptions.m4 differ diff -Nru redshift-1.11/m4/ltoptions.m4 redshift-1.12/m4/ltoptions.m4 --- redshift-1.11/m4/ltoptions.m4 2016-01-02 19:04:46.000000000 +0000 +++ redshift-1.12/m4/ltoptions.m4 2017-07-28 21:58:02.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 7 ltoptions.m4 +# serial 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [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 + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ 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 '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_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_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.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _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.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _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'. +# 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], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _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'. +# 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], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _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'. +# 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], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_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.]) +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.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# 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'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_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.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/m4/._ltsugar.m4 and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/m4/._ltsugar.m4 differ diff -Nru redshift-1.11/m4/ltsugar.m4 redshift-1.12/m4/ltsugar.m4 --- redshift-1.11/m4/ltsugar.m4 2016-01-02 19:04:47.000000000 +0000 +++ redshift-1.12/m4/ltsugar.m4 2017-07-28 21:58:02.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# 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])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# 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 diff -Nru redshift-1.11/m4/ltversion.m4 redshift-1.12/m4/ltversion.m4 --- redshift-1.11/m4/ltversion.m4 2016-01-02 19:04:47.000000000 +0000 +++ redshift-1.12/m4/ltversion.m4 2017-07-28 21:58:02.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru redshift-1.11/Makefile.am redshift-1.12/Makefile.am --- redshift-1.11/Makefile.am 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/Makefile.am 2017-10-19 22:51:59.000000000 +0000 @@ -9,7 +9,7 @@ UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor || : EXTRA_ROOTDOC_FILES = \ - HACKING \ + CONTRIBUTING.md \ DESIGN \ README \ README-colorramp \ @@ -39,6 +39,9 @@ APPDATA_IN_FILES = \ data/appdata/redshift-gtk.appdata.xml.in +APPARMOR_IN_FILES = \ + data/apparmor/usr.bin.redshift.in + # Icons if ENABLE_GUI @@ -103,6 +106,17 @@ endif +# AppArmor profile +if ENABLE_APPARMOR +apparmordir = @sysconfdir@/apparmor.d +apparmor_DATA = $(APPARMOR_IN_FILES:.in=) + +$(apparmor_DATA): $(APPARMOR_IN_FILES) Makefile + $(AM_V_GEN)$(MKDIR_P) $(@D) && \ + sed -e "s|\@bindir\@|$(bindir)|g" "$(srcdir)/$(@:=.in)" > $@ +endif + + EXTRA_DIST = \ $(EXTRA_ROOTDOC_FILES) \ @@ -111,12 +125,14 @@ $(_UBUNTU_MONO_LIGHT_FILES) \ $(DESKTOP_IN_FILES) \ $(SYSTEMD_USER_UNIT_IN_FILES) \ - $(APPDATA_IN_FILES) + $(APPDATA_IN_FILES) \ + $(APPARMOR_IN_FILES) CLEANFILES = \ $(desktop_DATA) \ $(systemduserunit_DATA) \ - $(appdata_DATA) + $(appdata_DATA) \ + $(apparmor_DATA) # Update PO translations diff -Nru redshift-1.11/Makefile.in redshift-1.12/Makefile.in --- redshift-1.11/Makefile.in 2016-01-02 22:53:19.000000000 +0000 +++ redshift-1.12/Makefile.in 2018-05-21 01:20:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,11 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(dist_man1_MANS) ABOUT-NLS COPYING NEWS \ - README compile config.guess config.rpath config.sub depcomp \ - install-sh missing py-compile ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -96,6 +101,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -157,16 +164,17 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } man1dir = $(mandir)/man1 -am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" \ - "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(hicolor_icondir)" \ +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(apparmordir)" \ + "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)" \ + "$(DESTDIR)$(hicolor_icondir)" \ "$(DESTDIR)$(systemduserunitdir)" \ "$(DESTDIR)$(ubuntu_mono_dark_icondir)" \ "$(DESTDIR)$(ubuntu_mono_light_icondir)" NROFF = nroff MANS = $(dist_man1_MANS) -DATA = $(appdata_DATA) $(desktop_DATA) $(hicolor_icon_DATA) \ - $(systemduserunit_DATA) $(ubuntu_mono_dark_icon_DATA) \ - $(ubuntu_mono_light_icon_DATA) +DATA = $(apparmor_DATA) $(appdata_DATA) $(desktop_DATA) \ + $(hicolor_icon_DATA) $(systemduserunit_DATA) \ + $(ubuntu_mono_dark_icon_DATA) $(ubuntu_mono_light_icon_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -197,6 +205,10 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \ + $(srcdir)/config.h.in ABOUT-NLS COPYING NEWS README compile \ + config.guess config.rpath config.sub depcomp install-sh \ + ltmain.sh missing py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -256,7 +268,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -272,8 +283,6 @@ FGREP = @FGREP@ GEOCLUE2_CFLAGS = @GEOCLUE2_CFLAGS@ GEOCLUE2_LIBS = @GEOCLUE2_LIBS@ -GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ -GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ @@ -289,7 +298,6 @@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ @@ -308,6 +316,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -349,6 +358,7 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WINDRES = @WINDRES@ X11_CFLAGS = @X11_CFLAGS@ X11_LIBS = @X11_LIBS@ XCB_CFLAGS = @XCB_CFLAGS@ @@ -429,7 +439,7 @@ UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor || : EXTRA_ROOTDOC_FILES = \ - HACKING \ + CONTRIBUTING.md \ DESIGN \ README \ README-colorramp \ @@ -459,6 +469,9 @@ APPDATA_IN_FILES = \ data/appdata/redshift-gtk.appdata.xml.in +APPARMOR_IN_FILES = \ + data/apparmor/usr.bin.redshift.in + # Icons @ENABLE_GUI_TRUE@hicolor_icondir = @datadir@/icons/hicolor/scalable/apps @@ -481,6 +494,10 @@ # Appdata file @ENABLE_GUI_TRUE@appdatadir = @datadir@/appdata @ENABLE_GUI_TRUE@appdata_DATA = $(APPDATA_IN_FILES:.xml.in=.xml) + +# AppArmor profile +@ENABLE_APPARMOR_TRUE@apparmordir = @sysconfdir@/apparmor.d +@ENABLE_APPARMOR_TRUE@apparmor_DATA = $(APPARMOR_IN_FILES:.in=) EXTRA_DIST = \ $(EXTRA_ROOTDOC_FILES) \ $(_HICOLOR_FILES) \ @@ -488,12 +505,14 @@ $(_UBUNTU_MONO_LIGHT_FILES) \ $(DESKTOP_IN_FILES) \ $(SYSTEMD_USER_UNIT_IN_FILES) \ - $(APPDATA_IN_FILES) + $(APPDATA_IN_FILES) \ + $(APPARMOR_IN_FILES) CLEANFILES = \ $(desktop_DATA) \ $(systemduserunit_DATA) \ - $(appdata_DATA) + $(appdata_DATA) \ + $(apparmor_DATA) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -514,7 +533,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -598,6 +616,27 @@ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +install-apparmorDATA: $(apparmor_DATA) + @$(NORMAL_INSTALL) + @list='$(apparmor_DATA)'; test -n "$(apparmordir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(apparmordir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(apparmordir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(apparmordir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(apparmordir)" || exit $$?; \ + done + +uninstall-apparmorDATA: + @$(NORMAL_UNINSTALL) + @list='$(apparmor_DATA)'; test -n "$(apparmordir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(apparmordir)'; $(am__uninstall_files_from_dir) install-appdataDATA: $(appdata_DATA) @$(NORMAL_INSTALL) @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ @@ -896,7 +935,7 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -911,17 +950,17 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -939,7 +978,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -949,23 +988,23 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1023,7 +1062,7 @@ all-am: Makefile $(MANS) $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(hicolor_icondir)" "$(DESTDIR)$(systemduserunitdir)" "$(DESTDIR)$(ubuntu_mono_dark_icondir)" "$(DESTDIR)$(ubuntu_mono_light_icondir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(apparmordir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(hicolor_icondir)" "$(DESTDIR)$(systemduserunitdir)" "$(DESTDIR)$(ubuntu_mono_dark_icondir)" "$(DESTDIR)$(ubuntu_mono_light_icondir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -1081,8 +1120,8 @@ info-am: -install-data-am: install-appdataDATA install-desktopDATA \ - install-hicolor_iconDATA install-man \ +install-data-am: install-apparmorDATA install-appdataDATA \ + install-desktopDATA install-hicolor_iconDATA install-man \ install-systemduserunitDATA install-ubuntu_mono_dark_iconDATA \ install-ubuntu_mono_light_iconDATA @$(NORMAL_INSTALL) @@ -1131,8 +1170,8 @@ ps-am: -uninstall-am: uninstall-appdataDATA uninstall-desktopDATA \ - uninstall-hicolor_iconDATA uninstall-man \ +uninstall-am: uninstall-apparmorDATA uninstall-appdataDATA \ + uninstall-desktopDATA uninstall-hicolor_iconDATA uninstall-man \ uninstall-systemduserunitDATA \ uninstall-ubuntu_mono_dark_iconDATA \ uninstall-ubuntu_mono_light_iconDATA @@ -1150,9 +1189,10 @@ dist-xz dist-zip distcheck distclean distclean-generic \ distclean-hdr distclean-libtool distclean-tags distcleancheck \ distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-appdataDATA install-data \ - install-data-am install-data-hook install-desktopDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ + info-am install install-am install-apparmorDATA \ + install-appdataDATA install-data install-data-am \ + install-data-hook install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am \ install-hicolor_iconDATA install-html install-html-am \ install-info install-info-am install-man install-man1 \ install-pdf install-pdf-am install-ps install-ps-am \ @@ -1162,12 +1202,15 @@ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-appdataDATA uninstall-desktopDATA \ - uninstall-hicolor_iconDATA uninstall-hook uninstall-man \ - uninstall-man1 uninstall-systemduserunitDATA \ + uninstall-am uninstall-apparmorDATA uninstall-appdataDATA \ + uninstall-desktopDATA uninstall-hicolor_iconDATA \ + uninstall-hook uninstall-man uninstall-man1 \ + uninstall-systemduserunitDATA \ uninstall-ubuntu_mono_dark_iconDATA \ uninstall-ubuntu_mono_light_iconDATA +.PRECIOUS: Makefile + @ENABLE_GUI_TRUE@install-data-hook: @ENABLE_GUI_TRUE@ $(UPDATE_ICON_CACHE); @@ -1191,6 +1234,10 @@ @ENABLE_GUI_TRUE@ $(AM_V_GEN)$(MKDIR_P) $(@D); @ENABLE_GUI_TRUE@ $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +@ENABLE_APPARMOR_TRUE@$(apparmor_DATA): $(APPARMOR_IN_FILES) Makefile +@ENABLE_APPARMOR_TRUE@ $(AM_V_GEN)$(MKDIR_P) $(@D) && \ +@ENABLE_APPARMOR_TRUE@ sed -e "s|\@bindir\@|$(bindir)|g" "$(srcdir)/$(@:=.in)" > $@ + # Update PO translations .PHONY: update-po update-po: diff -Nru redshift-1.11/missing redshift-1.12/missing --- redshift-1.11/missing 2016-01-02 19:04:54.000000000 +0000 +++ redshift-1.12/missing 2017-07-28 21:58:10.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._ar.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._ar.po differ diff -Nru redshift-1.11/po/ar.po redshift-1.12/po/ar.po --- redshift-1.11/po/ar.po 2016-01-02 22:24:27.000000000 +0000 +++ redshift-1.12/po/ar.po 2018-05-21 01:13:14.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2013-11-10 10:27+0000\n" "Last-Translator: ســند \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: ar\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,179 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "ضبط درجة حرارة اللون بما يناسب مستوى الإضاءة في وقت محدد من اليوم\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "طرق التعديل المتاحة:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "" @@ -224,205 +128,345 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" msgstr "" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "ضبط درجة حرارة اللون بما يناسب مستوى الإضاءة في وقت محدد من اليوم\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "طرق التعديل المتاحة:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -435,380 +479,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._be.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._be.po differ diff -Nru redshift-1.11/po/be.po redshift-1.12/po/be.po --- redshift-1.11/po/be.po 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/po/be.po 2018-05-21 01:13:15.000000000 +0000 @@ -0,0 +1,881 @@ +# Belarusian translation for redshift +# Copyright (c) 2018 Rosetta Contributors and Canonical Ltd 2018 +# This file is distributed under the same license as the redshift package. +# FIRST AUTHOR , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: redshift\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-04-05 13:24+0000\n" +"Last-Translator: Zmicer Turok \n" +"Language-Team: Belarusian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" +"Language: be\n" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 +msgid "" +"Redshift adjusts the color temperature of your screen according to your " +"surroundings. This may help your eyes hurt less if you are working in front " +"of the screen at night." +msgstr "" +"Redshift рэгулюе каляровую тэмпературу экрана ў адпаведнасці з асяроддзем. " +"Гэта можа дапамагчы вашым вачам, калі вы працуеце ноччу." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 +msgid "" +"The color temperature is set according to the position of the sun. A " +"different color temperature is set during night and daytime. During twilight " +"and early morning, the color temperature transitions smoothly from night to " +"daytime temperature to allow your eyes to slowly adapt." +msgstr "" +"Каляровая тэмпература прызначаецца ў адпаведнасці са становішчам сонца. " +"Розная каляровая тэмпература прызначаецца ў начны час і днём. Падчас " +"змяркання і на золку, каляровая тэмпература паступова пераходзіць ад " +"тэмпературы ночы да тэмпературы ў дзённы час, каб вашыя вочы паступова " +"прызвычаіліся." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 +msgid "" +"This program provides a status icon that allows the user to control Redshift." +msgstr "" +"У праграмы ёсць значок на прасторы апавяшчэнняў, праз які можна кіраваць " +"Redshift." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 +msgid "" +"The Redshift information window overlaid with an example of the redness " +"effect" +msgstr "Інфармацыйнае акно Redshift пакажа прыклад эфекту пачырванення" + +#: ../data/applications/redshift.desktop.in.h:1 +#: ../data/applications/redshift-gtk.desktop.in.h:1 +msgid "Redshift" +msgstr "Redshift" + +#: ../data/applications/redshift.desktop.in.h:2 +#: ../data/applications/redshift-gtk.desktop.in.h:2 +msgid "Color temperature adjustment" +msgstr "Рэгуляванне каляровай тэмпературы" + +#: ../data/applications/redshift.desktop.in.h:3 +#: ../data/applications/redshift-gtk.desktop.in.h:3 +msgid "Color temperature adjustment tool" +msgstr "Інструмент рэгулявання каляровай тэмпературы" + +#. TRANSLATORS: Name printed when period of day is unknown +#: ../src/redshift.c:135 +msgid "None" +msgstr "Няма" + +#: ../src/redshift.c:136 ../src/redshift.c:1107 +msgid "Daytime" +msgstr "Дзённы час" + +#: ../src/redshift.c:137 ../src/redshift.c:1111 +msgid "Night" +msgstr "Начны час" + +#: ../src/redshift.c:138 +msgid "Transition" +msgstr "Пераход" + +#: ../src/redshift.c:225 +#, c-format +msgid "Period: %s\n" +msgstr "Перыяд : %s\n" + +#: ../src/redshift.c:228 +#, c-format +msgid "Period: %s (%.2f%% day)\n" +msgstr "Перыяд: %s (%.2f%% дзень)\n" + +#. TRANSLATORS: Abbreviation for `north' +#: ../src/redshift.c:240 +msgid "N" +msgstr "Пнч" + +#. TRANSLATORS: Abbreviation for `south' +#: ../src/redshift.c:242 +msgid "S" +msgstr "Пдз" + +#. TRANSLATORS: Abbreviation for `east' +#: ../src/redshift.c:244 +msgid "E" +msgstr "У" + +#. TRANSLATORS: Abbreviation for `west' +#: ../src/redshift.c:246 +msgid "W" +msgstr "З" + +#. TRANSLATORS: Append degree symbols after %f if possible. +#. The string following each number is an abreviation for +#. north, source, east or west (N, S, E, W). +#: ../src/redshift.c:251 +#, c-format +msgid "Location: %.2f %s, %.2f %s\n" +msgstr "Мясцовасць: %.2f %s, %.2f %s\n" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Памылка падчас ініцыялізацыі %s .\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Не атрымалася задаць параметр %s .\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "" +"Паспрабуйце `-l %s:help' , каб атрымаць больш дакладную інфармацыю.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Не атрымалася разабраць параметр `%s'.\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Не атрымалася запусціць пастаўшчыка %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Паспрабуйце `-m %s:help' каб атрымаць больш дакладную інфармацыю.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "" +"Паспрабуйце `-m %s:help' , каб атрымаць больш дакладную інфармацыю.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "Не атрымалася запусціць метад рэгулявання %s.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Шырата мусіць быць паміж %.1f і %.1f.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Даўгата мусіць быць паміж %.1f і %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Не атрымалася прачытаць сістэмны час\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Чаканне даступнасці першапачатковага месцазнаходжання...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Не атрымалася вызначыць мясцовасць ў пастаўшчыка.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Ад пастаўшчыка атрымана хібнае месцазнахожданне.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Каляровая тэмпература: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Яркасць: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Стан: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Адключана" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Уключана" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Не атрымалася наладзіць тэмпературу\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Месцазнаходжанне часова недаступна; Выкарыстоўваецца папярэдняе, пакуль " +"гэтае не стане даступна...\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Частковая наладка часу не падтрымліваецца!\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Хібная канфігурацыя часу світанку/змяркання!\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Паспрабаваць пастаўшчыка мясцовасці `%s'...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Паспрабаваць наступнага пастаўшчыка...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Выкарыстоўваць пастаўшчыка `%s'.\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "Больш няма пастаўшчыкоў.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "Высокі пераход не можа быць ніжэй, чым вышыня нізкага пераходу.\n" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "Вышыня сонца : днём вышэй %.1f, ноччу ніжэй за %.1f\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Тэмпература : %dK днём, %dK уначы\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "Тэмпература павінна быць паміж %uK і %uK.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "Яркасць мусіць быць паміж %.1f і %.1f.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Яркасць: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "Значэнне гамы мусіць быць паміж %.1f і %.1f.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Гама (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "Паспрабаваць наступны рэжым...\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "Выкарыстоўваемы рэжым `%s'.\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "Больш няма рэжымаў.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "Чаканне даступнасці бягучага месцазнаходжання...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Вышыня сонца : %f\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Націсніце ctrl-c, каб спыніцца...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Выкарыстоўваецца: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "" +"Прызначыць каляровую тэмпературу дысплея ў залежнасці ад часу сутак.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tПаказвае гэтае паведамленне даведкі\n" +" -v\t\tПоўны вывад\n" +" -V\t\tПаказвае версію праграмы\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b DAY:NIGHT\tЯркасць экрана (ад 0,1 да 1,0)\n" +" -c FILE\tАтрымаць налады з абранага файла канфігурацыі\n" +" -g R:G:B\tДадатковая карэкцыя гамы \n" +" -l LAT:LON\tВашая дзейная мясовасць\n" +" -l PROVIDER\tАбярыце пастаўшчыка для аўтаматычнага абнаўлення мясцовасці\n" +" \t\t(Увядзіце `спіс', каб убачыць даступных пастаўшчыкоў)\n" +" -m METHOD\tМетад ужывання каляровай тэмпературы\n" +" \t\t(Увядзіце `спіс', каб убачыць даступныя метады)\n" +" -o\t\tРэжым аднаго стрэлу (карэктаваць каляровую тэмпературу аднойчы)\n" +" -O TEMP\tСамастойнае выкарыстанне рэжыму аднаго стрэлу (прызначыць " +"каляровую тэмпературу)\n" +" -p\t\tРэжым вываду (толькі параметры вываду і выхад)\n" +" -x\t\tРэжым \"скінуць\" (выдаліць карэкцыю з экрана)\n" +" -r\t\tАдключыць пераходы тэмпературы\n" +" -t DAY:NIGHT\tКаляровая тэмпературы для прызначэння днём/уначы\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"Нейтральная тэмпература %uK. Ужыванне гэтага значэння не будзе\n" +"ўплываць на каляровую тэмпературу дысплея.\n" +"Каляровая тэмпература вышэй за гэтую дае\n" +"больш сіняе святло, ніжэй за гэтую дае\n" +"больш чырвонае святло.\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Прадвызначаныя значэнні:\n" +"\n" +"Тэмпература днём: %uK\n" +"Тэмпература ноччу: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Калі ласка, распавядзіце пра памылку <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Даступныя метады рэгулявання:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Прызначыць налады для раздзяляемых двукроп'ем `-m METHOD:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Паспрабуйце для дапамогі `-m METHOD:help'.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Даступныя пастаўшчыкі мясцовасці:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Прызначыць налады для раздзяляемых двукроп'ем `-l PROVIDER:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Паспрабуйце для дапамогі `-l PROVIDER:help'.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Недакладны аргумент гамы.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Паспрабуйце ключ `-h' для вываду больш дакладнай інфармацыі\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Невядомы пастаўшчык мясцовасці `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Невядомы метад рэгулявання `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Недакладны аргумент тэмпературы.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Недакладныя налады гамы.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Недакладныя налады часу світанку `%s'.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Недакладныя налады часу змяркання `%s'.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Невядомая канфігурацыя налад `%s'.\n" + +#: ../src/config-ini.c:167 +msgid "Malformed section header in config file.\n" +msgstr "Недакладны загаловак раздзела ў файле канфігурацыі\n" + +#: ../src/config-ini.c:203 +msgid "Malformed assignment in config file.\n" +msgstr "Недакладнае прызначэнне ў файле канфігурацыі.\n" + +#: ../src/config-ini.c:214 +msgid "Assignment outside section in config file.\n" +msgstr "Прызначэнне па-за раздзелам файла канфігурацыі.\n" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Не атрымалася адкрыць DRM прылады: %s\n" + +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "Не атрымалася вызначыць рэсурсы рэжыму DRM\n" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 +#, c-format +msgid "CRTC %d does not exist. " +msgstr "CRTC %d не існуе. " + +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 +#, c-format +msgid "Valid CRTCs are [0-%d].\n" +msgstr "Дзейны CRTCs - гэта [0-%d].\n" + +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 +#, c-format +msgid "Only CRTC 0 exists.\n" +msgstr "Існуе толькі CRTC 0 .\n" + +#: ../src/gamma-drm.c:159 +#, c-format +msgid "CRTC %i lost, skipping\n" +msgstr "CRTC %i не знойдзены , прамінута\n" + +#: ../src/gamma-drm.c:165 +#, c-format +msgid "" +"Could not get gamma ramp size for CRTC %i\n" +"on graphics card %i, ignoring device.\n" +msgstr "" +"Немагчыма атрымаць значэнне гамы CRTC %i\n" +"відэакарты %i, не зважаючы на прыладу.\n" + +#: ../src/gamma-drm.c:178 +#, c-format +msgid "" +"DRM could not read gamma ramps on CRTC %i on\n" +"graphics card %i, ignoring device.\n" +msgstr "" +"У DRM не атрымалася прачытаць значэнне гамы CRTC %i\n" +"відэакарты %i, не зважаючы на прыладу.\n" + +#: ../src/gamma-drm.c:242 +msgid "Adjust gamma ramps with Direct Rendering Manager.\n" +msgstr "Наладзіць гаму з дапамогай Direct Rendering Manager\n" + +#. TRANSLATORS: DRM help output +#. left column must not be translated +#: ../src/gamma-drm.c:247 +msgid "" +" card=N\tGraphics card to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" +" card=N\tГрафічная карта для ўжытых змен\n" +" crtc=N\tCRTC для ўжытых змен для\n" + +#: ../src/gamma-drm.c:260 +#, c-format +msgid "CRTC must be a non-negative integer\n" +msgstr "CRTC мусіць быць станоўчым цэлым лікам\n" + +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 +#, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "Невядомы параметр метаду `%s'.\n" + +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 +#, c-format +msgid "`%s' returned error %d\n" +msgstr "`%s' вярнуўся з памылкай %d\n" + +#: ../src/gamma-randr.c:103 +#, c-format +msgid "Unsupported RANDR version (%u.%u)\n" +msgstr "Непадтрымліваемая версія RANDR (%u.%u)\n" + +#: ../src/gamma-randr.c:138 +#, c-format +msgid "Screen %i could not be found.\n" +msgstr "Хібны экран %i .\n" + +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 +#, c-format +msgid "Gamma ramp size too small: %i\n" +msgstr "Значэнне гамы занадта малое : %i\n" + +#: ../src/gamma-randr.c:277 +#, c-format +msgid "Unable to restore CRTC %i\n" +msgstr "Немагчыма аднавіць CRTC %i\n" + +#: ../src/gamma-randr.c:301 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "Наладзіць гаму з пашырэннем X RANDR.\n" + +#. TRANSLATORS: RANDR help output +#. left column must not be translated +#: ../src/gamma-randr.c:306 +msgid "" +" screen=N\t\tX screen to apply adjustments to\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tX экран для ўжывання змен для\n" +" preserve={0,1}\tЦі мусіць быць захавана існуючая гама\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Не атрымалася прачытаць нумар экрана: `%s'.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" +"Параметр `%s` зараз уключаны; Увядзіце у тэрмінале загад `%s` для " +"выключэння.\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 +#, c-format +msgid "X request failed: %s\n" +msgstr "Памылка падчас запыту да X : %s\n" + +#: ../src/gamma-vidmode.c:140 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "Наладзіць гаму з пашырэннем X VidMode.\n" + +#. TRANSLATORS: VidMode help output +#. left column must not be translated +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr "" +" screen=N\t\tX экран для ўжывання змен для\n" +" crtc=N\t\tCRTC для ўжывання змен\n" +" preserve={0,1}\tЦі мусіць быць захавана існуючая гама\n" + +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 +msgid "Unable to save current gamma ramp.\n" +msgstr "Немагчыма захаваць дзейную гаму.\n" + +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Наладзіць гаму для OSX ужываючы Quartz.\n" + +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 +msgid "Unable to open device context.\n" +msgstr "Немагчыма праглядзець кантэкст прылады.\n" + +#: ../src/gamma-w32gdi.c:75 +msgid "Display device does not support gamma ramps.\n" +msgstr "Экран прылады не падтрымлівае гаму.\n" + +#: ../src/gamma-w32gdi.c:115 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "Наладзіць гаму з Windows GDI.\n" + +#: ../src/gamma-w32gdi.c:153 +msgid "Unable to restore gamma ramps.\n" +msgstr "Немагчыма аднавіць гаму.\n" + +#: ../src/gamma-w32gdi.c:211 +msgid "Unable to set gamma ramps.\n" +msgstr "Немагчыма прызначыць гаму.\n" + +#: ../src/gamma-dummy.c:43 +msgid "" +"WARNING: Using dummy gamma method! Display will not be affected by this " +"gamma method.\n" +msgstr "" +"УВАГА: Ужываецца фіктыўны метад гамы! Дысплей не будзе залежаць ад гэтага " +"метаду.\n" + +#: ../src/gamma-dummy.c:60 +msgid "" +"Does not affect the display but prints the color temperature to the " +"terminal.\n" +msgstr "" +"Не ўплывае на дысплей, але ўжывае каляровую тэмпературу ў тэрмінале.\n" + +#: ../src/gamma-dummy.c:75 +#, c-format +msgid "Temperature: %i\n" +msgstr "Тэмпература: %i\n" + +#: ../src/location-geoclue2.c:59 +#, c-format +msgid "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" +"GeoClue адмоўлена ў доступ да бягучага месцазнаходжання!\n" +"Пераканайцеся ў тым, што сэрвісы вызначэння месцазнаходжання ўключаны і што " +"Redshift дазволена\n" +"выкарыстоўваць іх. Наведайце https://github.com/jonls/redshift#faq для\n" +"атрымання больш дакладнай інфармацыі.\n" + +#: ../src/location-geoclue2.c:107 +#, c-format +msgid "Unable to obtain location: %s.\n" +msgstr "Не атрымалася вызначыць мясцовасць: %s.\n" + +#: ../src/location-geoclue2.c:150 +#, c-format +msgid "Unable to obtain GeoClue Manager: %s.\n" +msgstr "Немагчыма злучыцца з кіраўніком GeoClue: %s.\n" + +#: ../src/location-geoclue2.c:166 +#, c-format +msgid "Unable to obtain GeoClue client path: %s.\n" +msgstr "Немагчыма знайсці шлях да кліента GeoClue: %s.\n" + +#: ../src/location-geoclue2.c:188 +#, c-format +msgid "Unable to obtain GeoClue Client: %s.\n" +msgstr "Немагчыма злучыцца з кліентам GeoClue: %s.\n" + +#: ../src/location-geoclue2.c:229 +#, c-format +msgid "Unable to set distance threshold: %s.\n" +msgstr "Немагчыма прызначыць парог адлегласці: %s.\n" + +#: ../src/location-geoclue2.c:253 +#, c-format +msgid "Unable to start GeoClue client: %s.\n" +msgstr "Немагчыма запусціць кліент GeoClue: %s.\n" + +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Не атрымалася запусціць пастаўшчыка GeoClue2!\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Выкарыстоўвайце мясцовасць, выяўленую пастаўшчыком GeoClue2.\n" + +#: ../src/location-corelocation.m:73 +msgid "Not authorized to obtain location from CoreLocation.\n" +msgstr "" +"Патрэбна аўтарызавацца падчас вызначэння мясцовасці ў CoreLocation.\n" + +#: ../src/location-corelocation.m:111 +#, c-format +msgid "Error obtaining location from CoreLocation: %s\n" +msgstr "Памылка падчас вызначэння мясцовасці ў CoreLocation: %s\n" + +#: ../src/location-corelocation.m:120 +msgid "Waiting for authorization to obtain location...\n" +msgstr "Чакаецца аўтарызацыя для выяўлення мясцовасці...\n" + +#: ../src/location-corelocation.m:122 +msgid "Request for location was not authorized!\n" +msgstr "Запыт на выяўленне мясцовасці не аўтарызаваны!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Не атрымалася запусціць пастаўшчыка CoreLocation!\n" + +#: ../src/location-corelocation.m:235 +msgid "Use the location as discovered by the Corelocation provider.\n" +msgstr "Выкарыстоўвайце мясцовасць, выяўленую пастаўшчыком CoreLocation.\n" + +#: ../src/location-manual.c:59 +msgid "Latitude and longitude must be set.\n" +msgstr "Мусяць быць вызначаны шырата і даўгата.\n" + +#: ../src/location-manual.c:75 +msgid "Specify location manually.\n" +msgstr "Пазначце мясцовасць самастойна.\n" + +#. TRANSLATORS: Manual location help output +#. left column must not be translated +#: ../src/location-manual.c:80 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" +" lat=N\t\tШырата\n" +" lon=N\t\tДаўгата\n" + +#: ../src/location-manual.c:83 +msgid "" +"Both values are expected to be floating point numbers,\n" +"negative values representing west / south, respectively.\n" +msgstr "" +"Абодва значэння будуць лікам з коскай, якая плавае,\n" +"адмоўныя значэнні адпавядаюць захаду / поўдню, адпаведна.\n" + +#: ../src/location-manual.c:97 +msgid "Malformed argument.\n" +msgstr "Недакладны аргумент.\n" + +#: ../src/redshift-gtk/statusicon.py:78 +msgid "Suspend for" +msgstr "Прыпыніць на" + +#: ../src/redshift-gtk/statusicon.py:80 +msgid "30 minutes" +msgstr "30 хвілін" + +#: ../src/redshift-gtk/statusicon.py:81 +msgid "1 hour" +msgstr "1 гадзіну" + +#: ../src/redshift-gtk/statusicon.py:82 +msgid "2 hours" +msgstr "2 гадзіны" + +#: ../src/redshift-gtk/statusicon.py:91 +msgid "Autostart" +msgstr "Аўтазапуск" + +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 +msgid "Info" +msgstr "Інфармацыя" + +#: ../src/redshift-gtk/statusicon.py:108 +msgid "Quit" +msgstr "Выйсці" + +#: ../src/redshift-gtk/statusicon.py:146 +msgid "Close" +msgstr "Закрыць" + +#: ../src/redshift-gtk/statusicon.py:300 +msgid "Status: {}" +msgstr "Стан: {}" + +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 +msgid "Color temperature" +msgstr "Каляровая тэмпература" + +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 +msgid "Period" +msgstr "Перыяд" + +#: ../src/redshift-gtk/statusicon.py:318 +msgid "Location" +msgstr "Мясцовасць" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Для вываду дапаможніка, калі ласка, увядзіце `redshift -h`." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._bg.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._bg.po differ diff -Nru redshift-1.11/po/bg.po redshift-1.12/po/bg.po --- redshift-1.11/po/bg.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/bg.po 2018-05-21 01:13:15.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2011-10-30 07:39+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: bg\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,179 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "" @@ -224,205 +128,345 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" msgstr "" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -435,380 +479,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._ca.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._ca.po differ diff -Nru redshift-1.11/po/ca.po redshift-1.12/po/ca.po --- redshift-1.11/po/ca.po 2016-01-02 22:24:27.000000000 +0000 +++ redshift-1.12/po/ca.po 2018-05-21 01:13:16.000000000 +0000 @@ -1,21 +1,21 @@ # Catalan translation for redshift -# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the redshift package. -# FIRST AUTHOR , 2011. +# FIRST AUTHOR , 2010. # msgid "" msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-02-23 06:54+0000\n" -"Last-Translator: Jon Lund Steffensen \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-05-20 13:39+0000\n" +"Last-Translator: toniem \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: ca\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,6 +24,9 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" +"El Redshift ajusta la temperatura de color de la pantalla d'acord amb " +"l'entorn. Aquest ajust pot ajudar a reduir el dolor d'ulls si treballeu " +"davant una pantalla a la nit." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -32,104 +35,329 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" +"La temperatura de color s'estableix segons la posició del sol. S'estableix " +"una temperatura diferent durant el dia i durant la nit. Durant el capvespre " +"i l'alba, la temperatura de color canvia suaument, de temperatura diürna a " +"temperatura nocturna o viceversa, per permetre que els ulls s'adaptin " +"lentament." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" +"Aquest programa proporciona una icona de notificació que permet a l'usuari " +"controlar el Redshift." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" msgstr "" +"La finestra d'informació del Redshift es superposa amb un exemple de " +"l'efecte d'envermelliment" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "" +msgstr "Ajust de la temperatura de color" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "" +msgstr "Eina per a l'ajust de la temperatura de color" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "" +msgstr "Desconegut" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" -msgstr "" +msgstr "Dia" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" -msgstr "" +msgstr "Nit" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" -msgstr "" +msgstr "Transició" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "Període: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "" +msgstr "Període: %s (%.2f%% dia)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "" +msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" -msgstr "" +msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" -msgstr "" +msgstr "E" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" -msgstr "" +msgstr "O" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" +msgstr "Ubicació: %.2f° %s, %.2f° %s\n" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "La inicialització de %s ha fallat.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "No s'ha pogut establir l'opció %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "Proveu «-l %s:help» per obtenir més informació.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "No s'ha pogut analitzar l'opció «%s».\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "No s'ha pogut iniciar el proveïdor %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Proveu «-m %s:help» per obtenir més informació.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "Proveu «-m %s:help» per obtenir més informació.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "No s'ha pogut iniciar el mètode d'ajust %s.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "La latitud ha d'estar entre %.1f i %.1f.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "La longitud ha d'estar entre %.1f i %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "No s'ha pogut llegir l'hora del sistema.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "S'està esperant que la ubicació inicial estigui disponible...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "No s'ha pogut obtenir una ubicació del proveïdor.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "La ubicació proporcionada pel proveïdor no és vàlida.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Temperatura de color: %u K\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Brillantor: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Estat: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Desactivat" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Activat" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "No s'ha pogut ajustar la temperatura.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" +"La ubicació no està disponible temporalment. S'utilitzarà la ubicació " +"anterior fins que estigui disponible...\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "No s'admet la configuració parcial de l'hora!\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "La configuració de l'hora de l'alba o el capvespre no és vàlida!\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "S'està provant el proveïdor d'ubicació «%s»...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "S'està provant el proveïdor següent...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "S'està utilitzant el proveïdor «%s».\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "No hi ha més proveïdors d'ubicació per provar.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "La transició superior no pot ser menor que la transició inferior.\n" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "Elevacions solars: dia per sobre de %.1f °, nit per sota de %.1f °\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperatures: %d K de dia, %d K de nit\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "La temperatura ha d'estar entre %u K y %u K.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "Els valors de la brillantor han d'estar entre %.1f y %.1f.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Brillantor : %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "El valor gamma ha d'estar entre %.1f y %.1f.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "S'està provant el mètode següent...\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "S'està utilitzant el mètode «%s».\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "No hi ha més mètodes per provar.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "S'està esperant que la ubicació actual estigui disponible...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Elevació solar: %fº\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Premeu Ctrl-C per aturar...\n" #. TRANSLATORS: help output 1 #. LAT is latitude, LON is longitude, #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: ../src/redshift.c:452 +#: ../src/options.c:159 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" msgstr "Ús: %s -l LAT:LON -t DIA:NIT [OPCIONS...]\n" #. TRANSLATORS: help output 2 #. no-wrap -#: ../src/redshift.c:458 +#: ../src/options.c:165 msgid "Set color temperature of display according to time of day.\n" -msgstr "Fixa la temperatura de color a mostrar segons l'hora del dia.\n" +msgstr "" +"Estableix la temperatura de color de la pantalla segons l'hora del dia.\n" #. TRANSLATORS: help output 3 #. no-wrap -#: ../src/redshift.c:464 +#: ../src/options.c:171 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" @@ -142,7 +370,7 @@ #. TRANSLATORS: help output 4 #. `list' must not be translated #. no-wrap -#: ../src/redshift.c:472 +#: ../src/options.c:179 msgid "" " -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" " -c FILE\tLoad settings from specified configuration file\n" @@ -155,29 +383,46 @@ " -o\t\tOne shot mode (do not continuously adjust color temperature)\n" " -O TEMP\tOne shot manual mode (set color temperature)\n" " -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" " -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" +" -r\t\tDisable fading between color temperatures\n" " -t DAY:NIGHT\tColor temperature to set at daytime/night\n" msgstr "" +" -b DIA:NIT\tBrillantor de la pantalla per aplicar (entre 0.1 i 1.0)\n" +" -c FITXER\tCarrega els paràmetres del fitxer de configuració especificat\n" +" -g R:G:B\tCorrecció gamma addicional per aplicar\n" +" -l LAT:LON\tLa ubicació actual\n" +" -l PROVEÏDOR\tSelecciona el proveïdor per a les actualitzacions " +"automàtiques de la ubicació\n" +" \t\t(Escriviu «list» per veure els proveïdors disponibles)\n" +" -m MÈTODE\tMètode utilitzat per establir la temperatura de color\n" +" \t\t(Escriviu «list» per veure els mètodes disponibles)\n" +" -o\t\tMode d'ajust únic (no ajusta contínuament la temperatura de color))\n" +" -O TEMP\tMode d'ajust únic manual (fixa la temperatura de color)\n" +" -p\t\tMode d'impressió (només imprimeix els paràmetres i surt)\n" +" -P\t\tRestableix els valors de gamma existents abans d'aplicar un nou " +"efecte de color\n" +" -x\t\tMode de reinici (elimina l'ajust de la pantalla)\n" +" -r\t\tDesactiva les transicions entre les temperatures de color\n" +" -t DIA:NIT\tTemperatura de color per establir de dia i de nit\n" #. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 +#: ../src/options.c:201 #, c-format msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" "more red light.\n" msgstr "" -"La temperatura neutra és %uK. Fer servir aquest valor no\n" -"canviarà la temperatura de color del monitor. Establir la\n" -"temperatura de color a un valor més alt que aquest tindrà\n" -"com a resultat més llum blava, i establint-la a un valor més\n" -"baix tindrà com a resultat més llum vermella.\n" +"La temperatura neutra és %u K. L'ús d'aquest valor no canviarà la\n" +"temperatura de color de la pantalla. Establir un valor més alt\n" +"donarà com a resultat un to més blavós i establir un valor més\n" +"baix donarà com a resultat un to més vermellós.\n" #. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 +#: ../src/options.c:210 #, c-format msgid "" "Default values:\n" @@ -187,583 +432,387 @@ msgstr "" "Valors per defecte:\n" "\n" -" Temperatura diurna: %uK\n" -" Temperatura nocturna: %uK\n" +" Temperatura de dia: %u K\n" +" Temperatura de nit: %u K\n" #. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 +#: ../src/options.c:218 #, c-format msgid "Please report bugs to <%s>\n" -msgstr "Si us plau, informeu dels errors a <%s>\n" +msgstr "Informeu dels errors a <%s>\n" -#: ../src/redshift.c:516 +#: ../src/options.c:225 msgid "Available adjustment methods:\n" -msgstr "Métodes d'ajust disponibles:\n" +msgstr "Mètodes d'ajust disponibles:\n" -#: ../src/redshift.c:522 +#: ../src/options.c:231 msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" msgstr "" -"Especifiqueu opcions separades per dos punts amb '-m MÈTODE:OPCIONS'.\n" +"Especifiqueu les opcions separades per dos punts amb «-m MÈTODE:OPCIONS».\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 +#: ../src/options.c:234 msgid "Try `-m METHOD:help' for help.\n" -msgstr "Proveu '-m MÈTODE:help' per obtenir ajuda.\n" +msgstr "Proveu «-m MÈTODE:help» per obtenir ajuda.\n" -#: ../src/redshift.c:531 +#: ../src/options.c:241 msgid "Available location providers:\n" msgstr "Proveïdors d'ubicació disponibles:\n" -#: ../src/redshift.c:537 +#: ../src/options.c:247 msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" msgstr "" -"Especifiqueu opcions separades per dos punts amb '-l PROVEÏDOR:OPCIONS'.\n" +"Especifiqueu les opcions separades per dos punts amb «-l " +"PROVEÏDOR:OPCIONS».\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 +#: ../src/options.c:250 msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Proveu '-l PROVEÏDOR:help' per obtenir ajuda.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 -#, c-format -msgid "Initialization of %s failed.\n" -msgstr "Ha fallat la inicialització de %s.\n" - -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 -#, c-format -msgid "Failed to set %s option.\n" -msgstr "L'establiment de la opció %s ha fallat.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 -#, c-format -msgid "Try `-l %s:help' for more information.\n" -msgstr "Proveu '-l %s:help' per obtenir més informació.\n" - -#: ../src/redshift.c:601 ../src/redshift.c:682 -#, c-format -msgid "Failed to parse option `%s'.\n" -msgstr "" - -#: ../src/redshift.c:628 -#, c-format -msgid "Failed to start provider %s.\n" -msgstr "No s'ha pogut iniciar el proveïdor %s.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#: ../src/redshift.c:665 -#, c-format -msgid "Try `-m %s:help' for more information.\n" -msgstr "Proveu '-m %s:help' per obtenir més informació.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 -#, c-format -msgid "Try -m %s:help' for more information.\n" -msgstr "Proveu '-m %s:help' per obtenir més informació.\n" - -#: ../src/redshift.c:707 -#, c-format -msgid "Failed to start adjustment method %s.\n" -msgstr "No s'ha pogut iniciar el mètode d'ajust %s.\n" - -#: ../src/redshift.c:870 ../src/redshift.c:898 -#, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "" - -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "" - -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" -msgstr "No s'ha pogut llegir l'hora del sistema.\n" - -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 -#, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura de color: %uK\n" - -#: ../src/redshift.c:1004 ../src/redshift.c:1625 -#, c-format -msgid "Brightness: %.2f\n" -msgstr "Brillantor: %.2f\n" - -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "No s'ha pogut ajustar la temperatura.\n" +msgstr "Proveu «-l PROVEÏDOR:help» per obtenir ajuda.\n" -#: ../src/redshift.c:1105 +#: ../src/options.c:356 msgid "Malformed gamma argument.\n" -msgstr "Argument de gamma mal format.\n" +msgstr "El paràmetre gamma no és correcte.\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 msgid "Try `-h' for more information.\n" -msgstr "Proveu '-h' per obtenir més informació.\n" +msgstr "Proveu «-h» per obtenir més informació.\n" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 +#: ../src/options.c:407 ../src/options.c:610 #, c-format msgid "Unknown location provider `%s'.\n" -msgstr "Proveïdor d'ubicació '%s' desconegut.\n" +msgstr "El proveïdor d'ubicació «%s» és desconegut.\n" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 +#: ../src/options.c:439 ../src/options.c:597 #, c-format msgid "Unknown adjustment method `%s'.\n" -msgstr "Mètode d'ajust '%s' desconegut.\n" +msgstr "El mètode d'ajust «%s» és desconegut.\n" -#: ../src/redshift.c:1213 +#: ../src/options.c:470 msgid "Malformed temperature argument.\n" -msgstr "Argument de temperatura mal format.\n" +msgstr "El paràmetre de la temperatura no és correcte.\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 msgid "Malformed gamma setting.\n" -msgstr "Paràmetre de gamma mal format.\n" - -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Paràmetre de configuració '%s' desconegut.\n" - -#: ../src/redshift.c:1422 -#, c-format -msgid "Trying location provider `%s'...\n" -msgstr "" - -#: ../src/redshift.c:1427 -msgid "Trying next provider...\n" -msgstr "S'està provant el següent proveïdor...\n" - -#: ../src/redshift.c:1433 -#, c-format -msgid "Using provider `%s'.\n" -msgstr "S'està fent servir el proveïdor '%s'.\n" - -#: ../src/redshift.c:1441 -msgid "No more location providers to try.\n" -msgstr "No queden més proveïdors d'ubicació per provar.\n" - -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "No s'ha pogut obtenir la ubicació des del proveïdor.\n" +msgstr "El paràmetre gamma no és correcte.\n" -#: ../src/redshift.c:1460 +#: ../src/options.c:621 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "" +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "El paràmetre de l'hora de l'alba «%s» no és correcte.\n" -#. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/options.c:632 #, c-format -msgid "Solar elevations: day above %.1f, night below %.1f\n" -msgstr "" +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "El paràmetre de l'hora del capvespre «%s» no és correcte.\n" -#: ../src/redshift.c:1473 +#: ../src/options.c:639 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "La latitud ha d'estar entre %.1f i %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "La longitud ha d'estar entre %.1f i %.1f.\n" - -#: ../src/redshift.c:1493 ../src/redshift.c:1511 -#, c-format -msgid "Temperature must be between %uK and %uK.\n" -msgstr "La temperatura ha d'estar entre %uK i %uK.\n" - -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 -#, c-format -msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1529 -#, c-format -msgid "Brightness: %.2f:%.2f\n" -msgstr "" - -#: ../src/redshift.c:1537 -#, c-format -msgid "Gamma value must be between %.1f and %.1f.\n" -msgstr "El valor de la gamma ha d'estar entre %.1f i %.1f.\n" - -#. TRANSLATORS: The string in parenthesis is either -#. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 -#, c-format -msgid "Gamma (%s): %.3f, %.3f, %.3f\n" -msgstr "" - -#: ../src/redshift.c:1572 -msgid "Trying next method...\n" -msgstr "S'està provant el mètode següent...\n" - -#: ../src/redshift.c:1577 -#, c-format -msgid "Using method `%s'.\n" -msgstr "S'està fent servir el mètode '%s'.\n" - -#: ../src/redshift.c:1584 -msgid "No more methods to try.\n" -msgstr "No queden més mètodes per provar.\n" - -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 -#, c-format -msgid "Solar elevation: %f\n" -msgstr "Elevació solar: %f\n" - -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 -msgid "Press ctrl-c to stop...\n" -msgstr "" +msgid "Unknown configuration setting `%s'.\n" +msgstr "El paràmetre de configuració «%s» és desconegut.\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" -msgstr "Capçalera mal formada al fitxer de configuració.\n" +msgstr "" +"Un encapçalament de secció al fitxer de configuració no és correcte.\n" #: ../src/config-ini.c:203 msgid "Malformed assignment in config file.\n" -msgstr "Assignació mal formada en el fitxer de configuració.\n" +msgstr "L'assignació de dades al fitxer de configuració no és correcta.\n" #: ../src/config-ini.c:214 msgid "Assignment outside section in config file.\n" -msgstr "Assignació fora de secció al fitxer de configuració.\n" +msgstr "" +"L'assignació de dades al fitxer de configuració estan fora d'una secció.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "No s'ha pogut obrir el dispositiu DRM: %s\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" -msgstr "" +msgstr "No s'han pogut obtenir els recursos del mode DRM\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "El CRTC %d no existeix. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" -msgstr "Els CRTCs vàlids són [0-%d].\n" +msgstr "Els CRTC vàlids són [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Només existeix el CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" -msgstr "" +msgstr "El CRTC %i s'ha perdut, s'ometrà\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" +"No s'ha pogut obtenir la mida del valor gamma per al CRTC %i\n" +"en la targeta de vídeo %i. S'ignorarà el dispositiu.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" +"El DRM no pot llegir els valors gamma en el CRTC %i\n" +"en la targeta de vídeo %i. S'ignorarà el dispositiu.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" -msgstr "" +msgstr "Ajusta els valors gamma amb el DRM.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" +" card=N\tTargeta gràfica per aplicar els ajusts\n" +" crtc=N\tCRTC per aplicar els ajusts\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" -msgstr "" +msgstr "El CRTC ha de ser un nombre enter no negatiu\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" -msgstr "Paràmetre de mètode desconegut: '%s'.\n" +msgstr "El paràmetre del mètode és desconegut: «%s».\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" -msgstr "'%s' ha retornat l'error %d\n" +msgstr "«%s» ha retornat l'error %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" -msgstr "Versió RANDR no compatible (%u.%u)\n" +msgstr "La versió de RANDR no és compatible (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" -msgstr "No s'ha pogut trobar la pantalla %i.\n" +msgstr "No s'ha trobat la pantalla %i.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" -msgstr "La mida de la rampa de gamma és massa petita: %i\n" +msgstr "El valor gamma és massa petit: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" -msgstr "No s'ha pogut restablir el CRTC %i\n" +msgstr "No es pot restablir el CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" -msgstr "Ajusta les rampes de gamma amb l'extensió X RANDR.\n" +msgstr "Ajustar los valores gamma con la extensión X RANDR\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tPantalla X per aplicar els ajustos\n" +" crtc=N\\Llista dels CRTC, separats per comes, per aplicar els ajustos\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "No es pot llegir el número de pantalla: «%s».\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" +"El paràmetre «%s» ara està sempre activat. Utilitzeu l'opció de línia " +"d'ordres «%s» per desactivar-lo.\n" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "Ha fallat la petició X: %s\n" +msgstr "La sol·licitud X ha fallat: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" -msgstr "Ajusta les rampes de gamma amb l'extensió X VidMode.\n" +msgstr "Ajusta els valors gamma amb l'extensió X VidMode\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tPantalla X per aplicar els ajustos\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" -msgstr "No s'ha pogut desar la rampa de gamma actual.\n" +msgstr "No es pot desar el valor gamma actual.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Ajusta els valors gamma en macOS utilitzant Quartz.\n" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" -msgstr "No s'ha pogut obrir el context del dispositiu.\n" +msgstr "No es pot obrir el context del dispositiu.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" -msgstr "El monitor no permet rampes de gamma.\n" +msgstr "El dispositiu de visualització no admet els valors gamma.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" -msgstr "Ajusta les rampes de gamma amb el GDI de Windows.\n" +msgstr "Ajusta els valors gamma amb el GDI de Windows.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" -msgstr "No s'han pogut restablir les rampes de gamma.\n" +msgstr "No es poden restaurar els valors gamma.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" -msgstr "No s'han pogut establir les rampes de gamma.\n" +msgstr "No es poden establir els valors gamma.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" +"AVÍS: S'està fent servir un mètode gamma fictici! La pantalla no es veurà " +"afectada per aquest mètode gamma.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" +"No afecta a la pantalla, però imprimeix la temperatura de color al " +"terminal.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" -msgstr "" +msgstr "Temperatura: %i\n" -#: ../src/location-geoclue.c:76 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" +"El GeoClue ha denegat l'accés a la ubicació actual!\n" +"Assegureu-vos que els serveis d'ubicació estiguin habilitats i que el " +"Redshif\n" +"té permís per utilitzar-los. Consulteu " +"https://github.com/jonls/redshift#faq\n" +"per obtenir més informació.\n" -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "" +msgstr "No es pot obtenir la ubicació: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" -msgstr "" +msgstr "No es pot obtenir el GeoClue Manager: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "" +msgstr "No es pot obtenir el camí del client GeoClue: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "" +msgstr "No es pot obtenir el client GeoClue: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" -msgstr "" +msgstr "No es pot establir el llindar de distància: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "" +msgstr "No es pot iniciar el client GeoClue: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "No s'ha pogut iniciar el proveïdor GeoClue2!\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Utilitzeu la ubicació trobada per un proveïdor GeoClue2.\n" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" -msgstr "" +msgstr "No teniu autorització per obtenir la ubicació del CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" -msgstr "" +msgstr "S'ha produït un error en obtenir la ubicació del CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" -msgstr "" +msgstr "S'està esperant l'autorització per obtenir la ubicació...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" -msgstr "" +msgstr "No s'ha autoritzat la sol·licitud d'ubicació!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "No s'ha pogut iniciar el proveïdor CoreLocation!\n" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" -msgstr "" +msgstr "Utilitzeu la ubicació trobada pel proveïdor CoreLocation.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "S'han d'establir la latitud i la longitud.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" -msgstr "Especificar la ubicació manualment.\n" +msgstr "Especifiqueu la ubicació manualment.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -771,60 +820,66 @@ " lat=N\t\tLatitud\n" " lon=N\t\tLongitud\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" +"S'espera que tots dos valors siguin nombres de coma flotant,\n" +"els valors negatius representen l'oest i el sud, respectivament.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" -msgstr "Argument mal format.\n" +msgstr "El paràmetre no és correcte.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "Suspèn durant" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 minuts" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "1 hora" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "2 hores" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Inici automàtic" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "Informació" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "Surt" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" -msgstr "" +msgstr "Tanca" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "Estat: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "Temperatura de color" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "Període" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" -msgstr "" +msgstr "Ubicació" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Executeu «redshift -h» per obtenir ajuda." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._cs.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._cs.po differ diff -Nru redshift-1.11/po/cs.po redshift-1.12/po/cs.po --- redshift-1.11/po/cs.po 2016-01-02 22:24:25.000000000 +0000 +++ redshift-1.12/po/cs.po 2018-05-21 01:13:16.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-10-21 10:12+0000\n" -"Last-Translator: David Nguyen \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-11-16 20:39+0000\n" +"Last-Translator: Pavel Borecki \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: cs\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -54,79 +54,296 @@ "Informační okno aplikace Redshift, překryté ukázkou efektu zabarvení do " "červena" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "Přizpůsobení barevné teploty" +msgstr "Nastavení teploty barev" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Nástroj pro přizpůsobení barevné teploty" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Neznámo" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Přes den" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "V noci" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Přechod" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Období: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Období: %s (%.2f%% den)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "S" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "J" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "V" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "Z" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "Poloha %.2f° %s, %.2f° %s\n" +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Inicializace %s se nezdařila.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Nezdařilo se nastavit volbu %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "Zkuste `-l %s:help' pro více informací.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Nezdařilo se analyzovat zadání volby %s.\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Nezdařilo se spustit poskytovatele %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Zkuste `-m %s:help' pro více informací.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "Více informací získáte zadáním „-m %s:help“.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "Nezdařilo se spustit metodu přizpůsobení %s.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Je třeba, aby zeměpisná šířka byla z rozsahu %.1f až %.1f.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Je třeba, aby zeměpisná délka byla z rozsahu %.1f až %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Nebylo možné načíst systémový čas.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Čekání na dostupnost úvodního umístění…\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Nebylo možné získat polohu od poskytovatele.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Poskytovatel vrátil neplatnou polohu.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Barevná teplota: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Jas: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Stav: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Vypnuto" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Zapnuto" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Přizpůsobení barevné teploty se nezdařilo.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Poloha je dočasně nedostupná; Než bude k dispozici, bude použita ta " +"předchozí…\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Částečné nastavení času není podporováno!\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Neplatné nastavení času úsvitu/setmění!\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Zkouší se poskytovatel polohy %s…\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Zkouší se další poskytovatel…\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Nyní je používán poskytovatel %s.\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "Nezbývají žádní další poskytovatelé polohy k vyzkoušení.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"Výška ve vyšší z hodnot přechodu nemůže být nižší než výška v nižší z hodnot " +"přechodu.\n" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "Výšky (úhly) Slunce: den nad %.1f°, noc pod %.1f°\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Barevné teploty: %dK ve dne, %dK v noci\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "Je třeba, aby teplota byla z rozsahu %uK až %uK.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "Je třeba, aby hodnota jasu byla z rozsahu %.1f až %.1f.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Jas: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "Je třeba, aby hodnota gama byla z rozsahu %.1f až %.1f.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Gama (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "Zkouší se další metoda…\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "S použitím metody %s.\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "Byly již vyzkoušeny veškeré dostupné metody.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "Čekání na dostupnost aktuální polohy…\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Výška (úhel) Slunce: %f°\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Zastavte stisknutím Ctrl-C…\n" + #. TRANSLATORS: help output 1 #. LAT is latitude, LON is longitude, #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: ../src/redshift.c:452 +#: ../src/options.c:159 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" msgstr "" @@ -135,13 +352,13 @@ #. TRANSLATORS: help output 2 #. no-wrap -#: ../src/redshift.c:458 +#: ../src/options.c:165 msgid "Set color temperature of display according to time of day.\n" msgstr "Nastavení barevné teploty obrazovky dle denní doby.\n" #. TRANSLATORS: help output 3 #. no-wrap -#: ../src/redshift.c:464 +#: ../src/options.c:171 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" @@ -154,7 +371,7 @@ #. TRANSLATORS: help output 4 #. `list' must not be translated #. no-wrap -#: ../src/redshift.c:472 +#: ../src/options.c:179 msgid "" " -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" " -c FILE\tLoad settings from specified configuration file\n" @@ -167,44 +384,43 @@ " -o\t\tOne shot mode (do not continuously adjust color temperature)\n" " -O TEMP\tOne shot manual mode (set color temperature)\n" " -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" " -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" +" -r\t\tDisable fading between color temperatures\n" " -t DAY:NIGHT\tColor temperature to set at daytime/night\n" msgstr "" -" -b :\tJas obrazovky (z rozmezí 0.1 až 1.0)\n" -" -c SOUBOR\tNačíst nastavení ze zadaného souboru\n" -" -g ::\tPřídavná gama korekce\n" -" -l :\t Ruční zadání vaší současné zeměpisné " -"polohy\n" -" -l \tVýběr poskytovatele samočinné aktualizace " -"polohy\n" -" \t\t(Dostupné poskytovatele budou vypsáni po zadání „list“)\n" -" -m \tMetoda použitá k nastavení teploty barev\n" -" \t\t(Dostupné metody budou vypsány po zadání „list“)\n" -" -o\t\tJednorázový režim (neaktualizuje průběžně teplotu barev)\n" -" -O TEPLOTA\tJednorázový ruční režim (nastaví teplotu barev)\n" -" -p\t\tVýpisový režim (pouze vypíše parametry a skončí)\n" -" -x\t\tResetovací režim (odstraní přizpůsobení obrazovky)\n" -" -r\t\tBarevnou teplotu změnit skokově, bez pozvolného přechodu\n" -" -t :\tNastavení barevné teploty pro den/noc\n" +" -b DEN:NOC\tJas pro obrazovku (z rozmezí 0.1 až1.0)\n" +" -c SOUBOR\tNačíst nastavení ze zadaného souboru s nastaveními\n" +" -g C:Z:M\tDodatečná korekce gama\n" +" -l Z_SIRKA:Z_SIRKA\tAktuální pozice\n" +" -l POSKYTOVATEL\tVybrat poskytovatele automatických aktualizací pozice\n" +" \t\t(dostupné poskytovatele získáte zadáním „list“)\n" +" -m METODA\tMetoda kterou nastavovat teplotu barev\n" +" \t\t(dostupné metody získáte zadáním „list“)\n" +" -o\t\tJednorázový režim (neupravovat teplotu barev průběžně)\n" +" -O TEPL\tJednorázový ruční režim (nastavit teplotu barev)\n" +" -p\t\tRežim výpisu (pouze vypsat parametry a skončit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" #. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 +#: ../src/options.c:201 #, c-format msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" "more red light.\n" msgstr "" -"Neutrální teplota je %uK. Použitím této hodnoty nedojde \n" -"ke změně barevné teploty na displeji. Nastavení vyšší \n" -"barevné teploty vyústí ve více namodralého studeného, \n" -"nastavení nižší pak ve více teplého červeného světla.\n" +"Neutrální teplota barev je %uK. Použití této hodnoty nezmění teplotu barev\n" +"displeje. Nastavení teploty barev na hodnotu vyšší než tato vyústí ve více\n" +"modrého světla a nastavení na nižší hodnotu ve více červeného světla.\n" #. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 +#: ../src/options.c:210 #, c-format msgid "" "Default values:\n" @@ -218,255 +434,83 @@ " Teplota v noci: %uK\n" #. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 +#: ../src/options.c:218 #, c-format msgid "Please report bugs to <%s>\n" msgstr "Chyby prosím hlaste na <%s>\n" -#: ../src/redshift.c:516 +#: ../src/options.c:225 msgid "Available adjustment methods:\n" msgstr "Dostupné metody přizpůsobení:\n" -#: ../src/redshift.c:522 +#: ../src/options.c:231 msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" msgstr "" "Volby pro danou metodu zadejte oddělené dvojtečkou za její název: „-m " "METODA:VOLBY“.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 +#: ../src/options.c:234 msgid "Try `-m METHOD:help' for help.\n" msgstr "Zkuste `-m METODA:help' pro nápovědu.\n" -#: ../src/redshift.c:531 +#: ../src/options.c:241 msgid "Available location providers:\n" msgstr "Dostupní poskytovatelé určení polohy:\n" -#: ../src/redshift.c:537 +#: ../src/options.c:247 msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" msgstr "" "Volby pro daného poskytovatele zadejte oddělené dvojtečkou za jeho název: „-" "l POSKYTOVATEL:VOLBY“.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 +#: ../src/options.c:250 msgid "Try `-l PROVIDER:help' for help.\n" msgstr "Nápovědu získáte zadáním „-l :help“.\n" -#: ../src/redshift.c:553 ../src/redshift.c:645 -#, c-format -msgid "Initialization of %s failed.\n" -msgstr "Inicializace %s se nezdařila.\n" - -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 -#, c-format -msgid "Failed to set %s option.\n" -msgstr "Nezdařilo se nastavit volbu %s.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 -#, c-format -msgid "Try `-l %s:help' for more information.\n" -msgstr "Zkuste `-l %s:help' pro více informací.\n" - -#: ../src/redshift.c:601 ../src/redshift.c:682 -#, c-format -msgid "Failed to parse option `%s'.\n" -msgstr "Nezdařilo se analyzovat zadání volby %s.\n" - -#: ../src/redshift.c:628 -#, c-format -msgid "Failed to start provider %s.\n" -msgstr "Nezdařilo se spustit poskytovatele %s.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#: ../src/redshift.c:665 -#, c-format -msgid "Try `-m %s:help' for more information.\n" -msgstr "Zkuste `-m %s:help' pro více informací.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 -#, c-format -msgid "Try -m %s:help' for more information.\n" -msgstr "Více informací získáte zadáním „-m %s:help“.\n" - -#: ../src/redshift.c:707 -#, c-format -msgid "Failed to start adjustment method %s.\n" -msgstr "Nezdařilo se spustit metodu přizpůsobení %s.\n" - -#: ../src/redshift.c:870 ../src/redshift.c:898 -#, c-format -msgid "Status: %s\n" -msgstr "Stav: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Zapnuto" - -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Vypnuto" - -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" -msgstr "Nebylo možné načíst systémový čas.\n" - -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 -#, c-format -msgid "Color temperature: %uK\n" -msgstr "Barevná teplota: %uK\n" - -#: ../src/redshift.c:1004 ../src/redshift.c:1625 -#, c-format -msgid "Brightness: %.2f\n" -msgstr "Jas: %.2f\n" - -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Přizpůsobení barevné teploty se nezdařilo.\n" - -#: ../src/redshift.c:1105 +#: ../src/options.c:356 msgid "Malformed gamma argument.\n" msgstr "Neplatný argument gama.\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 msgid "Try `-h' for more information.\n" msgstr "Více informací získáte zadáním „-h“.\n" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 +#: ../src/options.c:407 ../src/options.c:610 #, c-format msgid "Unknown location provider `%s'.\n" msgstr "Neznámý poskytovatel polohy %s.\n" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 +#: ../src/options.c:439 ../src/options.c:597 #, c-format msgid "Unknown adjustment method `%s'.\n" msgstr "Neznámá metoda přizpůsobení %s.\n" -#: ../src/redshift.c:1213 +#: ../src/options.c:470 msgid "Malformed temperature argument.\n" msgstr "Neplatný argument teploty.\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 msgid "Malformed gamma setting.\n" msgstr "Neplatné nastavení gama.\n" -#: ../src/redshift.c:1364 +#: ../src/options.c:621 #, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Neznámá položka nastavení %s.\n" - -#: ../src/redshift.c:1422 -#, c-format -msgid "Trying location provider `%s'...\n" -msgstr "Zkouší se poskytovatel polohy %s…\n" - -#: ../src/redshift.c:1427 -msgid "Trying next provider...\n" -msgstr "Zkouší se další poskytovatel…\n" - -#: ../src/redshift.c:1433 -#, c-format -msgid "Using provider `%s'.\n" -msgstr "Nyní je používán poskytovatel %s.\n" - -#: ../src/redshift.c:1441 -msgid "No more location providers to try.\n" -msgstr "Nezbývají žádní další poskytovatelé polohy k vyzkoušení.\n" +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Chybně formulované nastavení času úsvitu „%s“.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Nebylo možné získat polohu od poskytovatele.\n" - -#: ../src/redshift.c:1460 +#: ../src/options.c:632 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Barevné teploty: %dK ve dne, %dK v noci\n" +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Chybně formulované nastavení času soumraku „%s“.\n" -#. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/options.c:639 #, c-format -msgid "Solar elevations: day above %.1f, night below %.1f\n" -msgstr "Výšky (úhly) Slunce: den nad %.1f°, noc pod %.1f°\n" - -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Je třeba, aby zeměpisná šířka byla z rozsahu %.1f až %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Je třeba, aby zeměpisná délka byla z rozsahu %.1f až %.1f.\n" - -#: ../src/redshift.c:1493 ../src/redshift.c:1511 -#, c-format -msgid "Temperature must be between %uK and %uK.\n" -msgstr "Je třeba, aby teplota byla z rozsahu %uK až %uK.\n" - -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" -"Výška ve vyšší z hodnot přechodu nemůže být nižší než výška v nižší z hodnot " -"přechodu.\n" - -#: ../src/redshift.c:1523 -#, c-format -msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "Je třeba, aby hodnota jasu byla z rozsahu %.1f až %.1f.\n" - -#: ../src/redshift.c:1529 -#, c-format -msgid "Brightness: %.2f:%.2f\n" -msgstr "Jas: %.2f:%.2f\n" - -#: ../src/redshift.c:1537 -#, c-format -msgid "Gamma value must be between %.1f and %.1f.\n" -msgstr "Je třeba, aby hodnota gama byla z rozsahu %.1f až %.1f.\n" - -#. TRANSLATORS: The string in parenthesis is either -#. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 -#, c-format -msgid "Gamma (%s): %.3f, %.3f, %.3f\n" -msgstr "Gama (%s): %.3f, %.3f, %.3f\n" - -#: ../src/redshift.c:1572 -msgid "Trying next method...\n" -msgstr "Zkouší se další metoda…\n" - -#: ../src/redshift.c:1577 -#, c-format -msgid "Using method `%s'.\n" -msgstr "S použitím metody %s.\n" - -#: ../src/redshift.c:1584 -msgid "No more methods to try.\n" -msgstr "Byly již vyzkoušeny veškeré dostupné metody.\n" - -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 -#, c-format -msgid "Solar elevation: %f\n" -msgstr "Výška (úhel) Slunce: %f°\n" - -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 -msgid "Press ctrl-c to stop...\n" -msgstr "Zastavte stisknutím Ctrl-C…\n" +msgid "Unknown configuration setting `%s'.\n" +msgstr "Neznámá položka nastavení %s.\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" @@ -480,32 +524,37 @@ msgid "Assignment outside section in config file.\n" msgstr "Přiřazení mimo sekci v souboru s nastaveními.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Nepodařilo se otevřít DRM zařízení: %s\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "Nezdařilo se získat zdroje DRM režimu\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d neexistuje. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Platná označení CRTC jsou [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Existuje pouze CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "CRTC %i bylo ztraceno – pokračuje se dalším\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" @@ -514,7 +563,7 @@ "Nelze získat velikost gama křivky pro CRTC %i\n" "on grafické kartě %i, zařízení bude ignorováno.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" @@ -523,7 +572,7 @@ "Rozhraní DRM nemůže načíst hodnotu gama korekce na CRTC %i na grafické kartě " "%i – zařízení bude ignorováno.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" "Přizpůsobit gamma korekci pomocí rozhraní podsystému Direct Rendering " @@ -531,7 +580,7 @@ #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" @@ -539,124 +588,122 @@ " card=N\tGrafická karta, na které provést přizpůsobení\n" " crtc=N\tCRTC, na kterém provést přizpůsobení\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "Je třeba, aby položka CRTC byla celé kladné číslo\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Neznámý parametr metody: %s.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "%s vrátilo chybu %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Nepodporovaná verze protokolu RANDR (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Obrazovku %i nelze nalézt.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Rozsah gama křivky není dostačující: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Nebylo možné obnovit CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" "Přizpůsobit hodnoty gama korekce pomocí rozšíření RANDR graf. serveru X.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tobrazovka graf. serveru X na kterou úpravu použít\n" +" crtc=N\tSeznam čárkou oddělených obrazových výstupů na který úpravu " +"použít\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Nepodařilo se načíst číslo obrazovky: „%s“.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -" screen=N\t\tObrazovka graf. serveru X, na které použít přizpůsobení\n" -" crtc=N\t\tCRTC, na kterém použít přizpůsobení\n" -" preserve={0,1}\tZda zachovat existující nastavení gama\n" - -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +"Parametr „%s“ je nyní vždy zapnutý. Pro vypnutí použijte volbu příkazového " +"řádku „%s“.\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "Požadavek na graf. server X nebyl v pořádku vyřízen: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Přizpůsobit gama korekci pomocí rozšíření VidMode graf. serveru X.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" -" screen=N\t\tUrčení, kterou obrazovku graf. serveru X přizpůsobit\n" -" preserve={0,1}\tZda zachovat existující nastavení gama\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tobrazovka graf. serveru X na který úpravu použít\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Stávající gama křivku nebylo možné uložit.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" -"Přizpůsobit gama křivky na systému OS X pomocí funkcí grafického serveru " -"Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Přizpůsobit gama křivky na macOS pomocí Quartz.\n" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr " preserve={0,1}\tZda zachovat stávající nastavení gama\n" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Nebylo možné otevřít kontext zařízení.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Toto zobrazovací zařízení nepodporuje gama korekci.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Přizpůsobit gama korekci pomocí rozhraní Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Nebylo možné obnovit původní gama korekci.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Není možné nastavit gama korekci.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" @@ -664,161 +711,106 @@ "Varování: je používána fiktivní metoda nastavení gama! Nastavení obrazovky " "proto nebude tímto způsobem nijak dotčeno.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" "Nezpůsobí změnu zobrazení, ale vypíše barevnou teplotu na terminál.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Teplota: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "Nepodařilo se získat hlavního klienta: %s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "Nepodařilo se získat hlavního klienta\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "Nelze nastavit požadavky pro hlavní:%s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "Nelze nastavit požadavky pro hlavní\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Spuštěn Geoclue poskytovatel %s.\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Nebyl nalezen použitelný Geoclue poskytovatele.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "Zkuste nastavit jméno a cestu k určení, kterého mám použít.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Použít polohu zjištěnou od poskytovatele Geoclue.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" name=N\tNázev Geoclue poskytovatele (nebo default)\n" -" path=N\tSouborová cesta ke Geoclue poskytovateli (nebo default)\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -"Poznámka: Jakmile je spuštěna, aplikace neprovádí opakované zjištování z " -"%s.\n" -"Z toho plyne, že je třeba ji po přesunu (cestování) restartovat.\n" +"Přístup k poloze byl GeoClue odepřen!\n" +"Ověřte že je služba zjišťování polohy zapnutá a Redshift může používat\n" +"služby zjišťování polohy. Více informací naleznete na\n" +"https://github.com/jonls/redshift#faq.\n" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Nelze zjistit polohu: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Dle poskytovatele Geoclue se nacházíte na: %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Poskytovatel nemá k dispozici platné údaje o poloze." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Použít polohu zjištěnou z poskytovatele Geoclue2.\n" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "Nelze získat údaj o poloze: %s.\n" +msgstr "Nedaří se zjistit polohu: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "Nebylo možné získat správu systémové služby Geoclue: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "Nebylo možné získat umístění klienta systémové služby Geoclue: %s.\n" +msgstr "Nepodařilo se zjistit umístění klienta GeoClue: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "Nebylo možné získat Geoclue klienta:%s.\n" +msgstr "Nedaří se použít klienta GeoClue: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "Nelze nastavit práh vzdálenosti: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "Nelze spustit Geoclue klienta: %s.\n" +msgstr "Nedaří se spustit klienta GeoClue: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Nelze se připojit k systémové službě Geoclue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Nepodařilo se spustit poskytovatele GeoClue2!\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Použít polohu zjištěnou z poskytovatele Geoclue2.\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "Nepodařilo se získat pověření pro získání polohy z CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "Chyba při získávání polohy ze systémové služby CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "Čekání na pověření k získání polohy…\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" -msgstr "Požadavek na získání polohy byl zamítnut!\n" +msgstr "Požadavek na zjištění polohy byl zamítnut!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Nepodařilo se spustit poskytovatele CoreLocation!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "Použít polohu zjištěnou poskytovatelem Corelocation.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Zeměpisnou šířku a délku je třeba nastavit.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Určete umístění ručně.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -826,7 +818,7 @@ " lat=N\t\tzeměpisná šířka\n" " lon=N\t\tzeměpisná délka\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" @@ -834,54 +826,58 @@ "Obě hodnoty mají být desetinná čísla,\n" "záporné hodnoty představují západ, resp. jih.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Neplatný argument.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Odstavit po dobu" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minut" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 hodiny" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 hodin" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" -msgstr "Samočinné spuštění" +msgstr "Spouštět automaticky" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "Podrobnosti" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Ukončit" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Zavřít" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Stav: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Barevná teplota" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Období" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Poloha" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Nápovědu získáte spuštěním „redshift -h“" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._da.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._da.po differ diff -Nru redshift-1.11/po/da.po redshift-1.12/po/da.po --- redshift-1.11/po/da.po 2016-01-02 22:24:24.000000000 +0000 +++ redshift-1.12/po/da.po 2018-05-21 01:13:17.000000000 +0000 @@ -1,21 +1,20 @@ # Danish translation for redshift # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the redshift package. -# FIRST AUTHOR , 2010. -# +# scootergrisen, 2018. msgid "" msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-02-23 06:54+0000\n" -"Last-Translator: Jon Lund Steffensen \n" -"Language-Team: Danish \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-05-07 01:48+0000\n" +"Last-Translator: scootergrisen \n" +"Language-Team: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: da\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -55,187 +54,83 @@ "Informationsvinduet i Redshift med en effekt lagt over som viser et eksempel " "på den rødlige effekt" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Justering af farvetemperatur" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Justeringsværktøj for farvetemperatur" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Ingen" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Dag" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Nat" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Overgang" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Periode: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Periode: %s (%.2f%% dag)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "Ø" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "V" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "Placering: %.2f° %s, %.2f° %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Brug: %s -l BRED:LÆNG -t DAG:NAT [TILVALG...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Indstil skærmens farvetemperatur ud fra klokkeslæt.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Den neutrale temperatur er %uK. Når denne værde benyttes vil\n" -"der ikke ske nogen farveændringer. En højere værdi vil\n" -"resultere i mere blåt lås, mens en lavere værdi vil resultere\n" -"i mere rødt lys.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Standardværdier:\n" -"\n" -" Dagtemperatur: %uK\n" -" Nattemperatur: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Rapporter venligst fejl til <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Tilgængelige justeringsmetoder:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "Specificer indstillinger separeret med kolon: `-m METODE:VALG'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Prøv `-m METODE:help' for at få hjælp.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Tilgængelige metoder til placeringsopdatering:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "Specificer indstillinger separeret med kolon: `-l METODE:VALG'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Prøv `-l METODE:help' for at få hjælp.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "Fejl under klargøring af %s.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Kunne ikke sætte indstilling %s.\n" @@ -243,206 +138,374 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Prøv `-l %s:help' for mere information.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "Kunne ikke læse indstilling `%s'.\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" -msgstr "Kunne ikke starte placeringsmetode %s.\n" +msgstr "Kunne ikke starte placeringsudbyder %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Prøv `-m %s:help' for mere information.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Prøv `-m %s:help' for mere information.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Kunne ikke starte justeringsmetode %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Aktiv" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Breddegrad skal være mellem %.1f° og %.1f°.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Deaktiveret" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Længdegrad skal være mellem %.1f° og %.1f°.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Kan ikke læse systemtid.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Venter på at indledende placering bliver tilgængelig...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Kan ikke modtage placeringsopdatering.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Ugyldig placering returneret fra udbyder.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Farvetemperatur: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Lysstyrke: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Fejl ved justering af temperatur.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Fejl i gamma-argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Status: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Prøv `-h' for mere information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Deaktiveret" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Ukendt metode til placeringsopdatering `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Aktiv" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Ukendt justeringsmetode: `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Fejl ved justering af temperatur.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Fejl i temperaturargument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Placering er midlertidig utilgængelig. Bruger forrige placering indtil den " +"bliver tilgængelig...\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Fejl i gamma indstilling.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Delvis tidskonfiguration understøttet ikke!\n" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Ukendt konfigurationsindstilling `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Ugyldig tidskonfiguration for solopgang/solnedgang!\n" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" -msgstr "Prøver placeringsmetoden `%s'...\n" +msgstr "Prøver placeringsudbyder `%s'...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" -msgstr "Prøver næste placeringsmetode...\n" +msgstr "Prøver næste udbyder...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" -msgstr "Bruger placeringsmetoden `%s'.\n" +msgstr "Bruger udbyderen `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" -msgstr "Ikke flere metoder til placeringsopdateringer kan prøves.\n" +msgstr "Ikke flere placeringsudbydere som kan prøves.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Kan ikke modtage placeringsopdatering.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Temperaturer: %dK om dagen, %dK om natten\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"Den høje tærskel for solhøjde kan ikke være lavere end den lave tærskel for " +"solhøjde.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "Solhøjde: dag over %.1f°, nat under %.1f°\n" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Breddegrad skal være mellem %.1f° og %.1f°.\n" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Længdegrad skal være mellem %.1f° og %.1f°.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperaturer: %dK om dagen, %dK om natten\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Temperatur skal være mellem %uK og %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" -"Den høje tærskel for solhøjde kan ikke være lavere end den lave tærskel for " -"solhøjde.\n" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "Værdi for lysstyrke skal være mellem %.1f og %.1f.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Lysstyrke: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gamma-værdi skal være mellem %.1f og %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" -msgstr "Prøver næste farvejusteringsmetode...\n" +msgstr "Prøver næste metode...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" -msgstr "Bruger farvejusteringsmetoden `%s'.\n" +msgstr "Bruger metoden `%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" -msgstr "Der er ikke flere justeringsmetoder som kan prøves.\n" +msgstr "Der er ikke flere metoder som kan prøves.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "Venter på at nuværende placering bliver tilgængelig...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Solhøjde: %f°\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" +msgstr "Tryk på ctrl-c for at stoppe...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Anvendelse: %s -l BRE:LÆN -t DAG:NAT [TILVALG...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Indstil skærmens farvetemperatur ud fra klokkeslæt.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tViser denne hjælpemeddelelse\n" +" -v\t\tUddybende output\n" +" -V\t\tVis programversion\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b DAG:NAT\tSkærmlysstyrke som skal anvendes (mellem 0.1 og 1.0)\n" +" -c FIL\tIndlæs indstillinger fra angivne konfigurationsfil\n" +" -g R:G:B\tYderligere gammakorrektion som skal anvendes\n" +" -l BRE:LÆN\tDin nuværende placering\n" +" -l UDBYDER\tVælg udbyder til automatisk opdateringer af placering\n" +" \t\t(skriv `list' for at se tilgængelige udbydere)\n" +" -m METODE\tMetode som skal bruges til at sætte farvetemperatur\n" +" \t\t(skriv `list' for at se tilgængelige metoder)\n" +" -o\t\tÉt skud-tilstand (juster ikke farvetemperaturen løbende)\n" +" -O TEMP\tManuel ét skud-tilstand (sæt farvetemperatur)\n" +" -p\t\tUdskriv tilstand (vis kun parametre og afslut)\n" +" -P\t\tNulstil eksisterende gammatabeller inden nye farveeffekter anvendes\n" +" -x\t\tNulstil tilstand (fjern justering fra skærm)\n" +" -r\t\tDeaktivér fading mellem farvetemperaturer\n" +" -t DAG:NAT\tFarvetemperatur som skal sættes ved dag/nat\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"Den neutrale temperatur er %uK. Når denne værdi benyttes vil der\n" +"ikke ske nogen ændringer af farvetemperaturen. En højere værdi vil\n" +"resultere i mere blåt lås, mens en lavere værdi vil resultere\n" +"i mere rødt lys.\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" msgstr "" +"Standardværdier:\n" +"\n" +" Dagtemperatur: %uK\n" +" Nattemperatur: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Rapporter venligst fejl til <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Tilgængelige justeringsmetoder:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Specificer indstillinger separeret med kolon: `-m METODE:VALG'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Prøv `-m METODE:help' for at få hjælp.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Tilgængelige placeringsudbydere:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Specificer indstillinger separeret med kolon: `-l UDBYDER:VALG'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Prøv `-l UDBYDER:help' for at få hjælp.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Fejl i gamma-argument.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Prøv `-h' for mere information.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Ukendt placeringsudbyder `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Ukendt justeringsmetode: `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Fejl i temperaturargument.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Fejl i gamma indstilling.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Forkert udformet indstilling for solnedgang `%s'.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Forkert udformet indstilling for solopgang `%s'.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Ukendt konfigurationsindstilling `%s'.\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" @@ -456,56 +519,61 @@ msgid "Assignment outside section in config file.\n" msgstr "Variabeltildeling udenfor sektion i konfigurationsfil.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Kunne ikke åbne DRM-enhed: %s\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" -msgstr "Kunne ikke få fat i DRM tilstandsresourcer\n" +msgstr "Kunne ikke få fat i DRM tilstandsressourcer\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d eksisterer ikke. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Gyldige CRTCer er [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Kun CRTC 0 eksisterer.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "CRTC %i er forsvundet, springer over\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -"Kunne ikke få fat i størrelsen på gammatabelen for CRTC %i\n" +"Kunne ikke få fat i størrelsen på gammatabellen for CRTC %i\n" "på grafikkort %i, ignorerer enheden.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -"DRM kunne ikke læse gammatabelen for CRTC %i på\n" +"DRM kunne ikke læse gammatabellen for CRTC %i på\n" "grafikkort %i, ignorerer enheden.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" -msgstr "Juster gammatabelerne med Direct Rendering Manager\n" +msgstr "Juster gammatabellerne med Direct Rendering Manager.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" @@ -513,273 +581,228 @@ " card=N\tGrafikkort som skal justeres\n" " crtc=N\tCRTC som skal justeres\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "CRTC skal være et ikke-negativt heltal\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" -msgstr "Ukendt parameter til justeringsmetode: `%s'.\n" +msgstr "Ukendt metodeparameter: `%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' returnerede fejlen %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Ikke-understøttet RANDR version (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Skærm %i kunne ikke findes.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Størrelsen på gammatabellen er for lille: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Kan ikke genskabe CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Juster gammatabellerne med X RANDR udvidelsen.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tX-skærm som skal justeres\n" +" crtc=N\tListe over kommasepareret CRTC'er som skal justeres\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Kan ikke læse skærmnummer: `%s'.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" +"Parameteren `%s` er nu altid til. Brug kommandolinjetilvalget `%s` for at " +"deaktivere.\n" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "Fejl ved X forespørgsel: %s\n" +msgstr "X-anmodning mislykkede: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Juster gammatabellerne med X VidMode udvidelsen.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tX-skærm som skal justeres\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Kan ikke gemme nuværende gammatabeller.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "Juster gammatabellerne i OSX med Quartz\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Juster gammatabellerne i macOS med Quartz.\n" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Fejl ved åbning af enhedskontekst.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Skærmenhed understøtter ikke gammatabeller.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Juster gammatabeller med Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Kan ikke genskabe gammatabeller.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Kan ikke sætte gammatabeller.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" +"ADVARSEL: Bruger dummy-gammametode! Skærmen påvirkes ikke af denne " +"gammametode.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -"Har ingen effect på skærmen men udskriver farvetemperaturen til terminalen.\n" +"Påvirker ikke skærmen men udskriver farvetemperaturen til terminalen.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Temperatur: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Brug placeringen som Geoclue placeringsmetoden bidrager.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" -"BEMÆRK: På nuværende tidspunkt bliver %s kun checket ved opstart \n" -"hvilket betyder at Redshift skal genstartes for at opdatere placeringen.\n" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Kunne ikke hente placeringen: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" +"Adgang til den nuværende placering blev nægtet af GeoClue!\n" +"Sørg for at placeringstjenesten er aktiveret og at Redshift har tilladelse\n" +"til at bruge placeringstjenesterne. Se https://github.com/jonls/redshift#faq " +"for mere\n" +"information.\n" -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Brug placeringen som GeoClue2 pleceringmetoden bidrager.\n" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "Kunne ikke få fat i placeringen: %s.\n" +msgstr "Kan ikke indhente placeringen: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" -msgstr "" +msgstr "Kan ikke indhente GeoClue-håndtering: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "" +msgstr "Kan ikke indhente GeoClue-klientsti: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "" +msgstr "Kan ikke indhente GeoClue-klient: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" -msgstr "" +msgstr "Kan ikke sætte distancetærskel: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "" +msgstr "Kan ikke starte GeoClue-klient: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Kunne ikke starte GeoClue2-udbyder!\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Brug placeringen som opdaget af en GeoClue2-udbyder.\n" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" -msgstr "" +msgstr "Ikke autentificeret til at indhente placering fra CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" -msgstr "" +msgstr "Fejl ved indhentning af placering fra CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" -msgstr "" +msgstr "Venter på autentificering til indhentelse af placering...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" -msgstr "" +msgstr "Anmodning for placering blev ikke autentificeret!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Kunne ikke starte CoreLocation-udbyder!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" -msgstr "" +msgstr "Brug placeringen som opdaget af Corelocation-udbyderen.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Breddegrad og længdegrad skal angives.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Specificer placering manuelt.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -787,62 +810,66 @@ " lat=N\t\tBreddegrad\n" " lon=N\t\tLængdegrad\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" "Begge værdier skal angives som decimaltal,\n" -"negative værdier representerer respektivt vest og syd.\n" +"negative værdier repræsenterer henholdsvis vest og syd.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Fejl i parameteren.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Deaktiver i" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minutter" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 time" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 timer" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Automatisk opstart" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "Information" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Afslut" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Luk" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Status: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Farvetemperatur" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Periode" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Placering" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Kør venligst `redshift -h` for at få hjælp." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._de.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._de.po differ diff -Nru redshift-1.11/po/de.po redshift-1.12/po/de.po --- redshift-1.11/po/de.po 2016-01-02 22:24:25.000000000 +0000 +++ redshift-1.12/po/de.po 2018-05-21 01:13:17.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-12-29 01:37+0000\n" -"Last-Translator: Michael Vetter \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-10-30 16:39+0000\n" +"Last-Translator: Tobias Bannert \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: de\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -34,752 +34,780 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" -"Die Farbtemperatur wird nach der Position der Sonne gesetzt. Nachts wird " -"eine andere als tags genutzt. Wenn es dämmert und die Sonne aufgeht wird die " -"Farbtemperatur einen sanften Übergang vollziehen damit sich die Augen " -"langsam umgewöhnen können." +"Die Farbtemperatur wird entsprechend zum Stand der Sonne eingestellt. In der " +"Nacht und am Tag werden verschiedene Farbtemperaturen verwendet. Während der " +"Dämmerung und am frühen Morgen wird die Farbtemperatur weich von Nacht auf " +"Tag umgestellt, damit sich Ihre Augen langsam anpassen können." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" -"Die Farbtemperatur wird nach der Position der Sonne gesetzt. Nachts wird " -"eine andere als tags genutzt. Wenn es dämmert und die Sonne aufgeht wird die " -"Farbtemperatur einen sanften Übergang vollziehen damit sich die Augen " -"langsam umgewöhnen können." +"Dieses Programm bietet ein Statussymbol, das es dem Benutzer ermöglicht, " +"Redshift zu steuern." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" -msgstr "Das Redshift Informationsfenster mit einem Beispiel Effekt" +msgstr "" +"Das Redshift-Informationsfenster mit einem Beispiel des Rötungseffektes " +"überlagert" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "Farbtemperatur Anpassung" +msgstr "Farbtemperaturanpassung" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "Farbtemperatur Anpassungswerkzeug" +msgstr "Farbtemperaturanpassungswerkzeug" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Unbekannt" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Tagsüber" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Nachts" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Übergang" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Zeitraum: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "Zeitraum: %s (%.2f%% day)\n" +msgstr "Zeitraum: %s (%.2f%% Tag)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "O" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "W" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "Position: %.2f° %s, %.2f° %s\n" +msgstr "Standort: %.2f° %s, %.2f° %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Benutzung: %s -l BREITE:LÄNGE -t TAG:NACHT [OPTIONEN …]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Farbtemperatur des Bildschirms je nach Tageszeit ändern.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tDiese Hilfe-Nachricht anzeigen\n" -" -v\t\tAusführliche Ausgabe\n" -" -V\t\tProgrammversion anzeigen\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Die neutrale Temperatur ist %u K. Dieser Wert wird\n" -"die Farbtemperatur des Bildschirms nicht verändern.\n" -"Eine höhere Farbtemperatur ergibt blaueres Licht,\n" -"eine niedrige ergibt roteres Licht.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Vorgabewerte:\n" -"\n" -" Temperatur tagsüber: %uK\n" -" Temperatur nachts: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Bitte melden Sie Fehler auf <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Verfügbare Änderungsmethoden:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "Geben Sie kommaseparierte Optionen an: »-m METHODE:OPTIONEN«.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Benutzen Sie »-m METHODE:help« für Hilfe.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Verfügbare Standortbestimmungs-Dienste:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "Geben Sie kommaseparierte Optionen an: »-l DIENST:OPTIONEN«.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Benutzen Sie »-l DIENST:help« für Hilfe.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" -msgstr "Starten von %s fehlgeschlagen.\n" +msgstr "Starten von %s ist fehlgeschlagen.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" -msgstr "Setzen der Option %s fehlgeschlagen.\n" +msgstr "Festlegen der Option %s ist fehlgeschlagen.\n" #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" -msgstr "Benutzen Sie »-l %s:help« für weitere Informationen.\n" +msgstr "Bitte »-l %s:help« für weitere Informationen versuchen.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" -msgstr "Konnte Option nicht parsen `%s'.\n" +msgstr "Analysieren von Option »%s« ist fehlgeschlagen.\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" -msgstr "Starten des Dienstes %s fehlgeschlagen.\n" +msgstr "Starten des Anbieters »%s« ist fehlgeschlagen.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" -msgstr "Probieren Sie '-m%s:hilfe' für mehr Information.\n" +msgstr "Bitte »-m%s:help« für weitere Informationen versuchen.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" -msgstr "Benutzen Sie »-m %s:help« für weitere Informationen.\n" +msgstr "Bitte »-m%s:help« für weitere Informationen versuchen.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" -msgstr "Starten der Änderungsmethode %s fehlgeschlagen.\n" +msgstr "Starten der Änderungsmethode %s ist fehlgeschlagen.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "Status: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Aktiviert" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Der Breitengrad muss sich zwischen %.1f und %.1f befinden.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Deaktiviert" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Der Längengrad muss sich zwischen %.1f und %.1f befinden.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" -msgstr "Konnte Systemzeit nicht auslesen.\n" +msgstr "Systemzeit konnte nicht ausgelesen werden.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Es wird gewartet, bis der anfängliche Standort verfügbar ist …\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Standort konnte nicht vom Anbieter erhalten werden.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Es ist ein ungültiger Standort vom Anbieter geliefert worden.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Farbtemperatur: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Helligkeit: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Temperaturänderung fehlgeschlagen.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Fehlerhaftes Kommando für Gamma-Wert.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Status: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Benutzen Sie »-h« für mehr Informationen.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Deaktiviert" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Unbekannter Dienst »%s«.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Aktiviert" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Unbekanntes Anpassungsverfahren »%s«\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Temperaturänderung ist fehlgeschlagen.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Fehlerhaftes Kommando für Temperatur.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Standort kann derzeit nicht ermittelt werden, stattdessen wird der vorherige " +"Standort verwendet.\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Verkehrte Gamma-Einstellung.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Teilzeitkonfiguration wird nicht unterstützt!\n" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Unbekannte Konfigurationseinstellung »%s«\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" +"Ungültige Einstellung der Zeiten für Morgengrauen und Abenddämmerung!\n" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" -msgstr "Versuche Location Provider `%s'...\n" +msgstr "Standortanbieter »%s« wird versucht …\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" -msgstr "Nächster Dienst wird getestet …\n" +msgstr "Nächster Anbieter wird versucht …\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" -msgstr "Dienst »%s« wird benutzt.\n" +msgstr "Anbieter »%s« wird verwendet.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" -msgstr "Keine weiteren Dienste verfügbar.\n" - -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Konnte Standort nicht vom Dienst erhalten.\n" +msgstr "Keine weiteren Standortanbieter verfügbar.\n" -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Farbtemperatur: %dK tagsüber, %dK nachts\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"Eine hohe Übergangshöhe kann nicht kleiner sein, als die niedrige " +"Übergangshöhe.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" -msgstr "" - -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Der Breitengrad muss sich zwischen %.1f und %.1f befinden.\n" +msgstr "Sonnenstand: Tag oben %.1f, Nacht unten %.1f\n" -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Der Längengrad muss sich zwischen %.1f und %.1f befinden.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Farbtemperatur: %dK tagsüber, %dK nachts\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Die Temperatur muss sich zwischen %uK und %uK befinden.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "Helligkeit muss zwischen %.1f und % .1f liegen.\n" +msgstr "Der Helligkeitswert muss zwischen %.1f und %.1f liegen.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Helligkeit: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Der Gamma-Wert muss sich zwischen %.1f und %.1f befinden.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Nächste Methode wird getestet …\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Methode »%s« wird benutzt.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Keine weiteren Methoden verfügbar.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "Es wird gewartet, bis der derzeitige Standort verfügbar ist …\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Sonnenstand: %f°\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" -msgstr "Drücke Str-c um anzuhalten..\n" +msgstr "Strg-c drücken, um anzuhalten …\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Benutzung: %s -l BREITE:LÄNGE -t TAG:NACHT [OPTIONEN …]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Farbtemperatur des Bildschirms je nach Tageszeit ändern.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tDiese Hilfenachricht anzeigen\n" +" -v\t\tAusführliche Ausgabe\n" +" -V\t\tProgrammversion anzeigen\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b TAG:NACHT\tBildschirmhelligkeit zum Anwenden (zwischen 0.1 und 1.0)\n" +" -c DATEI\tEinstellungen aus der angegebenen Konfigurationsdatei laden\n" +" -g R:G:B\tZusätzliche Gamma-Korrektur zum Anwenden\n" +" -l BREIT:LÄNG\tIhr aktueller Standort in Breiten- und Längengrad\n" +" -l ANBIETER\tAnbieter für automatische Standortaktualisierungen auswählen\n" +" \t\t(»list« für verfügbare Anbieter eingeben)\n" +" -m METHODE\tMethode zum Einstellen der Farbtemperatur\n" +" \t\t(»list« für verfügbare Methoden eingeben)\n" +" -o\t\tEinmaliger-Modus (Farbtemperatur nicht kontinuierlich anpassen)\n" +" -O TEMP\tEinmaliger-Manueller-Modus (Farbtemperatur einstellen)\n" +" -p\t\tAusgabemodus (nur die Werte ausgeben und beenden)\n" +" -P\t\tGammaanstieg zurücksetzen, vor Anwenden des neuen Farbeffektes\n" +" -x\t\tZurücksetzmodus (Anpassung vom Bildschirm entfernen)\n" +" -r\t\tAusblenden zwischen Farbtemperaturen deaktivieren\n" +" -t TAG:NACHT\tFarbtemperatur zur Anwendung bei Tag/Nacht\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"Die neutrale Temperatur ist %uK. Benutzung dieses Wertes ändert nicht\n" +"die Farbtemperatur des Bildschirms. Das Einstellen der Farbtemperatur\n" +"auf einen höheren Wert als diesen führt zu mehr blauem Licht,\n" +"und ein kleinerer führt zu röterem Licht.\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Vorgabewerte:\n" +"\n" +" Temperatur tagsüber: %uK\n" +" Temperatur nachts: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Bitte Fehler auf <%s> melden\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Verfügbare Änderungsmethoden:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Bitte durch Komma getrente Optionen angeben: »-m METHODE:OPTIONEN«.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "»-m METHODE:help« für Hilfe versuchen.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Verfügbare Standortanbieter:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Bitte durch Komma getrente Optionen angeben: »-l ANBIETER:OPTIONEN«.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "»-l ANBIETER:help« für Hilfe versuchen.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Fehlerhafter Gammawert.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Bitte »-h« für weitere Informationen versuchen.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Unbekannter Standortanbieter »%s«.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Unbekanntes Anpassungsverfahren »%s«\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Fehlerhafter Temperaturwert.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Fehlerhafte Gammaeinstellung.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Fehlerhafte Morgendämmerungszeiteinstellung »%s«.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Fehlerhafte Abenddämmerungszeiteinstellung »%s«.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Unbekannte Konfigurationseinstellung »%s«\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" -msgstr "Verunstaltete Header-Sektion in der Konfigurationsdatei.\n" +msgstr "Fehlerhafte Abschnittsüberschrift in der Konfigurationsdatei.\n" #: ../src/config-ini.c:203 msgid "Malformed assignment in config file.\n" -msgstr "Verunstaltete Abgrenzung in der Konfigurationsdatei.\n" +msgstr "Fehlerhafte Zuordnung in der Konfigurationsdatei.\n" #: ../src/config-ini.c:214 msgid "Assignment outside section in config file.\n" -msgstr "Zuweisung außerhalb von Sektion in Konfigurationsdatei.\n" +msgstr "Zuordnung außerhalb des Teils in der Konfigurationsdatei.\n" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Öffnen des DRM-Gerätes ist fehlgeschlagen: %s\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" -msgstr "Konnte DRM Modus Resourcen nicht erhalten\n" +msgstr "Erhalt der DRM-Modus-Quellen ist fehlgeschlagen\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " -msgstr "CRTC %d gibt es nicht. " +msgstr "CRTC %d ist nicht vorhanden. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Gültige CRTCs sind [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Es gibt nur CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" -msgstr "CRTC %i verlorgen, es wird abgebrochen\n" +msgstr "CRTC %i verloren, es wird übersprungen\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" +"Gamma-Anstieg kann nicht für CRTC %i\n" +"auf Grafikkarten %i erhalten werden.\n" +"Gerät wird ausgeschlossen\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" +"DRM kann den Gamma-Anstieg von CRTC %i an\n" +"Grafikkarten %i nicht lesen. Gerät wird ausgeschlossen.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" -msgstr "" +msgstr "Gamma-Anstiege mit Direct-Rendering-Manager (DRM) einstellen.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" +" card=N\tGrafikkarte zum Anpassen\n" +" crtc=N\tCRTC zum Anpassen\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" -msgstr "" +msgstr "CRTC muss eine nicht-negative Ganzzahl sein\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" -msgstr "Unbekanntes Kommando für Methode: »%s«.\n" +msgstr "Unbekannter Methodenwert: »%s«.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "»%s« gab einen Fehler zurück %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Nicht unterstützte RANDR-Version (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" -msgstr "Konnte Bildschirm %i nicht finden.\n" +msgstr "Bildschirm %i konnte nicht gefunden werden.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Gamma-Anstiegswert zu klein: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" -msgstr "Konnte CRTC nicht wiederherstellen %i\n" +msgstr "CRTC %i konnte nicht wiederhergestellt werden\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Gamma-Anstieg mit der X-RANDR-Erweiterung ändern.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" +" screen=N\t\tX-Bildschirm zum Anpassen\n" +" crtc=N\tListe von durch Komma getrennter CRTCs zum Anpassen\n" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Bildschirmnummer kann nicht gelesen werden: »%s«.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" +"Wert »%s« ist jetzt immer an; zum deaktivieren bitte die Befehlszeilenoption " +"»%s« benutzen.\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "X-Anfrage fehlgeschlagen: %s\n" +msgstr "X-Anfrage ist fehlgeschlagen: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Gamma-Änstiegswerte mit der X-VidMode-Erweiterung ändern.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tX-Bildschirm zum Anpassen\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" -msgstr "Konnte aktuellen Gamma-Anstiegswert nicht speichern.\n" +msgstr "Aktueller Gamma-Anstieg konnte nicht gespeichert werden.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr " preserve={0,1}\tOb existierender Gammawert behalten werden soll\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Gamma-Anstiege auf MacOS mit Quarz anpassen.\n" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" -msgstr "Konnte Gerätekontext nicht öffnen.\n" +msgstr "Gerätekontext konnte nicht geöffnet werden.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Anzeigegerät unterstützt Gamma-Anstieg nicht.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" -msgstr "Gamma-Anstieg mit der Windows GDI ändern.\n" +msgstr "Gamma-Anstieg mit der Windows-GDI ändern.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" -msgstr "Konnte Gamma-Anstieg nicht wiederherstellen.\n" +msgstr "Gamma-Anstiege konnten nicht wiederhergestellt werden.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" -msgstr "Konnte Gamma-Anstieg nicht festlegen.\n" +msgstr "Gamma-Anstiege konnten nicht festgelegt werden.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -"WARNUNG: Es wird eine Pseudo Gamma Methode genutzt? Der Bildschirm wird von " -"dieser Methode nicht beeinflusst werden.\n" +"ACHTUUNG: es wird eine Pseudo-Gamma-Methode verwendet! Der Bildschirm wird " +"von dieser Methode nicht beeinflusst.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -"Betrifft das Display nicht aber gibt die Farbtemperatur im Terminal aus.\n" +"Beeinflusst nicht den Bildschirm aber gibt die Farbtemperatur im Terminal " +"aus.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Temperatur: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "Konnte master client nicht bestimmen: %s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "Konnte master client nicht bestimmen\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "Kann Vorraussetzungen für Master nicht setzen: %s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "Kann Vorraussetzungen für Master nicht setzen\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Geoclue Provider `%s' gestartet.\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Konnte keinen benutzbaren Geoclue Provider finden.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" -"Setze den Namen und Pfad um zu bestimmen welche genutzt werden sollen.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Benutze die Lage die vom Geoclue Proiver festgestellt wurde.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" name=N\tName des Geoclue Providers (oder `default')\n" -" path=N\tPFad des Geoclue Providers (oder `default')\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -"HINWEIS: Redshift liest %s nach dem starten nicht mehr,\n" -"was bedeutet das es neugestartet werden muss wenn man seine Position " -"ändert.\n" +"Zugriff auf den aktuellen Standort wurde von GeoClue verweigert!\n" +"Stellen Sie sicher, dass die Standortdienste aktiviert sind und dass\n" +"Redshift Standortdienste verwenden darf.\n" +"Weitere Infos unter: https://github.com/jonls/redshift#faq\n" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Konnte Lage nicht bestimmen: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Laut geoclue provider wir sind bei: : %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Provider hat keine gültige Lage." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Benutze die von GeoClue2 Provider erhaltene Lage.\n" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "Konnte Lage nicht bestimmen: %s.\n" +msgstr "Standort konnte nicht erhalten werden: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" -msgstr "Konnte GeoClue Manager nicht bestimmen: %s.\n" +msgstr "GeoClue-Verwalter konnte nicht erhalten werden: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "Konnte GeoClue Client nicht bestimmen: %s.\n" +msgstr "GeoClue-Programmpfad konnte nicht erhalten werden: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "Konnte GeoClue Client nicht bestimmen: %s.\n" +msgstr "GeoClue-Programm konnte nicht erhalten werden: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" -msgstr "Konnte Distanzgrenzwert nicht setzen: %s.\n" +msgstr "Distanzgrenzwert konnte nicht festgelegt werden: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "Konnte GeoClue Client nicht starten: %s.\n" +msgstr "GeoClue-Programm konnte nicht gestartet werden: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Konnte nicht mit GeoClue verbinden.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Starten des GeoClue2-Anbieters ist fehlgeschlagen!\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Die vom GeoClue2-Anbieter erkannten Standort verwenden.\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" -msgstr "Nicht authorisiert die Lage von CoreLocation zu beziehen.\n" +msgstr "Keine Legitimation den Standort von CoreLocation zu erhalten.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" -msgstr "Fehler beim beziehen der Lage von CoreLocation: %s\n" +msgstr "Fehler beim Erhalt des Standortes von CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" -msgstr "Warte auf Authorisierung um die Lage zu beziehen..\n" +msgstr "Auf die Legitimation zum Erhalt des Standortes wird gewartet …\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" -msgstr "Anfrage der Lage wurde nicht genehmigt!\n" +msgstr "Anfrage des Standortes wurde nicht genehmigt!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Starten des CoreLocation-Anbieters ist fehlgeschlagen!\n" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" -msgstr "Benutze die Lage die vom Corelocation Provider gefunden wurde.\n" +msgstr "" +"Den Standortes die vom Corelocation-Anbieter erkannt wurde verwenden.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Breiten- und Längengrad müssen festgelegt sein.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Standort manuell festlegen.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -787,62 +815,66 @@ " lat=N\t\tBreitengrad\n" " lon=N\t\tLängengrad\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -"Beides sollten Kommawerte sein,\n" -"negative Werte stehen für Westen/Süden.\n" +"Beide Werte werden erwartet Gleitkommazahlen zu sein,\n" +"negative Werte stehen für Westen oder Süden.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" -msgstr "Fehlerhaftes Kommando.\n" +msgstr "Fehlerhafter Wert.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "Pausieren für" +msgstr "Unterbrechen für" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 Minuten" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 Stunde" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 Stunden" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Automatischer Start" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "Informationen" +msgstr "Information" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Beenden" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Schließen" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Status: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Farbtemperatur" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Zeitraum" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" -msgstr "Position" +msgstr "Standort" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Bitte »redshift -h« für Hilfe ausführen." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._el.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._el.po differ diff -Nru redshift-1.11/po/el.po redshift-1.12/po/el.po --- redshift-1.11/po/el.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/el.po 2018-05-21 01:13:18.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2014-12-03 08:49+0000\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Greek \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: el\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,179 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Για βοήθεια, δοκιμάστε `-m METHOD:help'\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Για βοήθεια, δοκιμάστε `-l PROVIDER:help'\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "Αποτυχία αρχικοποίησης του %s.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Αποτυχία ορισμού της επιλογής %s.\n" @@ -224,205 +128,345 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Για περισσότερες πληροφορίες, δοκιμάστε `-l %s:help'.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Για περισσότερες πληροφορίες, δοκιμάστε `-m %s:help'.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" msgstr "" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Για βοήθεια, δοκιμάστε `-m METHOD:help'\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Για βοήθεια, δοκιμάστε `-l PROVIDER:help'\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -435,380 +479,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._en_GB.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._en_GB.po differ diff -Nru redshift-1.11/po/en_GB.po redshift-1.12/po/en_GB.po --- redshift-1.11/po/en_GB.po 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/po/en_GB.po 2018-05-21 01:13:18.000000000 +0000 @@ -0,0 +1,877 @@ +# English (United Kingdom) translation for redshift +# Copyright (c) 2018 Rosetta Contributors and Canonical Ltd 2018 +# This file is distributed under the same license as the redshift package. +# FIRST AUTHOR , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: redshift\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-01-01 12:55+0000\n" +"Last-Translator: Andi Chandler \n" +"Language-Team: English (United Kingdom) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 +msgid "" +"Redshift adjusts the color temperature of your screen according to your " +"surroundings. This may help your eyes hurt less if you are working in front " +"of the screen at night." +msgstr "" +"Redshift adjusts the colour temperature of your screen according to your " +"surroundings. This may help your eyes hurt less if you are working in front " +"of the screen at night." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 +msgid "" +"The color temperature is set according to the position of the sun. A " +"different color temperature is set during night and daytime. During twilight " +"and early morning, the color temperature transitions smoothly from night to " +"daytime temperature to allow your eyes to slowly adapt." +msgstr "" +"The colour temperature is set according to the position of the Sun. A " +"different colour temperature is set during night and daytime. During " +"twilight and early morning, the colour temperature transitions smoothly from " +"night to daytime temperature to allow your eyes to slowly adapt." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 +msgid "" +"This program provides a status icon that allows the user to control Redshift." +msgstr "" +"This program provides a status icon that allows the user to control Redshift." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 +msgid "" +"The Redshift information window overlaid with an example of the redness " +"effect" +msgstr "" +"The Redshift information window overlaid with an example of the redness " +"effect" + +#: ../data/applications/redshift.desktop.in.h:1 +#: ../data/applications/redshift-gtk.desktop.in.h:1 +msgid "Redshift" +msgstr "Redshift" + +#: ../data/applications/redshift.desktop.in.h:2 +#: ../data/applications/redshift-gtk.desktop.in.h:2 +msgid "Color temperature adjustment" +msgstr "Colour temperature adjustment" + +#: ../data/applications/redshift.desktop.in.h:3 +#: ../data/applications/redshift-gtk.desktop.in.h:3 +msgid "Color temperature adjustment tool" +msgstr "Colour temperature adjustment tool" + +#. TRANSLATORS: Name printed when period of day is unknown +#: ../src/redshift.c:135 +msgid "None" +msgstr "None" + +#: ../src/redshift.c:136 ../src/redshift.c:1107 +msgid "Daytime" +msgstr "Daytime" + +#: ../src/redshift.c:137 ../src/redshift.c:1111 +msgid "Night" +msgstr "Night" + +#: ../src/redshift.c:138 +msgid "Transition" +msgstr "Transition" + +#: ../src/redshift.c:225 +#, c-format +msgid "Period: %s\n" +msgstr "Period: %s\n" + +#: ../src/redshift.c:228 +#, c-format +msgid "Period: %s (%.2f%% day)\n" +msgstr "Period: %s (%.2f%% day)\n" + +#. TRANSLATORS: Abbreviation for `north' +#: ../src/redshift.c:240 +msgid "N" +msgstr "N" + +#. TRANSLATORS: Abbreviation for `south' +#: ../src/redshift.c:242 +msgid "S" +msgstr "S" + +#. TRANSLATORS: Abbreviation for `east' +#: ../src/redshift.c:244 +msgid "E" +msgstr "E" + +#. TRANSLATORS: Abbreviation for `west' +#: ../src/redshift.c:246 +msgid "W" +msgstr "W" + +#. TRANSLATORS: Append degree symbols after %f if possible. +#. The string following each number is an abreviation for +#. north, source, east or west (N, S, E, W). +#: ../src/redshift.c:251 +#, c-format +msgid "Location: %.2f %s, %.2f %s\n" +msgstr "Location: %.2f %s, %.2f %s\n" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Initialisation of %s failed.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Failed to set %s option.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "Try `-l %s:help' for more information.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Failed to parse option `%s'.\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Failed to start provider %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Try `-m %s:help' for more information.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "Try -m %s:help' for more information.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "Failed to start adjustment method %s.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Latitude must be between %.1f and %.1f.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Longitude must be between %.1f and %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Unable to read system time.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Waiting for initial location to become available...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Unable to get location from provider.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Invalid location returned from provider.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Colour temperature: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Brightness: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Status: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Disabled" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Enabled" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Temperature adjustment failed.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Partitial time-configuration not supported!\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Invalid dawn/dusk time configuration!\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Trying location provider `%s'...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Trying next provider...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Using provider `%s'.\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "No more location providers to try.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "Solar elevations: day above %.1f, night below %.1f\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperatures: %dK at day, %dK at night\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "Temperature must be between %uK and %uK.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "Brightness values must be between %.1f and %.1f.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Brightness: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "Gamma value must be between %.1f and %.1f.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "Trying next method...\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "Using method `%s'.\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "No more methods to try.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "Waiting for current location to become available...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Solar elevation: %f\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Press ctrl-c to stop...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Set colour temperature of display according to time of day.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set colour temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust colour temperature)\n" +" -O TEMP\tOne shot manual mode (set colour temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new colour effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between colour temperatures\n" +" -t DAY:NIGHT\tColour temperature to set at daytime/night\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"The neutral temperature is %uK. Using this value will not change the colour\n" +"temperature of the display. Setting the colour temperature to a value " +"higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Please report bugs to <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Available adjustment methods:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Try `-m METHOD:help' for help.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Available location providers:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Try `-l PROVIDER:help' for help.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Malformed gamma argument.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Try `-h' for more information.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Unknown location provider `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Unknown adjustment method `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Malformed temperature argument.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Malformed gamma setting.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Malformed dawn-time setting `%s'.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Malformed dusk-time setting `%s'.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Unknown configuration setting `%s'.\n" + +#: ../src/config-ini.c:167 +msgid "Malformed section header in config file.\n" +msgstr "Malformed section header in config file.\n" + +#: ../src/config-ini.c:203 +msgid "Malformed assignment in config file.\n" +msgstr "Malformed assignment in config file.\n" + +#: ../src/config-ini.c:214 +msgid "Assignment outside section in config file.\n" +msgstr "Assignment outside section in config file.\n" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Failed to open DRM device: %s\n" + +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "Failed to get DRM mode resources\n" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 +#, c-format +msgid "CRTC %d does not exist. " +msgstr "CRTC %d does not exist. " + +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 +#, c-format +msgid "Valid CRTCs are [0-%d].\n" +msgstr "Valid CRTCs are [0-%d].\n" + +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 +#, c-format +msgid "Only CRTC 0 exists.\n" +msgstr "Only CRTC 0 exists.\n" + +#: ../src/gamma-drm.c:159 +#, c-format +msgid "CRTC %i lost, skipping\n" +msgstr "CRTC %i lost, skipping\n" + +#: ../src/gamma-drm.c:165 +#, c-format +msgid "" +"Could not get gamma ramp size for CRTC %i\n" +"on graphics card %i, ignoring device.\n" +msgstr "" +"Could not get gamma ramp size for CRTC %i\n" +"on graphics card %i, ignoring device.\n" + +#: ../src/gamma-drm.c:178 +#, c-format +msgid "" +"DRM could not read gamma ramps on CRTC %i on\n" +"graphics card %i, ignoring device.\n" +msgstr "" +"DRM could not read gamma ramps on CRTC %i on\n" +"graphics card %i, ignoring device.\n" + +#: ../src/gamma-drm.c:242 +msgid "Adjust gamma ramps with Direct Rendering Manager.\n" +msgstr "Adjust gamma ramps with Direct Rendering Manager.\n" + +#. TRANSLATORS: DRM help output +#. left column must not be translated +#: ../src/gamma-drm.c:247 +msgid "" +" card=N\tGraphics card to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" +" card=N\tGraphics card to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" + +#: ../src/gamma-drm.c:260 +#, c-format +msgid "CRTC must be a non-negative integer\n" +msgstr "CRTC must be a non-negative integer\n" + +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 +#, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "Unknown method parameter: `%s'.\n" + +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 +#, c-format +msgid "`%s' returned error %d\n" +msgstr "`%s' returned error %d\n" + +#: ../src/gamma-randr.c:103 +#, c-format +msgid "Unsupported RANDR version (%u.%u)\n" +msgstr "Unsupported RANDR version (%u.%u)\n" + +#: ../src/gamma-randr.c:138 +#, c-format +msgid "Screen %i could not be found.\n" +msgstr "Screen %i could not be found.\n" + +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 +#, c-format +msgid "Gamma ramp size too small: %i\n" +msgstr "Gamma ramp size too small: %i\n" + +#: ../src/gamma-randr.c:277 +#, c-format +msgid "Unable to restore CRTC %i\n" +msgstr "Unable to restore CRTC %i\n" + +#: ../src/gamma-randr.c:301 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "Adjust gamma ramps with the X RANDR extension.\n" + +#. TRANSLATORS: RANDR help output +#. left column must not be translated +#: ../src/gamma-randr.c:306 +msgid "" +" screen=N\t\tX screen to apply adjustments to\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tX screen to apply adjustments to\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Unable to read screen number: `%s'.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 +#, c-format +msgid "X request failed: %s\n" +msgstr "X request failed: %s\n" + +#: ../src/gamma-vidmode.c:140 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "Adjust gamma ramps with the X VidMode extension.\n" + +#. TRANSLATORS: VidMode help output +#. left column must not be translated +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tX screen to apply adjustments to\n" + +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 +msgid "Unable to save current gamma ramp.\n" +msgstr "Unable to save current gamma ramp.\n" + +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Adjust gamma ramps on macOS using Quartz.\n" + +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 +msgid "Unable to open device context.\n" +msgstr "Unable to open device context.\n" + +#: ../src/gamma-w32gdi.c:75 +msgid "Display device does not support gamma ramps.\n" +msgstr "Display device does not support gamma ramps.\n" + +#: ../src/gamma-w32gdi.c:115 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "Adjust gamma ramps with the Windows GDI.\n" + +#: ../src/gamma-w32gdi.c:153 +msgid "Unable to restore gamma ramps.\n" +msgstr "Unable to restore gamma ramps.\n" + +#: ../src/gamma-w32gdi.c:211 +msgid "Unable to set gamma ramps.\n" +msgstr "Unable to set gamma ramps.\n" + +#: ../src/gamma-dummy.c:43 +msgid "" +"WARNING: Using dummy gamma method! Display will not be affected by this " +"gamma method.\n" +msgstr "" +"WARNING: Using dummy gamma method! Display will not be affected by this " +"gamma method.\n" + +#: ../src/gamma-dummy.c:60 +msgid "" +"Does not affect the display but prints the color temperature to the " +"terminal.\n" +msgstr "" +"Does not affect the display but prints the colour temperature to the " +"terminal.\n" + +#: ../src/gamma-dummy.c:75 +#, c-format +msgid "Temperature: %i\n" +msgstr "Temperature: %i\n" + +#: ../src/location-geoclue2.c:59 +#, c-format +msgid "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" + +#: ../src/location-geoclue2.c:107 +#, c-format +msgid "Unable to obtain location: %s.\n" +msgstr "Unable to obtain location: %s.\n" + +#: ../src/location-geoclue2.c:150 +#, c-format +msgid "Unable to obtain GeoClue Manager: %s.\n" +msgstr "Unable to obtain GeoClue Manager: %s.\n" + +#: ../src/location-geoclue2.c:166 +#, c-format +msgid "Unable to obtain GeoClue client path: %s.\n" +msgstr "Unable to obtain GeoClue client path: %s.\n" + +#: ../src/location-geoclue2.c:188 +#, c-format +msgid "Unable to obtain GeoClue Client: %s.\n" +msgstr "Unable to obtain GeoClue Client: %s.\n" + +#: ../src/location-geoclue2.c:229 +#, c-format +msgid "Unable to set distance threshold: %s.\n" +msgstr "Unable to set distance threshold: %s.\n" + +#: ../src/location-geoclue2.c:253 +#, c-format +msgid "Unable to start GeoClue client: %s.\n" +msgstr "Unable to start GeoClue client: %s.\n" + +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Failed to start GeoClue2 provider!\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Use the location as discovered by a GeoClue2 provider.\n" + +#: ../src/location-corelocation.m:73 +msgid "Not authorized to obtain location from CoreLocation.\n" +msgstr "Not authorised to obtain location from CoreLocation.\n" + +#: ../src/location-corelocation.m:111 +#, c-format +msgid "Error obtaining location from CoreLocation: %s\n" +msgstr "Error obtaining location from CoreLocation: %s\n" + +#: ../src/location-corelocation.m:120 +msgid "Waiting for authorization to obtain location...\n" +msgstr "Waiting for authorisation to obtain location...\n" + +#: ../src/location-corelocation.m:122 +msgid "Request for location was not authorized!\n" +msgstr "Request for location was not authorised!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Failed to start CoreLocation provider!\n" + +#: ../src/location-corelocation.m:235 +msgid "Use the location as discovered by the Corelocation provider.\n" +msgstr "Use the location as discovered by the Corelocation provider.\n" + +#: ../src/location-manual.c:59 +msgid "Latitude and longitude must be set.\n" +msgstr "Latitude and Longitude must be set.\n" + +#: ../src/location-manual.c:75 +msgid "Specify location manually.\n" +msgstr "Specify location manually.\n" + +#. TRANSLATORS: Manual location help output +#. left column must not be translated +#: ../src/location-manual.c:80 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" + +#: ../src/location-manual.c:83 +msgid "" +"Both values are expected to be floating point numbers,\n" +"negative values representing west / south, respectively.\n" +msgstr "" +"Both values are expected to be floating point numbers,\n" +"negative values representing west / south, respectively.\n" + +#: ../src/location-manual.c:97 +msgid "Malformed argument.\n" +msgstr "Malformed argument.\n" + +#: ../src/redshift-gtk/statusicon.py:78 +msgid "Suspend for" +msgstr "Suspend for" + +#: ../src/redshift-gtk/statusicon.py:80 +msgid "30 minutes" +msgstr "30 minutes" + +#: ../src/redshift-gtk/statusicon.py:81 +msgid "1 hour" +msgstr "1 hour" + +#: ../src/redshift-gtk/statusicon.py:82 +msgid "2 hours" +msgstr "2 hours" + +#: ../src/redshift-gtk/statusicon.py:91 +msgid "Autostart" +msgstr "Autostart" + +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 +msgid "Info" +msgstr "Info" + +#: ../src/redshift-gtk/statusicon.py:108 +msgid "Quit" +msgstr "Quit" + +#: ../src/redshift-gtk/statusicon.py:146 +msgid "Close" +msgstr "Close" + +#: ../src/redshift-gtk/statusicon.py:300 +msgid "Status: {}" +msgstr "Status: {}" + +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 +msgid "Color temperature" +msgstr "Colour temperature" + +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 +msgid "Period" +msgstr "Period" + +#: ../src/redshift-gtk/statusicon.py:318 +msgid "Location" +msgstr "Location" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Please run `redshift -h` for help output." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._es.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._es.po differ diff -Nru redshift-1.11/po/es.po redshift-1.12/po/es.po --- redshift-1.11/po/es.po 2016-01-02 22:24:25.000000000 +0000 +++ redshift-1.12/po/es.po 2018-05-21 01:13:18.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-12-21 00:01+0000\n" -"Last-Translator: Francisca \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-05-20 13:39+0000\n" +"Last-Translator: toniem \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: es\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,9 +24,9 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" -"Redshift ajusta la temperatura de color de tu pantalla, de acuerdo a tu " -"alrededor. Esto puede ayudar a que tus ojos duelan menos si trabajas frente " -"a tu pantalla por las noches." +"Redshift ajusta la temperatura de color de la pantalla de acuerdo con el " +"entorno. Este ajuste puede ayudar a reducir el dolor de ojos si trabaja " +"frente una pantalla por la noche." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -35,776 +35,790 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" -"La temperatura de color se determina según la posición del sol. Temperaturas " -"de color diferentes son establecidas para el día y la noche. Durante el " -"atardecer y el amanecer, la temperatura de color transiciona suavemente, de " -"temperatura nocturna a diurna, permitiendo a tus ojos adaptarse lentamente." +"La temperatura de color se establece según la posición del sol. Se establece " +"una temperatura distinta para el día y para la noche. Durante el atardecer y " +"el amanecer, la temperatura de color cambia suavemente, de temperatura " +"diurna a temperatura nocturna o viceversa, para permitir que los ojos se " +"adapten lentamente." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" -"Este programa provee de un ícono de estado, que permite al usuario controlar " -"Redshift." +"Este programa proporciona un ícono de notificación que permite al usuario " +"controlar Redshift." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" msgstr "" -"La ventana de información de Redshift sobrepuesta con un ejemplo del efecto " +"La ventana de información de Redshift se superpone con un ejemplo del efecto " "de enrojecimiento" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Ajuste de la temperatura de color" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Herramienta para el ajuste de la temperatura de color" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "Ninguno" +msgstr "Desconocido" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Día" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Noche" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Transición" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "Periodo: %s\n" +msgstr "Período: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "Periodo: %s (%.2f%% dia)\n" +msgstr "Período: %s (%.2f%% día)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "E" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "O" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "Localización: %.2f %s, %.2f %s\n" +msgstr "Ubicación: %.2f° %s, %.2f° %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Uso: %s -l LAT:LON -t DÍA:NOCHE [OPCIONES...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "La temperatura de color es establecida según a la hora del día.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tMostrar este mensaje de ayuda\n" -" -v\t\tSalida detallada\n" -" -V\t\tMostrar la versión del programa\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" -" -b DAY:NIGHT\tBrillo de la pantalla a aplicar (entre 0.1 y 1.0)\n" -" -c FILE\tCargar ajustes desde un el archivo de configuración especificado\n" -" -g R:G:B\tCorrección gamma adicional a aplicar\n" -" -l LAT:LON\tTu ubicación actual\n" -" -l PROVIDER\tSeleccionar proveedor para actualizaciones automáticas de " -"ubicación\n" -" \t\t(Escribir `list' para ver los proveedores disponibles)\n" -" -m METHOD\tMétodo utilizado para determinar la temperatura de color\n" -" \t\t(Escribir `list' para ver los métodos disponibles)\n" -" -o\t\tModo One shot (no ajustar la temperatura de color de manera " -"continua)\n" -" -O TEMP\tModo manual One shot (establecer la temperatura de color)\n" -" -p\t\tModo impresión (solo imprimir los parámetros y salir)\n" -" -x\t\tModo reset (remover los ajustes de la pantalla)\n" -" -r\t\tDesactivar transiciones de temperatura\n" -" -t DAY:NIGHT\tTemperatura de color para utilizar en el día/la noche\n" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"La temperatura neutral es %uK. Usando este valor no\n" -"cambiará el color del monitor. Cambiando el valor de\n" -"la temperatura del color a un valor más alto, dará como\n" -"resultado un tono más azulado; cambiándolo a un valor\n" -"más bajo, el tono será más rojo.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Valores por defecto:\n" -"\n" -" Temperatura del día: %uK\n" -" Temperatura de la noche: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Por favor reporta fallos a <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Métodos de ajuste disponibles:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Señalar opciones separadas con \"dos puntos\" mediante `-m " -"MÉTODO:OPCIONES'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Prueba `-m MÉTODO:help' para ayuda.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Proveedores de localización disponibles:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Señalar opciones separadas con \"dos puntos\" mediante `-l " -"PROVEEDOR:OPCIONES'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Prueba `-l PROVEEDOR:help' para ayuda.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" -msgstr "Iniciación de %s falló.\n" +msgstr "La inicialización de %s ha fallado.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" -msgstr "Falló establecer la opción %s\n" +msgstr "No se ha podido establecer la opción %s.\n" #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" -msgstr "Prueba `-l %s:help' para más información.\n" +msgstr "Pruebe «-l %s:help» para obtener más información.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" -msgstr "Falló el análisis de la opción «%s».\n" +msgstr "No se ha podido analizar la opción «%s».\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" -msgstr "Falló iniciar el proveedor %s.\n" +msgstr "No se ha podido iniciar el proveedor %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" -msgstr "Prueba `-m %s:help' para más información.\n" +msgstr "Pruebe «-m %s:help» para obtener más información.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" -msgstr "Prueba -m %s:help' para más información.\n" +msgstr "Pruebe «-m %s:help» para obtener más información.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" -msgstr "Falló el inicio del método de ajuste %s.\n" +msgstr "No se ha podido iniciar el método de ajuste %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "Estado: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Activado" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "La latitud debe estar entre %.1f y %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Desactivadas" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "La longitud debe estar entre %.1f y %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" -msgstr "Imposible leer la hora del sistema.\n" +msgstr "No se ha podido leer la hora del sistema.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "A la espera de que la ubicación inicial esté disponible...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "No se ha podido obtener la ubicación del proveedor.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "La ubicación proporcionada por el proveedor no es válida.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" -msgstr "Temperatura del color: %uK\n" +msgstr "Temperatura de color: %u K\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Brillo: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "El ajuste de la temperatura falló.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Parámetro gamma no válido.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Estado: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Tipee `-h' para más información.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Desactivado" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Proveedor de localización `%s' desconocido.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Activado" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Método de ajuste desconocido `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "No se ha podido ajustar la temperatura.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Parámetro de temperatura no válido.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"La ubicación no está disponible temporalmente. Se usará la ubicación " +"anterior hasta que esté disponible...\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Ajuste gamma incorrecto.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "¡No se admite la configuración parcial de la hora!\n" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Ajuste de configuración desconocido `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" +"¡La configuración de la hora del amanecer o el anochecer no es válida!\n" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" -msgstr "Tratando proveedor ubicación `%s'...\n" +msgstr "Probando el proveedor de ubicación «%s»...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" -msgstr "Probando el siguiente proveedor...\n" +msgstr "Probando el proveedor siguiente...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" -msgstr "Usando el proveedor `%s'.\n" +msgstr "Usando el proveedor «%s».\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" -msgstr "No hay más proveedores de localización para probar.\n" +msgstr "No hay más proveedores de ubicación para probar.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Incapaz de obtener localización desde el proveedor.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Temperaturas: % dK de día, dK% de noche\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"La transición superior no puede ser menor que la transición inferior.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -"Elevaciones solares: días anteriores %.1f, noche que figuran abajo %.1f\n" +"Elevaciones solares: día por encima de %.1f °, noche por debajo de %.1f °\n" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "La latitud debe estar entre %.1f y %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "La longitud debe estar entre %.1f y %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperaturas: %d K de día, %d K de noche\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" -msgstr "La temperatura debe estar entre %uK y %uK.\n" +msgstr "La temperatura debe estar entre %u K y %u K.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" -"Elevación alta de transición no puede ser inferior a elevación baja de " -"transición.\n" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "Valores de brillo deben estar entre %.1f y %.1f.\n" +msgstr "Los valores del brillo deben estar entre %.1f y %.1f.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Brillo : %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "El valor gamma debe estar entre %.1f y %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" -msgstr "Probando el siguiente método...\n" +msgstr "Probando el método siguiente...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" -msgstr "Usando el método `%s'.\n" +msgstr "Usando el método «%s».\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "No hay más métodos para probar.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "A la espera de que la ubicación actual esté disponible...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" -msgstr "Elevación solar: %f\n" +msgstr "Elevación solar: %fº\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" -msgstr "Presione ctrl-c para detener...\n" +msgstr "Presione Ctrl-C para detener...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Uso: %s -l LAT:LON -t DÍA:NOCHE [OPCIONES...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Establecer la temperatura de color según la hora del día.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tMuestra este mensaje de ayuda\n" +" -v\t\tSalida detallada\n" +" -V\t\tMuestra la versión del programa\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b DÍA:NOCHE\tBrillo de la pantalla para aplicar (entre 0.1 y 1.0)\n" +" -c ARCHIVO\tCarga los parámetros del archivo de configuración " +"especificado\n" +" -g R:G:B\tCorrección gamma adicional para aplicar\n" +" -l LAT:LON\tLa ubicación actual\n" +" -l PROVEEDOR\tSelecciona el proveedor para las actualizaciones automáticas " +"de la ubicación\n" +" \t\t(Escriba «list» para ver los proveedores disponibles)\n" +" -m MÉTODO\tMétodo usado para establecer la temperatura de color\n" +" \t\t(Escriba «list» para ver los métodos disponibles)\n" +" -o\t\tModo de ajuste único (no ajusta continuamente la temperatura de " +"color)\n" +" -O TEMP\tModo de ajuste único manual (fija la temperatura de color)\n" +" -p\t\tModo de impresión (solo imprime los parámetros y sale)\n" +" -P\t\tRestablece los valores de gama existentes antes de aplicar un nuevo " +"efecto de color\n" +" -x\t\tModo de reinicio (elimina el ajuste de la pantalla)\n" +" -r\t\tDesactiva las transiciones entre las temperaturas de color\n" +" -t DÍA:NOCHE\tTemperatura de color para establecer de día y de noche\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"La temperatura neutra es %u K. El uso de este valor no cambiará la\n" +"temperatura de color de la pantalla. Establecer un valor más alto\n" +"dará como resultado un tono más azulado y establecer un valor más\n" +"bajo dará como resultado un tono más rojizo.\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Valores por defecto:\n" +"\n" +" Temperatura de día: %u K\n" +" Temperatura de noche: %u K\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Informe de los errores en <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Métodos de ajuste disponibles:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Especifique las opciones separadas por dos puntos mediante «-m " +"MÉTODO:OPCIONES».\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Pruebe «-m MÉTODO:help» para obtener ayuda.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Proveedores de ubicación disponibles:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Especifique las opciones separadas por dos puntos mediante «-l " +"PROVEEDOR:OPCIONES».\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Pruebe «-l PROVEEDOR:help» para obtener ayuda.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "El parámetro gamma no es correcto.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Pruebe «-h» para obtener más información.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "El proveedor de ubicación «%s» es desconocido.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "El método de ajuste «%s» es desconocido.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "El parámetro de temperatura no es correcto.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "El parámetro gamma no es correcto.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "El parámetro de la hora del amanecer «%s» no es correcto.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "El parámetro de la hora del anochecer «%s» no es correcto.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "El parámetro de configuración «%s» es desconocido.\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" -msgstr "El encabezado del archivo de configuración es incorrecto.\n" +msgstr "" +"Un encabezado de sección en el archivo de configuración no es correcto.\n" #: ../src/config-ini.c:203 msgid "Malformed assignment in config file.\n" msgstr "" -"Los datos asignados en el archivo de configuración son incorrectos.\n" +"La asignación de datos en el archivo de configuración no es correcta.\n" #: ../src/config-ini.c:214 msgid "Assignment outside section in config file.\n" msgstr "" -"Los datos asignados en archivo de configuración están fuera de sección.\n" +"La asignación de datos en el archivo de configuración está fuera de una " +"sección.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "No se ha podido abrir el dispositivo DRM: %s\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" -msgstr "" +msgstr "No se han podido obtener los recursos del modo DRM\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " -msgstr "CRTC %d no existe. " +msgstr "El CRTC %d no existe. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" -msgstr "CRTCs válidos son [0-%d].\n" +msgstr "Los CRTC válidos son [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" -msgstr "Solo existe CRTC 0.\n" +msgstr "Solo existe el CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" -msgstr "CRTC %i perdidos, saltar\n" +msgstr "El CRTC %i se ha perdido, se omitirá\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" +"No se ha podido obtener el tamaño del valor gamma para el CRTC %i\n" +"en la tarjeta de video %i. Se ignorará el dispositivo.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -"DRM no puede leer las rampas gamma en CRTC %i\n" -"tarjeta gráfica %i, ignorando dispositivo.\n" +"El DRM no puede leer los valores gamma en el CRTC %i\n" +"en la tarjeta gráfica %i. Se ignorará el dispositivo.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" -msgstr "" +msgstr "Ajustar los valores gamma con el DRM\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -" card=N \t Tarjeta gráfica a la que aplicar los ajustes\n" -"crtc=N \t CRTC al que aplicar los ajustes\n" +" card=N \t Tarjeta gráfica para aplicar los ajustes\n" +" crtc=N \t CRTC para aplicar los ajustes\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" -msgstr "CRTC debe ser un número entero no negativo\n" +msgstr "El CRTC debe ser un número entero no negativo\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" -msgstr "Parámetro del método desconocido: `%s'.\n" +msgstr "El parámetro del método es desconocido: «%s».\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" -msgstr "«%s» devolvió el error %d\n" +msgstr "«%s» ha devuelto el error %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" -msgstr "No se admite la versión de RANDR (%u.%u)\n" +msgstr "La versión de RANDR no es compatible (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" -msgstr "No se encontró la pantalla %i.\n" +msgstr "No se ha encontrado la pantalla %i.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" -msgstr "El tamaño del valor gamma es demasiado pequeño: %i\n" +msgstr "El valor gamma es demasiado pequeño: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" -msgstr "Incapaz de restituir CRTC %i\n" +msgstr "No se puede restablecer el CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" -msgstr "Ajustar el valor gamma con la extensión X RANDR\n" +msgstr "Ajustar los valores gamma con la extensión X RANDR\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tPantalla X para aplicar los ajustes\n" +" crtc=N\tLista de los CRTC, separados por comas, para aplicar los ajustes\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "No se puede leer el número de pantalla: «%s».\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" +"El parámetro «%s» ahora está siempre activado. Use la opción de línea de " +"órdenes «%s» para desactivarlo.\n" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "Requerimiento de X falló: %s\n" +msgstr "La solicitud X ha fallado: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" -msgstr "Ajustar los valores gamma con la extensión X VidMode\n" +msgstr "Ajustar los valores gamma con la extensión X VidMode.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tPantalla X para aplicar los ajustes\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" -msgstr "Incapaz de guardar el rango gamma actual.\n" +msgstr "No se puede guardar el valor gamma actual.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Ajustar los valores gamma en macOS usando Quartz.\n" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr " preserve={0,1}\t Si el gamma existente debería preservarse\n" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" -msgstr "Incapaz de abrir del dispositivo de contexto.\n" +msgstr "No se puede abrir el contexto del dispositivo.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" -msgstr "El dispositivo de imagen no soporta rangos gamma.\n" +msgstr "El dispositivo de visualización no admite los valores gamma.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" -msgstr "Ajustar los valores gamma con Windows GDI.\n" +msgstr "Ajustar los valores gamma con el GDI de Windows.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" -msgstr "Incapaz de restaurar el rango gamma.\n" +msgstr "No se pueden restaurar los valores gamma.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" -msgstr "Incapaz de establecer rangos gamma.\n" +msgstr "No se pueden establecer los valores gamma.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" +"ADVERTENCIA: ¡Se está usando un método gamma ficticio! La pantalla no se " +"verá afectada por este método gamma.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" +"No afecta a la pantalla, pero imprime la temperatura de color en la " +"terminal.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Temperatura: %i\n" -#: ../src/location-geoclue.c:76 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "No se puede obtener el cliente principal: %s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "No se puede obtener el cliente principal\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "No se pueden aplicar los requerimientos para el master: %s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "No se puede establecer requisitos para maestro\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Se inició el proveedor de Geoclue «%s».\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "No se pudo encontrar un proveedor de Geoclue utilizable.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "Pruebe colocar nombre y ruta para especificar qué usar\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" -"Usar la ubicación como sea descubierta por un proveedor de Geoclue.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" name=N\t Nombre del proveedor de Geoclue (o 'default')\n" -"path=N\t Path del proveedor de Geoclue (o 'default')\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" +"¡GeoClue ha denegado el acceso a la ubicación actual!\n" +"Asegúrese de que los servicios de ubicación estén habilitados y de que " +"Redshif\n" +"tiene permiso para usarlos. Consulte https://github.com/jonls/redshift#faq\n" +"para obtener más información.\n" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "No se pudo obtener la ubicación: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Proveedor no tiene una ubicación válida disponible." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "" +msgstr "No se puede obtener la ubicación: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" -msgstr "" +msgstr "No se puede obtener GeoClue Manager: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "" +msgstr "No se puede obtener la ruta del cliente GeoClue: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "No fue posible obtener un Cliente GeoClue: %s.\n" +msgstr "No se puede obtener el cliente GeoClue: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" -msgstr "No se pudo determinar el umbral de distancia: %s.\n" +msgstr "No se puede establecer el umbral de distancia: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "No se pudo inicializar el cliente GeoClue: %s.\n" +msgstr "No se puede iniciar el cliente GeoClue: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "No se pudo conectar a GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "¡No se ha podido iniciar el proveedor GeoClue2!\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Use la ubicación encontrada por un proveedor GeoClue2.\n" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" -msgstr "No autorizado a obtener ubicación desde CoreLocation.\n" +msgstr "No tiene autorización para obtener la ubicación de CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" -msgstr "Error obteniendo ubicación desde CoreLocation: %s\n" +msgstr "Error al obtener la ubicación de CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" -msgstr "Esperando autorización para obtener la ubicación...\n" +msgstr "A la espera de la autorización para obtener la ubicación...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" -msgstr "La solicitud de ubicación no fue autorizada!\n" +msgstr "¡La solicitud de ubicación no ha sido autorizada!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "¡No se ha podido iniciar el proveedor CoreLocation!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" -msgstr "Usar la ubicación descubierta por el poveedor de Corelocation.\n" +msgstr "Use la ubicación encontrada por el proveedor CoreLocation.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" -msgstr "Latitud y longitud deben ser definidos.\n" +msgstr "Se deben establecer la latitud y la longitud.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" -msgstr "Especificar la localización manualmente.\n" +msgstr "Especifique la ubicación manualmente.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -812,62 +826,66 @@ " lat=N\t\tLatitud\n" " lon=N\t\tLongitud\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -"Se espera que ambos valores sean números de punto flotante,\n" -"los valores negativos representan oeste / sur, respectivamente.\n" +"Se espera que ambos valores sean números de coma flotante,\n" +"los valores negativos representan el oeste y el sur, respectivamente.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" -msgstr "El formato del argumento es incorrecto.\n" +msgstr "El parámetro no es correcto.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "Suspender para" +msgstr "Suspender durante" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minutos" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 hora" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "2 horas" +msgstr "2 horas" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Inicio automático" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "informacion" +msgstr "Información" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Salir" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Cerrar" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Estado: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Temperatura de color" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Período" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Ubicación" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Ejecute «redshift -h» para obtener ayuda." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._et.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._et.po differ diff -Nru redshift-1.11/po/et.po redshift-1.12/po/et.po --- redshift-1.11/po/et.po 2016-01-02 22:24:29.000000000 +0000 +++ redshift-1.12/po/et.po 2018-05-21 01:13:18.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2013-12-05 10:02+0000\n" "Last-Translator: Jalakas \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: et\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,179 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Palun teata vigadest <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "" @@ -224,205 +128,345 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" msgstr "" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Palun teata vigadest <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -435,380 +479,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._eu.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._eu.po differ diff -Nru redshift-1.11/po/eu.po redshift-1.12/po/eu.po --- redshift-1.11/po/eu.po 2016-01-02 22:24:26.000000000 +0000 +++ redshift-1.12/po/eu.po 2018-05-21 01:13:19.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2015-02-23 06:54+0000\n" "Last-Translator: Jon Lund Steffensen \n" "Language-Team: Basque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: eu\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,192 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Erabilera: %s -l LAT:LON -t EGUNEZ:GAUEZ [AUKERAK...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Aldatu pantailaren kolore-tenperatura eguneko unearen arabera.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tBistaratu laguntza-mezu hau\n" -" -v\t\tIrteera berritsua\n" -" -V\t\tErakutsi programaren bertsioa\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Tenperatura neutroa %uK da. Balio hau erabiltzen baduzu\n" -"pantailaren kolore-tenperatura ez da aldatuko.\n" -"Balio altuago bat ezartzen baduzu pantailaren tonua\n" -"urdinduko da eta balio baxuago bat ezartzen\n" -"baduzu berriz pantailaren tonua gorriagotuko da.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Balio lehenetsiak:\n" -"\n" -" Eguneko tenperatura: %uK\n" -" Gaueko tenperatura: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Mesedez, eman arazoen berri <%s> helbidean\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Eskuragarri dauden doikuntza metodoak:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "Zehaztu aukerak kakotxez bereizita honela: `-m METODOA:AUKERAK'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Idatzi `-m METODOA:help' laguntza lortzeko.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Eskuragarri dauden kokapen-hornitzaileak:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Zehaztu aukerak kakotxez bereizita honela: `-l HORNITZAILEA:AUKERAK'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Idatzi `-l HORNITZAILEA:help' laguntza lortzeko.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "%s abiarazteak huts egin du.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Ezin izan da %s aukera ezarri.\n" @@ -237,205 +128,353 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Idatzi `-l %s:help' informazio gehiagorako.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Ezin izan da %s hornitzailea abiarazi.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Idatzi `-m %s:help' informazio gehiagorako.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Idatzi -m %s:help' informazio gehiagorako.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Ezin izan da %s doikuntza metodoa abiarazi.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Latitudea muga hauen barruan egon behar da: %.1f eta %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Longitudea muga hauen barruan egon behar da: %.1f eta %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Ezin izan da sistemaren ordua irakurri.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Ezin izan da hornitzailearengandik kokapenik lortu.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Kolore-tenperatura: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Distira: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Tenperatura doitzeak huts egin du.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Gaizki eratutako gamma argumentua.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Idatzi `-h' informazio gehiagorako.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Kokapen-hornitzaile ezezaguna: `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Doikuntza metodo ezezaguna: `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Tenperatura doitzeak huts egin du.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Gaizki eratutako tenperatura argumentua.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Gaizki eratutako gamma ezarpena.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Konfigurazio ezarpen ezezaguna: `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Hurrengo hornitzailearekin saiatzen...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "`%s' hornitzailea erabiltzen.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Ez dago beste kokapen-hornitzailerik probatzeko.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Ezin izan da hornitzailearengandik kokapenik lortu.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Latitudea muga hauen barruan egon behar da: %.1f eta %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Longitudea muga hauen barruan egon behar da: %.1f eta %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Tenperatura muga hauen barruan egon behar da: %uK eta %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gamma balioa muga hauen barruan egon behar da: %.1f eta %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Hurrengo metodoarekin saiatzen...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "`%s' metodoa erabiltzen.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Ez dago beste metodorik probatzeko.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Eguzkiaren gorapen-angelua: %fº\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Erabilera: %s -l LAT:LON -t EGUNEZ:GAUEZ [AUKERAK...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Aldatu pantailaren kolore-tenperatura eguneko unearen arabera.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tBistaratu laguntza-mezu hau\n" +" -v\t\tIrteera berritsua\n" +" -V\t\tErakutsi programaren bertsioa\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Balio lehenetsiak:\n" +"\n" +" Eguneko tenperatura: %uK\n" +" Gaueko tenperatura: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Mesedez, eman arazoen berri <%s> helbidean\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Eskuragarri dauden doikuntza metodoak:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Zehaztu aukerak kakotxez bereizita honela: `-m METODOA:AUKERAK'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Idatzi `-m METODOA:help' laguntza lortzeko.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Eskuragarri dauden kokapen-hornitzaileak:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Zehaztu aukerak kakotxez bereizita honela: `-l HORNITZAILEA:AUKERAK'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Idatzi `-l HORNITZAILEA:help' laguntza lortzeko.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Gaizki eratutako gamma argumentua.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Idatzi `-h' informazio gehiagorako.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Kokapen-hornitzaile ezezaguna: `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Doikuntza metodo ezezaguna: `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Gaizki eratutako tenperatura argumentua.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Gaizki eratutako gamma ezarpena.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Konfigurazio ezarpen ezezaguna: `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Gaizki eratutako sekzio goiburua konfigurazio fitxategian.\n" @@ -448,321 +487,272 @@ msgid "Assignment outside section in config file.\n" msgstr "Gaizki eratutako esleipena konfigurazio fitxategian.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "%d CRTCa ez da existitzen. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Onartutako CRTCak honakoak dira [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "0 CRTCa baino ez da existitzen.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Metodoaren parametro ezezaguna: `%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s'(k) akats hau itzuli du: %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Onartu gabeko RANDR bertsioa (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "%i pantaila ez da aurkitu.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Gamma ramp tamaina txikiegia: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Ezin izan da CRTCa berrezarri %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Doitu gammaren ramp-ak X RANDR hedapenarekin.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "X eskaerak huts egin du: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Doitu gammaren ramp-ak X VidMode hedapenarekin.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Ezin izan da uneko gammaren ramp-a gorde.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Ezin izan da gailuaren testuingurua ireki.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Pantailak ez ditu gammaren ramp-ak onartzen.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Doitu gammaren ramp-ak Windowsen GDIarekin.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Ezin izan dira gammaren ramp-ak berrezarri.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Ezin izan dira gammaren ramp-ak ezarri.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Latitudea eta longitudea zehaztu behar dira.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Kokapena eskuz zehaztu.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -770,60 +760,64 @@ " lat=N\t\tLatitudea\n" " lon=N\t\tLongitudea\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Gaizki eratutako argumentua.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Autoabiarazi" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._fi.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._fi.po differ diff -Nru redshift-1.11/po/fi.po redshift-1.12/po/fi.po --- redshift-1.11/po/fi.po 2016-01-02 22:24:25.000000000 +0000 +++ redshift-1.12/po/fi.po 2018-05-21 01:13:19.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2015-02-23 06:54+0000\n" "Last-Translator: Jon Lund Steffensen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: fi\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -45,195 +45,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Käyttö: %s -l LAT:LON -t PÄIVÄ:YÖ [VALINNAT...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Säädä näytön värilämpötila vuorokaudenajan mukaan.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tNäytä tämä ohje\n" -" -v\t\tNäytä yksityskohtainen tuloste\n" -" -V\t\tNäytä ohjelman versio\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Neutraali värilämpötila on %uK. Käytettäessä neutraalia\n" -"arvoa, ei näytön värilämpötila muutu. Käytettäessä\n" -"neutraalia värilämpötilaa korkeampaa arvoa, muuttuu\n" -"näytön valo sinisemmäksi ja käytettäessä alhaisempaa\n" -"arvoa, muuttuu valo punaisemmaksi.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Oletusvalinnat:\n" -"\n" -" Päiväsajan värilämpötila: %uK\n" -" Yöajan värilämpötila: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Raportoi bugeista osoitteeseen <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Käytettävissä olevat säätömenetelmät:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Luettele kaksoispisteellä erotellut asetukset valitsimella\n" -"'-m MENETELMÄ:ASETUKSET'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Valitsin '-m MENETELMÄ:help' antaa lisätietoja.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Käytettävissä olevat sijainnintarjoajat:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Luettele kaksoispisteellä erotellut asetukset valitsimella\n" -"'-l TARJOAJA:ASETUKSET'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Valitsin '-l TARJOAJA:help' antaa lisätietoja.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "%s:n käyttöönotto epäonnistui.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Asetuksen %s asettaminen epäonnistui.\n" @@ -241,205 +129,356 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Valitsin '-l %s:help' antaa lisätietoja.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Tarjoajan %s käynnistäminen epäonnistui.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Valitsin '-m %s:help' antaa lisätietoja.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Valitsin -m %s:help' antaa lisätietoja.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Säätömenetelmän %s käynnistäminen epäonnistui.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Leveyspiirin on oltava väliltä %.1f - %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Pituuspiirin on oltava väliltä %.1f - %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Ei voida lukea järjestelmän aikaa.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Sijaintia ei saatu toimittajalta.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Värilämpötila: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Kirkkaus: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Värilämpötilan säätö epäonnistui.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Vääränlainen gamman parametri.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Valitsin '-h' antaa lisätietoja.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Tuntematon sijainnin toimittaja '%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Tuntematon säätömenetelmä '%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Värilämpötilan säätö epäonnistui.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Vääränmuotoinen värilämpötilan parametri.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Vääränmuotoinen gamma-asetus.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Tuntematon asetus '%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Kokeillaan seuraavaa toimittajaa...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Käytetään toimittajaa '%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Ei enää kokeiltavia toimittajia.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Sijaintia ei saatu toimittajalta.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Leveyspiirin on oltava väliltä %.1f - %.1f.\n" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Pituuspiirin on oltava väliltä %.1f - %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Värilämpötilan on oltava väliltä %uK - %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gamman arvon on oltava väliltä %.1f - %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Kokeillaan seuraavaa menetelmää...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Käytetään menetelmää '%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Ei enää kokeiltavia menetelmiä.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Auringon korkeuskulma: %f°\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Käyttö: %s -l LAT:LON -t PÄIVÄ:YÖ [VALINNAT...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Säädä näytön värilämpötila vuorokaudenajan mukaan.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tNäytä tämä ohje\n" +" -v\t\tNäytä yksityskohtainen tuloste\n" +" -V\t\tNäytä ohjelman versio\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Oletusvalinnat:\n" +"\n" +" Päiväsajan värilämpötila: %uK\n" +" Yöajan värilämpötila: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Raportoi bugeista osoitteeseen <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Käytettävissä olevat säätömenetelmät:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Luettele kaksoispisteellä erotellut asetukset valitsimella\n" +"'-m MENETELMÄ:ASETUKSET'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Valitsin '-m MENETELMÄ:help' antaa lisätietoja.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Käytettävissä olevat sijainnintarjoajat:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Luettele kaksoispisteellä erotellut asetukset valitsimella\n" +"'-l TARJOAJA:ASETUKSET'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Valitsin '-l TARJOAJA:help' antaa lisätietoja.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Vääränlainen gamman parametri.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Valitsin '-h' antaa lisätietoja.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Tuntematon sijainnin toimittaja '%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Tuntematon säätömenetelmä '%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Vääränmuotoinen värilämpötilan parametri.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Vääränmuotoinen gamma-asetus.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Tuntematon asetus '%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Konfiguraatiotiedostossa virheellisesti muotoiltu osion otsikko.\n" @@ -452,321 +491,272 @@ msgid "Assignment outside section in config file.\n" msgstr "Konfiguraatiotiedoston arvomääritelmä on otsikon ulkopuolella.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d ei ole olemassa. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Kelvot CRTC:t ovat [o-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Vain CRTC 0 on olemassa.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Tuntematon menetelmäparametri '%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "'%s' palautti virheen %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "RANDR versio %u.%u ei ole tuettu\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Näyttöä %i ei löytynyt.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Gamman askellus liian pieni: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Ei kyetä palauttamaan CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Säädä gamman askellusta X RANDR laajennusta käyttäen.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "X-kutsu epäonnistui: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Säädä gamman askellusta X VidMode laajennuksella.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Laitetta ei saada avattua käsittelyyn.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Näyttö ei tue gamman askellusta.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Leveys- ja pituupiiri on asetettava.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Määritä sijainti manuaalisesti.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -774,60 +764,64 @@ " lat=N\t\tLeveyspiiri\n" " lon=N\t\tPituuspiiri\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Vääränmuotoinen parametri.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Automaattikäynnistys" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._fr.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._fr.po differ diff -Nru redshift-1.11/po/fr.po redshift-1.12/po/fr.po --- redshift-1.11/po/fr.po 2016-01-02 22:24:26.000000000 +0000 +++ redshift-1.12/po/fr.po 2018-05-21 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-10-18 13:33+0000\n" -"Last-Translator: lithelin \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-01-21 20:33+0000\n" +"Last-Translator: Saumon \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: fr\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -25,8 +25,8 @@ "of the screen at night." msgstr "" "Redshift adapte la température de couleur de votre écran en fonction de " -"votre environnement. Ceci contribuera à une diminution des douleurs " -"oculaires pouvant survenir lorsque vous travaillez sur un écran de nuit." +"l'environnement. Cela peut aider à diminuer les douleurs oculaires si vous " +"travaillez sur un écran de nuit." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -36,16 +36,15 @@ "daytime temperature to allow your eyes to slowly adapt." msgstr "" "La température de couleur est définie en fonction de la position du soleil. " -"Une température de couleur différente est définie durant la nuit et le jour. " -"Pendant le crépuscule et l'aube, la température de couleur change doucement " -"depuis la température de nuit jusqu'à celle du jour afin de laisser vos yeux " -"s'adapter doucement." +"Une température de couleur différente est appliquée durant le jour ou la " +"nuit. Lors du lever ou du coucher du soleil, la température de couleur " +"change doucement pour permettre à vos yeux de s'adapter." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" -"Ce programme place une icône de notification permettant à l'utilisateur de " +"Ce programme fournit une icône de notification permettant à l'utilisateur de " "contrôler Redshift." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 @@ -56,215 +55,83 @@ "La fenêtre d'information de Redshift superpose un exemple de l'effet de " "rougeur." +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Réglage de la température de couleur" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Outil de réglage de la température de couleur" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Inconnue" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Journée" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Nuit" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Transition" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "Période : %s\n" +msgstr "Période : %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "Période : %s (%.2f%% day)\n" +msgstr "Période : %s (%.2f%% jour)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "E" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "O" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "Localisation : %.2f° %s, %.2f° %s\n" +msgstr "Localisation : %.2f°%s,%.2f°%s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Utilisation : %s -l LAT:LON -t JOUR:NUIT [OPTIONS...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "" -"Régler la température de couleur de l'affichage selon le moment de la " -"journée.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tAffiche cet aide\n" -" -v\t\tMode verbeux\n" -" -V\t\tAffiche la version du programe\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" -" -b JOUR:NUIT \t Luminosité de l'écran à appliquer (entre 0.1 et 1.0)\n" -" -c FICHIER \t Charger des paramètres à partir d'un fichier de " -"configuration\n" -" -g R:G:B \t Corrections de couleurs supplémentaires à appliquer\n" -" -l LAT:LON \t Votre location actuelle\n" -" -l FOURNISSEUR \t Sélectionner le fournisseur pour les localisations " -"automatiques\n" -" \t \t (Taper \"list\" pour voir les fournisseurs disponibles)\n" -" -m MÉTHODE \t Méthode à utiliser pour régler la température des couleurs\n" -" \t \t (Taper \"list\" pour voir les méthodes disponibles)\n" -" -o \t \t Mode prise de vue (Sans réglage en continu la température des " -"couleurs)\n" -" -O TEMP. \t Mode prise de vue manuelle (Régler la température des " -"couleurs)\n" -" -p \t \t Mode d'impression (Impression des paramètres et fermeture)\n" -" -x \t \t Mode de réinitialisation (Supprimer les réglages de l'écran)\n" -" -r \t \t Désactiver les transitions de température\n" -" -t JOUR/NUIT \t Température des couleurs à appliquer le jour / la nuit\n" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"La température neutre est de %uK. L'utilisation de cette valeur ne\n" -"changera pas de la température de couleur de l'écran. Régler la\n" -"température de couleur à une valeur plus élevée entraînera plus \n" -"de lumière bleue, et régler une valeur inférieure se traduira par\n" -"plus de lumière rouge.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Valeurs par défaut :\n" -"\n" -" Température du jour : %uK\n" -" Température de la nuit : %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Veuillez signaler les bogues à <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Méthodes d'ajustement disponibles :\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Spécifiez les options séparées par des deux-points en tant que « -m " -"MÉTHODE:OPTIONS ».\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Essayez « -m MÉTHODE:help » pour obtenir de l'aide.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Fournisseurs de localisation disponibles :\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Spécifiez les options séparées par des deux-points en tant que « -l " -"FOURNISSEUR:OPTIONS ».\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Essayez « -l FOURNISSEUR:help » pour obtenir de l'aide.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "L'initialisation de %s a échouée.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Impossible de spécifier l'option %s.\n" @@ -272,208 +139,388 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Essayez « -l %s:help » pour plus d'informations.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "Impossible d'analyser l'option « %s ».\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Impossible de démarrer le fournisseur %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Essayez « -m %s:help » pour plus d'informations.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Essayez « -m %s:help » pour plus d'informations.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Impossible de démarrer la méthode d'ajustement %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "État : %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Activé" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "La latitude doit être comprise entre %.1f et %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Désactivé" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "La longitude doit être comprise entre %.1f et %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Impossible d'obtenir l'heure du système.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "En attente de localisation initiale...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Impossible d'obtenir une localisation du fournisseur.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Le fournisseur a renvoyé une localisation invalide.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Température de couleur : %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Luminosité : %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "L'ajustement de la température a échoué.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Argument gamma mal formé.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "État : %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Essayez « -h » pour plus de renseignements.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Désactivé" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Fournisseur de localisation « %s » inconnu.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Activé" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Méthode d'ajustement « %s » inconnue.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "L'ajustement de la température a échoué.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Argument de la température incorrect.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"La localisation est temporairement indisponible. Utilisation de la " +"localisation précédente jusqu'à résolution...\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Paramètre gamma mal formé.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Paramètre de configuration « %s » inconnu.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Configuration aube/crépuscule invalide !\n" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "Essai du fournisseur de localisation « %s »...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Essai du fournisseur suivant...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Utilisation du fournisseur « %s ».\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Il n'y a plus de fournisseur de localisation à essayer.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Impossible d'obtenir une localisation du fournisseur.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Températures : %dK le jour, %dK la nuit\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"La transition supérieure ne peut être inférieure à la transition " +"inférieure.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" "Élévations solaires : jour au-dessus de %.1f, nuit en-dessous de %.1f\n" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "La latitude doit être comprise entre %.1f et %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "La longitude doit être comprise entre %.1f et %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Températures : %dK le jour, %dK la nuit\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "La température doit être comprise entre %uK et %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" -"La transition supérieure ne peut être inférieure à la transition " -"inférieure.\n" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "Les indices de luminosité doivent être compris entre %.1f et %.1f.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Luminosité : %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "La valeur gamma doit être comprise entre %.1f et %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Gamma (%s) : %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Essai de la méthode suivante...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Utilisation de la méthode « %s ».\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Il n'y a plus de méthodes à essayer.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "En attente de localisation...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Élévation solaire : %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "Taper Ctrl+C pour quitter...\n" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Utilisation : %s -l LAT:LON -t JOUR:NUIT [OPTIONS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "" +"Régler la température de couleur de l'affichage selon le moment de la " +"journée.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tAffiche cet aide\n" +" -v\t\tMode verbeux\n" +" -V\t\tAffiche la version du programe\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b JOUR:NUIT\tLuminosité à appliquer (entre 0.1 et 1.0)\n" +" -c FICHIER\tCharge les paramètres depuis le fichier de configuration " +"spécifié\n" +" -g R:V:B\tCorrection gamma additionnelle à appliquer\n" +" -l LAT:LON\tVotre localisation actuelle\n" +" -l FOURNISSEUR\tSélectionne le fournisseur pour les mises à jour " +"automatiques de localisation\n" +" \t\t(Tapez `list' pour voir les fournisseurs disponibles)\n" +" -m METHODE\tMéthode utilisée pour appliquer la température de couleur\n" +" \t\t(Tapez `list' pour voir les méthodes disponibles)\n" +" -o\t\tMode one-shot (ne pas ajuster continuellement la température de " +"couleur)\n" +" -O TEMP\tMode one-shot manuel (change la température de couleur)\n" +" -p\t\tMode affichage (affiche les paramètres et quitte)\n" +" -P\t\tRéinitialise la correction gamma avant d'appliquer un nouvel effet\n" +" -x\t\tRéinitialisation (désactive l'ajustement de l'écran)\n" +" -r\t\tDésative les transitions entre les températures de couleur\n" +" -t JOUR:NUIT\tTempérature de couleur à appliquer le jour/la nuit\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"La température neutre est %uK. L'utilisation de cette valeur ne changera " +"pas\n" +"la température de couleur de l'affichage. Une valeur plus élevée que celle-" +"ci\n" +"résultera en une lumière plus bleue, et une valeur plus faible résultera en " +"une\n" +"lumière plus rouge.\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Valeurs par défaut :\n" +"\n" +" Température du jour : %uK\n" +" Température de la nuit : %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Veuillez signaler les bogues à <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Méthodes d'ajustement disponibles :\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Spécifiez les options séparées par des deux-points en tant que « -m " +"MÉTHODE:OPTIONS ».\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Essayez « -m MÉTHODE:help » pour obtenir de l'aide.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Fournisseurs de localisation disponibles :\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Spécifiez les options séparées par des deux-points en tant que « -l " +"FOURNISSEUR:OPTIONS ».\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Essayez « -l FOURNISSEUR:help » pour obtenir de l'aide.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Argument gamma mal formé.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Essayez « -h » pour plus de renseignements.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Fournisseur de localisation « %s » inconnu.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Méthode d'ajustement « %s » inconnue.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Argument de la température incorrect.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Paramètre gamma mal formé.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Paramètre d'aube `%s' mal formé.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Paramètre de crépuscule `%s' mal formé.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Paramètre de configuration « %s » inconnu.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Section header mal formée dans le fichier de configuration.\n" @@ -487,32 +534,37 @@ msgstr "" "Affectation en dehors d'une section dans le fichier de configuration.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Impossible d'ouvrir le DRM : %s\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "Impossible d'obtenir les ressources en mode DRM\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "Le CRTC %d n'existe pas. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Les CRTCs valides sont [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Le CRTC 0 est le seul à exister.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "CRTC %i perdu, abandon\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" @@ -521,7 +573,7 @@ "Impossible d'obtenir la taille de rampe de couleur pour le CRTC %i\n" "sur la carte graphique% i, dispositif ignoré.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" @@ -530,13 +582,13 @@ "DRM ne peut pas lire les rampes de couleurs sur CRTC %i sur\n" "les carte graphique %i, dispositif ignoré.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "Régler les rampes de couleurs avec Direct Rendering Manager.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" @@ -544,122 +596,119 @@ " card=N \t Réglages à appliquer à la carte graphique\n" " crtc=N \t Réglages à appliquer au CRTC\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "Le CRTC doit être un nombre entier positif\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Paramètre de la méthode inconnu : « %s ».\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "« %s » a retourné l'erreur %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Version de RANDR non prise en charge (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Moniteur %i introuvable.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "La taille de la rampe gamma est trop petite : %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Impossible de rétablir CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Ajuster les rampes gamma avec l'extension X RANDR.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Impossible de lire le numéro d'écran : `%s'\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -" screen=N\t\tÉcran X à ajuster\n" -" crtc=N\t\tCRTC à ajuster\n" -" preserve={0,1}\tPréserver ou non le gamma actuel\n" - -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +"Le paramètre `%s` est désormais tout le temps activé ; utilisez l'option " +"`%s` en ligne de commande pour le désactiver.\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "La requête X a échoué : %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Ajuster les rampes gamma avec l'extension X VidMode.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -" screen=N\t\tÉcran X à ajuster\n" -" preserve={0,1}\tPréserver ou non le gamma actuel\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Impossible d'enregistrer la rampe gamma actuelle.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "Ajuster les courbes du gamma sur OSX en utilisant Quartz.\n" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr " preserve={0,1}\tPréserver ou non le gamma actuel\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Impossible d'ouvrir le contexte du dispositif.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" "Le périphérique d'affichage ne prend pas en charge les rampes gamma.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Ajuster la rampe gamma avec le GDI de Windows.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Impossible de restaurer les rampes gamma.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Impossible de spécifier les rampes gamma.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" @@ -667,7 +716,7 @@ "ATTENTION : Utilisation d'une méthode d'ajustement du gamma fictive ! " "L'affichage ne sera pas modifié par cette méthode.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" @@ -675,157 +724,103 @@ "N'affecte pas l'affichage mais affiche les températures de couleur dans le " "terminal.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Température : %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "Impossible d'obtenir le client maître : %s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "Impossible d'obtenir le client maître\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "Impossible de définir les besoins du maître : %s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "Impossible de définir les besoins du maître\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Le fournisseur Geoclue « %s » a démarré.\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Impossible de trouver un fournisseur Geoclue utilisable.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" -"Essayez de régler le nom et le chemin pour spécifier lequel utiliser.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Utilisez l'emplacement qu'un fournisseur Geoclue a découvert.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" name=N\t Nom du fournisseur Geoclue (ou 'défault')\n" -" path=N\t Chemin du fournisseur Geoclue (ou 'default')\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" -"NOTE : actuellement Redshift ne contacte %s qu'une seule fois,\n" -"ce qui veut dire qu'il faut le relancer pour qu'il prenne en compte un " -"changement de lieu.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" +"L'accès à la localisation a été refusé par GeoClue !\n" +"Vérifiez que les services de localisation sont activés et que Redshift est " +"autorisé\n" +"à utiliser ces services. Visitez https://github.com/jonls/redshift#faq pour " +"plus\n" +"d'informations.\n" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Impossible d'obtenir l'emplacement : %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Selon le fournisseur geoclue nous sommes à : %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Le fournisseur n'a pas d'emplacement valide disponible." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Utilise la localisation trouvée par un fournisseur GeoClue2.\n" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "Impossible d'obtenir la localisation : %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "Impossible d'accéder au GeoClue Manager : %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "Impossible d'obtenir le chemin du client GeoClue : %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "Impossible d'obtenir le client GeoClue : %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "Impossible de définir le seuil de distance : %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "Impossible de démarrer le client GeoClue : %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Impossible de se connecter à GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Impossible de lancer le fournisser GeoClue2 !\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Utilise la localisation trouvée par un fournisseur GeoClue2.\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "Obtention de la localisation depuis CoreLocation refusée.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" "Erreur lors de l'obtention de la localisation depuis CoreLocation : %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "En attente de l'autorisation pour obtenir la localisation…\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "La requête pour la localisation a été refusée !\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Impossible de lancer le fournisseur CoreLocation !\n" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" "Utilise la localisation découverte par le fournisseur Corelocation.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "La latitude et longitude doivent être spécifiées.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Spécifier la localisation manuellement.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -833,7 +828,7 @@ " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" @@ -841,54 +836,58 @@ "Les deux valeurs devraient être des nombres à virgule flottants,\n" "des valeurs négatives représentant l'ouest / le sud, respectivement.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Paramètre incorrect.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Suspendre pendant" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minutes" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 heure" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 heures" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Lancement automatique" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "Info" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Quitter" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Fermer" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "État : {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Température des couleurs" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Période" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Emplacement" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Tapez `redshift -h` pour l'aide." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._gl.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._gl.po differ diff -Nru redshift-1.11/po/gl.po redshift-1.12/po/gl.po --- redshift-1.11/po/gl.po 2016-01-02 22:24:26.000000000 +0000 +++ redshift-1.12/po/gl.po 2018-05-21 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2014-12-31 23:56+0000\n" "Last-Translator: Jon Lund Steffensen \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: gl\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,189 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Uso: %s -l LAT:LON -t DÍA:NOITE [OPCIÓNS...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "A temperatura da cor móstrase dacordo á hora do día.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"A temperatura neutral é %uK. Usando este valor non\n" -"cambiará a cor do monitor. Cambiando o valor da temperatura \n" -"da cor a un valor máis alto, dará como resultado un ton\n" -"más azulado, cambiándoo a un valor máis baixo, el tono \n" -"será máis vermello.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Valores por defecto:\n" -"\n" -" Temperatura do día: %uK\n" -" Temperatura da noite: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Por favor reporta fallos a <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Métodos de axuste dispoñíbeis:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Sinalar opcións separadas con \"dos puntos\" mediante `-m MÉTODO:OPCIONES'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Proba `-m MÉTODO:help' para axuda.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Fornecedores de localización dispoñíbeis:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Prova `-l FORNECEDOR:help' para axuda.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "A inicialización de %s fallou.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Produciuse un fallo ao estabelecer a opción %s\n" @@ -234,205 +128,350 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Probe `-l %s:help' para máis información.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "A latitude debe estar entre %.1f e %.1f.\n" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "A longitude debe estar entre %.1f e %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Imposíbele ler a hora do sistema.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" -msgstr "Imposíbele ler a hora do sistema.\n" +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Temperatura da color: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "O axuste da temperatura fallou.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "O axuste da temperatura fallou.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Axuste de gamma incorrecto.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Axuste de configuración desconñecido `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Probando o seguinte fornecedor...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Usando o fornecedor `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "A latitude debe estar entre %.1f e %.1f.\n" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "A longitude debe estar entre %.1f e %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "A temperatura debe estar entre %uK e %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Usando o método `%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Elevación solar: %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Uso: %s -l LAT:LON -t DÍA:NOITE [OPCIÓNS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "A temperatura da cor móstrase dacordo á hora do día.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Valores por defecto:\n" +"\n" +" Temperatura do día: %uK\n" +" Temperatura da noite: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Por favor reporta fallos a <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Métodos de axuste dispoñíbeis:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Sinalar opcións separadas con \"dos puntos\" mediante `-m MÉTODO:OPCIONES'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Proba `-m MÉTODO:help' para axuda.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Fornecedores de localización dispoñíbeis:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Prova `-l FORNECEDOR:help' para axuda.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Axuste de gamma incorrecto.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Axuste de configuración desconñecido `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -445,380 +484,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' devolveu o erro %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Versión de RANDR non compatíbel (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "A pantalla %i podería non atoparse.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Non foi posíbel restituir CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Argumento formado incorrectamente.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Inicio automático" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._he.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._he.po differ diff -Nru redshift-1.11/po/he.po redshift-1.12/po/he.po --- redshift-1.11/po/he.po 2016-01-02 22:24:26.000000000 +0000 +++ redshift-1.12/po/he.po 2018-05-21 01:13:21.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2010-08-18 21:19+0000\n" -"Last-Translator: Jon Lund Steffensen \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2016-10-26 08:41+0000\n" +"Last-Translator: Niv Baehr \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: he\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,6 +24,8 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" +"Redshift מתאימה את טמפרטורת הצבע של המסך בהתאם לסביבה. דבר שיכול לעזור " +"להפחית כאב בעיניים בעבודה מול המסך בלילה." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -44,385 +46,436 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "" +msgstr "התאמת טמפרטורת צבע" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "" +msgstr "כלי להתאמת טמפרטורת צבע" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "" +msgstr "ללא" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" -msgstr "" +msgstr "Daytime" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" -msgstr "" +msgstr "Night" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" -msgstr "" +msgstr "Transition" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "Period: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "" +msgstr "Period: %s (%.2f%% day)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "" +msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" -msgstr "" +msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" -msgstr "" +msgstr "E" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" -msgstr "" +msgstr "W" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "" - -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "שימוש: %s -l רוחב:אורך -t יום:לילה [אפהשרויות...]‏\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "הגדר את טמפרטורת צבעי המסך לפי שעת היום.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" +msgstr "Location: %.2f %s, %.2f %s\n" -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "ספקים מקומיים זמינים:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" -msgstr "" +msgstr "Initialization of %s failed.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" -msgstr "" +msgstr "Failed to set %s option.\n" #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" -msgstr "" +msgstr "Try `-l %s:help' for more information.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" -msgstr "" +msgstr "Failed to parse option `%s'.\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" -msgstr "" +msgstr "Failed to start provider %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" -msgstr "" +msgstr "Try `-m %s:help' for more information.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" -msgstr "כשל בתחילת שיטת הזזה %s.‏\n" +msgstr "Failed to start adjustment method %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Unable to read system time.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Unable to get location from provider.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" -msgstr "" +msgstr "Color temperature: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" -msgstr "" +msgstr "Brightness: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Status: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "תנסה \"-h\" לקבלת מידע נוסף.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "מושבת" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "ספק מיקום \"%s\" לא מוכר.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "פעיל" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Temperature adjustment failed.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" -msgstr "מנסה ספק הבא...\n" +msgstr "Trying next provider...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" -msgstr "משתמש בספק \"%s\".‏\n" +msgstr "Using provider `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" -msgstr "אין ספקי מיקום נוספים לנסות.\n" - -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "לא ניתן לקבל מיקום מהספק.\n" +msgstr "No more location providers to try.\n" -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Set color temperature of display according to time of day.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Please report bugs to <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Available adjustment methods:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Try `-m METHOD:help' for help.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Available location providers:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Try `-l PROVIDER:help' for help.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Malformed gamma argument.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Try `-h' for more information.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Unknown location provider `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Unknown adjustment method `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -435,380 +488,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" -msgstr "" +msgstr "Temperature: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "השהיה" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 דקות" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "שעה" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "שעתיים" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" -msgstr "" +msgstr "הפעלה אוטומטית" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "מידע" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "יציאה" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" -msgstr "" +msgstr "סגירה" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "מצב: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "טמפרטורת צבע" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "פרק זמן" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" +msgstr "מיקום" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._hi.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._hi.po differ diff -Nru redshift-1.11/po/hi.po redshift-1.12/po/hi.po --- redshift-1.11/po/hi.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/hi.po 2018-05-21 01:13:21.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2013-05-04 08:35+0000\n" "Last-Translator: Ravi Kumar \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: hi\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,182 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "दिन के समय के अनुसार डिस्प्ले का रंग सेट करे.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tयह सहायता संदेश प्रदर्शित करें\n" -"-v\t\tवाचाल आउटपुट\n" -"-V\t\tप्रोग्राम का संस्करण दिखाएँ\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "कृपया बग की रिपोर्ट <%s> काे करे\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "उपलब्ध समायोजन तरीके:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "मदद के लिए `-m METHOD:help' का प्रयास करें.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "मदद के लिए `-l PROVIDER:help' का प्रयास करें.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "%s के प्रारंभिकीकरण असफल.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "%s विकल्प सेट करने में विफल.\n" @@ -227,205 +128,348 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "अधिक जानकारी के लिए `-l %s:help'.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "प्रदाता %s को आरंभ करने में विफल.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" msgstr "" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "दिन के समय के अनुसार डिस्प्ले का रंग सेट करे.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tयह सहायता संदेश प्रदर्शित करें\n" +"-v\t\tवाचाल आउटपुट\n" +"-V\t\tप्रोग्राम का संस्करण दिखाएँ\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "कृपया बग की रिपोर्ट <%s> काे करे\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "उपलब्ध समायोजन तरीके:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "मदद के लिए `-m METHOD:help' का प्रयास करें.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "मदद के लिए `-l PROVIDER:help' का प्रयास करें.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -438,380 +482,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._hr.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._hr.po differ diff -Nru redshift-1.11/po/hr.po redshift-1.12/po/hr.po --- redshift-1.11/po/hr.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/hr.po 2018-05-21 01:13:22.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2015-02-23 06:54+0000\n" "Last-Translator: Mario Dautović \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: hr\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,194 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Uporaba: %s -l DUŽ:ŠIR -t DNE:NOĆ [OPCIJE...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Postaviti temperaturu boje zaslona ovisno o razdoblju dana.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tPrikaži ovu pomoć\n" -" -v\t\tOpširan ispis\n" -" -V\t\tPrikaži inačicu programa\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Neutralna temperatura je %uK. Korištenje ove vrijednosti neće\n" -"promijeniti temperaturu boje zaslona. Postavljanje temperature\n" -"boje na višu vrijednost će rezultirati većom količinom\n" -"plavog svijetla, a manja vrijednost većom količinom\n" -"crvenog svijetla.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Zadane vrijednosti:\n" -"\n" -" Dnevna temperatura: %uK\n" -" Noćna temperatura: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Molimo vas greške prijavite na <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Dostupni načini prilagodbe\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Zadajte opcije s vrijednostima odvojenim dvotočkom `-m NAČIN:OPCIJA'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Probajte `-m NAČIN:help' za pomoć.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Dostupni pružatelji lokacije\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Zadajte opcije s vrijednostima odvojenim dvotočkom `-l " -"PRUŽATELJ_USLUGE:OPCIJA'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Probajte `-l PRUŽATELJ_USLUGE:help' za pomoć.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "Učitavanje %s nije uspjelo.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Postavljanje %s opcije nije uspjelo.\n" @@ -239,205 +128,355 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Upišite `-l %s:help' za pojedinosti.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Pogreška prilikom pokretanja pružatelja usluge %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Pokušajte `-m %s:help' za pojedinosti.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Pokušajte -m %s:help' za pojedinosti.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Način podešavanja %s nije uspio.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Zemljopisna širina mora biti između %.1f i %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Zemljopisna dužina mora biti između %.1f i %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Nije moguće pročitati vrijeme na sustavu.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Ne mogu dobiti lokaciju od pružatelja usluge.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Temperatura boje: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Jačina svjetla: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Podešavanje temperature nije uspjelo.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Netočan gama argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Pokušajte `-h' za pojedinosti.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Nepoznat pružatelj usluge lociranja `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Nepoznata način podešavanja `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Podešavanje temperature nije uspjelo.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Netočna postavka temperature.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Netočne gama postavke.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Nepoznate postavke `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Pokušavam kod sljedećeg pružatelja usluge...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Koristim pružatelja usluge `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Ne postoji više pružatelja usluge lociranja za probati.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Ne mogu dobiti lokaciju od pružatelja usluge.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Zemljopisna širina mora biti između %.1f i %.1f.\n" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Zemljopisna dužina mora biti između %.1f i %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Temperatura mora biti između %uK i %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gama vrijednost mora biti između %.1f i %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Pokušavam sljedeći način...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Koristim način `%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Ne postoji više načina za probati.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Sunčeva visina: %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Uporaba: %s -l DUŽ:ŠIR -t DNE:NOĆ [OPCIJE...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Postaviti temperaturu boje zaslona ovisno o razdoblju dana.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tPrikaži ovu pomoć\n" +" -v\t\tOpširan ispis\n" +" -V\t\tPrikaži inačicu programa\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Zadane vrijednosti:\n" +"\n" +" Dnevna temperatura: %uK\n" +" Noćna temperatura: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Molimo vas greške prijavite na <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Dostupni načini prilagodbe\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Zadajte opcije s vrijednostima odvojenim dvotočkom `-m NAČIN:OPCIJA'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Probajte `-m NAČIN:help' za pomoć.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Dostupni pružatelji lokacije\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Zadajte opcije s vrijednostima odvojenim dvotočkom `-l " +"PRUŽATELJ_USLUGE:OPCIJA'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Probajte `-l PRUŽATELJ_USLUGE:help' za pomoć.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Netočan gama argument.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Pokušajte `-h' za pojedinosti.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Nepoznat pružatelj usluge lociranja `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Nepoznata način podešavanja `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Netočna postavka temperature.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Netočne gama postavke.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Nepoznate postavke `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Neispravno zaglavlje u datoteci s postavkama.\n" @@ -450,321 +489,272 @@ msgid "Assignment outside section in config file.\n" msgstr "Dodjela vrijednosti izvan okvira u datoteci s postavkama.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d ne postoji. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Valjani CRTCs su [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Postoji samo CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Neispravan parametar `%s' za metodu.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' je vratio grešku %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Nepodržana RANDR inačica (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Zaslon %i nije moguće pronaći.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Veličina gama krivulje je premala: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Nije moguće povratiti CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Prilagodi gama krivulju sa X RANDR proširenjem.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "X zahtjev nije uspio: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Prilagodi gama krivulju sa X VidMode proširenjem.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Nije moguće spremiti trenutnu gama krivulju.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Nemoguće je otvoriti sadržaj uređaja.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Zaslon ne podržava gama krivulju.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Prilagodi gama krivulju s Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Nije moguće povratiti gama krivulju.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Nije moguće postaviti gama krivulju.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Zemljopisna širina i dužina moraju biti postavljene.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Ručno određivanje lokacije.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -772,60 +762,64 @@ " lat=N\t\tŠirina\n" " lon=N\t\tDužina\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Neispravan argument.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Automatsko pokretanje" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._hu.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._hu.po differ diff -Nru redshift-1.11/po/hu.po redshift-1.12/po/hu.po --- redshift-1.11/po/hu.po 2016-01-02 22:24:29.000000000 +0000 +++ redshift-1.12/po/hu.po 2018-05-21 01:13:22.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-03-31 13:29+0000\n" -"Last-Translator: miku84 \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-04-07 16:04+0000\n" +"Last-Translator: Laci \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: hu\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -35,10 +35,10 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" -"A szín hőmérsékletet a nap helyzetéhez igazítja. Különböző szín " -"hőmérsékletet állít be nappal és éjszaka. Szürkületben és kora reggel, a " -"szín hőmérséklet átmenet az éjszakiról a napplai hőmérsékletre lehetővé " -"teszi, hogy a szem lassan alkalmazkodhasson." +"A színhőmérsékletet a nap helyzetéhez igazítja. Különböző színhőmérsékletet " +"állít be nappal és éjszaka. Szürkületben és kora reggel a színhőmérséklet " +"átmenete az éjszakiról a nappali hőmérsékletre lehetővé teszi, hogy a szem " +"lassan alkalmazkodhasson." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" @@ -54,211 +54,83 @@ msgstr "" "A Redshift információs ablak egy példa vörös effektus átmenettel borított" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "Szín hőmérséklet beállítás" +msgstr "Színhőmérséklet beállítása" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Színhőmérséklet beállító eszköz" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "Egyik sem" +msgstr "Nincs információ" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Nappal" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Éjszaka" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Átmenet" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Periódus: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Periódus: %s (%.2f%% nap)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "Ész" +msgstr "É" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "D" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "K" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "NY" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "Helyzet: %.2f %s, %.2f %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Felhasználás: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "A képernyő színhőmérsékletének óra szerinti beállítása.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tEnnek a segítő üzenetnek a mutatása\n" -" -v\t\tRészletek mutatása\n" -" -V\t\tProgram verzió megmutatása\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" -" -b DAY:NIGHT\tKépernyőn használni kívánt fényerősség (0.1 és 1.0 közti " -"érték)\n" -" -c FILE\tBeállítások betöltése előre meghatározott beállítási fájlból\n" -" -g R:G:B\tTovábbi gamma korrekció alkalmazása\n" -" -l LAT:LON\tA jelenlegi helyzete\n" -" -l PROVIDER\tSzolgáltató kiválasztása az automatikus helyszín " -"frissítésekhez\n" -" \t\t(Írja be `list' az elérhető szolgáltatók listájához)\n" -" -m METHOD\tA szín hőmérséklet használatának módjai\n" -" \t\t(Írja be `list' a lehetséges módok megtekintéséhez)\n" -" -o\t\tEgyszeres beillesztési mód (nincs folyamatos szín hőmérséklet után " -"állítás)\n" -" -O TEMP\tEgyszeres kézi beillesztés mód (szín hőmérséklet beállítás)\n" -" -p\t\tNyomtatás mód (paraméterek kinyomtatása és kilépés)\n" -" -x\t\tVisszaállítás mód (kiiktatja a képernyő beállításait)\n" -" -r\t\tKiiktatja a hőmérséklet átmeneteket\n" -" -t DAY:NIGHT\tNappali/éjszakai szín hőmérséklet beállítása\n" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"A semleges hőmérséklet: %uK. Ennek az értéknek a használata \n" -"nem változtatja a képernyő hőmérsékletét. A szín\n" -"hőmérséklet ennél magasabbra állításával kékesebb,\n" -"alacsonyabbra állításával vörösebb színt kapunk.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"alapértelmezett értékek:\n" -"\n" -" Nappali hőmérséklet: %uK\n" -" Éjszakai hőmérséklet: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Hibát kérjük jelentse ide <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Elérhető beállítási módok:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Határozzon meg kettősponttal elválasztott lehetőségeket így `-m " -"METHOD:OPTIONS'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Próbálja ezt `-m METHOD:help' segítséghez.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Elérhető helyzet szolgáltatók:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Határozzon meg kettősponttal elválasztott lehetőségeket így `-l " -"PROVIDER:OPTIONS'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Próbálja ezt `-l PROVIDER:help' segítséghez.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" -msgstr "Sikertelen %s betöltése.\n" +msgstr "%s betöltése sikertelen.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "A %s lehetőség beállítása sikertelen.\n" @@ -266,207 +138,360 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Próbálja ezt `-l %s:help' további információ eléréséhez.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "'%s' lehetőség elemzése sikertelen.\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "%s szolgáltató elindítása sikertelen.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Próbálja ezt `-m %s:help' további információ eléréséhez.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Próbálja ezt -m %s:help' további információ eléréséhez.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "%s beállítási mód elindítása sikertelen.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "Állapot: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Engedélyezve" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Földrajzi szélesség %.1f és %.1f közt kellene lennie.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Tiltva" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Hosszúsági körnek %.1f és %.1f közti értéknek kell lennie.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" -msgstr "Nem tudja olvasni a rendszeridőt.\n" +msgstr "Nem sikerült olvasni a rendszeridőt.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "A hely elsö keresése...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Nem tud helyzetet lekérdezni szolgáltatótól.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Érvénytelen helyet küldött a szolgáltató.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" -msgstr "Szín hőmérséklet: %uK\n" +msgstr "Színhőmérséklet: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Fényerő: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Hőmérséklet beállítás sikertelen.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Rosszul megadott gamma érték.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Állapot: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Próbálja ezt `-h' további információ eléréséhez.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Tiltva" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "%s ismeretlen helyzet szolgáltató.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Engedélyezve" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "`%s' ismeretlen beállítási mód.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Hőmérséklet beállítás sikertelen.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Rosszul megadott hőmérséklet érték.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Helyadatok idéglenesen hozzáférhetetlenek, elözö adatok használása ameddig " +"nincs új adat...\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Rosszul megadott gamma beállítás.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Részleges időbeállítás nem támogatott!\n" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Ismeretlen beállítási érték `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Nem helyes hajnal/naplemente beállítások!\n" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "Kísérlet a helyzet szolgáltató elérésére `%s'...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Következő szolgáltató elérését kísérli meg...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Következő szolgáltatót használja `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Nincs több választható szolgáltató.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Nem tud helyzetet lekérdezni szolgáltatótól.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Hőmérsékletek: %dK nappal, %dK éjszaka\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"A magas átmeneti emelkedés nem lehet alacsonyabb mint az alacsony átmeneti " +"emelkedés.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "Nap szögmagasságai: nappal %.1f felett, éjszaka %.1f alatt\n" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Földrajzi szélesség %.1f és %.1f közt kellene lennie.\n" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Hosszúsági körnek %.1f és %.1f közti értéknek kell lennie.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Hőmérsékletek: %dK nappal, %dK éjszaka\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "A hőmérsékletnek %uK és %uK közti értéknek kell lennie.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" -"A magas átmeneti emelkedés nem lehet alacsonyabb mint az alacsony átmeneti " -"emelkedés.\n" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "Fényerősség értékének %.1f és %.1f közt kell lennie.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Fényerősség: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gamma értéknek %.1f and %.1f közt kell lennie.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Következő módot próbálja...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "`%s' mód használata.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Nincs több kipróbálható mód.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "A hely keresése...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Nap emelkedési szög: %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "Nyomj Ctrl + C -t a leállításhoz\n" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Használat: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "A képernyő színhőmérsékletének óra szerinti beállítása.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tEnnek a súgó üzenetnek a megjelenítése\n" +" -v\t\tRészletek megjelenítése\n" +" -V\t\tProgram verzió megjelenítése\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Alapértelmezett értékek:\n" +"\n" +" Nappali hőmérséklet: %uK\n" +" Éjszakai hőmérséklet: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Hibajelentés: <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Elérhető beállítási módok:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Határozzon meg kettősponttal elválasztott lehetőségeket így `-m " +"METHOD:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Próbálja ezt `-m METHOD:help' segítséghez.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Elérhető helyzet szolgáltatók:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Határozzon meg kettősponttal elválasztott lehetőségeket így `-l " +"PROVIDER:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Próbálja ezt `-l PROVIDER:help' segítséghez.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Rosszul megadott gamma érték.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Próbálja ezt `-h' további információ eléréséhez.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "%s ismeretlen helyzet szolgáltató.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "`%s' ismeretlen beállítási mód.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Rosszul megadott hőmérséklet érték.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Rosszul megadott gamma beállítás.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "A halynal-beállítás '%s' érvénytelen!\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "A naplemente-beállítás '%s' érvénytelen!\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Ismeretlen beállítási érték `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Nem megfelelő fejléc szegmens a beállító fájlban.\n" @@ -479,32 +504,37 @@ msgid "Assignment outside section in config file.\n" msgstr "Külső szakasz kijelölés a beállító fájlban.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Nem lehetett a %s DRM-egséget kinyitni\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "Hibázott a DRM módú erőforrások meghívásánál\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d nem létezik. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Ezek érvényes CRTC-k [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Csak CRTC 0 létezik.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "CRTC %i elveszett, átugorja\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" @@ -513,7 +543,7 @@ "Nem tudja a CRTC %i gamma emelkedési szintet a\n" " %i grafikus kártyán, eszköz figyelmen kívül hagyása.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" @@ -522,13 +552,13 @@ "DRM nem tudja kiolvasni a CRTC %i gamma emelkedéseket a\n" "%i grafikus kártyán, eszköz figyelmen kívül hagyása.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "A gamma emelkedés beállítása a Közvetlen kiválasztó kezelővel.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" @@ -536,121 +566,119 @@ " kártya=N\tGrafikus kártya amin beállítást végez\n" " crtc=N\tCRTC amin beállítást végez\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "CRTC nem lehet negatív változó\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Ismeretlen mód paraméter: `%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' visszatért hibával %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Nem támogatott RANDR verzió (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "%i képernyő nem található.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Gamma emelkedés mérete túl kicsi: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Nem tudja visszaállítani a CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Gamma emelkedés beállítása a X RANDR kiterjesztéssel.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tX képernyö, amire a beállítások érvényesek lesznek\n" +" crtc=N\tVesszőkkel elválasztott CRTC-lista, amire a beállítások érvényesek " +"lesznek\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "A képernyö '%s' nem olvasható.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -" screen=N\t\tbeállítások alkalmazása a képernyőre\n" -" crtc=N\t\tCtrl +C a beállítások alkalmázásához\n" -" preserve={0,1}\ta jelenlegi fényerő megtartása\n" - -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "X igénylés hibás: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Gamma emelkedés beállításai az X VidMode kiterjesztéssel.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -" screen=N\t\ta beállítások alkalmazása a képernyőre\n" -" preserve={0,1}\ta jelenlegi fényerő megtartása\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Nem tudja menteni a jelenlegi gamma emelkedést.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "Gamma emelkedés beállítása az OSX rendszeren Quartz használatával.\n" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr " preserve={0,1}\tA létező fényerő megtartása\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Nem tudja megnyitni a készülék függőségeit.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Kijelző készülék nem támogatja a gamma emelkedést.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Gamma emelkedés beállítása a Windows GDI eszközzel.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Nem tudja visszaállítani a gamma emelkedést.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Nem tudja beállítani a gamma emelkedést.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" @@ -658,7 +686,7 @@ "VIGYÁZAT: Látszólagos gamma érték használata! A kijelzést nem befolyásolja " "ez a gamma mód.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" @@ -666,160 +694,98 @@ "Nem befolyásolja a kijelzőt, de kinyomtatja a szín hőmérsékletet a " "terminálra.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Hőmérséklet: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "Nem tudja beszerezni a fő kiszolgálót: %s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "Nem tudja beszerezni a fő kiszolgálót\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "Nem, tudja beállítani a követelményeket a fő kiszolgálóhoz: %s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "Nem, tudja beállítani a követelményeket a fő kiszolgálóhoz\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Geoclue szolgáltatás elindítva `%s'.\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Nem talál használható Geoclue szolgáltatót.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" -"Próbálja a beállítani a nevet és elérési utat ahhoz, hogy melyiket " -"használja.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Használja a Geoclue szolgáltatás által felfedezett helyszínt.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" név=N\tGeoclue szolgáltató neve (vagy `alapértelmezett')\n" -" elérési út=N\tGeoclue szolgáltató elérési útja (vagy `alapértelmezett')\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -"MEGJEGYZÉST: jelenleg a Redshift nem ismétli meg %s ellenőrzését, ha már " -"fut,\n" -"mely azt jelenti, ismét el kell indítani, hogy a helyzet változtatás " -"alkalmazva legyen.\n" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Nem talál helyszínt: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "A geoclue szolgáltató szerint mi itt vagyunk: %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "A szolgáltató nem közöl érvényes helyszínt." -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Használja a helyzetét melyet a GeoClue2 szolgáltatótól kapott.\n" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "Nem éri el a helyszín: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "Nem éri el a GeoClue kezelőt: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "Nem éri el a GeoClue kliens szolgáltató elérési útját: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "Nem éri el a GeoClue kliens szolgáltatót: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "Nem tudja beállítani a távolsági küszöbértéket: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "Nem tudja elindítani a GeoClue klienst: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Nem tud csatlakozni a GeoClue szolgáltatóhoz.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Nem lehetett indítani a GeoClue2 szolgáltatót!\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Használja a helyzetét melyet a GeoClue2 szolgáltatótól kapott.\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" "Nincs felhatalmazása helyzet lekérésére a helyiség fő adatbázisából.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" "Hiba a helyiség fő adatbázisából történő helyzet lekérése közben: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "Hozzáférési engedély kérése a helyzet eléréséhez...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "A helyzet igénylése nem engedélyezett!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Nem lehetett indítani a CoreLocation szolgáltatót!\n" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" "A fő helyiség adatbázis szolgáltató által elővett helyzet használata.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Szélességi és hosszúsági köröket be kell állítani.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Határozzon meg egy helyszínt, kézzel.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -827,7 +793,7 @@ " hossz=N\t\tHosszúsági\n" " szél=N\t\tSzélességi\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" @@ -835,54 +801,58 @@ "Mindkét érték várhatóan lebegőpontos szám,\n" "negatív számok képviselik a nyugat / dél megfelelő irányokat.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Rosszul megadott érték.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Felfüggesztési idő" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 perc" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 óra" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 óra" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Automatikus indítás" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "Információ" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Kilépés" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Bezárás" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Állapot: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Színhőmérséklet" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Időszak" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Tartózkodási hely" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Futtatsa 'redshift -h' a súgó megtekintésének." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._it.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._it.po differ diff -Nru redshift-1.11/po/it.po redshift-1.12/po/it.po --- redshift-1.11/po/it.po 2016-01-02 22:24:25.000000000 +0000 +++ redshift-1.12/po/it.po 2018-05-21 01:13:23.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2015-03-25 11:58+0000\n" "Last-Translator: Stefano Prenna \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: it\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -56,86 +56,299 @@ "La finestra delle informazioni di Redshift mostra un esempio sovrapposto " "dell'effetto rosso" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Regolazione della temperatura del colore" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Strumento per la regolazione della temperatura del colore" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Nessuno" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Giorno" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Notte" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Transizione" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Periodo: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Periodo: %s (%.2f%% giorno)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "E" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "O" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "Posizione: %.2f %s, %.2f %s\n" +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Inizializzazione di %s non riuscita.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Impossibile impostare l'opzione %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "Provare \"-l %s:help\" per maggiori informazioni.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Impossibile analizzare l'opzione \"%s\".\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Impossibile avviare il provider %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Provare \"-m %s:help\" per maggiori informazioni.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "Provare \"-m %s:help\" per maggiori informazioni.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "Impossibile avviare il metodo di regolazione %s.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "La latitudine deve essere compresa tra %.1f e %.1f.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "La longitudine deve essere compresa tra %.1f e %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Impossibile leggere l'orario di sistema.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Impossibile ottenere la posizione dal provider.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Temperatura del colore: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Luminosità: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Stato: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Disabilitato" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Abilitato" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Impostazione della temperatura non riuscita.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Tentativo con il provider della posizione \"%s\"...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Tentativo con il provider successivo...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Provider in uso \"%s\"\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "Nessun altro provider per la posizione da provare.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperature: %dK di giorno, %dK di notte\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "La temperatura deve essere compresa tra %uK e %uK.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "I valori della luminosità devono essere tra %.1f e %.1f.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Luminosità: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "Il valore della gamma deve essere compreso tra %.1f e %.1f.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "Tentativo con il metodo successivo...\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "Metodo in uso \"%s\".\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "Nessun altro metodo da provare.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Elevazione del sole: %f °\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Premere Ctrl-c per arrestare...\n" + #. TRANSLATORS: help output 1 #. LAT is latitude, LON is longitude, #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: ../src/redshift.c:452 +#: ../src/options.c:159 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" msgstr "Uso: %s -l LAT:LON -t GIORNO:NOTTE [OPZIONI...]\n" #. TRANSLATORS: help output 2 #. no-wrap -#: ../src/redshift.c:458 +#: ../src/options.c:165 msgid "Set color temperature of display according to time of day.\n" msgstr "" "Imposta la temperatura del colore dello schermo in base all'orario del " @@ -143,7 +356,7 @@ #. TRANSLATORS: help output 3 #. no-wrap -#: ../src/redshift.c:464 +#: ../src/options.c:171 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" @@ -156,7 +369,7 @@ #. TRANSLATORS: help output 4 #. `list' must not be translated #. no-wrap -#: ../src/redshift.c:472 +#: ../src/options.c:179 msgid "" " -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" " -c FILE\tLoad settings from specified configuration file\n" @@ -169,46 +382,25 @@ " -o\t\tOne shot mode (do not continuously adjust color temperature)\n" " -O TEMP\tOne shot manual mode (set color temperature)\n" " -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" " -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" +" -r\t\tDisable fading between color temperatures\n" " -t DAY:NIGHT\tColor temperature to set at daytime/night\n" msgstr "" -" -b DAY:NIGHT\tLuminosità dello schermo da applicare (tra 0.1 e 1.0)\n" -" -c FILE\tCarica le impostazioni da un file di configurazione specifico\n" -" -g R:G:B\tGamme di correzioni aggiuntive da applicare\n" -" -l LAT:LON\tPosizione attuale\n" -" -l PROVIDER\tSeleziona ilprovider per aggiornamenti automatici della " -"posizione\n" -" \t\t(Digitare \"list\" per vedere i provider disponibili)\n" -" -m METHOD\tMetodo da usare per impostare la temperatura del colore\n" -" \t\t(Digitare \"list\" per vedere i metodi disponibili)\n" -" -o\t\tModalità singola regolazione (non regole la temperatura del colore " -"continuamente)\n" -" -O TEMP\tModalità singola regolazione manuale (imposta la temperatura del " -"colore)\n" -" -p\t\tModalità stampa (stampa solo i parametri ed esce)\n" -" -x\t\tModalità ripristino (rimuove le regolazioni dallo schermo)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" #. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 +#: ../src/options.c:201 #, c-format msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" "more red light.\n" msgstr "" -"La temperatura neutra è %uK. Usando questo valore non\n" -"cambierà la temperatura del colore dello schermo. Impostando\n" -"la temperatura del colore a un valore più alto di questo si ottiene\n" -"una luce più blu, mentre impostando un valore più basso si\n" -"ottiene una luce più rossa.\n" #. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 +#: ../src/options.c:210 #, c-format msgid "" "Default values:\n" @@ -222,251 +414,81 @@ " Temperatura notturna: %uK\n" #. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 +#: ../src/options.c:218 #, c-format msgid "Please report bugs to <%s>\n" msgstr "Segnalare i bug all'indirizzo <%s>\n" -#: ../src/redshift.c:516 +#: ../src/options.c:225 msgid "Available adjustment methods:\n" msgstr "Metodi di regolazione disponibili:\n" -#: ../src/redshift.c:522 +#: ../src/options.c:231 msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" msgstr "" "Specificare opzioni separate da due punti con \"-m METODO:OPZIONI\".\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 +#: ../src/options.c:234 msgid "Try `-m METHOD:help' for help.\n" msgstr "Provare \"-m METODO:help\" per informazioni aggiuntive.\n" -#: ../src/redshift.c:531 +#: ../src/options.c:241 msgid "Available location providers:\n" msgstr "Provider della posizione disponibili:\n" -#: ../src/redshift.c:537 +#: ../src/options.c:247 msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" msgstr "" "Specificare opzioni separate da due punti con \"-m PROVIDER:OPZIONI\".\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 +#: ../src/options.c:250 msgid "Try `-l PROVIDER:help' for help.\n" msgstr "Provare \"-m PROVIDER:help\" per informazioni aggiuntive.\n" -#: ../src/redshift.c:553 ../src/redshift.c:645 -#, c-format -msgid "Initialization of %s failed.\n" -msgstr "Inizializzazione di %s non riuscita.\n" - -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 -#, c-format -msgid "Failed to set %s option.\n" -msgstr "Impossibile impostare l'opzione %s.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 -#, c-format -msgid "Try `-l %s:help' for more information.\n" -msgstr "Provare \"-l %s:help\" per maggiori informazioni.\n" - -#: ../src/redshift.c:601 ../src/redshift.c:682 -#, c-format -msgid "Failed to parse option `%s'.\n" -msgstr "Impossibile analizzare l'opzione \"%s\".\n" - -#: ../src/redshift.c:628 -#, c-format -msgid "Failed to start provider %s.\n" -msgstr "Impossibile avviare il provider %s.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#: ../src/redshift.c:665 -#, c-format -msgid "Try `-m %s:help' for more information.\n" -msgstr "Provare \"-m %s:help\" per maggiori informazioni.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 -#, c-format -msgid "Try -m %s:help' for more information.\n" -msgstr "Provare \"-m %s:help\" per maggiori informazioni.\n" - -#: ../src/redshift.c:707 -#, c-format -msgid "Failed to start adjustment method %s.\n" -msgstr "Impossibile avviare il metodo di regolazione %s.\n" - -#: ../src/redshift.c:870 ../src/redshift.c:898 -#, c-format -msgid "Status: %s\n" -msgstr "Stato: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Abilitato" - -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Disabilitato" - -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" -msgstr "Impossibile leggere l'orario di sistema.\n" - -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 -#, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura del colore: %uK\n" - -#: ../src/redshift.c:1004 ../src/redshift.c:1625 -#, c-format -msgid "Brightness: %.2f\n" -msgstr "Luminosità: %.2f\n" - -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Impostazione della temperatura non riuscita.\n" - -#: ../src/redshift.c:1105 +#: ../src/options.c:356 msgid "Malformed gamma argument.\n" msgstr "Argomento di gamma in forma errata.\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 msgid "Try `-h' for more information.\n" msgstr "Provare \"-h\" per maggiori informazioni.\n" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 +#: ../src/options.c:407 ../src/options.c:610 #, c-format msgid "Unknown location provider `%s'.\n" msgstr "Provider della posizione sconosciuto \"%s\".\n" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 +#: ../src/options.c:439 ../src/options.c:597 #, c-format msgid "Unknown adjustment method `%s'.\n" msgstr "Metodo di regolazione \"%s\" sconosciuto.\n" -#: ../src/redshift.c:1213 +#: ../src/options.c:470 msgid "Malformed temperature argument.\n" msgstr "Argomento della temperatura in forma errata.\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 msgid "Malformed gamma setting.\n" msgstr "Impostazioni gamma in forma errata.\n" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Impostazione di configurazione sconosciuta \"%s\".\n" - -#: ../src/redshift.c:1422 -#, c-format -msgid "Trying location provider `%s'...\n" -msgstr "Tentativo con il provider della posizione \"%s\"...\n" - -#: ../src/redshift.c:1427 -msgid "Trying next provider...\n" -msgstr "Tentativo con il provider successivo...\n" - -#: ../src/redshift.c:1433 -#, c-format -msgid "Using provider `%s'.\n" -msgstr "Provider in uso \"%s\"\n" - -#: ../src/redshift.c:1441 -msgid "No more location providers to try.\n" -msgstr "Nessun altro provider per la posizione da provare.\n" - -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Impossibile ottenere la posizione dal provider.\n" - -#: ../src/redshift.c:1460 -#, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Temperature: %dK di giorno, %dK di notte\n" - -#. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/options.c:621 #, c-format -msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgid "Malformed dawn-time setting `%s'.\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "La latitudine deve essere compresa tra %.1f e %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "La longitudine deve essere compresa tra %.1f e %.1f.\n" - -#: ../src/redshift.c:1493 ../src/redshift.c:1511 -#, c-format -msgid "Temperature must be between %uK and %uK.\n" -msgstr "La temperatura deve essere compresa tra %uK e %uK.\n" - -#: ../src/redshift.c:1501 +#: ../src/options.c:632 #, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" +msgid "Malformed dusk-time setting `%s'.\n" msgstr "" -#: ../src/redshift.c:1523 -#, c-format -msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "I valori della luminosità devono essere tra %.1f e %.1f.\n" - -#: ../src/redshift.c:1529 -#, c-format -msgid "Brightness: %.2f:%.2f\n" -msgstr "Luminosità: %.2f:%.2f\n" - -#: ../src/redshift.c:1537 -#, c-format -msgid "Gamma value must be between %.1f and %.1f.\n" -msgstr "Il valore della gamma deve essere compreso tra %.1f e %.1f.\n" - -#. TRANSLATORS: The string in parenthesis is either -#. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 -#, c-format -msgid "Gamma (%s): %.3f, %.3f, %.3f\n" -msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" - -#: ../src/redshift.c:1572 -msgid "Trying next method...\n" -msgstr "Tentativo con il metodo successivo...\n" - -#: ../src/redshift.c:1577 -#, c-format -msgid "Using method `%s'.\n" -msgstr "Metodo in uso \"%s\".\n" - -#: ../src/redshift.c:1584 -msgid "No more methods to try.\n" -msgstr "Nessun altro metodo da provare.\n" - -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/options.c:639 #, c-format -msgid "Solar elevation: %f\n" -msgstr "Elevazione del sole: %f °\n" - -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 -msgid "Press ctrl-c to stop...\n" -msgstr "Premere Ctrl-c per arrestare...\n" +msgid "Unknown configuration setting `%s'.\n" +msgstr "Impostazione di configurazione sconosciuta \"%s\".\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" @@ -481,173 +503,172 @@ msgid "Assignment outside section in config file.\n" msgstr "Sezione esterna dell'assegnamento nel file di configurazione.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "Impossibile ottenere le risorse per la modalità DRM\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d non esiste. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "I CRTC validi sono [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Esiste solo il CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "CRTC %i perso, salto\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "CRCT deve essere un valore intero non negativo\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Parametro del metodo sconosciuto: \"%s\".\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "\"%s\" ha prodotto l'errore %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Versione di RANDR non supportata (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Lo schermo %i non è stato trovato.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Dimensione della scala di gamma troppo piccola: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Impossibile ripristinare CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Regolare la scala di gamma con l'estensione di X RANDR.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -" screen=N\t\tSchermo X al quale applicare le regolazioni\n" -" crtc=N\t\tCRTC al quale applicare le regolazioni\n" -" preserve={0,1}\tIndica se la gamma esistente deve essere preservata\n" - -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "Richiesta X non riuscita: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Regolare la scala di gamma con l'estensione di X VidMode.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -" screen=N\t\tSchermo X al quale applicare le regolazioni\n" -" preserve={0,1}\tIndica se la gamma esistente deve essere preservata\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Impossibile salvare la scala di gamma attuale.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -" preserve={0,1}\tIndica se la gamma esistente deve essere preservata\n" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Impossibile aprire il contesto del dispositivo.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "La periferica di visualizzazione non supporta la scala di gamma.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Regolare la scala di gamma con il Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Impossibile ripristinare la scala di gamma.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Impossibile impostare la scala di gamma.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" @@ -655,7 +676,7 @@ "ATTENZIONE: si sta usando un metodo fittizio per la Gamma! Lo schermo non " "sarà modificato.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" @@ -663,155 +684,96 @@ "Non cambia la visualizzazione su schermo, ma mostra la temperatura del " "colore nel terminale.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Temperatura: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Avviato provider Geoclue \"%s\".\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Impossibile trovare un provider Geoclue usabile.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" -"Prova a impostare il nome e il percorso per specificare quale usare.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Usare la posizione come rilevata da un provider Geoclue.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" name=N\tNome del provider Geoclue (o \"default\")\n" -" path=N\tPercorso del provider Geoclue (o \"default\")\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -"Nota: attualmente Redshift non ricontrolla %s una volta avviato.\n" -"Questo significa che deve essere riavviato per aggiornarsi dopo un viaggio.\n" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Impossibile ottenere la posizione: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Secondo il provider Geoclue la posizione è:%.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Il provider non ha una posizione valida disponibile." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Usa la localizzazione come indicato da un provider GeoClue2.\n" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "Impossibile ottenere la posizione: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "Impossibile ottenere il gestore Geoclue: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "Impossibile ottenere il percorso del client Geoclue: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "Impossibile ottenere il client Geoclue: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "Impossibile impostare la sogli di distanza: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "Impossibile avviare il client Geoclue: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Impossibile connettersi a Geoclue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Usa la localizzazione come indicato da un provider GeoClue2.\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "Non autorizzare a ottenere la posizione da CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "Errore nell'ottenere la posizione da CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "In attesa dell'autorizzazione ad ottenere la posizione...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "La richiesta della posizione non è stata autorizzata.\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" "La latitudine e la longitudine devono essere impostate obbligatoriamente.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Specificare la posizione manualmente.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -819,60 +781,64 @@ " lat=N\t\tLatitudine\n" " lon=N\t\tLongitudine\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Argomento in forma errata.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Sospendi per" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minuti" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 ora" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 ore" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Avvio automatico" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "Infomazioni" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Esci" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Chiudi" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Stato: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Temperatura del colore" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Periodo" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Posizione" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._ja.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._ja.po differ diff -Nru redshift-1.11/po/ja.po redshift-1.12/po/ja.po --- redshift-1.11/po/ja.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/ja.po 2018-05-21 01:13:23.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2014-12-31 23:56+0000\n" -"Last-Translator: Nobuto Murata \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-03-15 15:36+0000\n" +"Last-Translator: kakurasan \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: ja\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,6 +24,8 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" +"Redshift " +"は環境に応じてお使いの画面の色温度を調整します。これは夜間に画面の前で作業している場合に目への悪影響を軽減させる助けになるかもしれません。" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -32,783 +34,825 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" +"色温度は太陽の位置に応じて設定されます。昼と夜とでは異なる色温度が設定されます。夕暮れ時や早朝の間は、 " +"色温度は滑らかに変化してゆっくり目を慣れさせることができます。" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." -msgstr "" +msgstr "このプログラムはユーザが Redshift を制御できるようにするためのステータス アイコンを提供します。" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" -msgstr "" +msgstr "赤み効果の例で覆われた Redshift 情報ウィンドウ" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "" +msgstr "色温度の調整" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "" +msgstr "色温度の調整ツール" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "" +msgstr "不明" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" -msgstr "" +msgstr "昼間" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" -msgstr "" +msgstr "夜間" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" -msgstr "" +msgstr "昼夜の変わり目" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "時間帯: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "" +msgstr "時間帯: %s (昼間の割合 %.2f%%)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "" +msgstr "北緯" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" -msgstr "" +msgstr "南緯" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" -msgstr "" +msgstr "東経" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" -msgstr "" +msgstr "西経" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "" +msgstr "位置: %2$s %1$.2f°, %4$s %3$.2f°\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" -msgstr "" +msgstr "%s の初期化に失敗しました。\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" -msgstr "" +msgstr "%s のオプションの設定に失敗しました。\n" #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" -msgstr "" +msgstr "`-l %s:help' で詳細情報が参照できます。\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" -msgstr "" +msgstr "オプション `%s' の解析に失敗しました。\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" -msgstr "" +msgstr "プロバイダ %s の開始に失敗しました。\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" -msgstr "" +msgstr "`-m %s:help' で詳細情報が参照できます。\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" -msgstr "" +msgstr "`-m %s:help' で詳細情報が参照できます。\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" -msgstr "" +msgstr "調整方式 %s の開始に失敗しました。\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "緯度は %.1f と %.1f の間でなければなりません。\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "経度は %.1f と %.1f の間でなければなりません。\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" -msgstr "" +msgstr "システムの時刻を読み込めません。\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "初期位置が取得可能になるのを待機しています...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "プロバイダから位置を取得できません。\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "プロバイダから無効な位置が返されました。\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" -msgstr "" +msgstr "色温度: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" -msgstr "" +msgstr "明るさ: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "状態: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "無効" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "有効" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "温度の調整に失敗しました。\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "位置情報は一時的に利用不能です; 利用可能になるまでは前回の位置を使用します...\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "部分的な時刻設定はサポートされていません!\n" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "無効な日の出/日の入り時刻の設定です!\n" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" -msgstr "" +msgstr "位置プロバイダ `%s' を試行しています...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" -msgstr "" +msgstr "次のプロバイダを試行しています...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" -msgstr "" +msgstr "プロバイダ `%s' を使用します。\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" -msgstr "" +msgstr "試行する位置プロバイダがもうありません。\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "elevation-high の値は elevation-low の値より小さくできません。\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" -msgstr "" - -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" +msgstr "太陽の高度範囲: 昼間は %.1f° より上, 夜間は %.1f° より下\n" -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "温度: 昼間 %dK, 夜間 %dK\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" -msgstr "" +msgstr "温度は %uK と %uK の間でなければなりません。\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "" +msgstr "明るさの値は %.1f と %.1f の間でなければなりません。\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" -msgstr "" +msgstr "明るさ: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" -msgstr "" +msgstr "ガンマの値は %.1f と %.1f の間でなければなりません。\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" -msgstr "" +msgstr "ガンマ (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" -msgstr "" +msgstr "次の方式を試行しています...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" -msgstr "" +msgstr "方式 `%s' を使用します。\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" -msgstr "" +msgstr "試行する方式がもうありません。\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "現在位置が取得可能になるのを待機しています...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" -msgstr "" +msgstr "太陽の高度: %f°\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" +msgstr "ctrl-c を押すと停止します...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "使い方: %s -l 緯度:経度 -t 昼の色温度:夜の色温度 [オプション...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "時刻に従ってディスプレイの色温度を設定します。\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" msgstr "" +" -h\t\tこのヘルプ メッセージを表示\n" +" -v\t\t詳細な出力\n" +" -V\t\tプログラムのバージョンを表示\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b DAY:NIGHT\t画面に適用する明るさ (0.1 から 1.0 の間)\n" +" -c FILE\t指定した設定ファイルから設定を読み込む\n" +" -g R:G:B\t追加で適用するガンマ補正\n" +" -l LAT:LON\tあなたの現在位置\n" +" -l PROVIDER\t自動で位置情報を更新するプロバイダを選択\n" +" \t\t(`list' を指定すると利用可能なプロバイダの一覧が見られます)\n" +" -m METHOD\t色温度の設定方式\n" +" \t\t(`list' を指定すると利用可能な方式の一覧が見られます)\n" +" -o\t\tワン ショット モード (色温度の変更は継続して行いません)\n" +" -O TEMP\tワン ショット 手動モード (色温度を設定します)\n" +" -p\t\t表示モード (パラメータの出力のみを行って終了します)\n" +" -P\t\t新しい色効果の適用前に既存のガンマ ランプをリセット\n" +" -x\t\tリセット モード (画面の調整を解除します)\n" +" -r\t\t色温度の緩やかな変更を無効にする\n" +" -t DAY:NIGHT\t昼間/夜間に設定する色温度\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"ニュートラルな温度は %uK です。この値を用いると\n" +"ディスプレイの色温度は変更されません。これよりも高い値を設定すると\n" +"青い光が増え、低い値を設定すると赤い光が増えます。\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"既定値:\n" +"\n" +" 昼間の温度: %uK\n" +" 夜間の温度: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "バグは <%s> に報告してください\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "利用可能な調整方式:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "`-m 方式名:オプション' でコロン区切りのオプションを指定します。\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "`-m 方式名:help' でヘルプが参照できます。\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "利用可能な位置プロバイダ:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "`-l プロバイダ名:オプション' でコロン区切りのオプションを指定します。\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "`-l プロバイダ名:help' でヘルプが参照できます。\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "不正なガンマ引数です。\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "`-h' で詳細情報が参照できます。\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "不明な位置プロバイダ `%s' です。\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "不明な調整方式 `%s' です。\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "不正な温度の引数です。\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "不正なガンマ設定です。\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "不正な日の出時刻の設定 `%s' です。\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "不正な日の入り時刻の設定 `%s' です。\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "不明な設定項目 `%s' です。\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" -msgstr "" +msgstr "設定ファイルに不正なセクション ヘッダがあります。\n" #: ../src/config-ini.c:203 msgid "Malformed assignment in config file.\n" -msgstr "" +msgstr "設定ファイルに不正な代入があります。\n" #: ../src/config-ini.c:214 msgid "Assignment outside section in config file.\n" -msgstr "" +msgstr "設定ファイルにセクション外の代入があります。\n" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "DRM デバイスを開くのに失敗しました: %s\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" -msgstr "" +msgstr "DRM モード リソースの取得に失敗しました\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " -msgstr "" +msgstr "CRTC %d は存在しません。 " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" -msgstr "" +msgstr "有効な CRTC は [0-%d] です。\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" -msgstr "" +msgstr "CRTC 0 しか存在しません。\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" -msgstr "" +msgstr "CRTC %i を見失いました、スキップします\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" +"グラフィックス カード %i 上の CRTC %i のガンマ ランプの\n" +"サイズが取得できませんでした、デバイスを無視します。\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" +"DRM は グラフィックス カード %i 上の CRTC %i のガンマ ランプを\n" +"読み込めませんでした、デバイスを無視します。\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" -msgstr "" +msgstr "Direct Rendering Manager を用いてガンマ ランプを調整します。\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" +" card=N\t調整を適用するグラフィックス カード\n" +" crtc=N\t調整を適用する CRTC\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" -msgstr "" +msgstr "CRTC は負でない整数でなければなりません\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" -msgstr "" +msgstr "方式のパラメータが不明です: `%s'\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" -msgstr "" +msgstr "`%s' はエラー %d を返しました\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" -msgstr "" +msgstr "サポートされていない RANDR のバージョンです (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" -msgstr "" +msgstr "スクリーン %i を見つけられませんでした。\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" -msgstr "" +msgstr "ガンマ ランプのサイズが小さすぎます: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" -msgstr "" +msgstr "CRTC %i を復元できません\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" -msgstr "" +msgstr "X RANDR 拡張を用いてガンマ ランプを調整します。\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" +" screen=N\t\t調整を適用する X のスクリーン\n" +" crtc=N\t\t調整を適用する CRTC のコンマ区切りの一覧\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "スクリーンの番号を読み込めません: `%s'\n" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "現在のバージョンではパラメータ `%s` は常に有効です; コマンド ライン オプション `%s` を用いると無効になります。\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "" +msgstr "X のリクエストに失敗しました: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" -msgstr "" +msgstr "X VidMode 拡張を用いてガンマ ランプを調整します。\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\t調整を適用する X のスクリーン\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" -msgstr "" +msgstr "現在のガンマ ランプを保存できません。\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Quartz を用いて macOS 上でガンマ ランプを調整します。\n" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" -msgstr "" +msgstr "デバイス コンテキストを開けません。\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" -msgstr "" +msgstr "ディスプレイ デバイスはガンマ ランプをサポートしていません。\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" -msgstr "" +msgstr "Windows GDI を用いてガンマ ランプを調整します。\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" -msgstr "" +msgstr "ガンマ ランプを復元できません。\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" -msgstr "" +msgstr "ガンマ ランプを設定できません。\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" -msgstr "" +msgstr "警告: ダミーのガンマ方式を使用しています! このガンマ方式ではディスプレイは影響を受けません。\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" -msgstr "" +msgstr "ディスプレイには影響を与えませんが、端末に色温度を表示します。\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" -msgstr "" - -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" +msgstr "温度: %i\n" -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" +"現在位置へのアクセスが GeoClue によって拒否されました!\n" +"位置情報サービスが有効であることおよび Redshift が位置情報サービスに\n" +"許可されていることを確認してください。詳しい情報は\n" +"https://github.com/jonls/redshift#faq を参照してください。\n" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "" +msgstr "位置を取得できません: %s\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" -msgstr "" +msgstr "GeoClue マネージャを取得できません: %s\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "" +msgstr "GeoClue クライアント パスを取得できません: %s\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "" +msgstr "GeoClue クライアントを取得できません: %s\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" -msgstr "" +msgstr "距離のしきい値を設定できません: %s\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "" +msgstr "GeoClue クライアントを開始できません: %s\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "GeoClue2 プロバイダ の開始に失敗しました!\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "GeoClue2 プロバイダによって見つかった位置を使用します。\n" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" -msgstr "" +msgstr "CoreLocation からの位置の取得は許可されていません。\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" -msgstr "" +msgstr "CoreLocation から位置を取得する際にエラーが発生しました: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" -msgstr "" +msgstr "位置を取得するための認証を待機しています...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" -msgstr "" +msgstr "位置の要求は許可されていませんでした!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "CoreLocation プロバイダ の開始に失敗しました!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" -msgstr "" +msgstr "Corelocation プロバイダによって見つかった位置を使用します。\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" -msgstr "" +msgstr "緯度と経度が設定されていなければなりません。\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" -msgstr "" +msgstr "位置を手動で指定します。\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" +" lat=N\t\t緯度\n" +" lon=N\t\t経度\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" +"いずれの値も浮動小数点数であることが期待され、\n" +"負の値は西 / 南をそれぞれ表します。\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" -msgstr "" +msgstr "不正な引数です。\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "一時休止" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 分" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "1 時間" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "2 時間" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" -msgstr "" +msgstr "自動起動" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "情報" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "終了" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" -msgstr "" +msgstr "閉じる" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "状態: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "色温度" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "時間帯" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" -msgstr "" +msgstr "位置" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "ヘルプを出力するには `redshift -h` を実行してください。" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._ka.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._ka.po differ diff -Nru redshift-1.11/po/ka.po redshift-1.12/po/ka.po --- redshift-1.11/po/ka.po 2016-01-02 22:24:26.000000000 +0000 +++ redshift-1.12/po/ka.po 2018-05-21 01:13:24.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2010-10-18 01:52+0000\n" "Last-Translator: Jon Lund Steffensen \n" "Language-Team: Georgian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: ka\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,179 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "" @@ -224,205 +128,345 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" msgstr "" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" msgstr "" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" msgstr "" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -435,380 +479,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "ავტოგაშვება" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" diff -Nru redshift-1.11/po/LINGUAS redshift-1.12/po/LINGUAS --- redshift-1.11/po/LINGUAS 2016-01-02 22:52:35.000000000 +0000 +++ redshift-1.12/po/LINGUAS 2018-05-21 01:17:27.000000000 +0000 @@ -1,11 +1,13 @@ # List of available languages ar +be bg ca cs da de el +en_GB es et eu @@ -23,9 +25,13 @@ nb nl pl -pt_BR pt +pt_BR +ro ru +sr sv tr +uk zh_CN +zh_TW Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._lt.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._lt.po differ diff -Nru redshift-1.11/po/lt.po redshift-1.12/po/lt.po --- redshift-1.11/po/lt.po 2016-01-02 22:24:26.000000000 +0000 +++ redshift-1.12/po/lt.po 2018-05-21 01:13:24.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-10-27 16:07+0000\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-08-08 15:09+0000\n" "Last-Translator: Moo \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: lt\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -52,193 +52,83 @@ "effect" msgstr "Redshift informacinis langas, padengtas pavyzdiniu raudonumo efektu" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Spalvos temperatūros reguliavimas" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Spalvos temperatūros reguliavimo įrankis" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Nėra" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Dienos metas" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Naktis" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Perėjimas" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "Laikotarpis: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "Š" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "P" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "R" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "V" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Naudojimas: %s -l PLA:ILG -t DIENA:NAKTIS [PARAMETRAI...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Monitoriaus spalvų temperatūros nustatymas pagal paros laiką.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tRodyti šį pagalbos pranešimą\n" -" -v\t\tIšsamioji išvestis\n" -" -V\t\tRodyti programos versiją\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Neutrali temperatūra yra %uK. Naudojant šią reikšmę,\n" -"ekrano temperatūra nepasikeis. Nustačius spalvos \n" -"temperatūrą į didesnę, negu ši reikšmė, ekranas taps\n" -"labiau mėlynos spalvos, o nustačius į mažesnę reikšmę,\n" -"ekranas taps labiau raudonos spalvos.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Numatytosios reikšmės:\n" -"\n" -" Dienos temperatūra: %uK\n" -" Nakties temperatūra: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Apie klaidas praneškite <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Prieinami sureguliavimo metodai:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Nurodykite dvitaškiu atskirtus parametrus taip „-m METODAS:PARAMETRAI“.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Mėginkite „-m METODAS:help“ pagalbai gauti.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Prieinami vietos tiekėjai:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Nurodykite dvitaškiu atskirtus parametrus taip „-l TIEKĖJAS:PARAMETRAI“.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Mėginkite „-l TIEKĖJAS:help“ pagalbai gauti.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "Nepavyko inicijuoti %s.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Nepavyko nustatyti parametro %s.\n" @@ -246,205 +136,354 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Norėdami gauti daugiau informacijos, mėginkite „-l %s:help“.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "Nepavyko išanalizuoti parinkties \"%s\".\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Nepavyko paleisti tiekėjo %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Išsamesnei informacijai pabandykite `-m %s:help'.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Norėdami gauti daugiau informacijos, mėginkite „-m %s:help“.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Nepavyko paleisti sureguliavimo metodo %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "Būsena: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Įjungta" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Platuma turi būti tarp %.1f ir %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Išjungta" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Ilguma turi būti tarp %.1f ir %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Nepavyko perskaityti sistemos laiko.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Nepavyko gauti vietos iš tiekėjo.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" -msgstr "Spalvų temperatūra: %uK\n" +msgstr "Spalvos temperatūra: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Nepavyko sureguliuoti temperatūros.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Blogai suformuotas gamos argumentas.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Būsena: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Norėdami gauti daugiau informacijos, mėginkite „-h“.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Išjungta" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Nežinomas vietos tiekėjas „%s“.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Įjungta" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Nežinomas reguliavimo metodas `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Nepavyko sureguliuoti temperatūros.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Blogai suformuotas temperatūros argumentas.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Netaisyklingas gamos nustatymas.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Nežinomas konfigūracijos nustatymas `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "Bandoma vietos tiekėją `%s'...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Mėginamas kitas tiekėjas...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Naudojamas tiekėjas „%s“.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Daugiau nebeliko vietos tiekėjų mėginimui.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Nepavyko gauti vietos iš tiekėjo.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Temperatūros: %dK dieną, %dK naktį\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Platuma turi būti tarp %.1f ir %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Ilguma turi būti tarp %.1f ir %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperatūros: %dK dieną, %dK naktį\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Temperatūra turi būti tarp %uK ir %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gamos reikšmė turi būti tarp %.1f ir %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Gama (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Mėginamas kitas metodas...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Naudojamas metodas „%s“.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Daugiau nebeliko metodų mėginimui.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Saulės aukštis virš horizonto: %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "Spauskite ctrl-c, kad sustabdytumėte...\n" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Naudojimas: %s -l PLA:ILG -t DIENA:NAKTIS [PARAMETRAI...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Monitoriaus spalvų temperatūros nustatymas pagal paros laiką.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tRodyti šį pagalbos pranešimą\n" +" -v\t\tIšsamioji išvestis\n" +" -V\t\tRodyti programos versiją\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Numatytosios reikšmės:\n" +"\n" +" Dienos temperatūra: %uK\n" +" Nakties temperatūra: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Apie klaidas praneškite <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Prieinami sureguliavimo metodai:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Nurodykite dvitaškiu atskirtus parametrus taip „-m METODAS:PARAMETRAI“.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Mėginkite „-m METODAS:help“ pagalbai gauti.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Prieinami vietos tiekėjai:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Nurodykite dvitaškiu atskirtus parametrus taip „-l TIEKĖJAS:PARAMETRAI“.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Mėginkite „-l TIEKĖJAS:help“ pagalbai gauti.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Blogai suformuotas gamos argumentas.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Norėdami gauti daugiau informacijos, mėginkite „-h“.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Nežinomas vietos tiekėjas „%s“.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Nežinomas reguliavimo metodas `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Blogai suformuotas temperatūros argumentas.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Netaisyklingas gamos nustatymas.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Nežinomas konfigūracijos nustatymas `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Netaisyklinga sekcijos antraštė konfigūracijos faile.\n" @@ -457,321 +496,272 @@ msgid "Assignment outside section in config file.\n" msgstr "Konfigūracijos faile paskirstymas už sekcijos ribų.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 #, c-format -msgid "Failed to get DRM mode resources\n" +msgid "Failed to open DRM device: %s\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "Nepavyko gauti DRM veiksenos išteklius\n" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d neegzistuoja. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Galimi CRTC yra [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Egzistuoja tik CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Nežinomas metodo parametras: „%s“.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "„%s“ grąžino klaidą %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Nepalaikoma RANDR versija (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Nepavyko rasti ekrano %i.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Gamos lentelės dydis per mažas: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Nepavyko atkurti CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Gamos lentelių sureguliavimas naudojant X RANDR plėtinį.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "X užklausa nepavyko: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Gamos lentelių sureguliavimas naudojant X VidMode plėtinį.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Nepavyko išsaugoti dabartinės gamos lentelės.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Nepavyko atverti įrenginio konteksto.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Ekrano įrenginys nepalaiko gamos lentelių.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Gamos lentelių sureguliavimas naudojant Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Nepavyko atkurti gamos lentelių.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Nepavyko nustatyti gamos lentelių.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Temperatūra: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Pasak geoclue tiekėjo, mes esame ties: %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "Nepavyksta paleisti GeoClue kliento: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Nepavyksta prisijungti prie GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Platuma ir ilguma turi būti nustatytos.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Nurodyti vietą rankiniu būdu.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -779,60 +769,64 @@ " pla=N\t\tPlatuma\n" " ilg=N\t\tIlguma\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Blogai suformuotas argumentas.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "Pristabdyti" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 minučių" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "1 valandai" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "2 valandoms" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Automatinis paleidimas" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "Informacija" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "Išeiti" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" -msgstr "" +msgstr "Užverti" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Būsena: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "Spalvos temperatūra" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "Laikotarpis" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Vieta" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" diff -Nru redshift-1.11/po/Makefile.in.in redshift-1.12/po/Makefile.in.in --- redshift-1.11/po/Makefile.in.in 2016-01-02 19:04:39.000000000 +0000 +++ redshift-1.12/po/Makefile.in.in 2017-07-28 21:57:54.000000000 +0000 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -80,7 +79,7 @@ .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< @@ -108,7 +107,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._nb.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._nb.po differ diff -Nru redshift-1.11/po/nb.po redshift-1.12/po/nb.po --- redshift-1.11/po/nb.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/nb.po 2018-05-21 01:13:25.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-03-05 12:16+0000\n" -"Last-Translator: Åka Sikrom \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-01-27 07:01+0000\n" +"Last-Translator: Allan Nordhøy \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: nb\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,6 +24,8 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" +"Rødskift justerer fargetemperaturen på skjermen din etter omgivelsene. Dette " +"bedrer øyenes arbeidsforhold hvis du sitter foran skjermen om natta." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -32,735 +34,735 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" +"Fargetermperaturen blir satt i henhold til solas posisjon. " +"Fargetermperaturen er forskjellig for natt og dagtid. I skumringen og tidlig " +"på morgenen toner fargetemperaturen mykt over i dagtermperatur for å la " +"øyene dine tilpasse seg." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" +"Dette programmet har et statusikon som lar brukeren kontrollere Rødskift." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" msgstr "" +"Rødskift sitt informasjonsvindu med et eksempel på rødhetseffekten lagt over " +"det" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Rødskift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "" +msgstr "Justering av fargetemperatur" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "" +msgstr "Justeringsverktøy for fargetemperatur" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "" +msgstr "Ingen" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" -msgstr "" +msgstr "Dagtid" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" -msgstr "" +msgstr "Natt" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" -msgstr "" +msgstr "Overgang" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "Periode%s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "" +msgstr "Periode: %s (%.2f%% day)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "" +msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" -msgstr "" +msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" -msgstr "" +msgstr "Ø" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" -msgstr "" +msgstr "V" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "" - -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Bruk: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Velg fargetemperatur på skjermen for ulike tider på døgnet.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tVis denne hjelpeteksten\n" -" -v\t\tVerbose output\n" -" -V\t\tVis programversjon\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Den nøytrale temperaturen er %uK. Å bruke denne verdien vil\n" -"olle endre fargetemperaturen på skjermen. Skjermlyset blir\n" -"mer blålig om verdien settes høyere, og rødlig om verdien\n" -"settes lavere.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Standardverdier:\n" -"\n" -" Dagtemperatur: %uK\n" -" Natttemperatur: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Vennligst rapporter feil til <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Tilgjengelige justeringsmetoder:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "Angi kolonseparerte valg med `-m METODE:VALG'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Forsøk `-m METODE:help' for veiledning.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Tilgjengelige plasseringstilbydere:\n" +msgstr "Plassering: %.2f %s, %.2f° %s\n" -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "Angi kolonseparerte valg med `-l METODE:VALG'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Forsøk `-l TILBYDER:help' for veiledning.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" -msgstr "Initiering av %s feilet.\n" +msgstr "Igangsetting av %s mislyktes.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" -msgstr "Kunne ikke sette valget %s.\n" +msgstr "Klarte ikke å velge %s.\n" #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" -msgstr "Forsøk `-l %s:help' for mer informasjon.\n" +msgstr "Prøv «-l %s:help» for mer informasjon.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" -msgstr "" +msgstr "Klarte ikke å tolke valget «%s».\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" -msgstr "Kunne ikke starte tilbyder %s.\n" +msgstr "Klarte ikke å starte tilbyder %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Forsøk `-m %s:help' for mer informasjon.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Forsøk `-m %s:help' for mer informasjon.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" -msgstr "Kunne ikke starte justeringsmetode %s.\n" +msgstr "Klarte ikke å starte justeringsmetode %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Breddegrad må være mellom %.1f og %.1f.\n" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Lengdegrad må være mellom %.1f og %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Klarte ikke å lese systemtid.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" -msgstr "Kunne ikke lese systemtiden.\n" +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Får ikke stedsinformasjon fra tilbyder.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Fargetemperatur: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Lysstyrke: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Kunne ikke justere temperaturen.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Argumentet for gamma er feilformatert.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Status: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Prøv `-h' for mer informasjon.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Slått av" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Ukjent stedstilbyder `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Slått på" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Ukjent justeringsmetode `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Klarte ikke å justere temperatur.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Argumentet for temperatur er feilformatert.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Gammavalget er feilformatert.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Ukjent konfigurasjonsvalg `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" -msgstr "" +msgstr "Prøver å bestemme posisjon `%s'…\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Prøver den neste tilbyderen…\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Bruker tilbyder `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Ingen flere stedstilbydere å forsøke.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Får ikke stedsinformasjon fra tilbyder.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Breddegrad må være mellom %.1f og %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Lengdegrad må være mellom %.1f og %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperaturer: %dK på dagen, %dK om natta\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Temperatur må være mellom %uK og %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "" +msgstr "Lydstyrkenivå må være mellom %.1f og %.1f.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" -msgstr "" +msgstr "Lysstyrke: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Gamma må være mellom %.1f and %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Prøver neste metode…\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Brukder metode `%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Ingen flere metoder å prøve.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Solhøyde: %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" +msgstr "Trykk Ctrl+c for å stoppe…\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Bruk: %s -l BRED:LENG -t DAG:NATT [VALG …]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Velg fargetemperatur på skjermen for ulike tider på døgnet.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tVis denne hjelpeteksten\n" +" -v\t\tSkriv ut detaljert info\n" +" -V\t\tVis programversjon\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" msgstr "" +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Standardverdier:\n" +"\n" +" Dagtemperatur: %uK\n" +" Natttemperatur: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Rapporter programfeil til <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Tilgjengelige justeringsmetoder:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Ta kolonseparerte valg med «-m METODE:VALG».\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Prøv «-m METODE:help» hvis du trenger hjelp.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Tilgjengelige posisjonstilbydere:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Ta kolonseparerte valg med «-l METODE:VALG».\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Prøv «-l TILBYDER:help» hvis du trenger hjelp.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Argumentet for gamma er feilformatert.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Prøv `-h' for mer informasjon.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Ukjent stedstilbyder `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Ukjent justeringsmetode `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Argumentet for temperatur er feilformatert.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Gammavalget er feilformatert.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "«%s» er et ukjent oppsettsvalg.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" -msgstr "Seksjonsoverskrift er feilformatert i konfigurasjonsfilen.\n" +msgstr "Seksjonsoverskrift er feilformatert i oppsettsfil.\n" #: ../src/config-ini.c:203 msgid "Malformed assignment in config file.\n" -msgstr "En valgtildeling er feilformatert i konfigurasjonsfilen.\n" +msgstr "Feilformatert tildeling i oppsettsfil.\n" #: ../src/config-ini.c:214 msgid "Assignment outside section in config file.\n" -msgstr "Tildeling utenfor en seksjon i konfigurasjonsfilen.\n" +msgstr "Tildeling utenfor seksjon i oppsettsfil.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d finnes ikke. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Gyldige CRTCs er [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Kun CRTC 0 finnes.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Ukjent metodeparameter: `%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' returnerte feilen %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "RANDR versjon (%u.%u) støttes ikke\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Skjerm %i ble ikke funnet.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "For lav verdi for gammarampen: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" -msgstr "Kan ikke gjenopprette CRTC %i\n" +msgstr "Klarte ikke å gjenopprette CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Still inn gammarampen med X RANDR-utvidelsen.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "X forespørsel feilet: %s\n" +msgstr "X-forespørsel mislyktes. %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Angi gammaramper med X VidMode-utvidelsen.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" -msgstr "Kunne ikke lagre gjeldende gammarampe.\n" - -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" +msgstr "Klarte ikke å lagre gjeldende gammarampe.\n" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" -msgstr "Kunne ikke åpne enhetskontekst.\n" +msgstr "Klarte ikke å åpne enhetskontekst.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Visningsenhet støtter ikke gammaramper.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Angi gammaramper med Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" -msgstr "Kunne ikke gjenopprette gammaramper.\n" +msgstr "Klarte ikke å gjenopprette gammaramper.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" -msgstr "Kunne ikke sette gammaramper.\n" +msgstr "Klarte ikke å justere gammaramper.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" +"Har ingen innvirkning på skjermen, men skriver fargetemperaturen i " +"terminalen.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" -msgstr "" - -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" +msgstr "Temperatur: %i\n" -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" +msgstr "Kunne ikke starte GeoClue-klient: %s.\n" + +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Lengde- og breddegrad må angis.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Velg sted manuelt.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -768,60 +770,64 @@ " lat=N\t\tBreddegrader\n" " lon=N\t\tHøydegrader\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Feilformatert argument.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "Sett ut av drift i" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 minutter" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "Én time" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "To timer" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Start automatisk" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "Avslutt" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" -msgstr "" +msgstr "Lukk" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "Status: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "Fargetemperatur" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "Periode" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" +msgstr "Plassering" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._nl.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._nl.po differ diff -Nru redshift-1.11/po/nl.po redshift-1.12/po/nl.po --- redshift-1.11/po/nl.po 2016-01-02 22:24:27.000000000 +0000 +++ redshift-1.12/po/nl.po 2018-05-21 01:13:25.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-12-29 01:36+0000\n" -"Last-Translator: xatr0z \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-11-28 11:25+0000\n" +"Last-Translator: Pjotr12345 \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: nl\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -25,8 +25,8 @@ "of the screen at night." msgstr "" "Redshift stelt de kleurtemperatuur bij van uw scherm aan de hand van uw " -"omgeving. Dit kan u helpen om oogpijn te verminderen als er 's avonds of 's " -"nachts aan een computerscherm gewerkt wordt." +"omgeving. Dit kan u helpen om oogpijn te verminderen als u 's avonds of 's " +"nachts achter een computerscherm werkt." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -35,125 +35,344 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" -"De kleurtemperatuur wordt gezet aan de hand van de positie van de zon. Een " -"andere kleurtemperatuur wordt ingesteld bij nacht en dag. Als het schemert " -"of vroeg in de ochtend is, wordt de kleurtemperatuur langzaam en soepel van " -"nacht naar dag ingesteld, zodat uw ogen langzaam kunnen wennen." +"De kleurtemperatuur wordt ingesteld aan de hand van de positie van de zon. " +"Bij nacht wordt er een andere kleurtemperatuur ingesteld dan bij dag. Als " +"het schemert of vroeg in de ochtend is, wordt de kleurtemperatuur " +"geleidelijk en soepel van nacht naar dag gebracht, zodat uw ogen er langzaam " +"aan kunnen wennen." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" -"Dit programma bevat een statusicoon die de gebruiker in staat stelt om " -"Redshift te gebruiken." +"Dit programma bevat een statuspictogram dat de gebruiker in staat stelt om " +"Redshift te bedienen." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" msgstr "" -"Het Redshift-informatievenster getoond met een voorbeeld van het rode effect." +"Het Redshift-informatievenster getoond met een voorbeeld van het rode effect" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "Kleurtemperatuur aanpassing" +msgstr "Bijstelling van kleurtemperatuur" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "Kleurtemperatuur aanpassingsprogramma" +msgstr "Hulpmiddel voor het bijstellen van de kleurtemperatuur" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Geen" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Overdag" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" -msgstr "Nacht" +msgstr "'s Nachts" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" -msgstr "Transitie" +msgstr "Overgang" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Periode: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Periode: %s (%.2f%% dag)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "" +msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" -msgstr "" +msgstr "Z" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" -msgstr "" +msgstr "O" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" -msgstr "" +msgstr "W" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "Locatie: %.2f %s, %.2f %s\n" +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Initialisatie van %s is mislukt.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Kan optie %s niet instellen.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "Probeer '-l%s:help' voor meer informatie.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Kon optie '%s' niet lezen.\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Kon aanbieder %s niet starten.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Probeer '-m%s:help' voor meer informatie.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "Probeer '-m%s:help' voor meer informatie.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "Kon bijstellingsmethode %s niet starten.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Breedtegraad moet tussen %.1f en %.1f zijn.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Lengtegraad moet tussen %.1f en %.1f zijn.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Kan systeemtijd niet lezen.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Aan het wachten op het beschikbaar komen van de aanvangslocatie...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Kon de locatie niet verkrijgen van de aanbieder.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Aanbieder gaf ongeldige locatie op.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Kleurtemperatuur: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Helderheid: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Status: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Uitgeschakeld" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Ingeschakeld" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Bijstelling van kleurtemperatuur is mislukt.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Locatie is tijdelijk niet beschikbaar; de vorige locatie wordt gebruikt " +"totdat zij alsnog beschikbaar komt...\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Gedeeltelijke tijdinstelling wordt niet ondersteund.\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Ongeldige instelling voor dageraad/schemering.\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Locatie-aanbieder '%s' aan het proberen...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Volgende aanbieder aan het proberen...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Gebruikt aanbieder '%s'.\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "Geen locatie-aanbieders meer over om te proberen.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"Hoge overgangsstand kan niet lager zijn dan de lage overgangsstand.\n" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "Zonnestanden: dag boven %.1f, nacht onder %.1f\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperaturen: %dK overdag, %dK 's nachts\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "Temperatuur moet tussen %uK en %uK zijn.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "Helderheidwaarden moeten tussen %.1f en %.1f zijn.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Helderheid: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "Gammawaarde moet tussen %.1f en %.1f liggen.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "Volgende methode aan het proberen...\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "Gebruikt methode '%s'.\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "Geen methoden meer over om te proberen.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" +"Aan het wachten op het ter beschikking komen van de huidige locatie...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Zonnestand: %f\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Druk ctrl-c om af te breken...\n" + #. TRANSLATORS: help output 1 #. LAT is latitude, LON is longitude, #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: ../src/redshift.c:452 +#: ../src/options.c:159 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Gebruik: %s -l LAT:LON -t DAG:NACHT [OPTIES...]\n" +msgstr "Gebruik: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" #. TRANSLATORS: help output 2 #. no-wrap -#: ../src/redshift.c:458 +#: ../src/options.c:165 msgid "Set color temperature of display according to time of day.\n" msgstr "" -"Stel de temperatuur van het scherm in afhankelijk van de tijd van de dag.\n" +"Stel de kleurtemperatuur van het scherm in overeenkomstig de tijd van de " +"dag.\n" #. TRANSLATORS: help output 3 #. no-wrap -#: ../src/redshift.c:464 +#: ../src/options.c:171 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" " -V\t\tShow program version\n" msgstr "" -" -h\t\tToon dit helpbericht\n" +" -h\t\tToon dit hulpbericht\n" " -v\t\tGedetailleerde uitvoer\n" " -V\t\tProgrammaversie weergeven\n" #. TRANSLATORS: help output 4 #. `list' must not be translated #. no-wrap -#: ../src/redshift.c:472 +#: ../src/options.c:179 msgid "" " -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" " -c FILE\tLoad settings from specified configuration file\n" @@ -166,43 +385,29 @@ " -o\t\tOne shot mode (do not continuously adjust color temperature)\n" " -O TEMP\tOne shot manual mode (set color temperature)\n" " -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" " -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" +" -r\t\tDisable fading between color temperatures\n" " -t DAY:NIGHT\tColor temperature to set at daytime/night\n" msgstr "" -" -b DAG:NACHT\tHelderheid van het scherm (tussen 0,1 en 1,0)\n" -" -c BESTAND\tLaadt instellingen van opgegeven configuratiebestand\n" -" -g R:G:B\tExtra gammacorrectie toepassen\n" -" -l LAT:LON\tUw huidige locatie (latitude:longitude)\n" -" -l AANBIEDER\tKies een aanbieder voor automatische locatie-updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHODE\t Gebruikte methode om de kleurtemperatuur in te stellen\n" -" \t\t(Typ `list' om beschikbare aanbieders te zien)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAG:NACHT\tColor temperature to set at daytime/night\n" #. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 +#: ../src/options.c:201 #, c-format msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" "more red light.\n" msgstr "" -"De neutrale temperatuur is %uK. Deze waarde zal de \n" -"kleurtemperatuur van het scherm niet wijzigen. Het\n" -"instellen van een hogere waarde resulteert in een blauwe\n" -"tint, en het instellen van een lagere waarde resulteert\n" -"in een rode tint.\n" +"De neutrale temperatuur is %uK. Het gebruik van deze waarde zal de\n" +"kleurtemperatuur van het scherm niet veranderen. Het instellen van de\n" +"kleurtemperatuur op een hogere waarde zal meer blauw licht geven,\n" +"en het instellen van een lagere waarde zal meer rood licht veroorzaken.\n" #. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 +#: ../src/options.c:210 #, c-format msgid "" "Default values:\n" @@ -210,591 +415,374 @@ " Daytime temperature: %uK\n" " Night temperature: %uK\n" msgstr "" -"Standaardwaardes:\n" +"Standaardwaarden:\n" "\n" " Temperatuur overdag: %uK\n" " Temperatuur 's nachts: %uK\n" #. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 +#: ../src/options.c:218 #, c-format msgid "Please report bugs to <%s>\n" -msgstr "Meld programmeerfouten aan <%s>\n" +msgstr "Meld fouten a.u.b. aan <%s>\n" -#: ../src/redshift.c:516 +#: ../src/options.c:225 msgid "Available adjustment methods:\n" -msgstr "Beschikbare aanpassingsmethoden:\n" +msgstr "Beschikbare bijstellingsmethoden:\n" -#: ../src/redshift.c:522 +#: ../src/options.c:231 msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" msgstr "" "Specificeer met dubbele punten gescheiden opties met `-m METHODE:OPTIES'.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 +#: ../src/options.c:234 msgid "Try `-m METHOD:help' for help.\n" msgstr "Probeer `-m METHODE:help' voor hulp\n" -#: ../src/redshift.c:531 +#: ../src/options.c:241 msgid "Available location providers:\n" -msgstr "Beschikbare locatieaanbieders:\n" +msgstr "Beschikbare locatie-aanbieders:\n" -#: ../src/redshift.c:537 +#: ../src/options.c:247 msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" msgstr "" "Specificeer met dubbele punten gescheiden opties met `-l AANBIEDER:OPTIES'.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 +#: ../src/options.c:250 msgid "Try `-l PROVIDER:help' for help.\n" msgstr "Probeer '-l AANBIEDER:help' voor hulp.\n" -#: ../src/redshift.c:553 ../src/redshift.c:645 -#, c-format -msgid "Initialization of %s failed.\n" -msgstr "Initialisatie van %s mislukt.\n" - -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 -#, c-format -msgid "Failed to set %s option.\n" -msgstr "Kan %s niet als optie instellen.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 -#, c-format -msgid "Try `-l %s:help' for more information.\n" -msgstr "Probeer '-l%s:help' voor meer informatie.\n" - -#: ../src/redshift.c:601 ../src/redshift.c:682 -#, c-format -msgid "Failed to parse option `%s'.\n" -msgstr "Niet gelukt om optie '%s' in te lezen.\n" - -#: ../src/redshift.c:628 -#, c-format -msgid "Failed to start provider %s.\n" -msgstr "Niet gelukt om aanbieder %s te starten.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#: ../src/redshift.c:665 -#, c-format -msgid "Try `-m %s:help' for more information.\n" -msgstr "Probeer '-m%s:help' voor meer informatie.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 -#, c-format -msgid "Try -m %s:help' for more information.\n" -msgstr "Probeer '-m%s:help' voor meer informatie.\n" - -#: ../src/redshift.c:707 -#, c-format -msgid "Failed to start adjustment method %s.\n" -msgstr "Starten van aanpassingsmethode %s is mislukt.\n" - -#: ../src/redshift.c:870 ../src/redshift.c:898 -#, c-format -msgid "Status: %s\n" -msgstr "Status: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Ingeschakeld" - -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Uitgeschakeld" - -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" -msgstr "Kan systeemtijd niet lezen.\n" - -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 -#, c-format -msgid "Color temperature: %uK\n" -msgstr "Kleurtemperatuur: %uK\n" - -#: ../src/redshift.c:1004 ../src/redshift.c:1625 -#, c-format -msgid "Brightness: %.2f\n" -msgstr "Helderheid: %.2f\n" - -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Kleuraanpassing mislukt.\n" - -#: ../src/redshift.c:1105 +#: ../src/options.c:356 msgid "Malformed gamma argument.\n" -msgstr "Misvormd gamma argument.\n" +msgstr "Misvormd gamma-argument.\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 msgid "Try `-h' for more information.\n" msgstr "Probeer '-h' voor meer informatie.\n" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 +#: ../src/options.c:407 ../src/options.c:610 #, c-format msgid "Unknown location provider `%s'.\n" -msgstr "Onbekende locatieaanbieder `%s'.\n" +msgstr "Onbekende locatie-aanbieder `%s'.\n" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 +#: ../src/options.c:439 ../src/options.c:597 #, c-format msgid "Unknown adjustment method `%s'.\n" -msgstr "Onbekende aanpassingsmethode `%s'.\n" +msgstr "Onbekende bijstellingsmethode '%s'.\n" -#: ../src/redshift.c:1213 +#: ../src/options.c:470 msgid "Malformed temperature argument.\n" msgstr "Misvormd temperatuurargument.\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 msgid "Malformed gamma setting.\n" -msgstr "Misvormde gamma instelling.\n" - -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Onbekende configuratie instelling `%s'.\n" - -#: ../src/redshift.c:1422 -#, c-format -msgid "Trying location provider `%s'...\n" -msgstr "Probeert locatieaanbieder `%s'...\n" - -#: ../src/redshift.c:1427 -msgid "Trying next provider...\n" -msgstr "Probeert volgende aanbieder...\n" - -#: ../src/redshift.c:1433 -#, c-format -msgid "Using provider `%s'.\n" -msgstr "Gebruikt aanbieder '%s'.\n" - -#: ../src/redshift.c:1441 -msgid "No more location providers to try.\n" -msgstr "Geen locatieaanbieders meer om uit te testen.\n" - -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Mislukt om de locatie te bemachtigen van de aanbieder.\n" - -#: ../src/redshift.c:1460 -#, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Temperaturen: %dK overdag, %dK 's nachts\n" - -#. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 -#, c-format -msgid "Solar elevations: day above %.1f, night below %.1f\n" -msgstr "" - -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Breedtegraad moet tussen %.1f en %.1f zijn.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Lengtegraad moet tussen %.1f en %.1f zijn.\n" - -#: ../src/redshift.c:1493 ../src/redshift.c:1511 -#, c-format -msgid "Temperature must be between %uK and %uK.\n" -msgstr "Temperatuur moet tussen %uK en %uK zijn.\n" - -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 -#, c-format -msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "Helderheidwaarde moeten tussen %.1f en %.1f zijn.\n" - -#: ../src/redshift.c:1529 -#, c-format -msgid "Brightness: %.2f:%.2f\n" -msgstr "Helderheid: %.2f:%.2f\n" - -#: ../src/redshift.c:1537 -#, c-format -msgid "Gamma value must be between %.1f and %.1f.\n" -msgstr "Gammawaarde moet tussen %.1f en %.1f liggen.\n" +msgstr "Misvormde gamma-instelling.\n" -#. TRANSLATORS: The string in parenthesis is either -#. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/options.c:621 #, c-format -msgid "Gamma (%s): %.3f, %.3f, %.3f\n" -msgstr "" - -#: ../src/redshift.c:1572 -msgid "Trying next method...\n" -msgstr "Probeer volgende methode...\n" +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Misvormde dageraadinstelling '%s'.\n" -#: ../src/redshift.c:1577 +#: ../src/options.c:632 #, c-format -msgid "Using method `%s'.\n" -msgstr "Gebruik methode `%s'.\n" - -#: ../src/redshift.c:1584 -msgid "No more methods to try.\n" -msgstr "Geen methodes meer om te proberen.\n" +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Misvormde schemeringinstelling '%s'.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/options.c:639 #, c-format -msgid "Solar elevation: %f\n" -msgstr "Zonshoogte: %f\n" - -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 -msgid "Press ctrl-c to stop...\n" -msgstr "Druk ctrl-c om te annuleren...\n" +msgid "Unknown configuration setting `%s'.\n" +msgstr "Onbekende instelling '%s'.\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" -msgstr "Misvormde sectiekop in configuratiebestand.\n" +msgstr "Misvormde sectiekop in instellingenbestand.\n" #: ../src/config-ini.c:203 msgid "Malformed assignment in config file.\n" -msgstr "Misvormde toewijzing in configuratiebestand.\n" +msgstr "Misvormde toewijzing in instellingenbestand.\n" #: ../src/config-ini.c:214 msgid "Assignment outside section in config file.\n" -msgstr "Toewijzing buiten sectie in configuratiebestand.\n" +msgstr "Toewijzing buiten sectie in instellingenbestand.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Kon DRM-apparaat niet openen: %s\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" -msgstr "" +msgstr "Kon hulpbronnen voor DRM-modus niet verkrijgen\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d bestaat niet. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" -msgstr "Juiste CRTCs zijn [0-%d].\n" +msgstr "Juiste CRTC's zijn [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Alleen CRTC 0 bestaat.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" -msgstr "CRTC %i verloren, overslaan\n" +msgstr "CRTC %i verloren gegaan, wordt overgeslagen\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" +" card=N\tGrafische kaart om bijstellingen op toe te passen\n" +" crtc=N\tCRTC om bijstellingen op toe te passen\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "CRTC moet een niet-negatief geheel getal zijn\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Onbekende methodeparameter: `%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "'%s' gaf foutcode %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" -msgstr "RANDR versie wordt niet ondersteund (%u.%u)\n" +msgstr "RANDR-versie wordt niet ondersteund (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" -msgstr "Scherm %i kan niet worden gevonden.\n" +msgstr "Scherm %i kon niet worden gevonden.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Gamma ramp grootte te klein: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Kan CRTC %i niet herstellen\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Pas gamma ramps aan met de X RANDR extensie.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tX-scherm om bijstellingen op toe te passen\n" +" crtc=N\tLijst of kommagescheiden CRTC's om bijstellingen op toe te passen\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Kon schermnummer niet lezen: '%s'.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" +"Parameter '%s' is nu altijd aan; gebruik de opdrachtregeloptie '%s' om hem " +"uit te schakelen.\n" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "X verzoek mislukt: %s\n" +msgstr "X-verzoek is mislukt: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Pas gamma ramps aan met de X VidMode extensie.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tX-scherm om bijstellingen op toe te passen\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Kan de huidige gamma ramps niet opslaan.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" -msgstr "Kon device context niet openen.\n" +msgstr "Kon apparaatcontext niet openen.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Weergave-apparaat ondersteund geen gamma ramps.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Stel gamma ramps in met de Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Kan gamma ramps niet herstellen.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Kan gamma ramps niet instellen.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -"Verandert niks aan de weergave maar toont kleurtemperatuur op de terminal.\n" +"Verandert niets aan de weergave maar toont kleurtemperatuur in het " +"terminalvenster.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Temperatuur: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Geoclue-aanbieder `%s' gestart.\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Kon geen bruikbare Geoclue-aanbieder vinden.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "Probeer de naam en het pad aan te geven welke te gebruiken.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Gebruik de locatie zoals ontdekt door de Geoclue-aanbieder\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -"LET OP: Redshift hercontroleert %s wanneer het is opgestart,\n" -"dat betekent dat het herstart moet worden om de effecten op te merken na een " -"reis.\n" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Kon de locatie niet krijgen: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Volgens de geoclue-aanbieder zijn we op: %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Aanbieder heeft geen geldige locatie beschikbaar." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Gebruik de locatie die ontdekt is door de GeoClue2 aanbieder.\n" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "Kon deze locatie niet krijgen: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "Kon GeoClue-beheerder niet ophalen: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Kan niet verbinden met GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Gebruik de locatie die ontdekt is door de GeoClue2 aanbieder.\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "Niet geautoriseerd om de locatie te verkrijgen van CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "Fout bij het ophalen van de locatie van CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "Wachten voor autorisatie om locatie op te halen...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "Aanvraag voor locatie was niet geautoriseerd!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "Gebruik de locatie die is ontdekt door de Corelocation-aanbieder.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Hoogte- en breedtegraad moeten nog ingesteld worden.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Geef locatie handmatig op.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -802,60 +790,64 @@ " lat=N\t\tBreedtegraad\n" " lon=N\t\tLengtegraad\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Misvormd argument.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Onderbreken voor" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minuten" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 uur" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 uren" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Start automatisch" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Afsluiten" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Sluiten" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Kleurtemperatuur" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Periode" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Locatie" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._pl.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._pl.po differ diff -Nru redshift-1.11/po/pl.po redshift-1.12/po/pl.po --- redshift-1.11/po/pl.po 2016-01-02 22:24:27.000000000 +0000 +++ redshift-1.12/po/pl.po 2018-05-21 01:13:26.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-12-30 13:38+0000\n" -"Last-Translator: Robert Wąsik \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-10-30 21:45+0000\n" +"Last-Translator: 5th \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: pl\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,8 +24,8 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" -"Redshift dostosowuję temperaturę barwową wyświetlacza do warunków " -"zewnętrznych. Pomaga w ten sposób uniknąć zmęczenia oczy przy pracy w nocy." +"Redshift dostosowuje temperaturę barwową wyświetlacza do warunków " +"zewnętrznych. Pomaga w ten sposób uniknąć zmęczenia oczu przy pracy w nocy." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -34,10 +34,10 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" -"Temperatura barwowa jest ustawiana w zależności od pozycji słońca. Różnią " -"się one w dzień i w nocy. Podczas zmierzchania (i świtania), temperatura " -"łagodnie zmienia się z dziennej na nocną (i odwrotnie), pozwalając oczom na " -"powolne przyzwyczajanie się." +"Temperatura barwowa jest ustawiana w zależności od pozycji słońca. Różni się " +"w dzień i w nocy. Podczas zmierzchania (i świtania), temperatura łagodnie " +"zmienia się z dziennej na nocną (i odwrotnie), pozwalając oczom na powolne " +"przyzwyczajanie się." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" @@ -52,191 +52,83 @@ msgstr "" "Okno Redshift przedstawia przykład dostosowania przesunięcia ku czerwieni." +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Dostosowanie temperatury barwowej" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Narzędzie do dostosowywania temperatury barwowej" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Nie rozpoznano" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Dzień" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Noc" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Przejście" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Czas: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Czas: %s (%.2f%% dni(a))\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "Pn" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "Pd" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "Wsch." #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "Zach." #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "Pozycja: %.2f %s, %.2f %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Użycie: %s -l SZER:DŁ -t DZIEŃ:NOC [OPCJE...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Ustawia temperaturę barwową ekranu, w zależności od pory dnia.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tWyświetla tę pomoc\n" -" -v\t\tUszczegóławia wyjście programu\n" -" -V\t\tWypisuje wersję programu\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Neutralną temperaturą jest %uK. Użycie tej wartości nie\n" -"zmieni temperatury barwowej ekranu. Ustawienie wyższej\n" -"wartości temperatury barwowej poskutkuje bardziej niebieskimi\n" -"barwami, natomiast ustawienie niższej wartości da kolory\n" -"bardziej czerwone.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Wartości domyślne:\n" -"\n" -" Temperatura dla dnia: %uK\n" -" Temperatura dla nocy: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Proszę zgłaszać błędy do <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Dostępne metody dostosowania:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "Podaj opcje oddzielone dwukropkiem z `-m METODA:OPCJE'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Spróbuj `-m METODA:help' aby uzyskać pomoc.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Dostępni dostawcy lokalizacji\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "Podaj opcje oddzielone dwukropkiem z `-l DOSTAWCA:OPCJE'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Spróbuj `-m DOSTAWCA:help' aby uzyskać pomoc.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "Inicjalizacja %s nie powiodła się.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Ustawienie opcji %s nie powiodło się.\n" @@ -244,205 +136,354 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Spróbuj `-l %s:help' aby uzyskać więcej informacji.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "Nieudane parsowanie opcji \"%s\".\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Uruchomienie dostawcy %s nie powiodło się.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Spróbuj `-m %s:help' aby uzyskać więcej informacji.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Spróbuj -m %s:help' aby uzyskać więcej informacji.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Uruchomienie metody dostosowania %s nie powiodło się.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "Stan: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Włączony" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Szerokość geograficzna musi być pomiędzy %.1f i %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Wyłączony" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Długość geograficzna musi być pomiędzy %.1f i %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Nie udało się odczytać czasu systemowego.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Czekanie, aż początkowa lokalizacja będzie dostępna\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Nie udało się uzyskać lokalizacji od dostawcy.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Dostawca zwrócił nieprawidłową lokalizację\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Temperatura barwowa: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Jasność: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Dostosowanie temperatury barwowej nie powiodło się.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Nieprawidłowy argument gammy.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Stan: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Spróbuj `-h' aby uzyskać więcej informacji.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Wyłączony" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Nieznany dostawca lokalizacji `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Włączony" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Nieznana metoda dostosowania `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Dostosowanie temperatury barwowej nie powiodło się.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Nieprawidłowy argument temperatury.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Lokalizacja jest tymczasowo niedostępna; Używa poprzedniej lokalizacji, " +"aż ta będzie dostępna\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Nieprawidłowe ustawienie gammy.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Częściowa konfiguracja czasu nie jest wspierana!\n" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Nieznane ustawienie konfiguracji `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Nieprawidłowa konfiguracja czasu zmierzchu/świtu\n" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "Sprawdzanie dostawcy pozycji \"%s\"…\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Próba użycia następnego dostawcy...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Użycie dostawcy `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Nie ma więcej dostawców do wypróbowania.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Nie udało się uzyskać lokalizacji od dostawcy.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Temperatury: %d K w dzień, %d K w nocy\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "Maksymalna wysokość nie może być mniejsza od minimalnej.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "Wysokość słońca (°): w dzień powyżej %.1f, nocą poniżej %.1f\n" -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Szerokość geograficzna musi być pomiędzy %.1f i %.1f.\n" - -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Długość geograficzna musi być pomiędzy %.1f i %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperatury: %d K w dzień, %d K w nocy\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Temperatura barwowa musi być pomiędzy %uK i %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "Maksymalna wysokość nie może być mniejsza od minimalnej.\n" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "Jasność musi zawierać się w przedziale od %.1f do %.1f\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Jasność: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Wartość gammy musi być pomiędzy %.1f i %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Próba użycia kolejnej metody...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Użycie metody `%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Nie ma więcej metod do wypróbowania.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "Czekanie, aż obecna lokalizacja będzie dostępna...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Pozycja słońca: %f°\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "Naciśnij ctrl+c aby zakończyć\n" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Użycie: %s -l SZER:DŁ -t DZIEŃ:NOC [OPCJE...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Ustawia temperaturę barwową ekranu, w zależności od pory dnia.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tWyświetla tę pomoc\n" +" -v\t\tUszczegóławia wyjście programu\n" +" -V\t\tWypisuje wersję programu\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Wartości domyślne:\n" +"\n" +" Temperatura dla dnia: %uK\n" +" Temperatura dla nocy: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Proszę zgłaszać błędy do <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Dostępne metody dostosowania:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Podaj opcje oddzielone dwukropkiem z `-m METODA:OPCJE'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Spróbuj `-m METODA:help' aby uzyskać pomoc.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Dostępni dostawcy lokalizacji\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Podaj opcje oddzielone dwukropkiem z `-l DOSTAWCA:OPCJE'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Spróbuj `-m DOSTAWCA:help' aby uzyskać pomoc.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Nieprawidłowy argument gammy.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Spróbuj `-h' aby uzyskać więcej informacji.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Nieznany dostawca lokalizacji `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Nieznana metoda dostosowania `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Nieprawidłowy argument temperatury.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Nieprawidłowe ustawienie gammy.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Błędnie zapisany czas zmierzchu `%s`.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Błędnie zapisany czas świtu `%s`.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Nieznane ustawienie konfiguracji `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Nieprawidłowy nagłówek sekcji w pliku konfiguracyjnym.\n" @@ -455,32 +496,37 @@ msgid "Assignment outside section in config file.\n" msgstr "Przypisanie poza sekcją w pliku konfiguracyjnym.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Nie udało się otworzyć urządzenia DRM: %s\n" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "Nie powiodło się pobieranie zasobów DRM\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d nie istnieje. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Prawidłowymi CRTC są [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Istnieje tylko CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "Zgubiono CRTC %i, pomijanie\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" @@ -489,7 +535,7 @@ "Nie udało się pobrać przedziału gamma dla CRTC %i\n" "dla karty graficznej %i, urządzenie pominięto.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" @@ -498,286 +544,234 @@ "DRM nie może odczytać zakresu gamma na CRTC %i na\n" "karcie graficznej %i, urządzenie pominięto.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "Dostosuj zakres gamma dzięki Direct Rendering Manager\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" +" card=N\t Karta, do której będą zastosowane parametry\n" +" crtc=N\t CRTC, do którego będą zastosowane parametry\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "CRTC musi być dodatni\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Nieznany parametr metody :`%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' zwróciło błąd %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Nieobsługiwana wersja RANDR (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Ekran %i nie może być znaleziony.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Rozmiar gamma ramp jest zbyt mały: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Nie udało się przywrócić CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Dopasuj gamma ramp przy pomocy rozszerzenia X RANDR\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Nie udało się przeczytać numeru wyświetlacza: `%s`.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" +"Parametr `%s` jest teraz zawsze aktywny; Użyj opcji `%s` w linii poleceń, " +"aby go wyłączyć.\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "Żądanie X-ów zawiodło: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Dopasuj gamma ramp przy pomocy rozszerzenia X VidMode\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Nie udało się zapisać aktualnego gamma ramp.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "Dostosuj zakresy gamma na OSX dzięki Quartz\n" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Nie udało się otworzyć device context.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Urządzenie ekranowe nie obsługuje gamma ramp.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Dopasuj gamma ramp przy pomocy Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Nie udało się przywrócić gamma ramp.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Nie udało się ustawić gamma ramp.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" "UWAGA: użyto atrapy metody gamma, ta metoda nie wpłynie na wygląd obrazu.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" "Nie zmienia wyglądu ekranu, ale wyświetla temperaturę barwową w terminalu.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Temperatura: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "Nie udało się skontaktować z: %s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "Błąd klienta\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "Nie udało się ustawić wymagań dla\" %s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "Nie udało się ustawić wymagań\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Uruchomiono dostawcę Geoclue: \"%s\"\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Nie znaleziono użytecznego dostawcy Geoclue\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "Spróbuj ustawić nazwę i ścieżkę, której należy użyć.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Użyj pozycji dostarczonej przez dostawcę Geoclue.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -"UWAGA: Redschift nie sprawdził %s od startu,\n" -"zrestartuj Redshift po podróży.\n" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Nie udało się pobrać pozycji: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Geoclue podaje następującą pozycję: %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Dostawca nie podaje poprawnej pozycji." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "Użyj pozycji dostarczonej przez dostawcę GeoClue2.\n" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "Nie można pobrac lokalizacji: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "Brak kontaktu z menadżerem GeoClue: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "Nie można czytać ścieżki klienta GeoClue: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "Brak kontaktu z klientem GeoClue: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "Nie można ustawić interwału odległości: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "Nie udało się uruchomić klienta GeoClue\" %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Nie udało się połączyć z GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Nie udało się uruchomić dostawcy GeoClue2\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Użyj pozycji dostarczonej przez dostawcę GeoClue2.\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "Brak uprawnień do pobrania pozycji z CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "Błąd przy pobieraniu pozycji z CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "Czekanie na autoryzację przed pobraniem pozycji…\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "Pytanie o pozycje nie zostało autoryzowane!\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Nie udało się uruchomić dostawcy CoreLocation\n" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "Użyj pozycji podanej przez dostawcę Corelocation.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Szerokość i długość geograficzna muszą być ustawione.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Ustaw lokalizację ręcznie.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -785,7 +779,7 @@ " lat=N\t\tSzerokość geograficzna\n" " lon=N\t\tDługość geograficzna\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" @@ -793,54 +787,58 @@ "Obie wartości powinny być liczbami zmiennoprzecinkowymi,\n" "ujemne opisują zachód i południe.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Nieprawidłowy argument.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Zawieś na" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minut" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 godzinę" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 godziny" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Uruchamiaj automatycznie" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "Informacje" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Zakończ" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Zamknij" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "Status: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Temperatura barwowa" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "Zakres" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Pozycja" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Uruchom `redshift -h` aby uzyskać pomoc" diff -Nru redshift-1.11/po/POTFILES.in redshift-1.12/po/POTFILES.in --- redshift-1.11/po/POTFILES.in 2016-01-02 19:01:20.000000000 +0000 +++ redshift-1.12/po/POTFILES.in 2017-10-19 02:36:21.000000000 +0000 @@ -5,7 +5,7 @@ data/applications/redshift-gtk.desktop.in src/redshift.c - +src/options.c src/config-ini.c src/gamma-drm.c @@ -15,7 +15,6 @@ src/gamma-w32gdi.c src/gamma-dummy.c -src/location-geoclue.c src/location-geoclue2.c src/location-corelocation.m src/location-manual.c Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._pt_BR.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._pt_BR.po differ diff -Nru redshift-1.11/po/pt_BR.po redshift-1.12/po/pt_BR.po --- redshift-1.11/po/pt_BR.po 2016-01-02 22:24:25.000000000 +0000 +++ redshift-1.12/po/pt_BR.po 2018-05-21 01:13:26.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-02-28 21:47+0000\n" -"Last-Translator: Ramon \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-11-21 20:51+0000\n" +"Last-Translator: Sitonir de Oliveira \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: pt_BR\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,6 +24,9 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" +"Redshift ajusta a temperatura da cor de sua tela de acordo com o que o " +"cerca. Isso ajuda a irritar menos os olhos se você está trabalhando em " +"frente a uma tela à noite." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -32,118 +35,341 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" +"A temperatura da cor é definida de acordo com a posição do Sol. Diferentes " +"temperaturas de cores são utilizadas durante a noite e o dia. Ao anoitecer e " +"ao amanhecer, ocorre uma transição suave entre a temperatura de cor da noite " +"para o dia para que seus olhos lentamente se adaptem." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" +"Esse programa exibe um ícone de status para que seja possível controlar o " +"Redshift." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" msgstr "" +"A janela de informação sobreposta do redshift exibe um exemplo do efeito " +"avermelhado" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "" +msgstr "Ajuste de temperatura de cor" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "" +msgstr "Ferramenta de ajuste de temperatura de cor" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "" +msgstr "Nenhum" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Manhã" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Noite" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Transição" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "Período: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "" +msgstr "Período: %s (%.2f%% day)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "L" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "O" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" +msgstr "Localização: %.2f %s, %.2f %s\n" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Não foi possível inicializar %s.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Não foi possível definir a opção %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "Tente `-l %s:help' para maiores informações.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Falha ao analisar opção `%s'.\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Não foi possível iniciar o provedor %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Tente `-m %s:help' para mais informações.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "Tente -m %s:help' para maiores informações.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "Não foi possível iniciar método de ajuste %s.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Latitude deve estar entre %.1f e %.1f.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Longitude deve estar entre %.1f e %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Não foi possível determinar a hora do sistema.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Esperando que a localização inicial esteja disponível...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Não foi possível determinar a localização pelo provedor.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Localização inválida retornado do provedor\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Temperatura da cor: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Brilho: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Estado: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Desativado" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Ativado" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "O ajuste de temperatura falhou.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"A localização está temporariamente indisponível; Usando a localização " +"anterior até ficar disponível ...\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Configuração parcial de tempo não suportada!\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Configuração do amanhacer/anoitecer inválida!\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Tentando provedor de localização `%s'...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Tentando próximo provedor...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Usando provedor `%s'.\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "Não há mais provedores de localização para contactar.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "Elevacao Solar: dia acima %.1f, noite abaixo %.1f\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperaturas: %dK de dia, %dK de noite\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "A temperatura deve estar entre %uK e %uK.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "Os valores do Brilho devem estar entre %.1f e %.1f.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Brilho: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "Valor Gamma deve estar entre %.1f e %.1f.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "Tentando próximo método...\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "Usando o método `%s'.\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "Não há mais métodos a testar.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Elevação solar: %f\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Pressione Ctrl-c para parar...\n" + #. TRANSLATORS: help output 1 #. LAT is latitude, LON is longitude, #. DAY is temperature at daytime, #. NIGHT is temperature at night #. no-wrap -#: ../src/redshift.c:452 +#: ../src/options.c:159 #, c-format msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" msgstr "Utilização: %s -l LAT:LON -t DIA:NOITE [OPÇÕES...]\n" #. TRANSLATORS: help output 2 #. no-wrap -#: ../src/redshift.c:458 +#: ../src/options.c:165 msgid "Set color temperature of display according to time of day.\n" msgstr "" -"Regula a temperatura da cor do monitor de acordo com a hora do dia.\n" +"Define a temperatura da cor do monitor de acordo com a hora do dia.\n" #. TRANSLATORS: help output 3 #. no-wrap -#: ../src/redshift.c:464 +#: ../src/options.c:171 msgid "" " -h\t\tDisplay this help message\n" " -v\t\tVerbose output\n" " -V\t\tShow program version\n" msgstr "" -" -h\t\t Mostra esta mensagem de ajuda\n" +" -h\t\t Exibe essa mensagem de ajuda\n" " -v\t\t Mostra o log \n" " -V\t\t Mostra versão do programa\n" #. TRANSLATORS: help output 4 #. `list' must not be translated #. no-wrap -#: ../src/redshift.c:472 +#: ../src/options.c:179 msgid "" " -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" " -c FILE\tLoad settings from specified configuration file\n" @@ -156,29 +382,25 @@ " -o\t\tOne shot mode (do not continuously adjust color temperature)\n" " -O TEMP\tOne shot manual mode (set color temperature)\n" " -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" " -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" +" -r\t\tDisable fading between color temperatures\n" " -t DAY:NIGHT\tColor temperature to set at daytime/night\n" msgstr "" #. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 +#: ../src/options.c:201 #, c-format msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" "more red light.\n" msgstr "" -"A temperatura neutra é %uK. Usar esse valor não irá\n" -"mudar a temperatura do monitor. Definir a temperatura\n" -"de cor a um valor maior que esse resulta em mais luz\n" -"azul, e definir uma temperatura mais baixa resultará\n" -"em mais luz vermelha.\n" #. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 +#: ../src/options.c:210 #, c-format msgid "" "Default values:\n" @@ -192,251 +414,81 @@ " Temperatura noturna: %uK\n" #. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 +#: ../src/options.c:218 #, c-format msgid "Please report bugs to <%s>\n" msgstr "Por favor, reporte bugs para <%s>\n" -#: ../src/redshift.c:516 +#: ../src/options.c:225 msgid "Available adjustment methods:\n" msgstr "Métodos de ajuste disponíveis:\n" -#: ../src/redshift.c:522 +#: ../src/options.c:231 msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" msgstr "" "Especifique opções separadas por dois pontos com `-m MÉTODO:OPÇÕES'.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 +#: ../src/options.c:234 msgid "Try `-m METHOD:help' for help.\n" msgstr "Tente `-m MÉTODO:help' para obter ajuda.\n" -#: ../src/redshift.c:531 +#: ../src/options.c:241 msgid "Available location providers:\n" -msgstr "Fornecedores de localidade disponíveis:\n" +msgstr "Fornecedores de localização disponíveis:\n" -#: ../src/redshift.c:537 +#: ../src/options.c:247 msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" msgstr "" "Especifique opções separadas por dois pontos com `-l PROVEDOR:OPÇÕES'.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 +#: ../src/options.c:250 msgid "Try `-l PROVIDER:help' for help.\n" msgstr "Tente `-l PROVEDOR:help' para obter ajuda.\n" -#: ../src/redshift.c:553 ../src/redshift.c:645 -#, c-format -msgid "Initialization of %s failed.\n" -msgstr "Não foi possível inicializar %s.\n" - -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 -#, c-format -msgid "Failed to set %s option.\n" -msgstr "Não foi possível configurar a opção %s.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 -#, c-format -msgid "Try `-l %s:help' for more information.\n" -msgstr "Tente `-l %s:help' para maiores informações.\n" - -#: ../src/redshift.c:601 ../src/redshift.c:682 -#, c-format -msgid "Failed to parse option `%s'.\n" -msgstr "" - -#: ../src/redshift.c:628 -#, c-format -msgid "Failed to start provider %s.\n" -msgstr "Não foi possível iniciar o provedor %s.\n" - -#. TRANSLATORS: `help' must not be -#. translated. -#: ../src/redshift.c:665 -#, c-format -msgid "Try `-m %s:help' for more information.\n" -msgstr "Tente `-m %s:help' para mais informações.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 -#, c-format -msgid "Try -m %s:help' for more information.\n" -msgstr "Tente -m %s:help' para maiores informações.\n" - -#: ../src/redshift.c:707 -#, c-format -msgid "Failed to start adjustment method %s.\n" -msgstr "Não foi possível iniciar método de ajuste %s.\n" - -#: ../src/redshift.c:870 ../src/redshift.c:898 -#, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Ativado" - -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Desativado" - -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" -msgstr "Não foi possível determinar a hora do sistema.\n" - -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 -#, c-format -msgid "Color temperature: %uK\n" -msgstr "Temperatura de cor: %uK\n" - -#: ../src/redshift.c:1004 ../src/redshift.c:1625 -#, c-format -msgid "Brightness: %.2f\n" -msgstr "Brilho: %.2f\n" - -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "O ajuste de temperatura falhou.\n" - -#: ../src/redshift.c:1105 +#: ../src/options.c:356 msgid "Malformed gamma argument.\n" msgstr "Argumento gama mal-formatado.\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 msgid "Try `-h' for more information.\n" msgstr "Tente `-h' para mais informações.\n" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 +#: ../src/options.c:407 ../src/options.c:610 #, c-format msgid "Unknown location provider `%s'.\n" msgstr "Provedor de localização `%s' desconhecido.\n" #. TRANSLATORS: This refers to the method #. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 +#: ../src/options.c:439 ../src/options.c:597 #, c-format msgid "Unknown adjustment method `%s'.\n" msgstr "Método de ajuste `%s' desconhecido.\n" -#: ../src/redshift.c:1213 +#: ../src/options.c:470 msgid "Malformed temperature argument.\n" msgstr "Argumento de temperatura mal-formatado.\n" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 msgid "Malformed gamma setting.\n" msgstr "Definição de gama mal formada.\n" -#: ../src/redshift.c:1364 +#: ../src/options.c:621 #, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Definição de configuração `%s' desconhecida.\n" - -#: ../src/redshift.c:1422 -#, c-format -msgid "Trying location provider `%s'...\n" +msgid "Malformed dawn-time setting `%s'.\n" msgstr "" -#: ../src/redshift.c:1427 -msgid "Trying next provider...\n" -msgstr "Tentando próximo provedor...\n" - -#: ../src/redshift.c:1433 -#, c-format -msgid "Using provider `%s'.\n" -msgstr "Usando provedor `%s'.\n" - -#: ../src/redshift.c:1441 -msgid "No more location providers to try.\n" -msgstr "Não há mais provedores de localização para contactar.\n" - -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Não foi possível determinar a localização pelo provedor.\n" - -#: ../src/redshift.c:1460 +#: ../src/options.c:632 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "Malformed dusk-time setting `%s'.\n" msgstr "" -#. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 -#, c-format -msgid "Solar elevations: day above %.1f, night below %.1f\n" -msgstr "" - -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Latitude deve estar entre %.1f e %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Longitude deve estar entre %.1f and %.1f.\n" - -#: ../src/redshift.c:1493 ../src/redshift.c:1511 -#, c-format -msgid "Temperature must be between %uK and %uK.\n" -msgstr "A temperatura deve estar entre %uK e %uK.\n" - -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 -#, c-format -msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1529 -#, c-format -msgid "Brightness: %.2f:%.2f\n" -msgstr "" - -#: ../src/redshift.c:1537 -#, c-format -msgid "Gamma value must be between %.1f and %.1f.\n" -msgstr "Valor gama deve estar entre %.1f and %.1f.\n" - -#. TRANSLATORS: The string in parenthesis is either -#. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 -#, c-format -msgid "Gamma (%s): %.3f, %.3f, %.3f\n" -msgstr "" - -#: ../src/redshift.c:1572 -msgid "Trying next method...\n" -msgstr "Tentando próximo método...\n" - -#: ../src/redshift.c:1577 -#, c-format -msgid "Using method `%s'.\n" -msgstr "Usando o método `%s'.\n" - -#: ../src/redshift.c:1584 -msgid "No more methods to try.\n" -msgstr "Não há mais métodos a serem tentados.\n" - -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/options.c:639 #, c-format -msgid "Solar elevation: %f\n" -msgstr "Elevação solar: %fº\n" - -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 -msgid "Press ctrl-c to stop...\n" -msgstr "" +msgid "Unknown configuration setting `%s'.\n" +msgstr "Definição de configuração `%s' desconhecida.\n" #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" @@ -450,321 +502,278 @@ msgid "Assignment outside section in config file.\n" msgstr "Atribuição fora da seção no arquivo de configuração.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 #, c-format -msgid "Failed to get DRM mode resources\n" +msgid "Failed to open DRM device: %s\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "Não foi possível obter recursos do modo DRM\n" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d não existe. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "CRTCs válidos são [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Existe apenas CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" -msgstr "" +msgstr "CTRC %i perdido, saltando\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" +"Não foi possivel obter a escala gamma para CTRC %i\n" +"na placa gráfica %i, ignorando dispositivo.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" +"DRM não consegue obter a escala gamma de CTRC %i em\n" +"placa gráfica %i, ignorando dispositivo.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" -msgstr "" +msgstr "Ajuste escala gamma com Direct Rendering Manager.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" +" card=N\tPlaca gráfica para receber ajustes\n" +" crtc=N\tCRTC para receber ajustes\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" -msgstr "" +msgstr "CRTC deve ser um inteiro não negativo\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Parâmetro de método desconhecido: `%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "`%s' retornou erro %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" -msgstr "Não há suporte para a versão RANDR (%u.%u)\n" +msgstr "Versão RANDR não suportada (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Tela %i não foi encontrada.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" -msgstr "Tamanho da curva gama é pequeno demais: %i\n" +msgstr "Tamanho da escala gamma muito pequeno: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Não foi possível restaurar o CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" -msgstr "Ajuste as curvas gama com a extensão X RANDR.\n" +msgstr "Ajuste as escalas gamma com a extensão X RANDR.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "Requisição X falhou: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" -msgstr "Ajuste as curvas gama com a extensão X VidMode.\n" +msgstr "Ajuste as escalas gamma com a extensão X VidMode.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" -msgstr "Não foi possível salvar a curva gama atual.\n" +msgstr "Não foi possível salvar a escala gamma atual.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Não é possível abrir contexto de dispositivo.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" -msgstr "O dispositivo de exibição não oferece suporte a curvas gama.\n" +msgstr "O dispositivo de exibição não oferece suporte a escalas gamma.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" -msgstr "Ajuste as curvas gama com o GDI do Windows.\n" +msgstr "Ajuste as escalas gamma com o GDI do Windows.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" -msgstr "Não foi possível restaurar as curvas gama.\n" +msgstr "Não foi possível restaurar as escalas gamma.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" -msgstr "Não foi possível configurar as curvas gama.\n" +msgstr "Não foi possível configurar as escalas gamma.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" -msgstr "" - -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" +msgstr "Temperatura: %i\n" -#: ../src/location-geoclue.c:111 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "" +msgstr "Não é possível obter sua localização: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" -msgstr "" +msgstr "Não é possível obter Gerenciador do GeoClue: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "" +msgstr "Não é possível obter o caminho do cliente GeoClue: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "" +msgstr "Não é possível obter Cliente GeoClue: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" -msgstr "" +msgstr "Não é possível definir limite de distância: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "" +msgstr "Não foi possível iniciar o cliente GeoClue: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Usar a localização descoberta pelo provedor GeoClue2.\n" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" -msgstr "" +msgstr "Não autorizado para obter localização de Corelocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" -msgstr "" +msgstr "Erro ao obter localização de Corelocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" -msgstr "" +msgstr "Aguardando autorização para obter localização...\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" +msgstr "Pedido de localização não foi autorizado!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" -msgstr "" +msgstr "Usar localização informada pelo provedor Corelocation.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" -msgstr "Latitude e longitude precisam ser configuradas.\n" +msgstr "Latitude e longitude precisam ser definidas.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Especificar localização manualmente.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -772,60 +781,66 @@ " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" +"Ambos os valores precisam ser de ponto flutuante,\n" +"valores negativos representam O / S, respectivamente.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Argumento mal-formatado.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "Suspender por" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 minutos" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "1 hora" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "2 horas" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Iniciar automaticamente" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "Estatísticas" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "Sair" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" -msgstr "" +msgstr "Fechar" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "Estado: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "Temperatura das Cores" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "Período" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" +msgstr "Localização" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._pt.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._pt.po differ diff -Nru redshift-1.11/po/pt.po redshift-1.12/po/pt.po --- redshift-1.11/po/pt.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/pt.po 2018-05-21 01:13:26.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-02-23 06:54+0000\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2016-05-21 16:23+0000\n" "Last-Translator: Pedro Beja \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: pt\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,209 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "" +msgstr "Nenhum" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" -msgstr "" +msgstr "Diurno" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" -msgstr "" +msgstr "Noite" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" -msgstr "" +msgstr "Transição" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "Período: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "" +msgstr "Período: %s(%.2f%% dia)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "" +msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" -msgstr "" +msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" -msgstr "" +msgstr "E" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" -msgstr "" +msgstr "O" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "" - -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Uso: %s -l LAT:LON -t DIA:NOITE [OPÇÕES...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Definir temperatura da cor do ecrã de acordo com a hora do dia.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tMostrar esta mensagem de ajuda\n" -" -v\t\tVista detalhada\n" -" -V\t\tMostrar versão do programa\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" -" -b DIA:NOITE\tBrilho do ecrã a aplicar (entre 0.1 e 1.0)\n" -" -c Ficheiro\tCarregar as configurações do ficheiro de configuração " -"especificado\n" -" -g R:G:B\tCorreção da gama adicional a aplicar\n" -" -l LAT:LON\tSua localização atual\n" -" -l FORNECEDOR\tSelecionar o fornecedor para atualizar automaticamente a " -"localização\n" -" \t\t(Escrever 'list' para ver os fornecedores disponíveis)\n" -" -m MÉTODO\tMétodo a usar para definir a temperatura da cor\n" -" \t\t(Escrever 'list' para ver os métodos disponíveis)\n" -" -o\t\tModo one shot (não ajusta continuamente a temperatura da cor)\n" -" -O TEMP\tModo one shot manual (define a temperatura da cor)\n" -" -p\t\tModo print (mostra apenas os parâmetros e sai)\n" -" -x[tab\tModo reset (remove o ajustamento do ecrã)\n" -" -r\t\tDesabilitar as transições da temperatura\n" -" -t DIA:NOITE\tA temperatura da cor a definir o dia/noite\n" +msgstr "Localização: %.2fº%s,%.2fº%s\n" -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"A temperatura neutra é %uK. Usando este valor não vai\n" -"alterar a temperatura da cor do ecrã. Definindo a\n" -"temperatura da cor para um valor superior resulta em\n" -"mais luz azul, e definindo um valor inferior resultará em\n" -"mais luz vermelha.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Valores por omissão:\n" -"\n" -" Temperatura diurna: %uK\n" -" Temperatura noturna: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Por favor relate os erros para <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Métodos de ajuste disponíveis:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" -"Especifique as opções separadas por dois-pontos com `-m MÉTODO:OPÇÕES'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Tente `-m MÉTODO:help' para ajuda.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Fornecedores de localização disponíveis:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" -"Especifique opções separadas por dois-pontos com`-l FORNECEDOR:OPÇÕES'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Tente `-l FORNECEDOR:help' para ajuda.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "O arranque de %s falhou.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Falhou a definir %s opção.\n" @@ -254,207 +128,356 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Tente `-l %s:help' para mais informação.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "Falhou a analisar a opção '%s'.\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Falhou a iniciar o fornecedor %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Tente `-m %s:help' para mais informação.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Tente -m %s:help' para mais informação.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Falhou ao iniciar o método de ajuste %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Ativado" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "A latitude deve estar entre %.1f e %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Desativado" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "A longitude deve estar entre %.1f e %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Incapaz de ler as horas do sistema.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Incapaz de adquirir a localização do fornecedor.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Temperatura da cor: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Brilho: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "O ajustamento da temperatura falhou.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Argumento gama malformado.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Tente `-h' para mais informação.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Desativado" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Fornecedor de localização desconhecido `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Ativado" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Método de ajuste desconhecido `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "O ajustamento da temperatura falhou.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Argumento da temperatura malformado.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Configuração gama malformada.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Definições de configuração desconhecidas `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "A tentar a localização do fornecedor '%s'...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "A tentar o fornecedor seguinte...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "A utilizar o fornecedor `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Não existem mais fornecedores de localização para tentar.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Incapaz de adquirir a localização do fornecedor.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Temperaturas: %dK de dia, %dK à noite\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"A elevação de alta transição não pode ser menor que a elevação de baixa " +"transição.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "Elevações solares: dia acima %.1f, noite abaixo %.1f\n" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "A latitude deve estar entre %.1f e %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "A longitude deve estar entre %.1f e %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperaturas: %dK de dia, %dK à noite\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "A temperatura deve estar entre %uK e %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" -"A elevação de alta transição não pode ser menor que a elevação de baixa " -"transição.\n" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "Valores de brilho devem estar entre %.1f e %.1f.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Brilho: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "O valor gama deve estar entre %.1f e %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "A tentar o próximo método...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "A usar o método '%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Não há mais métodos para tentar.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Elevação solar: %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Uso: %s -l LAT:LON -t DIA:NOITE [OPÇÕES...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Definir temperatura da cor do ecrã de acordo com a hora do dia.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tMostrar esta mensagem de ajuda\n" +" -v\t\tVista detalhada\n" +" -V\t\tMostrar versão do programa\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Valores por omissão:\n" +"\n" +" Temperatura diurna: %uK\n" +" Temperatura noturna: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Por favor relate os erros para <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Métodos de ajuste disponíveis:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" +"Especifique as opções separadas por dois-pontos com `-m MÉTODO:OPÇÕES'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Tente `-m MÉTODO:help' para ajuda.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Fornecedores de localização disponíveis:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Especifique opções separadas por dois-pontos com`-l FORNECEDOR:OPÇÕES'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Tente `-l FORNECEDOR:help' para ajuda.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Argumento gama malformado.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Tente `-h' para mais informação.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Fornecedor de localização desconhecido `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Método de ajuste desconhecido `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Argumento da temperatura malformado.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Configuração gama malformada.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Definições de configuração desconhecidas `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Cabeçalho da secção malformado no ficheiro de configuração.\n" @@ -467,32 +490,37 @@ msgid "Assignment outside section in config file.\n" msgstr "Atribuição fora da secção no ficheiro de configuração.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "Falhou a obter recursos do modo DRM\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d não existe. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "CRTCs válidos são [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Apenas existe CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "CRTC %i perdido, saltando\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" @@ -501,7 +529,7 @@ "Não consegue obter o tamanho do declive gama para CRTC %i\n" "na placa gráfica %i, ignorando o dispositivo.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" @@ -510,13 +538,13 @@ "DRM não consegue ler o declive gama no CRTC %i da\n" "placa gráfica %i, ignorando o dispositivo.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "Ajusta o declive gama com o Gestor de Rendering Direto.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" @@ -524,272 +552,216 @@ " card=N\tPlaca gráfica a aplicar os ajuste a\n" " crtc=N\tCRTC a aplicar os ajustes a\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "CRTC deve ser um inteiro não negativo\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Parâmetro do método desconhecido: '%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "'%s' devolveu o erro %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Versão RANDR (%u.%u) não suportada.\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Ecrã %i não consegue ser encontrado.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Tamanho do declive gama demasiado pequeno: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Incapaz de restaurar CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Ajustar o declive gama com a extensão X RANDR.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "Pedido do X falhou: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Ajustar o declive gama com a extensão X VidMode.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Incapaz de guardar o declive gama atual.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Incapaz de abrir o contexto do dispositivo.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "O dispositivo de visualização não suporta os declives gama.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Ajustar os declives gama com o Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Incapaz de restaurar os declives gama.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Incapaz de definir os declives gama.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "Incapaz de obter o cliente mestre: %s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "Incapaz de obter o cliente mestre\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "Não pode definir os requisitos para o mestre: %s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "Não pode definir os requisitos para o mestre\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "Iniciou o fornecedor Geoclue '%s'.\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "Não consegue encontrar um fornecedor Geoclue utilizável.\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "Tentar definir o nome e o caminho para especificar qual utilizar.\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "Usar a localização descoberta pelo fornecedor Geoclue.\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" -" name=N\tNome do fornecedor Geoclue (ou 'default')\n" -" path=N\tCaminho do fornecedor Geoclue (ou 'default')\n" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Não consegue obter a localização: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "De acordo com o fornecedor geoclue estamos em: %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "Fornecedor não tem uma localização válida disponível." - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Latitude e longitude devem ser definidas.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Especifique a localização manualmente.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -797,7 +769,7 @@ " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" @@ -805,54 +777,58 @@ "Ambos os valores são esperados serem números de vírgula flutuante,\n" "valores negativos representam Oeste / Sul, respetivamente.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Argumento malformado.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Suspender por" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 minutos" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 hora" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 horas" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Iniciar automaticamente" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "Informação" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Sair" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Fechar" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Temperatura da cor" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Período" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Localização" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._ro.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._ro.po differ diff -Nru redshift-1.11/po/ro.po redshift-1.12/po/ro.po --- redshift-1.11/po/ro.po 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/po/ro.po 2018-05-21 01:13:26.000000000 +0000 @@ -0,0 +1,812 @@ +# Romanian translation for redshift +# Copyright (c) 2018 Rosetta Contributors and Canonical Ltd 2018 +# This file is distributed under the same license as the redshift package. +# FIRST AUTHOR , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: redshift\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-04-03 17:16+0000\n" +"Last-Translator: Ciprian \n" +"Language-Team: Romanian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 +msgid "" +"Redshift adjusts the color temperature of your screen according to your " +"surroundings. This may help your eyes hurt less if you are working in front " +"of the screen at night." +msgstr "" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 +msgid "" +"The color temperature is set according to the position of the sun. A " +"different color temperature is set during night and daytime. During twilight " +"and early morning, the color temperature transitions smoothly from night to " +"daytime temperature to allow your eyes to slowly adapt." +msgstr "" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 +msgid "" +"This program provides a status icon that allows the user to control Redshift." +msgstr "" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 +msgid "" +"The Redshift information window overlaid with an example of the redness " +"effect" +msgstr "" + +#: ../data/applications/redshift.desktop.in.h:1 +#: ../data/applications/redshift-gtk.desktop.in.h:1 +msgid "Redshift" +msgstr "Redshift" + +#: ../data/applications/redshift.desktop.in.h:2 +#: ../data/applications/redshift-gtk.desktop.in.h:2 +msgid "Color temperature adjustment" +msgstr "" + +#: ../data/applications/redshift.desktop.in.h:3 +#: ../data/applications/redshift-gtk.desktop.in.h:3 +msgid "Color temperature adjustment tool" +msgstr "" + +#. TRANSLATORS: Name printed when period of day is unknown +#: ../src/redshift.c:135 +msgid "None" +msgstr "" + +#: ../src/redshift.c:136 ../src/redshift.c:1107 +msgid "Daytime" +msgstr "" + +#: ../src/redshift.c:137 ../src/redshift.c:1111 +msgid "Night" +msgstr "" + +#: ../src/redshift.c:138 +msgid "Transition" +msgstr "" + +#: ../src/redshift.c:225 +#, c-format +msgid "Period: %s\n" +msgstr "" + +#: ../src/redshift.c:228 +#, c-format +msgid "Period: %s (%.2f%% day)\n" +msgstr "" + +#. TRANSLATORS: Abbreviation for `north' +#: ../src/redshift.c:240 +msgid "N" +msgstr "" + +#. TRANSLATORS: Abbreviation for `south' +#: ../src/redshift.c:242 +msgid "S" +msgstr "" + +#. TRANSLATORS: Abbreviation for `east' +#: ../src/redshift.c:244 +msgid "E" +msgstr "" + +#. TRANSLATORS: Abbreviation for `west' +#: ../src/redshift.c:246 +msgid "W" +msgstr "" + +#. TRANSLATORS: Append degree symbols after %f if possible. +#. The string following each number is an abreviation for +#. north, source, east or west (N, S, E, W). +#: ../src/redshift.c:251 +#, c-format +msgid "Location: %.2f %s, %.2f %s\n" +msgstr "" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Strălucire: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Dezactivat" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Activat" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + +#: ../src/config-ini.c:167 +msgid "Malformed section header in config file.\n" +msgstr "" + +#: ../src/config-ini.c:203 +msgid "Malformed assignment in config file.\n" +msgstr "" + +#: ../src/config-ini.c:214 +msgid "Assignment outside section in config file.\n" +msgstr "" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 +#, c-format +msgid "CRTC %d does not exist. " +msgstr "" + +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 +#, c-format +msgid "Valid CRTCs are [0-%d].\n" +msgstr "" + +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 +#, c-format +msgid "Only CRTC 0 exists.\n" +msgstr "" + +#: ../src/gamma-drm.c:159 +#, c-format +msgid "CRTC %i lost, skipping\n" +msgstr "" + +#: ../src/gamma-drm.c:165 +#, c-format +msgid "" +"Could not get gamma ramp size for CRTC %i\n" +"on graphics card %i, ignoring device.\n" +msgstr "" + +#: ../src/gamma-drm.c:178 +#, c-format +msgid "" +"DRM could not read gamma ramps on CRTC %i on\n" +"graphics card %i, ignoring device.\n" +msgstr "" + +#: ../src/gamma-drm.c:242 +msgid "Adjust gamma ramps with Direct Rendering Manager.\n" +msgstr "" + +#. TRANSLATORS: DRM help output +#. left column must not be translated +#: ../src/gamma-drm.c:247 +msgid "" +" card=N\tGraphics card to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-drm.c:260 +#, c-format +msgid "CRTC must be a non-negative integer\n" +msgstr "" + +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 +#, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 +#, c-format +msgid "`%s' returned error %d\n" +msgstr "" + +#: ../src/gamma-randr.c:103 +#, c-format +msgid "Unsupported RANDR version (%u.%u)\n" +msgstr "" + +#: ../src/gamma-randr.c:138 +#, c-format +msgid "Screen %i could not be found.\n" +msgstr "" + +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 +#, c-format +msgid "Gamma ramp size too small: %i\n" +msgstr "" + +#: ../src/gamma-randr.c:277 +#, c-format +msgid "Unable to restore CRTC %i\n" +msgstr "" + +#: ../src/gamma-randr.c:301 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "" + +#. TRANSLATORS: RANDR help output +#. left column must not be translated +#: ../src/gamma-randr.c:306 +msgid "" +" screen=N\t\tX screen to apply adjustments to\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 +#, c-format +msgid "X request failed: %s\n" +msgstr "" + +#: ../src/gamma-vidmode.c:140 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "" + +#. TRANSLATORS: VidMode help output +#. left column must not be translated +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 +msgid "Unable to save current gamma ramp.\n" +msgstr "" + +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 +msgid "Unable to open device context.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:75 +msgid "Display device does not support gamma ramps.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:115 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:153 +msgid "Unable to restore gamma ramps.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:211 +msgid "Unable to set gamma ramps.\n" +msgstr "" + +#: ../src/gamma-dummy.c:43 +msgid "" +"WARNING: Using dummy gamma method! Display will not be affected by this " +"gamma method.\n" +msgstr "" + +#: ../src/gamma-dummy.c:60 +msgid "" +"Does not affect the display but prints the color temperature to the " +"terminal.\n" +msgstr "" + +#: ../src/gamma-dummy.c:75 +#, c-format +msgid "Temperature: %i\n" +msgstr "" + +#: ../src/location-geoclue2.c:59 +#, c-format +msgid "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" + +#: ../src/location-geoclue2.c:107 +#, c-format +msgid "Unable to obtain location: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:150 +#, c-format +msgid "Unable to obtain GeoClue Manager: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:166 +#, c-format +msgid "Unable to obtain GeoClue client path: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:188 +#, c-format +msgid "Unable to obtain GeoClue Client: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:229 +#, c-format +msgid "Unable to set distance threshold: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:253 +#, c-format +msgid "Unable to start GeoClue client: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 +msgid "Not authorized to obtain location from CoreLocation.\n" +msgstr "" + +#: ../src/location-corelocation.m:111 +#, c-format +msgid "Error obtaining location from CoreLocation: %s\n" +msgstr "" + +#: ../src/location-corelocation.m:120 +msgid "Waiting for authorization to obtain location...\n" +msgstr "" + +#: ../src/location-corelocation.m:122 +msgid "Request for location was not authorized!\n" +msgstr "" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 +msgid "Use the location as discovered by the Corelocation provider.\n" +msgstr "" + +#: ../src/location-manual.c:59 +msgid "Latitude and longitude must be set.\n" +msgstr "Latitudinea și longitudinea trebuiesc setate.\n" + +#: ../src/location-manual.c:75 +msgid "Specify location manually.\n" +msgstr "Specificați locația manual.\n" + +#. TRANSLATORS: Manual location help output +#. left column must not be translated +#: ../src/location-manual.c:80 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" + +#: ../src/location-manual.c:83 +msgid "" +"Both values are expected to be floating point numbers,\n" +"negative values representing west / south, respectively.\n" +msgstr "" + +#: ../src/location-manual.c:97 +msgid "Malformed argument.\n" +msgstr "" + +#: ../src/redshift-gtk/statusicon.py:78 +msgid "Suspend for" +msgstr "" + +#: ../src/redshift-gtk/statusicon.py:80 +msgid "30 minutes" +msgstr "30 de minute" + +#: ../src/redshift-gtk/statusicon.py:81 +msgid "1 hour" +msgstr "1 oră" + +#: ../src/redshift-gtk/statusicon.py:82 +msgid "2 hours" +msgstr "2 ore" + +#: ../src/redshift-gtk/statusicon.py:91 +msgid "Autostart" +msgstr "Pornire automată" + +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 +msgid "Info" +msgstr "Informații" + +#: ../src/redshift-gtk/statusicon.py:108 +msgid "Quit" +msgstr "Ieșire" + +#: ../src/redshift-gtk/statusicon.py:146 +msgid "Close" +msgstr "Închideți" + +#: ../src/redshift-gtk/statusicon.py:300 +msgid "Status: {}" +msgstr "" + +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 +msgid "Color temperature" +msgstr "" + +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 +msgid "Period" +msgstr "Perioadă" + +#: ../src/redshift-gtk/statusicon.py:318 +msgid "Location" +msgstr "Locație" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._ru.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._ru.po differ diff -Nru redshift-1.11/po/ru.po redshift-1.12/po/ru.po --- redshift-1.11/po/ru.po 2016-01-02 22:24:24.000000000 +0000 +++ redshift-1.12/po/ru.po 2018-05-21 01:13:27.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-06-25 00:03+0000\n" -"Last-Translator: Yanpas \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-12-10 19:55+0000\n" +"Last-Translator: Andrey S. Kunitsyn \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: ru\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -51,190 +51,85 @@ "The Redshift information window overlaid with an example of the redness " "effect" msgstr "" +"Информационное окно Redshift перекрыто примером эффекта тёплого света" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Настройка цветовой температуры" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Инструмент регулирования цветовой температуры" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Неизвестно" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "День" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Ночь" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Переход" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Время: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Период: %s (%.2f%% день)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "С" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "Ю" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "В" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "З" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "Местоположение: %.2f %s, %.2f %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Использование: %s -l ШИР:ДОЛ -t ДЕНЬ:НОЧЬ [ОПЦИИ...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Установка температуры цвета дисплея согласно времени суток.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\tПоказать это сообщение\n" -" -v\t\tВывод на экран информации о работе приложения\n" -" -V\t\tПоказать версию приложения\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"Нейтральная температура цвета - %uK. Использование этой величины\n" -"не изменит температуру цвета дисплея. Установка температуры цвета\n" -"больше этого значения приведет к более синему цвету экрана,\n" -"установка меньшего значения - к более красному оттенку.\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"Значения по умолчанию:\n" -" Температура цвета днем: %uK\n" -" Температура цвета ночью: %uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "Пожалуйста, об ошибках сообщайте на <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "Доступные методы корректировки:\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "Укажите опции, разделенные двоеточием: `-m METHOD:OPTIONS'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "Используйте `-m МЕТОД:help' для справки.\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "Доступные источники информации о местоположении:\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "Укажите опции, разделенные двоеточием: `-l PROVIDER:OPTIONS'.\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "Попробуйте `-l ИСТОЧНИК:help' для справки.\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "Ошибка инициализации %s\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "Не удалось установить опцию %s\n" @@ -242,205 +137,351 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "Попробуйте `-l %s:help' для получения дополнительной информации.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "Не удалось разобрать опцию `%s'.\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "Ошибка обращения к источнику местоположения%s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "Попробуйте `-m %s:help' для дополнительной информации.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "Используйте -m %s:help' для получения дополнительной информации.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "Не удалось использовать метод корректировки %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "Статус: %s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "Включено" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Возможные значения широты: %.1f - %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "Выключено" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Долгота должна быть между %.1f и %.1f.\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "Невозможно прочесть системное время.\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Не удается получить координаты от указанного источника.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "Температура цвета: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "Яркость: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "Корректировка цветовой температуры не удалась.\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "Некорректная величина гаммы.\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Статус: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "Используйте «-h» для получения дополнительной информации.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Выключено" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "Неизвестный источник информации `%s'.\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Включено" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "Неизвестный метод настройки `%s'.\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Корректировка цветовой температуры не удалась.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "Некорректное значение температуры цвета.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "Неправильные настройки гаммы.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "Неизвестный параметр конфигурации `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "Попытка использования провайдера местоположений `%s'...\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "Использование следующего источника местоположения...\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "Использование источника `%s'.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "Нет больше доступных источников местоположения.\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "Не удается получить координаты от указанного источника.\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "Температуры: %dK днём, %dK ночью\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "Возможные значения широты: %.1f - %.1f.\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "Долгота должна быть между %.1f и %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Температуры: %dK днём, %dK ночью\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "Температура должна быть между %uK и %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "Яркость должна быть между %.1f и %.1f.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "Яркость: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "Возможные значения гаммы: %.1f - %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "Гамма (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "Попытка использования следующего метода...\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "Использование метода `%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "Больше нет доступных для использования методов.\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "Высота Солнца над горизонтом: %f°\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "Нажмите ctrl-c чтобы остановить...\n" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Использование: %s -l ШИР:ДОЛ -t ДЕНЬ:НОЧЬ [ОПЦИИ...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Установка температуры цвета дисплея согласно времени суток.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tПоказать это сообщение\n" +" -v\t\tВывод на экран информации о работе приложения\n" +" -V\t\tПоказать версию приложения\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Значения по умолчанию:\n" +" Температура цвета днем: %uK\n" +" Температура цвета ночью: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Пожалуйста, об ошибках сообщайте на <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Доступные методы корректировки:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Укажите опции, разделенные двоеточием: `-m METHOD:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Используйте `-m МЕТОД:help' для справки.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Доступные источники информации о местоположении:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Укажите опции, разделенные двоеточием: `-l PROVIDER:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Попробуйте `-l ИСТОЧНИК:help' для справки.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Некорректная величина гаммы.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Используйте «-h» для получения дополнительной информации.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Неизвестный источник информации `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Неизвестный метод настройки `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Некорректное значение температуры цвета.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Неправильные настройки гаммы.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Неизвестный параметр конфигурации `%s'.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "Неправильный заголовок секции в файле конфигурации.\n" @@ -454,321 +495,272 @@ msgstr "" "Некорректное значение за пределами секции в конфигурационном файле.\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "Не удалось получить ресурсы DRM режима\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d не найден. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "Правильный CRTCs [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "Существует только CRTC 0.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "Неизвестный параметр метода: `%s'.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "«%s» завершилось с ошибкой %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "Неподдерживаемая версия RANDR (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "Экран %i не может быть найден.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "Размер таблицы корректировки цвета мал: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "Не удается восстановить параметры CRT контроллера %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "Корректирование цвета с помощью расширения X RANDR.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "Ошибка X запроса: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "Корректирование цвета с помощью расширения X VidMode.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "Не удается сохранить текущие значения корректировки цвета.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "Не удается открыть контекст устройства.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "Дисплей не поддерживает коррекцию цвета.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "Коррекция цвета с помощью Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "Невозможно восстановить исходные значения корректировки цвета.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "Невозможно установить параметры корректировки цвета.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "Температура: %i\n" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "Не удалось определить местоположение: %s.\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "Согласно провайдеру geoclue вы в точке: %.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "Не удалось определить местоположение: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "Не удалось запустить клиент GeoClue: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "Не удалось соединиться с GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "Широта и долгота должны быть указаны.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "Укажите свое местоположение вручную:\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -776,60 +768,64 @@ " lat=N\t\tШирота\n" " lon=N\t\tДолгота\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "Неправильный аргумент.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "Приостановить на" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 минут" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 час" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 часа" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "Автозапуск" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "Информация" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "Выйти" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "Закрыть" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "Статус: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "Цветовая температура" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "Период" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "Местоположение" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._sr.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._sr.po differ diff -Nru redshift-1.11/po/sr.po redshift-1.12/po/sr.po --- redshift-1.11/po/sr.po 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/po/sr.po 2018-05-21 01:13:28.000000000 +0000 @@ -0,0 +1,829 @@ +# Serbian translation for redshift. +# Copyright (C) 2016 redshift's COPYRIGHT HOLDER +# This file is distributed under the same license as the redshift package. +# Марко М. Костић (Marko M. Kostić), 2016. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2016-09-20 09:54+0000\n" +"Last-Translator: Марко М. Костић \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" +"Language: sr\n" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 +msgid "" +"Redshift adjusts the color temperature of your screen according to your " +"surroundings. This may help your eyes hurt less if you are working in front " +"of the screen at night." +msgstr "" +"Редшифт мења температуру боје вашег екрана у складу са вашим окружењем. Ово " +"вам може помоћи уколико осећате бол у очима када радите за рачунаром ноћу." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 +msgid "" +"The color temperature is set according to the position of the sun. A " +"different color temperature is set during night and daytime. During twilight " +"and early morning, the color temperature transitions smoothly from night to " +"daytime temperature to allow your eyes to slowly adapt." +msgstr "" +"Температура боје се се подешава у складу са положајем сунца. Другачија " +"температура боје се поставља ноћу а другачија дању. У сумрак и рано јутро " +"температура боје лагано прелази из ноћне у дневну температуру да би се вашим " +"очима омогућило лакше привикавање." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 +msgid "" +"This program provides a status icon that allows the user to control Redshift." +msgstr "" +"Овај програм пружа иконицу стања која омогућава кориснику да управља " +"Редшифтом." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 +msgid "" +"The Redshift information window overlaid with an example of the redness " +"effect" +msgstr "" +"Прозор са подацима Редшифта који је прекриван примером ефекта црвенила." + +#: ../data/applications/redshift.desktop.in.h:1 +#: ../data/applications/redshift-gtk.desktop.in.h:1 +msgid "Redshift" +msgstr "Редшифт" + +#: ../data/applications/redshift.desktop.in.h:2 +#: ../data/applications/redshift-gtk.desktop.in.h:2 +msgid "Color temperature adjustment" +msgstr "Прилагођавање температуре боје" + +#: ../data/applications/redshift.desktop.in.h:3 +#: ../data/applications/redshift-gtk.desktop.in.h:3 +msgid "Color temperature adjustment tool" +msgstr "Алатка за прилагођавање температуре боје" + +#. TRANSLATORS: Name printed when period of day is unknown +#: ../src/redshift.c:135 +msgid "None" +msgstr "Непознато" + +#: ../src/redshift.c:136 ../src/redshift.c:1107 +msgid "Daytime" +msgstr "Дан" + +#: ../src/redshift.c:137 ../src/redshift.c:1111 +msgid "Night" +msgstr "Ноћ" + +#: ../src/redshift.c:138 +msgid "Transition" +msgstr "Прелаз" + +#: ../src/redshift.c:225 +#, c-format +msgid "Period: %s\n" +msgstr "Период: %s\n" + +#: ../src/redshift.c:228 +#, c-format +msgid "Period: %s (%.2f%% day)\n" +msgstr "Период: %s (%.2f%% дан)\n" + +#. TRANSLATORS: Abbreviation for `north' +#: ../src/redshift.c:240 +msgid "N" +msgstr "С" + +#. TRANSLATORS: Abbreviation for `south' +#: ../src/redshift.c:242 +msgid "S" +msgstr "Ј" + +#. TRANSLATORS: Abbreviation for `east' +#: ../src/redshift.c:244 +msgid "E" +msgstr "И" + +#. TRANSLATORS: Abbreviation for `west' +#: ../src/redshift.c:246 +msgid "W" +msgstr "З" + +#. TRANSLATORS: Append degree symbols after %f if possible. +#. The string following each number is an abreviation for +#. north, source, east or west (N, S, E, W). +#: ../src/redshift.c:251 +#, c-format +msgid "Location: %.2f %s, %.2f %s\n" +msgstr "Место: %.2f %s, %.2f %s\n" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Покретање ставке „%s“ није успело.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Нисам успео да подесим опцију %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Нисам успео да обрадим опцију „%s“.\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Нисам успео да покренем достављача %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Не могу да прочитам системско време.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Температура боје: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Осветљење: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Стање: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Онемогућено" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Омогућено" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Прилагођавање температуре није успело.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Покушавам са достављачем локације „%s“...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Покушавам са следећим достављачем...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Користим достављача „%s“.\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "Испробао сам све достављаче локација.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Температуре: %dK дању, %dK ноћу\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Осветљење: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Притисните ctrl-c за престанак рада...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Коришћење: %s -l ГЕО.ШИРИНА:ДУЖИНА -t ДАН:НОЋ [ОПЦИЈЕ...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Подеси температуру боје екрана у складу са тренутним временом.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tПриказује ову помоћну поруку\n" +" -v\t\tПричљив излаз\n" +" -V\t\tПриказује издање програма\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Подразумеване вредности:\n" +"\n" +" Дневна температура: %uK\n" +" Ноћна температура: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Пријављујте грешке у програму на <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Доступни начини прилагођавања:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Наведите опције раздвојене цртицом са „-m НАЧИН:ОПЦИЈЕ“.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Укуцајте `-m НАЧИН:help' за више података.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Доступни достављачи локација:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Наведите опције раздвојене цртицом са „-l ДОСТАВЉАЧ:ОПЦИЈЕ“.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Укуцајте `-l ДОСТАВЉАЧ:help' за више података.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Деформисана вредност гама аргумента.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + +#: ../src/config-ini.c:167 +msgid "Malformed section header in config file.\n" +msgstr "" + +#: ../src/config-ini.c:203 +msgid "Malformed assignment in config file.\n" +msgstr "" + +#: ../src/config-ini.c:214 +msgid "Assignment outside section in config file.\n" +msgstr "" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 +#, c-format +msgid "CRTC %d does not exist. " +msgstr "" + +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 +#, c-format +msgid "Valid CRTCs are [0-%d].\n" +msgstr "" + +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 +#, c-format +msgid "Only CRTC 0 exists.\n" +msgstr "" + +#: ../src/gamma-drm.c:159 +#, c-format +msgid "CRTC %i lost, skipping\n" +msgstr "" + +#: ../src/gamma-drm.c:165 +#, c-format +msgid "" +"Could not get gamma ramp size for CRTC %i\n" +"on graphics card %i, ignoring device.\n" +msgstr "" + +#: ../src/gamma-drm.c:178 +#, c-format +msgid "" +"DRM could not read gamma ramps on CRTC %i on\n" +"graphics card %i, ignoring device.\n" +msgstr "" + +#: ../src/gamma-drm.c:242 +msgid "Adjust gamma ramps with Direct Rendering Manager.\n" +msgstr "" + +#. TRANSLATORS: DRM help output +#. left column must not be translated +#: ../src/gamma-drm.c:247 +msgid "" +" card=N\tGraphics card to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-drm.c:260 +#, c-format +msgid "CRTC must be a non-negative integer\n" +msgstr "" + +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 +#, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 +#, c-format +msgid "`%s' returned error %d\n" +msgstr "" + +#: ../src/gamma-randr.c:103 +#, c-format +msgid "Unsupported RANDR version (%u.%u)\n" +msgstr "" + +#: ../src/gamma-randr.c:138 +#, c-format +msgid "Screen %i could not be found.\n" +msgstr "" + +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 +#, c-format +msgid "Gamma ramp size too small: %i\n" +msgstr "" + +#: ../src/gamma-randr.c:277 +#, c-format +msgid "Unable to restore CRTC %i\n" +msgstr "" + +#: ../src/gamma-randr.c:301 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "" + +#. TRANSLATORS: RANDR help output +#. left column must not be translated +#: ../src/gamma-randr.c:306 +msgid "" +" screen=N\t\tX screen to apply adjustments to\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 +#, c-format +msgid "X request failed: %s\n" +msgstr "" + +#: ../src/gamma-vidmode.c:140 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "" + +#. TRANSLATORS: VidMode help output +#. left column must not be translated +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 +msgid "Unable to save current gamma ramp.\n" +msgstr "" + +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 +msgid "Unable to open device context.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:75 +msgid "Display device does not support gamma ramps.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:115 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:153 +msgid "Unable to restore gamma ramps.\n" +msgstr "" + +#: ../src/gamma-w32gdi.c:211 +msgid "Unable to set gamma ramps.\n" +msgstr "" + +#: ../src/gamma-dummy.c:43 +msgid "" +"WARNING: Using dummy gamma method! Display will not be affected by this " +"gamma method.\n" +msgstr "" + +#: ../src/gamma-dummy.c:60 +msgid "" +"Does not affect the display but prints the color temperature to the " +"terminal.\n" +msgstr "" + +#: ../src/gamma-dummy.c:75 +#, c-format +msgid "Temperature: %i\n" +msgstr "Температура: %i\n" + +#: ../src/location-geoclue2.c:59 +#, c-format +msgid "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" + +#: ../src/location-geoclue2.c:107 +#, c-format +msgid "Unable to obtain location: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:150 +#, c-format +msgid "Unable to obtain GeoClue Manager: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:166 +#, c-format +msgid "Unable to obtain GeoClue client path: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:188 +#, c-format +msgid "Unable to obtain GeoClue Client: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:229 +#, c-format +msgid "Unable to set distance threshold: %s.\n" +msgstr "" + +#: ../src/location-geoclue2.c:253 +#, c-format +msgid "Unable to start GeoClue client: %s.\n" +msgstr "Не могу да покренем GeoClue клијента: %s.\n" + +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "" + +#: ../src/location-corelocation.m:73 +msgid "Not authorized to obtain location from CoreLocation.\n" +msgstr "" + +#: ../src/location-corelocation.m:111 +#, c-format +msgid "Error obtaining location from CoreLocation: %s\n" +msgstr "" + +#: ../src/location-corelocation.m:120 +msgid "Waiting for authorization to obtain location...\n" +msgstr "" + +#: ../src/location-corelocation.m:122 +msgid "Request for location was not authorized!\n" +msgstr "" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 +msgid "Use the location as discovered by the Corelocation provider.\n" +msgstr "" + +#: ../src/location-manual.c:59 +msgid "Latitude and longitude must be set.\n" +msgstr "" + +#: ../src/location-manual.c:75 +msgid "Specify location manually.\n" +msgstr "" + +#. TRANSLATORS: Manual location help output +#. left column must not be translated +#: ../src/location-manual.c:80 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" + +#: ../src/location-manual.c:83 +msgid "" +"Both values are expected to be floating point numbers,\n" +"negative values representing west / south, respectively.\n" +msgstr "" + +#: ../src/location-manual.c:97 +msgid "Malformed argument.\n" +msgstr "Деформисан аргумент.\n" + +#: ../src/redshift-gtk/statusicon.py:78 +msgid "Suspend for" +msgstr "Обустави на" + +#: ../src/redshift-gtk/statusicon.py:80 +msgid "30 minutes" +msgstr "30 минута" + +#: ../src/redshift-gtk/statusicon.py:81 +msgid "1 hour" +msgstr "1 сат" + +#: ../src/redshift-gtk/statusicon.py:82 +msgid "2 hours" +msgstr "2 сата" + +#: ../src/redshift-gtk/statusicon.py:91 +msgid "Autostart" +msgstr "Самопокретање" + +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 +msgid "Info" +msgstr "Подаци" + +#: ../src/redshift-gtk/statusicon.py:108 +msgid "Quit" +msgstr "Изађи" + +#: ../src/redshift-gtk/statusicon.py:146 +msgid "Close" +msgstr "Затвори" + +#: ../src/redshift-gtk/statusicon.py:300 +msgid "Status: {}" +msgstr "Стање: {}" + +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 +msgid "Color temperature" +msgstr "Температура боје" + +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 +msgid "Period" +msgstr "Период" + +#: ../src/redshift-gtk/statusicon.py:318 +msgid "Location" +msgstr "Место" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._sv.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._sv.po differ diff -Nru redshift-1.11/po/sv.po redshift-1.12/po/sv.po --- redshift-1.11/po/sv.po 2016-01-02 22:24:28.000000000 +0000 +++ redshift-1.12/po/sv.po 2018-05-21 01:13:28.000000000 +0000 @@ -1,21 +1,22 @@ # Swedish translation for redshift -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# Copyright (c) 2017 # This file is distributed under the same license as the redshift package. -# FIRST AUTHOR , 2012. +# Jonathan Nyberg , 2017. +# Josef Andersson josef.andersson@fripost.org, 2017. # msgid "" msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2014-12-31 23:53+0000\n" -"Last-Translator: Jon Lund Steffensen \n" -"Language-Team: Swedish \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-02-06 09:54+0000\n" +"Last-Translator: Josef Andersson \n" +"Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: sv\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -24,6 +25,8 @@ "surroundings. This may help your eyes hurt less if you are working in front " "of the screen at night." msgstr "" +"Redshift justerar färgtemperaturen på skärmen utefter din omgivning. Det kan " +"göra att dina ögon mindre irriterade om du arbetar framför skärmen på natten." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 msgid "" @@ -32,783 +35,812 @@ "and early morning, the color temperature transitions smoothly from night to " "daytime temperature to allow your eyes to slowly adapt." msgstr "" +"Färgtemperaturen ställs in beroende på positionen av solen. En annan " +"färgtemperatur sätts under natten och dagen. Under skymning och tidigt på " +"morgonen övergår färgtemperaturen smidigt från natt till dagtidstemperatur " +"för att ge dina ögon tid att långsamt anpassa sig." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 msgid "" "This program provides a status icon that allows the user to control Redshift." msgstr "" +"Detta program skapar en statusikon som gör det möjligt för användaren att " +"styra Redshift." #: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 msgid "" "The Redshift information window overlaid with an example of the redness " "effect" msgstr "" +"Informationsfönstret för Redshift övertäckt med ett exempel på " +"rödhetseffekten" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" -msgstr "" +msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" -msgstr "" +msgstr "Färgtemperaturjustering" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" -msgstr "" +msgstr "Justeringsverktyg för färgtemperaturer" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" -msgstr "" +msgstr "Ingen" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" -msgstr "" +msgstr "Dagtid" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" -msgstr "" +msgstr "Natt" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" -msgstr "" +msgstr "Övergång" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" -msgstr "" +msgstr "Period: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" -msgstr "" +msgstr "Period: %s (%.2f%% dag)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" -msgstr "" +msgstr "N" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" -msgstr "" +msgstr "S" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" -msgstr "" +msgstr "Ö" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" -msgstr "" +msgstr "V" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "" - -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" +msgstr "Plats: %.2f %s, %.2f %s\n" -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" -msgstr "Initialisering av %s misslyckades.\n" +msgstr "Initiering av %s misslyckades.\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" -msgstr "" +msgstr "Det gick inte att ställa in flaggan %s.\n" #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" -msgstr "" +msgstr "Försök med ”-l %s:help” för mera information.\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" -msgstr "" +msgstr "Det gick inte att tolka flaggan ”%s”.\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" -msgstr "" +msgstr "Det gick inte att starta leverantör %s.\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" -msgstr "" +msgstr "Försök med ”-m %s:help” för mer information.\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" -msgstr "" +msgstr "Försök med ”-m %s:help” för mer information.\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" -msgstr "" +msgstr "Det gick inte att starta justeringsmetod %s.\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Latitud måste vara mellan %.1f och %.1f.\n" -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Longitud måste vara mellan %.1f och %.1f.\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Det går inte att läsa systemets tid.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 -msgid "Unable to read system time.\n" +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Det går inte att få plats från leverantör.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" -msgstr "Färgtemperatur: %u K\n" +msgstr "Färgtemperatur: %uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" -msgstr "" +msgstr "Ljusstyrka: %.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Status: %s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Inaktiverad" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Aktiverad" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Temperaturjustering misslyckades.\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" -msgstr "" +msgstr "Provar platsleverantör ”%s”…\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" -msgstr "" +msgstr "Provar nästa leverantör…\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" -msgstr "" +msgstr "Använder leverantör ”%s”.\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" -msgstr "" - -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" +msgstr "Inga fler platsleverantörer att pröva.\n" -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" +"Hög övergångsförhöjning kan inte vara lägre än den låga " +"övergångsförhöjningen.\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" -msgstr "" - -#: ../src/redshift.c:1473 -#, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" +msgstr "Solhöjd: dag över %.1f, natt under %.1f\n" -#: ../src/redshift.c:1482 +#: ../src/redshift.c:1049 #, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Temperaturer: %dK vid dag, %dK vid natt\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" -msgstr "" +msgstr "Temperatur måste vara mellan %uK och %uK.\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" -msgstr "" +msgstr "Värden för ljusstyrka måste vara mellan %.1f och %.1f.\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" -msgstr "" +msgstr "Ljusstyrka: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" -msgstr "" +msgstr "Gammavärde måste vara mellan %.1f och %.1f.\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" -msgstr "" +msgstr "Gamma (%s): %.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" -msgstr "" +msgstr "Provar nästa metod…\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" -msgstr "Använder metod '%s'.\n" +msgstr "Använder metod ”%s”.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" +msgstr "Inga fler metoder att pröva.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" -msgstr "" +msgstr "Solförhöjning: %f\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" +msgstr "Tryck ctrl-c för att stoppa…\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Användning: %s -l LAT:LON -t DAG:NATT [FLAGGOR…]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Ställ in färgtemperatur på skärmen beroende av tid på dagen.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\tVisa detta hjälp meddelande\n" +" -v\t\tUtförligt utdata\n" +" -V\t\tVisa programversion\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Standardvärden:\n" +"\n" +" Dagtidstemperatur: %uK\n" +" Nattemperatur: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Vänligen rapportera fel till <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Tillgängliga justeringsmetoder:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Ange kolonseparerade flaggor med ”-m METOD:FLAGGOR”.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Försök med `-m METOD:help' för hjälp.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Tillgängliga platsleverantörer:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "Ange kolonseparerade flaggor med ”-l LEVERANTÖR:FLAGGOR”.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Försök med ”-l LEVERANTÖR:help” för hjälp.\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Felaktigt gamma-argument.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Försök med ”-h” för mer information.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Okänd leverantörsplats ”%s”.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Okänd justeringsmetod ”%s”.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Felaktigt temperaturargument.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Felaktigt gamma-inställning.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" msgstr "" +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Okänd konfigurationsinställning ”%s”.\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" -msgstr "" +msgstr "Felaktig avsnittsrubrik i konfigurationsfil.\n" #: ../src/config-ini.c:203 msgid "Malformed assignment in config file.\n" -msgstr "" +msgstr "Felaktigt tilldelning i konfigurationsfil.\n" #: ../src/config-ini.c:214 msgid "Assignment outside section in config file.\n" +msgstr "Tilldelning utanför avsnitt i konfigurationsfil.\n" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" -msgstr "" +msgstr "Det gick inte att få DRM-läges resurser\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d existerar inte. " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" -msgstr "" +msgstr "Giltiga CRTC är [0-%d].\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" -msgstr "" +msgstr "Bara CRTC 0 finns.\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" -msgstr "" +msgstr "CRTC %i förlorat, hoppar över\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" +"Det gick inte att hämta gammaförfiningars storlek för CRTC %i\n" +"på grafikkort %i, ignorerar enhet.\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" +"DRM kunde inte läsa gammaförfiningar på CRTC %i på\n" +"grafikkort %i, ignorerar enhet.\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" -msgstr "" +msgstr "Justera gammaförfiningar med Direct Rendering Manager.\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" +" card=N\tGrafikkort att tillämpa justeringar på\n" +" crtc=N\tCRTC att tillämpa justeringar på\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" -msgstr "" +msgstr "CRTC måste vara ett icke-negativt heltal\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" -msgstr "" +msgstr "Okänd metod-parameter: ”%s”.\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" -msgstr "" +msgstr "”%s” returnerade ett fel %d\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" -msgstr "" +msgstr "RANDR-version stöds ej (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" -msgstr "" +msgstr "Skärm %i kunde inte hittas.\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" -msgstr "" +msgstr "Gammaförfinings storlek för liten: %i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" -msgstr "" +msgstr "Det går inte att återställa CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" -msgstr "" +msgstr "Justera gammaförfiningar med X RANDR utökningen.\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" -msgstr "X anrop misslyckades: %s\n" +msgstr "X-anrop misslyckades: %s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" -msgstr "" +msgstr "Justera gammaförfiningar med X VidMode utökning.\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" -msgstr "" +msgstr "Det går inte att spara nuvarande gammaförfining.\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr "" - -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" -msgstr "" +msgstr "Det går inte att öppna enhetskontext.\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" -msgstr "" +msgstr "Visningsenhet stöder inte gammaförfiningar.\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" -msgstr "" +msgstr "Justera gammaförfiningar med Windows GDI.\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" -msgstr "" +msgstr "Det går inte att återställa gammaförfiningar.\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" -msgstr "" +msgstr "Det går inte att ställa in gammaförfiningar.\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" +"VARNING: Använder falsk gamma-metod! Visning kommer inte att påverkas av " +"denna gamma-metod.\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" +"Påverkar inte visningen men skriver färgtemperaturen till terminalen.\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" -msgstr "" - -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" +msgstr "Temperatur: %i\n" -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" -msgstr "" +msgstr "Det går inte att erhålla plats: %s.\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" -msgstr "" +msgstr "Det går inte att erhålla GeoClue-hanterare: %s.\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" -msgstr "" +msgstr "Det går inte att erhålla GeoClue-klients sökväg: %s.\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" -msgstr "" +msgstr "Det går inte att erhålla GeoClue-klient: %s.\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" -msgstr "" +msgstr "Det går inte att ställa in avståndsgränsvärdet: %s.\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" -msgstr "" +msgstr "Det går inte att starta GeoClue-klient: %s.\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Använd platsen som upptäcktes av en GeoClue2-leverantör.\n" + +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" -msgstr "" +msgstr "Inte behörighet att få plats från CoreLocation.\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" -msgstr "" +msgstr "Fel erhållande av plats från CoreLocation: %s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" -msgstr "" +msgstr "Väntar på tillstånd att erhålla plats…\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" +msgstr "Begäran om platsen var inte godkänt!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" -msgstr "" +msgstr "Använd platsen som upptäckts av Corelocation-leverantören.\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" -msgstr "" +msgstr "Latitud och longitud måste anges.\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" -msgstr "" +msgstr "Ange plats manuellt.\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" +" lat=N\t\tLatitud\n" +" lon=N\t\tLongitud\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" +"Båda värdena beräknas vara flyttal,\n" +"negativa värden representerar väst/söder.\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" -msgstr "" +msgstr "Felaktigt argument.\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "Uppskjuta för" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 minuter" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "1 timme" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "2 timmar" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" -msgstr "" +msgstr "Starta automatiskt" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "Info" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "Avsluta" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" -msgstr "" +msgstr "Stäng" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "Status: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "Färgtemperatur" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "Period" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" +msgstr "Plats" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._tr.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._tr.po differ diff -Nru redshift-1.11/po/tr.po redshift-1.12/po/tr.po --- redshift-1.11/po/tr.po 2016-01-02 22:24:29.000000000 +0000 +++ redshift-1.12/po/tr.po 2018-05-21 01:13:29.000000000 +0000 @@ -6,16 +6,17 @@ msgid "" msgstr "" "Project-Id-Version: redshift\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" -"PO-Revision-Date: 2015-06-21 22:51+0000\n" -"Last-Translator: Mehmet Atif Ergun \n" +"Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2016-09-13 22:18+0000\n" +"Last-Translator: Butterfly \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" +"Language: tr\n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 msgid "" @@ -43,179 +44,83 @@ "effect" msgstr "" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "Redshift" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "Renk sıcaklığı ayarı" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "Renk sıcaklığı ayarlama aracı" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "Hiçbiri" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "Gündüz" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "Gece" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "Dönüşüm" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "Dönem: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "Dönem: %s (%.2f%% day)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "K" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "G" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "D" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "B" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" -msgstr "Yer: %.2f %s, %.2f %s\n" +msgstr "Konum: %.2f %s, %.2f %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "Kullanımı: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "Günün saatine göre renk sicaklığını ayarla.\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "" @@ -223,205 +128,345 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" +msgid "Latitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 -#, c-format -msgid "Color temperature: %uK\n" +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" msgstr "" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 -#, c-format -msgid "Brightness: %.2f\n" -msgstr "" - -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" msgstr "" -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" msgstr "" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "" +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Renk sıcaklığı: %uK\n" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "" +msgid "Brightness: %.2f\n" +msgstr "Parlaklık: %.2f\n" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 +#: ../src/redshift.c:686 #, c-format -msgid "Unknown adjustment method `%s'.\n" +msgid "Status: %s\n" +msgstr "Durum: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Pasif" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Etkin" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" msgstr "" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" msgstr "" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" +msgid "Temperatures: %dK at day, %dK at night\n" msgstr "" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" -msgstr "" +msgstr "Parlaklık: %.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" -msgstr "" +msgstr "Kullanılan yöntem `%s'.\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Kullanımı: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Günün saatine göre renk sicaklığını ayarla.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "" @@ -434,380 +479,335 @@ msgid "Assignment outside section in config file.\n" msgstr "" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "" -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" msgstr "" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "" -#: ../src/location-geoclue.c:76 -#, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 -msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" -msgstr "" - -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 +#: ../src/location-geoclue2.c:59 #, c-format msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" msgstr "" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" msgstr "" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" msgstr "" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" -msgstr "" +msgstr "Askıya alma" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" -msgstr "" +msgstr "30 dakika" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" -msgstr "" +msgstr "1 saat" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" -msgstr "" +msgstr "2 saat" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" -msgstr "" +msgstr "Otomatik başlat" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" -msgstr "" +msgstr "Bilgi" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" -msgstr "" +msgstr "Çıkış" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" -msgstr "" +msgstr "Durum: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" -msgstr "" +msgstr "Renk sıcaklığı" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" -msgstr "" +msgstr "Dönem" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" +msgstr "Konum" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._uk.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._uk.po differ diff -Nru redshift-1.11/po/uk.po redshift-1.12/po/uk.po --- redshift-1.11/po/uk.po 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/po/uk.po 2018-05-21 01:13:29.000000000 +0000 @@ -0,0 +1,879 @@ +# Ukrainian translation for redshift +# Copyright (c) 2017 Rosetta Contributors and Canonical Ltd 2017 +# This file is distributed under the same license as the redshift package. +# FIRST AUTHOR , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: redshift\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2017-10-26 11:19+0000\n" +"Last-Translator: Vitalii Paslavskyi \n" +"Language-Team: Ukrainian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 +msgid "" +"Redshift adjusts the color temperature of your screen according to your " +"surroundings. This may help your eyes hurt less if you are working in front " +"of the screen at night." +msgstr "" +"Redshift налаштовує колірну температуру вашого дисплею відповідно до " +"навколишнього природного середовища. Це може зменшити втому ваших очей під " +"час роботи перед екраном в ночі." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 +msgid "" +"The color temperature is set according to the position of the sun. A " +"different color temperature is set during night and daytime. During twilight " +"and early morning, the color temperature transitions smoothly from night to " +"daytime temperature to allow your eyes to slowly adapt." +msgstr "" +"Колірна температура налаштовується відповідно до позиції сонця. Різна " +"колірна температура відображення монітору вмикається у залежності від " +"періоду доби. Під час настання сутінків чи сходу сонця, колірна температура " +"повільно переходить із нічної до денної температури, що дозволяє вашим очам " +"повільно адаптуватися." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 +msgid "" +"This program provides a status icon that allows the user to control Redshift." +msgstr "" +"Ця програма супроводжується статусною піктограмою, що дозволяє користувачеві " +"контролювати Redshift." + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 +msgid "" +"The Redshift information window overlaid with an example of the redness " +"effect" +msgstr "" +"Інформаційне вікно Redshift накладене прикладом ефекту почервонніння" + +#: ../data/applications/redshift.desktop.in.h:1 +#: ../data/applications/redshift-gtk.desktop.in.h:1 +msgid "Redshift" +msgstr "Redshift" + +#: ../data/applications/redshift.desktop.in.h:2 +#: ../data/applications/redshift-gtk.desktop.in.h:2 +msgid "Color temperature adjustment" +msgstr "Налаштування колірної температури" + +#: ../data/applications/redshift.desktop.in.h:3 +#: ../data/applications/redshift-gtk.desktop.in.h:3 +msgid "Color temperature adjustment tool" +msgstr "Знаряддя налаштувань колірної температури" + +#. TRANSLATORS: Name printed when period of day is unknown +#: ../src/redshift.c:135 +msgid "None" +msgstr "Невідомо" + +#: ../src/redshift.c:136 ../src/redshift.c:1107 +msgid "Daytime" +msgstr "День" + +#: ../src/redshift.c:137 ../src/redshift.c:1111 +msgid "Night" +msgstr "Ніч" + +#: ../src/redshift.c:138 +msgid "Transition" +msgstr "Перехід" + +#: ../src/redshift.c:225 +#, c-format +msgid "Period: %s\n" +msgstr "Період: %s\n" + +#: ../src/redshift.c:228 +#, c-format +msgid "Period: %s (%.2f%% day)\n" +msgstr "Період: %s (%.2f%% днів)\n" + +#. TRANSLATORS: Abbreviation for `north' +#: ../src/redshift.c:240 +msgid "N" +msgstr "Пн" + +#. TRANSLATORS: Abbreviation for `south' +#: ../src/redshift.c:242 +msgid "S" +msgstr "Пд" + +#. TRANSLATORS: Abbreviation for `east' +#: ../src/redshift.c:244 +msgid "E" +msgstr "Сх" + +#. TRANSLATORS: Abbreviation for `west' +#: ../src/redshift.c:246 +msgid "W" +msgstr "Зх" + +#. TRANSLATORS: Append degree symbols after %f if possible. +#. The string following each number is an abreviation for +#. north, source, east or west (N, S, E, W). +#: ../src/redshift.c:251 +#, c-format +msgid "Location: %.2f %s, %.2f %s\n" +msgstr "Місце знаходження: %.2f %s, %.2f %s\n" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "Ініціалізація %s помилкова.\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "Помилка при ввімкнені %s опції.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "Спробуйте `-l %s:help' для отримання додаткової інформації.\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "Не вдалося проаналізувати параметр `% s '.\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "Не вдалось запустити постачальника %s.\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "Спробуйте `-m %s:help' для додаткової інформації.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "Спробуйте -m %s:help' для додаткової інформації.\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "Не вдалось запустити метод налаштувань %s.\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "Широта повинна бути між %.1f та %.1f.\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "Довгота повинна бути між %.1f та %.1f.\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "Неможливо зчитати системний час.\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "Очікування первинного місця розташування щоб стати доступним...\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "Неможливо отримати місце знаходження від провайдера.\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "Отримано недійсне місце знаходження від провайдера.\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "Колірна температура: %uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "Яскравість: %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "Статус: %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "Вимкнено" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "Увімкнено" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "Невдале налаштування колірної температури.\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" +"Місце знаходження тимчасово недоступне; Використовується попереднє місце " +"знаходження поки воно не буде доступним...\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "Часткова конфігурація часу не підтримується!\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "Недійсна конфігурація світанку / сутінків!\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "Під'єднання до постачальника місця знаходження '%s'...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "Під'єднання до наступного постачальника...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "Використовується постачальник `%s'.\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "Більше немає постачальників місця знаходження для нової спроби.\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "" +"Вища точка перепаду висот не може бути нижчою, ніж нижня точка перепад " +"висот.\n" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "Сонцестояння: день більший %.1f, ніч менша %.1f\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "Температура: %dK в день, %dK у ночі\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "температура повинна бути між %uK і %uK.\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "Яскравість повинна бути між %.1f та %.1f.\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "Яскравість: %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "Величина гамми повинна бути між %.1f та %.1f.\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "Гамма (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "Випрубовується новий спосіб...\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "Використовується спосіб `%s'.\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "Більше немає способів використання.\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "Очікування на дійсне місце знаходження ...\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "Розташування сонця: %f\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "Для зупинки натисніть ctrl-c ...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "Використовується: %s -l ШИР:ДОВ -t ДЕНЬ:НІЧ [ВИБІР...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "Увімкнути колірну температуру екрану відповідно періоду дня.\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\t Відображає це повідомлення допомоги\n" +" -v\t\tПовне виведення\n" +" -V\t\tПоказує версію програми\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b DAY:NIGHT\tЯскравість екрану (між 0.1 таd 1.0)\n" +" -c FILE\tЗавантажити налаштування із конфігураційного файлу\n" +" -g R:G:B\tЗастосування додатквого регулювання гамми\n" +" -l LAT:LON\tВаше дійсне місце знаходження\n" +" -l PROVIDER\tВибір постачальника автоматичних оновлень місця знаходження\n" +" \t\t(впишіть `list' для відображення доступних постачальників)\n" +" -m METHOD\tСпосіб використання колірної температури\n" +" \t\t(Впишість `list' для відображення доступних способів)\n" +" -o\t\tОдноразовий режим (тимчасове налаштування колірної температури)\n" +" -O TEMP\tОдноразовий ручний режим (вмикає колірну температуру)\n" +" -p\t\tРежим друку (лише друкує параметри і закривається)\n" +" -P\t\tСкидання наявних гамма-рамп перед застосуванням нового кольорового " +"ефекту\n" +" -x\t\tСкидання режиму (видаляє налаштування з екрану)\n" +" -r\t\tВимкнення затухання між колірними температурами\n" +" -t DAY:NIGHT\tУвімкнення колірної температури день/ніч\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"Встановлена нейтральна температура - %uK. Використовуючи регулятор, \n" +"колірна температура екрану не змінюватиметься. Регулювання колірної \n" +"температури до вищого значення ніж цей результат до більш блакитного\n" +"світла, і зменшення значення буде відображати більше червоного світла.\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"Значення за замовчуванням:\n" +"\n" +" Денна температура: %uK\n" +" Нічна температура: %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "Будь-ласка, повідомляйте про помилки до <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "Наявні способи налаштувань:\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "Вкажіть параметри, розділені двокрапками, з `-m METHOD:OPTIONS'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "Для допомоги спробуйте `-m METHOD:help'.\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "Доступні постачальники місця знаходження:\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "" +"Вкажіть параметри, розділені двокрапками, з `-l ПОСТАЧАЛЬНИК: НАЛАШТУВАННЯ " +"'.\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "Для допомоги спробуйте `-l ПОСТАЧАЛЬНИК:help' .\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "Спотворений гамма-аргумент.\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "Для додаткової інформації спробуйте `-h'.\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "Невідомий постачальник місця знаходження `%s'.\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "Невідомий спосіб налаштувань `%s'.\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "Спотворений температурний аргумент.\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "Спотворене налаштування гамми.\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "Неправильно сформульовано налаштування часу доби \"% s\".\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "Невірно сформоване налаштування часу сутінків '% s'.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "Невідоме налаштування конфігурації `%s'.\n" + +#: ../src/config-ini.c:167 +msgid "Malformed section header in config file.\n" +msgstr "Неправильний заголовок розділу у файлі конфігурації.\n" + +#: ../src/config-ini.c:203 +msgid "Malformed assignment in config file.\n" +msgstr "Неправильне форматування в файлі конфігурації.\n" + +#: ../src/config-ini.c:214 +msgid "Assignment outside section in config file.\n" +msgstr "Призначення зовнішнього розділу в конфігураційному файлі.\n" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "Не вдалося відкрити DRM-пристрій:% s\n" + +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "Не вдалося отримати ресурси режиму DRM\n" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 +#, c-format +msgid "CRTC %d does not exist. " +msgstr "CRTC %d не існує. " + +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 +#, c-format +msgid "Valid CRTCs are [0-%d].\n" +msgstr "Дійсний CRTCs є [0-%d].\n" + +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 +#, c-format +msgid "Only CRTC 0 exists.\n" +msgstr "Лише CRTC 0 в наявності.\n" + +#: ../src/gamma-drm.c:159 +#, c-format +msgid "CRTC %i lost, skipping\n" +msgstr "CRTC %i загублено, пропускаю\n" + +#: ../src/gamma-drm.c:165 +#, c-format +msgid "" +"Could not get gamma ramp size for CRTC %i\n" +"on graphics card %i, ignoring device.\n" +msgstr "" +"не вдалось отримати гамму-рампу для CRTC %i\n" +"на відеокарті %i, ігнорування пристрою.\n" + +#: ../src/gamma-drm.c:178 +#, c-format +msgid "" +"DRM could not read gamma ramps on CRTC %i on\n" +"graphics card %i, ignoring device.\n" +msgstr "" +"DRM не може прочитати гамма-рампу CRTC %i на\n" +"відеокарті %i, ігнорування пристрою.\n" + +#: ../src/gamma-drm.c:242 +msgid "Adjust gamma ramps with Direct Rendering Manager.\n" +msgstr "Налаштувати гамма-рампу за допомогою Direct Rendering Manager.\n" + +#. TRANSLATORS: DRM help output +#. left column must not be translated +#: ../src/gamma-drm.c:247 +msgid "" +" card=N\tGraphics card to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" +" card=N\t Щоб застосувати коригування до відеокарти\n" +" crtc=N\t Щоб застосувати коригування CRTC\n" + +#: ../src/gamma-drm.c:260 +#, c-format +msgid "CRTC must be a non-negative integer\n" +msgstr "CRTC має бути невід'ємним цілим числом\n" + +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 +#, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "Невідомий параметр способу : `%s'.\n" + +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 +#, c-format +msgid "`%s' returned error %d\n" +msgstr "`%s' повернута помилка %d\n" + +#: ../src/gamma-randr.c:103 +#, c-format +msgid "Unsupported RANDR version (%u.%u)\n" +msgstr "Непідримувана версія RANDR (%u.%u)\n" + +#: ../src/gamma-randr.c:138 +#, c-format +msgid "Screen %i could not be found.\n" +msgstr "Екран %i не знайдений.\n" + +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 +#, c-format +msgid "Gamma ramp size too small: %i\n" +msgstr "Розмір гамма-рампи надто малий: %i\n" + +#: ../src/gamma-randr.c:277 +#, c-format +msgid "Unable to restore CRTC %i\n" +msgstr "Неможливо відновити CRTC %i\n" + +#: ../src/gamma-randr.c:301 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "Налаштувати гамма-рампу за допомогою додатку X RANDR.\n" + +#. TRANSLATORS: RANDR help output +#. left column must not be translated +#: ../src/gamma-randr.c:306 +msgid "" +" screen=N\t\tX screen to apply adjustments to\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" screen=N\t\tЩоб застосувати коригування до X монітору\n" +" crtc=N\tЩоб застосувати налаштування до списку CRTCs, розділеного комою\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "Неможливо прочитати кількість екранів: `%s'.\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "" +"пареметр `%s` не завжди увімкнутий; Використайте опцію `%s` у командній " +"стрічці для вимкнення.\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 +#, c-format +msgid "X request failed: %s\n" +msgstr "X запит не виконаний: %s\n" + +#: ../src/gamma-vidmode.c:140 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "Налаштування гамма-рампи за допомогою додатку X VidMode.\n" + +#. TRANSLATORS: VidMode help output +#. left column must not be translated +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " screen=N\t\tX екран для застосування налаштувань\n" + +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 +msgid "Unable to save current gamma ramp.\n" +msgstr "Неможливо зберегти дану гамма-рампу\n" + +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "Налаштувати гамма-рампи на macOS використовуючи Quartz.\n" + +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 +msgid "Unable to open device context.\n" +msgstr "Неможливо відкрити контекстне меню пристрою.\n" + +#: ../src/gamma-w32gdi.c:75 +msgid "Display device does not support gamma ramps.\n" +msgstr "Монітор пристрою не підтримує гамма-рампи.\n" + +#: ../src/gamma-w32gdi.c:115 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "Налаштувати гамма-рампи за допомогою Windows GDI.\n" + +#: ../src/gamma-w32gdi.c:153 +msgid "Unable to restore gamma ramps.\n" +msgstr "Неможливо відновити гамма-рампи.\n" + +#: ../src/gamma-w32gdi.c:211 +msgid "Unable to set gamma ramps.\n" +msgstr "неможливо увімкнути гамма-рампи.\n" + +#: ../src/gamma-dummy.c:43 +msgid "" +"WARNING: Using dummy gamma method! Display will not be affected by this " +"gamma method.\n" +msgstr "" +"УВАГА: Використовується фіктивний гамма-метод! Цей гамма-метод не вплине на " +"дисплей.\n" + +#: ../src/gamma-dummy.c:60 +msgid "" +"Does not affect the display but prints the color temperature to the " +"terminal.\n" +msgstr "" +"Не застосовувати на екрані, лише надрукувати колірну температуру у " +"терміналі.\n" + +#: ../src/gamma-dummy.c:75 +#, c-format +msgid "Temperature: %i\n" +msgstr "Температура: %i\n" + +#: ../src/location-geoclue2.c:59 +#, c-format +msgid "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" +"Доступ до доного місця знаходження скасований GeoClue!\n" +"Переконайтесь, сервіси місця знаходження увімкнуті і що Redshift\n" +"дозволяється їх використовувати. Додаткова інформація \n" +"https://github.com/jonls/redshift#faq\n" + +#: ../src/location-geoclue2.c:107 +#, c-format +msgid "Unable to obtain location: %s.\n" +msgstr "Неможливо отримати місцеположення:% s.\n" + +#: ../src/location-geoclue2.c:150 +#, c-format +msgid "Unable to obtain GeoClue Manager: %s.\n" +msgstr "Не вдається отримати GeoClue Manager:% s.\n" + +#: ../src/location-geoclue2.c:166 +#, c-format +msgid "Unable to obtain GeoClue client path: %s.\n" +msgstr "Неможливо отримати шлях клієнта GeoClue:% s.\n" + +#: ../src/location-geoclue2.c:188 +#, c-format +msgid "Unable to obtain GeoClue Client: %s.\n" +msgstr "Неможливо отримати клієнта GeoClue:% s.\n" + +#: ../src/location-geoclue2.c:229 +#, c-format +msgid "Unable to set distance threshold: %s.\n" +msgstr "Неможливо встановити порогове значення відстані:% s.\n" + +#: ../src/location-geoclue2.c:253 +#, c-format +msgid "Unable to start GeoClue client: %s.\n" +msgstr "Неможливо запустити клієнт GeoClue: %s.\n" + +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "Не вдалось запустити постачальника GeoClue2 !\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "Використовуйте місцезнаходження надане постачальником GeoClue2.\n" + +#: ../src/location-corelocation.m:73 +msgid "Not authorized to obtain location from CoreLocation.\n" +msgstr "Не авторизований для отримання місцезнаходження з CoreLocation.\n" + +#: ../src/location-corelocation.m:111 +#, c-format +msgid "Error obtaining location from CoreLocation: %s\n" +msgstr "Помилка отримання місцеположення з CoreLocation: %s\n" + +#: ../src/location-corelocation.m:120 +msgid "Waiting for authorization to obtain location...\n" +msgstr "Очікування авторизації для отримання місцезнаходження ...\n" + +#: ../src/location-corelocation.m:122 +msgid "Request for location was not authorized!\n" +msgstr "Запит на місцезнаходження не дозволено!\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "Не вдалося запустити постачальника CoreLocation !\n" + +#: ../src/location-corelocation.m:235 +msgid "Use the location as discovered by the Corelocation provider.\n" +msgstr "" +"Використовуйте місце розташування, виявлене постачальником Corelocation.\n" + +#: ../src/location-manual.c:59 +msgid "Latitude and longitude must be set.\n" +msgstr "Довгота та широта повинні бути вказані.\n" + +#: ../src/location-manual.c:75 +msgid "Specify location manually.\n" +msgstr "Вказати місце розташування вручну.\n" + +#. TRANSLATORS: Manual location help output +#. left column must not be translated +#: ../src/location-manual.c:80 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" +" lat=N\t\tШирота\n" +" lon=N\t\tДовгота\n" + +#: ../src/location-manual.c:83 +msgid "" +"Both values are expected to be floating point numbers,\n" +"negative values representing west / south, respectively.\n" +msgstr "" +"Обидва значення повинні бути із комою, негативні\n" +"значення, що представляють захід / південь відповідно.\n" + +#: ../src/location-manual.c:97 +msgid "Malformed argument.\n" +msgstr "Невірно сформований аргумент!\n" + +#: ../src/redshift-gtk/statusicon.py:78 +msgid "Suspend for" +msgstr "Призупинити через" + +#: ../src/redshift-gtk/statusicon.py:80 +msgid "30 minutes" +msgstr "30 хвилини" + +#: ../src/redshift-gtk/statusicon.py:81 +msgid "1 hour" +msgstr "1 година" + +#: ../src/redshift-gtk/statusicon.py:82 +msgid "2 hours" +msgstr "2 години" + +#: ../src/redshift-gtk/statusicon.py:91 +msgid "Autostart" +msgstr "Автозапуск" + +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 +msgid "Info" +msgstr "Інформація" + +#: ../src/redshift-gtk/statusicon.py:108 +msgid "Quit" +msgstr "Вихід" + +#: ../src/redshift-gtk/statusicon.py:146 +msgid "Close" +msgstr "Закрити" + +#: ../src/redshift-gtk/statusicon.py:300 +msgid "Status: {}" +msgstr "Статус: {}" + +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 +msgid "Color temperature" +msgstr "Колірна температура" + +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 +msgid "Period" +msgstr "Період" + +#: ../src/redshift-gtk/statusicon.py:318 +msgid "Location" +msgstr "Місцезнаходження" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "Для отримання допомоги, запустіть `redshift -h`." Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._zh_CN.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._zh_CN.po differ diff -Nru redshift-1.11/po/zh_CN.po redshift-1.12/po/zh_CN.po --- redshift-1.11/po/zh_CN.po 2016-01-02 22:24:26.000000000 +0000 +++ redshift-1.12/po/zh_CN.po 2018-05-21 01:13:29.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: redshift\n" "Report-Msgid-Bugs-To: https://github.com/jonls/redshift/issues\n" -"POT-Creation-Date: 2015-02-22 11:23-0500\n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" "PO-Revision-Date: 2015-12-11 09:28+0000\n" "Last-Translator: wsxy162 \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2016-01-02 22:24+0000\n" -"X-Generator: Launchpad (build 17865)\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" "Language: \n" #: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 @@ -44,204 +44,83 @@ "effect" msgstr "Redshift 信息窗口覆盖了红移效果的示例。" +#: ../data/applications/redshift.desktop.in.h:1 #: ../data/applications/redshift-gtk.desktop.in.h:1 msgid "Redshift" msgstr "红移" +#: ../data/applications/redshift.desktop.in.h:2 #: ../data/applications/redshift-gtk.desktop.in.h:2 msgid "Color temperature adjustment" msgstr "色温调节" +#: ../data/applications/redshift.desktop.in.h:3 #: ../data/applications/redshift-gtk.desktop.in.h:3 msgid "Color temperature adjustment tool" msgstr "色温调节工具" #. TRANSLATORS: Name printed when period of day is unknown -#: ../src/redshift.c:319 +#: ../src/redshift.c:135 msgid "None" msgstr "无" -#: ../src/redshift.c:320 ../src/redshift.c:1546 +#: ../src/redshift.c:136 ../src/redshift.c:1107 msgid "Daytime" msgstr "日间" -#: ../src/redshift.c:321 ../src/redshift.c:1549 +#: ../src/redshift.c:137 ../src/redshift.c:1111 msgid "Night" msgstr "夜间" -#: ../src/redshift.c:322 +#: ../src/redshift.c:138 msgid "Transition" msgstr "过渡" -#: ../src/redshift.c:389 +#: ../src/redshift.c:225 #, c-format msgid "Period: %s\n" msgstr "时段: %s\n" -#: ../src/redshift.c:392 +#: ../src/redshift.c:228 #, c-format msgid "Period: %s (%.2f%% day)\n" msgstr "时段: %s (%.2f%% 日间)\n" #. TRANSLATORS: Abbreviation for `north' -#: ../src/redshift.c:404 +#: ../src/redshift.c:240 msgid "N" msgstr "北纬" #. TRANSLATORS: Abbreviation for `south' -#: ../src/redshift.c:406 +#: ../src/redshift.c:242 msgid "S" msgstr "南纬" #. TRANSLATORS: Abbreviation for `east' -#: ../src/redshift.c:408 +#: ../src/redshift.c:244 msgid "E" msgstr "东经" #. TRANSLATORS: Abbreviation for `west' -#: ../src/redshift.c:410 +#: ../src/redshift.c:246 msgid "W" msgstr "西经" #. TRANSLATORS: Append degree symbols after %f if possible. #. The string following each number is an abreviation for #. north, source, east or west (N, S, E, W). -#: ../src/redshift.c:415 +#: ../src/redshift.c:251 #, c-format msgid "Location: %.2f %s, %.2f %s\n" msgstr "位置：%.2f %s, %.2f %s\n" -#. TRANSLATORS: help output 1 -#. LAT is latitude, LON is longitude, -#. DAY is temperature at daytime, -#. NIGHT is temperature at night -#. no-wrap -#: ../src/redshift.c:452 -#, c-format -msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" -msgstr "用法：%s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" - -#. TRANSLATORS: help output 2 -#. no-wrap -#: ../src/redshift.c:458 -msgid "Set color temperature of display according to time of day.\n" -msgstr "根据一天中的时间设置显示器的色温。\n" - -#. TRANSLATORS: help output 3 -#. no-wrap -#: ../src/redshift.c:464 -msgid "" -" -h\t\tDisplay this help message\n" -" -v\t\tVerbose output\n" -" -V\t\tShow program version\n" -msgstr "" -" -h\t\t显示此帮助信息\n" -" -v\t\t详细输出\n" -" -V\t\t显示程序版本\n" - -#. TRANSLATORS: help output 4 -#. `list' must not be translated -#. no-wrap -#: ../src/redshift.c:472 -msgid "" -" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" -" -c FILE\tLoad settings from specified configuration file\n" -" -g R:G:B\tAdditional gamma correction to apply\n" -" -l LAT:LON\tYour current location\n" -" -l PROVIDER\tSelect provider for automatic location updates\n" -" \t\t(Type `list' to see available providers)\n" -" -m METHOD\tMethod to use to set color temperature\n" -" \t\t(Type `list' to see available methods)\n" -" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" -" -O TEMP\tOne shot manual mode (set color temperature)\n" -" -p\t\tPrint mode (only print parameters and exit)\n" -" -x\t\tReset mode (remove adjustment from screen)\n" -" -r\t\tDisable temperature transitions\n" -" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" -msgstr "" -" -b DAY:NIGHT\t应用的屏幕亮度 (介于 0.1 和 1.0)\n" -" -c FILE\t从指定的配置文件加载设置\n" -" -g R:G:B\t应用的附加伽马校正设置\n" -" -l LAT:LON\t你当前的位置\n" -" -l PROVIDER\t选择自动位置更新的服务提供者\n" -" \t\t(输入“list”来查看可用的服务提供者)\n" -" -m METHOD\t用来设置色温的模式\n" -" \t\t(输入“list”来查看可用的模式)\n" -" -o\t\t单触发模式 (不要平滑地调节色温)\n" -" -O TEMP\t单触发手动模式 (设置色温)\n" -" -p\t\t打印模式 (只打印参数值并退出)\n" -" -x\t\t重置模式 (从屏幕上移除调节)\n" -" -r\t\t禁用色温过渡\n" -" -t DAY:NIGHT\t设置日间/夜间的色温\n" - -#. TRANSLATORS: help output 5 -#: ../src/redshift.c:492 -#, c-format -msgid "" -"The neutral temperature is %uK. Using this value will not\n" -"change the color temperature of the display. Setting the\n" -"color temperature to a value higher than this results in\n" -"more blue light, and setting a lower value will result in\n" -"more red light.\n" -msgstr "" -"中性色温为 %uK。使用该值不会改变\n" -"显示器的色温。设置色温值高于它会\n" -"导致更多的蓝光，而设置低于它的色\n" -"温值会导致更多的红光。\n" - -#. TRANSLATORS: help output 6 -#: ../src/redshift.c:502 -#, c-format -msgid "" -"Default values:\n" -"\n" -" Daytime temperature: %uK\n" -" Night temperature: %uK\n" -msgstr "" -"默认值：\n" -"\n" -" 日间色温：%uK\n" -" 夜间色温：%uK\n" - -#. TRANSLATORS: help output 7 -#: ../src/redshift.c:510 -#, c-format -msgid "Please report bugs to <%s>\n" -msgstr "请报告 bugs 到 <%s>\n" - -#: ../src/redshift.c:516 -msgid "Available adjustment methods:\n" -msgstr "可用的调节模式：\n" - -#: ../src/redshift.c:522 -msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" -msgstr "以冒号分隔格式指定选项 ”-m METHOD:OPTIONS“\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:525 -msgid "Try `-m METHOD:help' for help.\n" -msgstr "尝试 ”-m METHOD:help“ 获取帮助。\n" - -#: ../src/redshift.c:531 -msgid "Available location providers:\n" -msgstr "可用的位置服务：\n" - -#: ../src/redshift.c:537 -msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" -msgstr "以冒号分格的格式指定 “-l PROVIDER:OPTIONS” 选项。\n" - -#. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:540 -msgid "Try `-l PROVIDER:help' for help.\n" -msgstr "尝试 “-l PROVIDER:help” 来获取帮助。\n" - -#: ../src/redshift.c:553 ../src/redshift.c:645 +#: ../src/redshift.c:325 ../src/redshift.c:416 #, c-format msgid "Initialization of %s failed.\n" msgstr "%s 初始化进程失败。\n" -#: ../src/redshift.c:568 ../src/redshift.c:612 ../src/redshift.c:660 -#: ../src/redshift.c:692 +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 #, c-format msgid "Failed to set %s option.\n" msgstr "设置 %s 选项失败。\n" @@ -249,205 +128,352 @@ #. TRANSLATORS: `help' must not be #. translated. #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:573 ../src/redshift.c:615 +#: ../src/redshift.c:345 ../src/redshift.c:387 #, c-format msgid "Try `-l %s:help' for more information.\n" msgstr "尝试“-l %s:help”来获取更多信息。\n" -#: ../src/redshift.c:601 ../src/redshift.c:682 +#: ../src/redshift.c:373 ../src/redshift.c:453 #, c-format msgid "Failed to parse option `%s'.\n" msgstr "解析“%s”选项失败。\n" -#: ../src/redshift.c:628 +#: ../src/redshift.c:400 #, c-format msgid "Failed to start provider %s.\n" msgstr "启动服务 %s 失败。\n" #. TRANSLATORS: `help' must not be #. translated. -#: ../src/redshift.c:665 +#: ../src/redshift.c:436 #, c-format msgid "Try `-m %s:help' for more information.\n" msgstr "尝试“-m %s:help”来获取更多信息。\n" #. TRANSLATORS: `help' must not be translated. -#: ../src/redshift.c:695 +#: ../src/redshift.c:466 #, c-format msgid "Try -m %s:help' for more information.\n" msgstr "尝试“-m %s:help”来获取更多信息。\n" -#: ../src/redshift.c:707 +#: ../src/redshift.c:478 #, c-format msgid "Failed to start adjustment method %s.\n" msgstr "启动调节模式 %s 失败。\n" -#: ../src/redshift.c:870 ../src/redshift.c:898 +#: ../src/redshift.c:509 #, c-format -msgid "Status: %s\n" -msgstr "状态：%s\n" - -#: ../src/redshift.c:870 ../src/redshift.c:899 -#: ../src/redshift-gtk/statusicon.py:260 ../src/redshift-gtk/statusicon.py:466 -msgid "Enabled" -msgstr "已启用" +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "纬度必须介于 %.1f 和 %.1f。\n" -#: ../src/redshift.c:899 ../src/redshift-gtk/statusicon.py:466 -msgid "Disabled" -msgstr "已禁用" +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "经度必须介于 %.1f 和 %.1f。\n" -#: ../src/redshift.c:927 ../src/redshift.c:1600 +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 msgid "Unable to read system time.\n" msgstr "无法读取系统时间。\n" -#: ../src/redshift.c:999 ../src/redshift.c:1623 ../src/redshift.c:1652 +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "无法从服务获取位置信息。\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 #, c-format msgid "Color temperature: %uK\n" msgstr "色温：%uK\n" -#: ../src/redshift.c:1004 ../src/redshift.c:1625 +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 #, c-format msgid "Brightness: %.2f\n" msgstr "亮度：%.2f\n" -#: ../src/redshift.c:1013 ../src/redshift.c:1636 ../src/redshift.c:1660 -#: ../src/redshift.c:1680 -msgid "Temperature adjustment failed.\n" -msgstr "色温调节失败。\n" - -#: ../src/redshift.c:1105 -msgid "Malformed gamma argument.\n" -msgstr "异常的伽马参数。\n" +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "状态：%s\n" -#: ../src/redshift.c:1107 ../src/redshift.c:1215 ../src/redshift.c:1234 -msgid "Try `-h' for more information.\n" -msgstr "尝试“-h”来获取更多信息。\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "已禁用" -#: ../src/redshift.c:1154 ../src/redshift.c:1355 -#, c-format -msgid "Unknown location provider `%s'.\n" -msgstr "未知的位置服务“%s”。\n" +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "已启用" -#. TRANSLATORS: This refers to the method -#. used to adjust colors e.g VidMode -#: ../src/redshift.c:1185 ../src/redshift.c:1341 -#, c-format -msgid "Unknown adjustment method `%s'.\n" -msgstr "未知的调节模式“%s”。\n" +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "色温调节失败。\n" -#: ../src/redshift.c:1213 -msgid "Malformed temperature argument.\n" -msgstr "异常的色温参数。\n" +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "" -#: ../src/redshift.c:1305 ../src/redshift.c:1318 ../src/redshift.c:1329 -msgid "Malformed gamma setting.\n" -msgstr "异常的伽马设置。\n" +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "" -#: ../src/redshift.c:1364 -#, c-format -msgid "Unknown configuration setting `%s'.\n" -msgstr "未知的配置设置“%s”。\n" +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "" -#: ../src/redshift.c:1422 +#: ../src/redshift.c:1006 #, c-format msgid "Trying location provider `%s'...\n" msgstr "正在尝试位置服务”%s“。\n" -#: ../src/redshift.c:1427 +#: ../src/redshift.c:1011 msgid "Trying next provider...\n" msgstr "正在尝试下一个服务…\n" -#: ../src/redshift.c:1433 +#: ../src/redshift.c:1017 #, c-format msgid "Using provider `%s'.\n" msgstr "正在使用服务”%s“。\n" -#: ../src/redshift.c:1441 +#: ../src/redshift.c:1025 msgid "No more location providers to try.\n" msgstr "没有更多的位置服务可供尝试。\n" -#: ../src/redshift.c:1450 -msgid "Unable to get location from provider.\n" -msgstr "无法从服务获取位置信息。\n" - -#: ../src/redshift.c:1460 +#: ../src/redshift.c:1034 #, c-format -msgid "Temperatures: %dK at day, %dK at night\n" -msgstr "色温：日间 %dK，夜间 %dK\n" +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "高过渡值不能低于低过渡值。\n" #. TRANSLATORS: Append degree symbols if possible. -#: ../src/redshift.c:1465 +#: ../src/redshift.c:1041 #, c-format msgid "Solar elevations: day above %.1f, night below %.1f\n" msgstr "太阳高度：日间高于 %.1f 度，夜间低于 %.1f 度\n" -#: ../src/redshift.c:1473 +#: ../src/redshift.c:1049 #, c-format -msgid "Latitude must be between %.1f and %.1f.\n" -msgstr "纬度必须介于 %.1f 和 %.1f。\n" - -#: ../src/redshift.c:1482 -#, c-format -msgid "Longitude must be between %.1f and %.1f.\n" -msgstr "经度必须介于 %.1f 和 %.1f。\n" +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "色温：日间 %dK，夜间 %dK\n" -#: ../src/redshift.c:1493 ../src/redshift.c:1511 +#: ../src/redshift.c:1060 ../src/redshift.c:1071 #, c-format msgid "Temperature must be between %uK and %uK.\n" msgstr "色温必须介于 %uK 和 %uK。\n" -#: ../src/redshift.c:1501 -#, c-format -msgid "" -"High transition elevation cannot be lower than the low transition " -"elevation.\n" -msgstr "高过渡值不能低于低过渡值。\n" - -#: ../src/redshift.c:1523 +#: ../src/redshift.c:1083 #, c-format msgid "Brightness values must be between %.1f and %.1f.\n" msgstr "亮度必须介于 %.1f 和 %.1f。\n" -#: ../src/redshift.c:1529 +#: ../src/redshift.c:1089 #, c-format msgid "Brightness: %.2f:%.2f\n" msgstr "亮度：%.2f:%.2f\n" -#: ../src/redshift.c:1537 +#: ../src/redshift.c:1098 #, c-format msgid "Gamma value must be between %.1f and %.1f.\n" msgstr "伽马值必须介于 %.1f 和 %.1f。\n" #. TRANSLATORS: The string in parenthesis is either #. Daytime or Night (translated). -#: ../src/redshift.c:1545 ../src/redshift.c:1548 +#: ../src/redshift.c:1106 ../src/redshift.c:1110 #, c-format msgid "Gamma (%s): %.3f, %.3f, %.3f\n" msgstr "伽马 (%s)：%.3f, %.3f, %.3f\n" -#: ../src/redshift.c:1572 +#: ../src/redshift.c:1139 msgid "Trying next method...\n" msgstr "正在尝试下一个模式…\n" -#: ../src/redshift.c:1577 +#: ../src/redshift.c:1144 #, c-format msgid "Using method `%s'.\n" msgstr "正在使用模式 ”%s“。\n" -#: ../src/redshift.c:1584 +#: ../src/redshift.c:1151 msgid "No more methods to try.\n" msgstr "没有更多的模式可供尝试。\n" -#. TRANSLATORS: Append degree symbol if possible. -#: ../src/redshift.c:1609 +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 #, c-format msgid "Solar elevation: %f\n" msgstr "太阳高度：%f度\n" -#: ../src/redshift.c:1645 ../src/redshift.c:1669 ../src/redshift.c:1689 +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 msgid "Press ctrl-c to stop...\n" msgstr "按 Ctrl-C 来停止…\n" +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "用法：%s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "根据一天中的时间设置显示器的色温。\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\t显示此帮助信息\n" +" -v\t\t详细输出\n" +" -V\t\t显示程序版本\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"默认值：\n" +"\n" +" 日间色温：%uK\n" +" 夜间色温：%uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "请报告 bugs 到 <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "可用的调节模式：\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "以冒号分隔格式指定选项 ”-m METHOD:OPTIONS“\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "尝试 ”-m METHOD:help“ 获取帮助。\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "可用的位置服务：\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "以冒号分格的格式指定 “-l PROVIDER:OPTIONS” 选项。\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "尝试 “-l PROVIDER:help” 来获取帮助。\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "异常的伽马参数。\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "尝试“-h”来获取更多信息。\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "未知的位置服务“%s”。\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "未知的调节模式“%s”。\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "异常的色温参数。\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "异常的伽马设置。\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "未知的配置设置“%s”。\n" + #: ../src/config-ini.c:167 msgid "Malformed section header in config file.\n" msgstr "异常的段头存在于配置文件中。\n" @@ -460,52 +486,57 @@ msgid "Assignment outside section in config file.\n" msgstr "分配在段外存在于配置文件中。\n" -#: ../src/gamma-drm.c:78 +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "" + +#: ../src/gamma-drm.c:105 #, c-format msgid "Failed to get DRM mode resources\n" msgstr "无法获取 DRM 模式资源\n" -#: ../src/gamma-drm.c:88 ../src/gamma-randr.c:311 +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 #, c-format msgid "CRTC %d does not exist. " msgstr "CRTC %d 没有退出。 " -#: ../src/gamma-drm.c:91 ../src/gamma-randr.c:314 +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 #, c-format msgid "Valid CRTCs are [0-%d].\n" msgstr "有效的 CRTCs 为 [0-%d]。\n" -#: ../src/gamma-drm.c:94 ../src/gamma-randr.c:317 +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 #, c-format msgid "Only CRTC 0 exists.\n" msgstr "只有 CRTC 0 存在。\n" -#: ../src/gamma-drm.c:132 +#: ../src/gamma-drm.c:159 #, c-format msgid "CRTC %i lost, skipping\n" msgstr "CRTC %i 丢失，跳过中\n" -#: ../src/gamma-drm.c:138 +#: ../src/gamma-drm.c:165 #, c-format msgid "" "Could not get gamma ramp size for CRTC %i\n" "on graphics card %i, ignoring device.\n" msgstr "无法在显卡 %i 上获取 CTRC %i 的伽马斜面大小，忽略设备中。\n" -#: ../src/gamma-drm.c:151 +#: ../src/gamma-drm.c:178 #, c-format msgid "" "DRM could not read gamma ramps on CRTC %i on\n" "graphics card %i, ignoring device.\n" msgstr "DRM 无法在显卡 %i 上获取 CTRC %i 的伽马斜面，忽略设备中。\n" -#: ../src/gamma-drm.c:214 +#: ../src/gamma-drm.c:242 msgid "Adjust gamma ramps with Direct Rendering Manager.\n" msgstr "使用 Direct Rendering Manager 调整伽马斜面。\n" #. TRANSLATORS: DRM help output #. left column must not be translated -#: ../src/gamma-drm.c:219 +#: ../src/gamma-drm.c:247 msgid "" " card=N\tGraphics card to apply adjustments to\n" " crtc=N\tCRTC to apply adjustments to\n" @@ -513,277 +544,216 @@ " card=N\t用来应用调节的显卡\n" " crtc=N\t用来应用调节的CRTC\n" -#: ../src/gamma-drm.c:232 +#: ../src/gamma-drm.c:260 #, c-format msgid "CRTC must be a non-negative integer\n" msgstr "CRTC 必须是非负整数\n" -#: ../src/gamma-drm.c:236 ../src/gamma-randr.c:297 ../src/gamma-vidmode.c:149 -#: ../src/gamma-quartz.c:172 ../src/gamma-w32gdi.c:121 ../src/gamma-dummy.c:66 -#: ../src/location-geoclue.c:180 ../src/location-geoclue2.c:82 -#: ../src/location-corelocation.m:141 ../src/location-manual.c:96 +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 #, c-format msgid "Unknown method parameter: `%s'.\n" msgstr "位置的模式参数：”%s“。\n" -#: ../src/gamma-randr.c:72 ../src/gamma-randr.c:129 ../src/gamma-randr.c:168 -#: ../src/gamma-randr.c:194 ../src/gamma-randr.c:251 ../src/gamma-randr.c:362 +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 #, c-format msgid "`%s' returned error %d\n" msgstr "”%s“ 返回了错误 %d。\n" -#: ../src/gamma-randr.c:80 +#: ../src/gamma-randr.c:103 #, c-format msgid "Unsupported RANDR version (%u.%u)\n" msgstr "不支持的 RANDR 版本 (%u.%u)\n" -#: ../src/gamma-randr.c:114 +#: ../src/gamma-randr.c:138 #, c-format msgid "Screen %i could not be found.\n" msgstr "屏幕 %i 无法找到。\n" -#: ../src/gamma-randr.c:180 ../src/gamma-vidmode.c:87 -#: ../src/gamma-quartz.c:100 +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 #, c-format msgid "Gamma ramp size too small: %i\n" msgstr "伽马斜面值太小：%i\n" -#: ../src/gamma-randr.c:253 +#: ../src/gamma-randr.c:277 #, c-format msgid "Unable to restore CRTC %i\n" msgstr "无法保存 CRTC %i\n" -#: ../src/gamma-randr.c:274 +#: ../src/gamma-randr.c:301 msgid "Adjust gamma ramps with the X RANDR extension.\n" msgstr "使用 X RANDR 扩展调整伽马斜面。\n" #. TRANSLATORS: RANDR help output #. left column must not be translated -#: ../src/gamma-randr.c:279 +#: ../src/gamma-randr.c:306 msgid "" " screen=N\t\tX screen to apply adjustments to\n" -" crtc=N\t\tCRTC to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" msgstr "" -" screen=N\t\t用来应用调节的 X 屏幕\n" -" ctrc=N\t\t用来应用调节的 CRTC\n" -" preserve={0,1}\t\t是否显示现有的伽马值\n" - -#: ../src/gamma-vidmode.c:51 ../src/gamma-vidmode.c:72 -#: ../src/gamma-vidmode.c:81 ../src/gamma-vidmode.c:108 -#: ../src/gamma-vidmode.c:168 ../src/gamma-vidmode.c:213 + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 #, c-format msgid "X request failed: %s\n" msgstr "X 请求失败：%s\n" -#: ../src/gamma-vidmode.c:129 +#: ../src/gamma-vidmode.c:140 msgid "Adjust gamma ramps with the X VidMode extension.\n" msgstr "使用 X VidMode 扩展调整伽马斜面。\n" #. TRANSLATORS: VidMode help output #. left column must not be translated -#: ../src/gamma-vidmode.c:134 -msgid "" -" screen=N\t\tX screen to apply adjustments to\n" -" preserve={0,1}\tWhether existing gamma should be preserved\n" +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" msgstr "" -" screen=N\t\t用来应用调节的 X 屏幕\n" -" preserve={0,1}\t\t是否显示已有的伽马值\n" -#: ../src/gamma-quartz.c:126 ../src/gamma-w32gdi.c:82 +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 msgid "Unable to save current gamma ramp.\n" msgstr "无法保存当前的伽马斜面。\n" -#: ../src/gamma-quartz.c:155 -msgid "Adjust gamma ramps on OSX using Quartz.\n" -msgstr "在 OSX 上使用 Quartz 调整伽马斜面。\n" - -#. TRANSLATORS: Quartz help output -#. left column must not be translated -#. TRANSLATORS: Windows GDI help output -#. left column must not be translated -#: ../src/gamma-quartz.c:160 ../src/gamma-w32gdi.c:109 -msgid " preserve={0,1}\tWhether existing gamma should be preserved\n" -msgstr " preserve={0,1}\t是否显示已有的伽马值\n" +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "" -#: ../src/gamma-w32gdi.c:59 ../src/gamma-w32gdi.c:134 -#: ../src/gamma-w32gdi.c:155 +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 msgid "Unable to open device context.\n" msgstr "无法打开设备上下文。\n" -#: ../src/gamma-w32gdi.c:66 +#: ../src/gamma-w32gdi.c:75 msgid "Display device does not support gamma ramps.\n" msgstr "显示设备不支持伽马斜面。\n" -#: ../src/gamma-w32gdi.c:104 +#: ../src/gamma-w32gdi.c:115 msgid "Adjust gamma ramps with the Windows GDI.\n" msgstr "使用 Windows GDI 调整伽马斜面。\n" -#: ../src/gamma-w32gdi.c:140 +#: ../src/gamma-w32gdi.c:153 msgid "Unable to restore gamma ramps.\n" msgstr "无法保存伽马斜面。\n" -#: ../src/gamma-w32gdi.c:195 +#: ../src/gamma-w32gdi.c:211 msgid "Unable to set gamma ramps.\n" msgstr "无法设置伽马斜面。\n" -#: ../src/gamma-dummy.c:42 +#: ../src/gamma-dummy.c:43 msgid "" "WARNING: Using dummy gamma method! Display will not be affected by this " "gamma method.\n" msgstr "警告：正在使用虚拟伽马模式！显示器不受此伽马模式影响。\n" -#: ../src/gamma-dummy.c:59 +#: ../src/gamma-dummy.c:60 msgid "" "Does not affect the display but prints the color temperature to the " "terminal.\n" msgstr "不要影响显示器但打印色温到终端上。\n" -#: ../src/gamma-dummy.c:73 +#: ../src/gamma-dummy.c:75 #, c-format msgid "Temperature: %i\n" msgstr "色温：%i\n" -#: ../src/location-geoclue.c:76 +#: ../src/location-geoclue2.c:59 #, c-format -msgid "Unable to obtain master client: %s\n" -msgstr "无法获取主客户端：%s\n" - -#: ../src/location-geoclue.c:80 -#, c-format -msgid "Unable to obtain master client\n" -msgstr "无法获取主客户端\n" - -#: ../src/location-geoclue.c:91 -#, c-format -msgid "Can't set requirements for master: %s\n" -msgstr "无法设置需求来为主客户端：%s\n" - -#: ../src/location-geoclue.c:95 -#, c-format -msgid "Can't set requirements for master\n" -msgstr "无法设置需求来为主客户端\n" - -#: ../src/location-geoclue.c:111 -#, c-format -msgid "Started Geoclue provider `%s'.\n" -msgstr "已启动的 Geoclue 服务 ”%s“。\n" - -#: ../src/location-geoclue.c:114 -msgid "Could not find a usable Geoclue provider.\n" -msgstr "无法找到可用的 Geoclue 服务提供者。\n" - -#: ../src/location-geoclue.c:115 -msgid "Try setting name and path to specify which to use.\n" -msgstr "尝试设置名称和路径来指定使用哪个位置服务。\n" - -#: ../src/location-geoclue.c:133 -msgid "Use the location as discovered by a Geoclue provider.\n" -msgstr "使用设定位置当做 Geoclue 服务检测到的。\n" - -#. TRANSLATORS: Geoclue help output -#. left column must not be translated -#: ../src/location-geoclue.c:138 msgid "" -" name=N\tName of Geoclue provider (or `default')\n" -" path=N\tPath of Geoclue provider (or `default')\n" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" msgstr "" -" name=N\tGeoclue 服务提供者的名称(或者”默认“)\n" -" path=N\tGeoclue 服务提供者的路径(或者”默认“)\n" -#: ../src/location-geoclue.c:141 ../src/location-geoclue2.c:72 -#: ../src/location-corelocation.m:131 -#, c-format -msgid "" -"NOTE: currently Redshift doesn't recheck %s once started,\n" -"which means it has to be restarted to take notice after travel.\n" -msgstr "注意：当前 Redshift 一旦开启不会重新检查 %s，这表示在旅行后必须重新启动来记录变化。\n" - -#: ../src/location-geoclue.c:199 -#, c-format -msgid "Could not get location: %s.\n" -msgstr "无法获取位置：%s\n" - -#: ../src/location-geoclue.c:206 -#, c-format -msgid "According to the geoclue provider we're at: %.2f, %.2f\n" -msgstr "根据 Geoclue 服务，我们位于：%.2f, %.2f\n" - -#: ../src/location-geoclue.c:210 -msgid "Provider does not have a valid location available." -msgstr "服务提供者没有可用的有效位置。" - -#: ../src/location-geoclue2.c:69 -msgid "Use the location as discovered by a GeoClue2 provider.\n" -msgstr "使用 GeoClue2 服务检测到的位置。\n" - -#: ../src/location-geoclue2.c:114 +#: ../src/location-geoclue2.c:107 #, c-format msgid "Unable to obtain location: %s.\n" msgstr "无法获取位置：%s。\n" -#: ../src/location-geoclue2.c:153 +#: ../src/location-geoclue2.c:150 #, c-format msgid "Unable to obtain GeoClue Manager: %s.\n" msgstr "无法获取 GeoClue 管理器：%s。\n" -#: ../src/location-geoclue2.c:168 +#: ../src/location-geoclue2.c:166 #, c-format msgid "Unable to obtain GeoClue client path: %s.\n" msgstr "无法获取 GeoClue 客户端路径：%s。\n" -#: ../src/location-geoclue2.c:189 +#: ../src/location-geoclue2.c:188 #, c-format msgid "Unable to obtain GeoClue Client: %s.\n" msgstr "无法获取 GeoClue 客户端：%s。\n" -#: ../src/location-geoclue2.c:228 +#: ../src/location-geoclue2.c:229 #, c-format msgid "Unable to set distance threshold: %s.\n" msgstr "无法设置距离阀值：%s。\n" -#: ../src/location-geoclue2.c:251 +#: ../src/location-geoclue2.c:253 #, c-format msgid "Unable to start GeoClue client: %s.\n" msgstr "无法启动 GeoClue 客户端：%s。\n" -#: ../src/location-geoclue2.c:269 -#, c-format -msgid "Unable to connect to GeoClue.\n" -msgstr "无法连接到 GeoClue。\n" +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "使用 GeoClue2 服务检测到的位置。\n" -#: ../src/location-corelocation.m:59 +#: ../src/location-corelocation.m:73 msgid "Not authorized to obtain location from CoreLocation.\n" msgstr "没有授权来从 CoreLocation 获取位置。\n" -#: ../src/location-corelocation.m:87 +#: ../src/location-corelocation.m:111 #, c-format msgid "Error obtaining location from CoreLocation: %s\n" msgstr "从 CoreLocation 获取位置时出错：%s\n" -#: ../src/location-corelocation.m:96 +#: ../src/location-corelocation.m:120 msgid "Waiting for authorization to obtain location...\n" msgstr "正在等待授权来获取位置…\n" -#: ../src/location-corelocation.m:99 +#: ../src/location-corelocation.m:122 msgid "Request for location was not authorized!\n" msgstr "位置请求还未授权！\n" -#: ../src/location-corelocation.m:128 +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "" + +#: ../src/location-corelocation.m:235 msgid "Use the location as discovered by the Corelocation provider.\n" msgstr "使用指定位置当做 Corelocation 服务检测到的。\n" -#: ../src/location-manual.c:50 +#: ../src/location-manual.c:59 msgid "Latitude and longitude must be set.\n" msgstr "纬度和经度必须设置。\n" -#: ../src/location-manual.c:65 +#: ../src/location-manual.c:75 msgid "Specify location manually.\n" msgstr "手动指定位置。\n" #. TRANSLATORS: Manual location help output #. left column must not be translated -#: ../src/location-manual.c:70 +#: ../src/location-manual.c:80 msgid "" " lat=N\t\tLatitude\n" " lon=N\t\tLongitude\n" @@ -791,7 +761,7 @@ " lat=N\t\t纬度\n" " lon=N\t\t经度\n" -#: ../src/location-manual.c:73 +#: ../src/location-manual.c:83 msgid "" "Both values are expected to be floating point numbers,\n" "negative values representing west / south, respectively.\n" @@ -799,54 +769,58 @@ "两个数值均为浮点数字，\n" "负数分表代表南纬/西经。\n" -#: ../src/location-manual.c:87 +#: ../src/location-manual.c:97 msgid "Malformed argument.\n" msgstr "异常参数。\n" -#: ../src/redshift-gtk/statusicon.py:265 +#: ../src/redshift-gtk/statusicon.py:78 msgid "Suspend for" msgstr "挂起于" -#: ../src/redshift-gtk/statusicon.py:267 +#: ../src/redshift-gtk/statusicon.py:80 msgid "30 minutes" msgstr "30 分钟后" -#: ../src/redshift-gtk/statusicon.py:268 +#: ../src/redshift-gtk/statusicon.py:81 msgid "1 hour" msgstr "1 小时后" -#: ../src/redshift-gtk/statusicon.py:269 +#: ../src/redshift-gtk/statusicon.py:82 msgid "2 hours" msgstr "2 小时后" -#: ../src/redshift-gtk/statusicon.py:277 +#: ../src/redshift-gtk/statusicon.py:91 msgid "Autostart" msgstr "开机启动" -#: ../src/redshift-gtk/statusicon.py:289 ../src/redshift-gtk/statusicon.py:300 +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 msgid "Info" msgstr "信息" -#: ../src/redshift-gtk/statusicon.py:294 +#: ../src/redshift-gtk/statusicon.py:108 msgid "Quit" msgstr "退出" -#: ../src/redshift-gtk/statusicon.py:301 +#: ../src/redshift-gtk/statusicon.py:146 msgid "Close" msgstr "关闭" -#: ../src/redshift-gtk/statusicon.py:466 +#: ../src/redshift-gtk/statusicon.py:300 msgid "Status: {}" msgstr "状态: {}" -#: ../src/redshift-gtk/statusicon.py:470 +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 msgid "Color temperature" msgstr "色温" -#: ../src/redshift-gtk/statusicon.py:474 +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 msgid "Period" msgstr "时段" -#: ../src/redshift-gtk/statusicon.py:478 +#: ../src/redshift-gtk/statusicon.py:318 msgid "Location" msgstr "位置" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "" Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/po/._zh_TW.po and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/po/._zh_TW.po differ diff -Nru redshift-1.11/po/zh_TW.po redshift-1.12/po/zh_TW.po --- redshift-1.11/po/zh_TW.po 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/po/zh_TW.po 2018-05-21 01:13:29.000000000 +0000 @@ -0,0 +1,856 @@ +# Chinese (Traditional) translation for redshift +# Copyright (c) 2018 Rosetta Contributors and Canonical Ltd 2018 +# This file is distributed under the same license as the redshift package. +# FIRST AUTHOR , 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: redshift\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2017-10-18 11:46-0700\n" +"PO-Revision-Date: 2018-04-28 15:30+0000\n" +"Last-Translator: BigELK176 ≡ \n" +"Language-Team: Chinese (Traditional) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2018-05-21 01:04+0000\n" +"X-Generator: Launchpad (build 18658)\n" +"Language: zh_TW\n" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:1 +msgid "" +"Redshift adjusts the color temperature of your screen according to your " +"surroundings. This may help your eyes hurt less if you are working in front " +"of the screen at night." +msgstr "" +"Redshift 根據你周圍環境來調節整螢幕色溫。\n" +"如果夜晚在螢幕前工作，這可以減少眼睛受到傷害。" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:2 +msgid "" +"The color temperature is set according to the position of the sun. A " +"different color temperature is set during night and daytime. During twilight " +"and early morning, the color temperature transitions smoothly from night to " +"daytime temperature to allow your eyes to slowly adapt." +msgstr "根據太陽位置日夜變化來設置螢幕色溫。隨著日夜交替時間轉換，色溫設置則會逐漸變化，可讓您的眼睛能夠漸漸地適應。" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:3 +msgid "" +"This program provides a status icon that allows the user to control Redshift." +msgstr "軟體提供狀態圖示，讓使用者來控制 Redshift 。" + +#: ../data/appdata/redshift-gtk.appdata.xml.in.h:4 +msgid "" +"The Redshift information window overlaid with an example of the redness " +"effect" +msgstr "Redshift 資訊視窗鋪上一層紅暈效果的的示範" + +#: ../data/applications/redshift.desktop.in.h:1 +#: ../data/applications/redshift-gtk.desktop.in.h:1 +msgid "Redshift" +msgstr "Redshift" + +#: ../data/applications/redshift.desktop.in.h:2 +#: ../data/applications/redshift-gtk.desktop.in.h:2 +msgid "Color temperature adjustment" +msgstr "色溫調整" + +#: ../data/applications/redshift.desktop.in.h:3 +#: ../data/applications/redshift-gtk.desktop.in.h:3 +msgid "Color temperature adjustment tool" +msgstr "色溫調整工具" + +#. TRANSLATORS: Name printed when period of day is unknown +#: ../src/redshift.c:135 +msgid "None" +msgstr "無" + +#: ../src/redshift.c:136 ../src/redshift.c:1107 +msgid "Daytime" +msgstr "日間" + +#: ../src/redshift.c:137 ../src/redshift.c:1111 +msgid "Night" +msgstr "夜間" + +#: ../src/redshift.c:138 +msgid "Transition" +msgstr "轉換" + +#: ../src/redshift.c:225 +#, c-format +msgid "Period: %s\n" +msgstr "期間： %s\n" + +#: ../src/redshift.c:228 +#, c-format +msgid "Period: %s (%.2f%% day)\n" +msgstr "期間： %s (%.2f%% day)\n" + +#. TRANSLATORS: Abbreviation for `north' +#: ../src/redshift.c:240 +msgid "N" +msgstr "北" + +#. TRANSLATORS: Abbreviation for `south' +#: ../src/redshift.c:242 +msgid "S" +msgstr "南" + +#. TRANSLATORS: Abbreviation for `east' +#: ../src/redshift.c:244 +msgid "E" +msgstr "東" + +#. TRANSLATORS: Abbreviation for `west' +#: ../src/redshift.c:246 +msgid "W" +msgstr "西" + +#. TRANSLATORS: Append degree symbols after %f if possible. +#. The string following each number is an abreviation for +#. north, source, east or west (N, S, E, W). +#: ../src/redshift.c:251 +#, c-format +msgid "Location: %.2f %s, %.2f %s\n" +msgstr "位置： %.2f %s, %.2f %s\n" + +#: ../src/redshift.c:325 ../src/redshift.c:416 +#, c-format +msgid "Initialization of %s failed.\n" +msgstr "針對 %s 初始化失敗。\n" + +#: ../src/redshift.c:340 ../src/redshift.c:384 ../src/redshift.c:431 +#: ../src/redshift.c:463 +#, c-format +msgid "Failed to set %s option.\n" +msgstr "設定 %s 選項失敗。\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:345 ../src/redshift.c:387 +#, c-format +msgid "Try `-l %s:help' for more information.\n" +msgstr "試試 `-l %s:help' 取得更多資訊。\n" + +#: ../src/redshift.c:373 ../src/redshift.c:453 +#, c-format +msgid "Failed to parse option `%s'.\n" +msgstr "解析 '%s' 選項失敗\n" + +#: ../src/redshift.c:400 +#, c-format +msgid "Failed to start provider %s.\n" +msgstr "啟動供應者 %s 失敗。\n" + +#. TRANSLATORS: `help' must not be +#. translated. +#: ../src/redshift.c:436 +#, c-format +msgid "Try `-m %s:help' for more information.\n" +msgstr "試試 `-m %s:help' 取得更多資訊。\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/redshift.c:466 +#, c-format +msgid "Try -m %s:help' for more information.\n" +msgstr "試試 -m %s:help' 取得更多資訊。\n" + +#: ../src/redshift.c:478 +#, c-format +msgid "Failed to start adjustment method %s.\n" +msgstr "啟動調整方法 %s 失敗。\n" + +#: ../src/redshift.c:509 +#, c-format +msgid "Latitude must be between %.1f and %.1f.\n" +msgstr "緯度必須在 %.1f 及 %.1f 之間。\n" + +#: ../src/redshift.c:518 +#, c-format +msgid "Longitude must be between %.1f and %.1f.\n" +msgstr "經度必須在 %.1f 及 %.1f 之間。\n" + +#: ../src/redshift.c:545 ../src/redshift.c:564 ../src/redshift.c:696 +#: ../src/redshift.c:1187 +msgid "Unable to read system time.\n" +msgstr "無法讀取系統時間。\n" + +#: ../src/redshift.c:635 +msgid "Waiting for initial location to become available...\n" +msgstr "等待初始化位置變成可以使用…\n" + +#: ../src/redshift.c:641 ../src/redshift.c:832 ../src/redshift.c:847 +#: ../src/redshift.c:1172 +msgid "Unable to get location from provider.\n" +msgstr "無法由供應者取得位置資訊。\n" + +#: ../src/redshift.c:647 ../src/redshift.c:871 +msgid "Invalid location returned from provider.\n" +msgstr "供應者回覆不合用的位置資訊。\n" + +#: ../src/redshift.c:656 ../src/redshift.c:788 ../src/redshift.c:1222 +#: ../src/redshift.c:1253 +#, c-format +msgid "Color temperature: %uK\n" +msgstr "色溫：%uK\n" + +#: ../src/redshift.c:657 ../src/redshift.c:793 ../src/redshift.c:1224 +#, c-format +msgid "Brightness: %.2f\n" +msgstr "亮度： %.2f\n" + +#: ../src/redshift.c:686 +#, c-format +msgid "Status: %s\n" +msgstr "狀態： %s\n" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:301 +msgid "Disabled" +msgstr "已停用" + +#: ../src/redshift.c:687 ../src/redshift-gtk/statusicon.py:73 +#: ../src/redshift-gtk/statusicon.py:301 +msgid "Enabled" +msgstr "已啟用" + +#: ../src/redshift.c:802 ../src/redshift.c:1233 ../src/redshift.c:1263 +#: ../src/redshift.c:1285 +msgid "Temperature adjustment failed.\n" +msgstr "色溫調整失敗。\n" + +#: ../src/redshift.c:854 +msgid "" +"Location is temporarily unavailable; Using previous location until it " +"becomes available...\n" +msgstr "位置資訊暫時無法使用；使用之前的位置資訊，直到可用提供…\n" + +#: ../src/redshift.c:967 +msgid "Partitial time-configuration not supported!\n" +msgstr "有部分的時間配置尚未支援！\n" + +#: ../src/redshift.c:975 +msgid "Invalid dawn/dusk time configuration!\n" +msgstr "無效的日出/日落時間配置！\n" + +#: ../src/redshift.c:1006 +#, c-format +msgid "Trying location provider `%s'...\n" +msgstr "試用位置資訊供應用者 `%s' ...\n" + +#: ../src/redshift.c:1011 +msgid "Trying next provider...\n" +msgstr "試用下一個供應用者 `%s' ...\n" + +#: ../src/redshift.c:1017 +#, c-format +msgid "Using provider `%s'.\n" +msgstr "使用供應用者 `%s' 。\n" + +#: ../src/redshift.c:1025 +msgid "No more location providers to try.\n" +msgstr "沒有其它位置資訊供應用者可供試用。\n" + +#: ../src/redshift.c:1034 +#, c-format +msgid "" +"High transition elevation cannot be lower than the low transition " +"elevation.\n" +msgstr "高過渡海拔不可低於低過渡海拔。\n" + +#. TRANSLATORS: Append degree symbols if possible. +#: ../src/redshift.c:1041 +#, c-format +msgid "Solar elevations: day above %.1f, night below %.1f\n" +msgstr "太陽海拔：日間高於 %.1f ．夜間低於 %.1f 。\n" + +#: ../src/redshift.c:1049 +#, c-format +msgid "Temperatures: %dK at day, %dK at night\n" +msgstr "溫度：日間為 %dK ．夜間為 %dK\n" + +#: ../src/redshift.c:1060 ../src/redshift.c:1071 +#, c-format +msgid "Temperature must be between %uK and %uK.\n" +msgstr "溫度必須介於 %uK 及 %uK 之間。\n" + +#: ../src/redshift.c:1083 +#, c-format +msgid "Brightness values must be between %.1f and %.1f.\n" +msgstr "高度數值必須介於 %.1f 及 %.1f 之間。\n" + +#: ../src/redshift.c:1089 +#, c-format +msgid "Brightness: %.2f:%.2f\n" +msgstr "亮度： %.2f:%.2f\n" + +#: ../src/redshift.c:1098 +#, c-format +msgid "Gamma value must be between %.1f and %.1f.\n" +msgstr "伽瑪數值必須介於 %.1f 及 %.1f 之間。\n" + +#. TRANSLATORS: The string in parenthesis is either +#. Daytime or Night (translated). +#: ../src/redshift.c:1106 ../src/redshift.c:1110 +#, c-format +msgid "Gamma (%s): %.3f, %.3f, %.3f\n" +msgstr "伽瑪 (%s): %.3f, %.3f, %.3f\n" + +#: ../src/redshift.c:1139 +msgid "Trying next method...\n" +msgstr "試用下一個方法…\n" + +#: ../src/redshift.c:1144 +#, c-format +msgid "Using method `%s'.\n" +msgstr "使用方法`%s'。\n" + +#: ../src/redshift.c:1151 +msgid "No more methods to try.\n" +msgstr "沒有其它方法可供試用。\n" + +#: ../src/redshift.c:1165 +msgid "Waiting for current location to become available...\n" +msgstr "等待目前位置資訊可供使用…\n" + +#. TRANSLATORS: Append degree symbol if +#. possible. +#: ../src/redshift.c:1206 +#, c-format +msgid "Solar elevation: %f\n" +msgstr "太陽海拔： %f\n" + +#: ../src/redshift.c:1244 ../src/redshift.c:1272 ../src/redshift.c:1294 +msgid "Press ctrl-c to stop...\n" +msgstr "按 ctrl-c 停止 ...\n" + +#. TRANSLATORS: help output 1 +#. LAT is latitude, LON is longitude, +#. DAY is temperature at daytime, +#. NIGHT is temperature at night +#. no-wrap +#: ../src/options.c:159 +#, c-format +msgid "Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n" +msgstr "用法: %s -l LAT:LON -t DAY:NIGHT [選項...]\n" + +#. TRANSLATORS: help output 2 +#. no-wrap +#: ../src/options.c:165 +msgid "Set color temperature of display according to time of day.\n" +msgstr "根據日間時間來設定顯示器的色溫\n" + +#. TRANSLATORS: help output 3 +#. no-wrap +#: ../src/options.c:171 +msgid "" +" -h\t\tDisplay this help message\n" +" -v\t\tVerbose output\n" +" -V\t\tShow program version\n" +msgstr "" +" -h\t\t顯示說明訊息\n" +" -v\t\t細節內容輸出\n" +" -V\t\t顯示軟體版本\n" + +#. TRANSLATORS: help output 4 +#. `list' must not be translated +#. no-wrap +#: ../src/options.c:179 +msgid "" +" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" +" -c FILE\tLoad settings from specified configuration file\n" +" -g R:G:B\tAdditional gamma correction to apply\n" +" -l LAT:LON\tYour current location\n" +" -l PROVIDER\tSelect provider for automatic location updates\n" +" \t\t(Type `list' to see available providers)\n" +" -m METHOD\tMethod to use to set color temperature\n" +" \t\t(Type `list' to see available methods)\n" +" -o\t\tOne shot mode (do not continuously adjust color temperature)\n" +" -O TEMP\tOne shot manual mode (set color temperature)\n" +" -p\t\tPrint mode (only print parameters and exit)\n" +" -P\t\tReset existing gamma ramps before applying new color effect\n" +" -x\t\tReset mode (remove adjustment from screen)\n" +" -r\t\tDisable fading between color temperatures\n" +" -t DAY:NIGHT\tColor temperature to set at daytime/night\n" +msgstr "" +" -b DAY:NIGHT\t螢幕亮度套用（介於 0.1 及 1.0）\n" +" -c FILE\t從指定的設置檔案來載入設置\n" +" -g R:G:B\t額外的伽瑪校正設置\n" +" -l LAT:LON \t你目前的位置\n" +" -l PROVIDER\t選擇自動位置更新的提供者\n" +" \t\t輸入 `list' 來查看可用的提供者）\n" +" -m METHOD\t用來設置色溫的方法\n" +" \t\t(輸入 `list' 來查看可用的方法）\n" +" -o\t\t單觸發模式（不要持續地調整色溫）\n" +" -O TEMP\t單觸發手動模式（設置色溫）\n" +" -p\t\t列印模式（僅列列印參數值並退出）\n" +" -P\t\t在套用新的顏色效果前要重置咖瑪斜面\n" +" -x\t\t重置模式（從螢幕上移除調整）\n" +" -r\t\t停用色溫之間的淡化轉化\n" +" -t DAY:NIGHT\t設置日間/夜間的色溫\n" + +#. TRANSLATORS: help output 5 +#: ../src/options.c:201 +#, c-format +msgid "" +"The neutral temperature is %uK. Using this value will not change the color\n" +"temperature of the display. Setting the color temperature to a value higher\n" +"than this results in more blue light, and setting a lower value will result " +"in\n" +"more red light.\n" +msgstr "" +"中性色溫為 %uK 。\n" +"使用該值不會改變顯示器的色溫。\n" +"設置色溫值高於它，會導致更多的藍光。\n" +"設置色溫值低於它，會導致更多的紅光。\n" + +#. TRANSLATORS: help output 6 +#: ../src/options.c:210 +#, c-format +msgid "" +"Default values:\n" +"\n" +" Daytime temperature: %uK\n" +" Night temperature: %uK\n" +msgstr "" +"預設值：\n" +"\n" +" 日間色溫： %uK\n" +" 夜間色溫： %uK\n" + +#. TRANSLATORS: help output 7 +#: ../src/options.c:218 +#, c-format +msgid "Please report bugs to <%s>\n" +msgstr "請回報 bug 至 <%s>\n" + +#: ../src/options.c:225 +msgid "Available adjustment methods:\n" +msgstr "可供使用的調整方法：\n" + +#: ../src/options.c:231 +msgid "Specify colon-separated options with `-m METHOD:OPTIONS'.\n" +msgstr "用冒號分隔選項 `-m METHOD:OPTIONS'\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:234 +msgid "Try `-m METHOD:help' for help.\n" +msgstr "試用 `-m METHOD:help' 取得說明。\n" + +#: ../src/options.c:241 +msgid "Available location providers:\n" +msgstr "可供使用的位置資訊供應者：\n" + +#: ../src/options.c:247 +msgid "Specify colon-separated options with`-l PROVIDER:OPTIONS'.\n" +msgstr "用冒號來分別選項 `-l PROVIDER:OPTIONS'。\n" + +#. TRANSLATORS: `help' must not be translated. +#: ../src/options.c:250 +msgid "Try `-l PROVIDER:help' for help.\n" +msgstr "試用 `-l PROVIDER:help' 來獲得說明。\n" + +#: ../src/options.c:356 +msgid "Malformed gamma argument.\n" +msgstr "異常的咖瑪參數。\n" + +#: ../src/options.c:358 ../src/options.c:472 ../src/options.c:491 +msgid "Try `-h' for more information.\n" +msgstr "試用 `-h' 獲得更多資訊。\n" + +#: ../src/options.c:407 ../src/options.c:610 +#, c-format +msgid "Unknown location provider `%s'.\n" +msgstr "不明的位置資訊供應者 `%s' 。\n" + +#. TRANSLATORS: This refers to the method +#. used to adjust colors e.g VidMode +#: ../src/options.c:439 ../src/options.c:597 +#, c-format +msgid "Unknown adjustment method `%s'.\n" +msgstr "不明的調整方法 `%s'。\n" + +#: ../src/options.c:470 +msgid "Malformed temperature argument.\n" +msgstr "異常的溫度參數。\n" + +#: ../src/options.c:561 ../src/options.c:575 ../src/options.c:586 +msgid "Malformed gamma setting.\n" +msgstr "髒常的咖瑪設定。\n" + +#: ../src/options.c:621 +#, c-format +msgid "Malformed dawn-time setting `%s'.\n" +msgstr "異常的日出時間設定 `%s'.\n" + +#: ../src/options.c:632 +#, c-format +msgid "Malformed dusk-time setting `%s'.\n" +msgstr "異常的日落時間設定 `%s'.\n" + +#: ../src/options.c:639 +#, c-format +msgid "Unknown configuration setting `%s'.\n" +msgstr "不明的設置設定 `%s'.\n" + +#: ../src/config-ini.c:167 +msgid "Malformed section header in config file.\n" +msgstr "設置檔案中異常分配存在。\n" + +#: ../src/config-ini.c:203 +msgid "Malformed assignment in config file.\n" +msgstr "設置檔案中分配異常。\n" + +#: ../src/config-ini.c:214 +msgid "Assignment outside section in config file.\n" +msgstr "設置檔案中分配外部段落。\n" + +#: ../src/gamma-drm.c:97 +#, c-format +msgid "Failed to open DRM device: %s\n" +msgstr "開啟 DRM 設備失敗： %s\n" + +#: ../src/gamma-drm.c:105 +#, c-format +msgid "Failed to get DRM mode resources\n" +msgstr "取得 DRM 模式資源失敗\n" + +#: ../src/gamma-drm.c:115 ../src/gamma-randr.c:384 +#, c-format +msgid "CRTC %d does not exist. " +msgstr "CRTC %d 不存在。 " + +#: ../src/gamma-drm.c:118 ../src/gamma-randr.c:387 +#, c-format +msgid "Valid CRTCs are [0-%d].\n" +msgstr "有效的 CRTCs 為 [0-%d]。\n" + +#: ../src/gamma-drm.c:121 ../src/gamma-randr.c:390 +#, c-format +msgid "Only CRTC 0 exists.\n" +msgstr "僅有 CRTC 0 存在。\n" + +#: ../src/gamma-drm.c:159 +#, c-format +msgid "CRTC %i lost, skipping\n" +msgstr "CRTC %i 遺失，跳過中\n" + +#: ../src/gamma-drm.c:165 +#, c-format +msgid "" +"Could not get gamma ramp size for CRTC %i\n" +"on graphics card %i, ignoring device.\n" +msgstr "" +"在顯示卡 %i 不能取得用於 CRTC %i 的咖瑪斜面大小，\n" +"忽略設備中。\n" + +#: ../src/gamma-drm.c:178 +#, c-format +msgid "" +"DRM could not read gamma ramps on CRTC %i on\n" +"graphics card %i, ignoring device.\n" +msgstr "" +"DRM 不能讀到咖瑪斜面於 CRTC %i on\n" +"顯示卡 %i , 忽略設備。\n" + +#: ../src/gamma-drm.c:242 +msgid "Adjust gamma ramps with Direct Rendering Manager.\n" +msgstr "用 Direct Rendering Manager 調整咖瑪斜面。\n" + +#. TRANSLATORS: DRM help output +#. left column must not be translated +#: ../src/gamma-drm.c:247 +msgid "" +" card=N\tGraphics card to apply adjustments to\n" +" crtc=N\tCRTC to apply adjustments to\n" +msgstr "" +" card=N\t顯示卡去套用調整至\n" +" crtc=N\tCRTC 去套用調整至\n" + +#: ../src/gamma-drm.c:260 +#, c-format +msgid "CRTC must be a non-negative integer\n" +msgstr "CRTC 必須為非負整數\n" + +#: ../src/gamma-drm.c:264 ../src/gamma-randr.c:369 ../src/gamma-vidmode.c:161 +#: ../src/gamma-quartz.c:183 ../src/gamma-w32gdi.c:128 ../src/gamma-dummy.c:67 +#: ../src/location-geoclue2.c:408 ../src/location-corelocation.m:243 +#: ../src/location-manual.c:106 +#, c-format +msgid "Unknown method parameter: `%s'.\n" +msgstr "不明的方法參數： `%s'.\n" + +#: ../src/gamma-randr.c:94 ../src/gamma-randr.c:153 ../src/gamma-randr.c:192 +#: ../src/gamma-randr.c:218 ../src/gamma-randr.c:275 ../src/gamma-randr.c:435 +#, c-format +msgid "`%s' returned error %d\n" +msgstr "`%s' 擲回錯誤 %d\n" + +#: ../src/gamma-randr.c:103 +#, c-format +msgid "Unsupported RANDR version (%u.%u)\n" +msgstr "不支援的 RANDR 版本 (%u.%u)\n" + +#: ../src/gamma-randr.c:138 +#, c-format +msgid "Screen %i could not be found.\n" +msgstr "螢幕 %i 未被找到。\n" + +#: ../src/gamma-randr.c:204 ../src/gamma-vidmode.c:96 ../src/gamma-quartz.c:114 +#, c-format +msgid "Gamma ramp size too small: %i\n" +msgstr "咖瑪斜面值太小： %i\n" + +#: ../src/gamma-randr.c:277 +#, c-format +msgid "Unable to restore CRTC %i\n" +msgstr "無法存入 CRTC %i\n" + +#: ../src/gamma-randr.c:301 +msgid "Adjust gamma ramps with the X RANDR extension.\n" +msgstr "使用 X RANDR 擴充來調整咖瑪斜面。\n" + +#. TRANSLATORS: RANDR help output +#. left column must not be translated +#: ../src/gamma-randr.c:306 +msgid "" +" screen=N\t\tX screen to apply adjustments to\n" +" crtc=N\tList of comma separated CRTCs to apply adjustments to\n" +msgstr "" +" 螢幕=N\t\tX 螢幕去套用調整至\n" +" crtc=N\t串串逗號幅來各別 CRTCs 去套用調整至\n" + +#: ../src/gamma-randr.c:328 +#, c-format +msgid "Unable to read screen number: `%s'.\n" +msgstr "無法讀取燭幕數字： `%s'。\n" + +#: ../src/gamma-randr.c:364 ../src/gamma-vidmode.c:156 +#: ../src/gamma-quartz.c:178 ../src/gamma-w32gdi.c:123 +#, c-format +msgid "" +"Parameter `%s` is now always on; Use the `%s` command-line option to " +"disable.\n" +msgstr "參數 `%s` 現在是永遠開啟； 使用 `%s` 指令選項去停用。\n" + +#: ../src/gamma-vidmode.c:61 ../src/gamma-vidmode.c:81 +#: ../src/gamma-vidmode.c:90 ../src/gamma-vidmode.c:117 +#: ../src/gamma-vidmode.c:180 ../src/gamma-vidmode.c:225 +#, c-format +msgid "X request failed: %s\n" +msgstr "X 請求失敗： %s\n" + +#: ../src/gamma-vidmode.c:140 +msgid "Adjust gamma ramps with the X VidMode extension.\n" +msgstr "使用 X VidMode extension 去調整咖瑪斜面。\n" + +#. TRANSLATORS: VidMode help output +#. left column must not be translated +#: ../src/gamma-vidmode.c:145 +msgid " screen=N\t\tX screen to apply adjustments to\n" +msgstr " 螢幕=N\t\tX 螢幕去套用調整至\n" + +#: ../src/gamma-quartz.c:140 ../src/gamma-w32gdi.c:91 +msgid "Unable to save current gamma ramp.\n" +msgstr "無法儲存目前的咖瑪斜面。\n" + +#: ../src/gamma-quartz.c:170 +msgid "Adjust gamma ramps on macOS using Quartz.\n" +msgstr "在 macOS 使用 Quarts 來調整咖瑪斜面。\n" + +#: ../src/gamma-w32gdi.c:68 ../src/gamma-w32gdi.c:141 ../src/gamma-w32gdi.c:168 +msgid "Unable to open device context.\n" +msgstr "無法開啟設備前後內文。\n" + +#: ../src/gamma-w32gdi.c:75 +msgid "Display device does not support gamma ramps.\n" +msgstr "顯示器沒有支援咖瑪斜面。\n" + +#: ../src/gamma-w32gdi.c:115 +msgid "Adjust gamma ramps with the Windows GDI.\n" +msgstr "用 Windows GDI 調整咖瑪斜面。\n" + +#: ../src/gamma-w32gdi.c:153 +msgid "Unable to restore gamma ramps.\n" +msgstr "無法存入咖瑪斜面。\n" + +#: ../src/gamma-w32gdi.c:211 +msgid "Unable to set gamma ramps.\n" +msgstr "無法設置咖瑪斜面。\n" + +#: ../src/gamma-dummy.c:43 +msgid "" +"WARNING: Using dummy gamma method! Display will not be affected by this " +"gamma method.\n" +msgstr "警示：正在使用虛擬咖瑪方法！顯示器不受此咖瑪方法的影響。\n" + +#: ../src/gamma-dummy.c:60 +msgid "" +"Does not affect the display but prints the color temperature to the " +"terminal.\n" +msgstr "不要影響顯示器，但列印色溫至終端器。\n" + +#: ../src/gamma-dummy.c:75 +#, c-format +msgid "Temperature: %i\n" +msgstr "色溫： %i\n" + +#: ../src/location-geoclue2.c:59 +#, c-format +msgid "" +"Access to the current location was denied by GeoClue!\n" +"Make sure that location services are enabled and that Redshift is permitted\n" +"to use location services. See https://github.com/jonls/redshift#faq for " +"more\n" +"information.\n" +msgstr "" +"取用目前位置資訊遭到 GeoClue 拒絕！\n" +"要確定位置提供服務是啟用的，且允許 Redshift 使用位置服務。\n" +"請見網頁 https://github.com/jonls/redshift#faq 更多資訊。\n" + +#: ../src/location-geoclue2.c:107 +#, c-format +msgid "Unable to obtain location: %s.\n" +msgstr "無法取得位置： %s。\n" + +#: ../src/location-geoclue2.c:150 +#, c-format +msgid "Unable to obtain GeoClue Manager: %s.\n" +msgstr "無法取得 GeoClue 管理者： %s。\n" + +#: ../src/location-geoclue2.c:166 +#, c-format +msgid "Unable to obtain GeoClue client path: %s.\n" +msgstr "無法取得 GeoClue 客戶端路徑： %s。\n" + +#: ../src/location-geoclue2.c:188 +#, c-format +msgid "Unable to obtain GeoClue Client: %s.\n" +msgstr "無法取得 GeoClue 客戶端： %s。\n" + +#: ../src/location-geoclue2.c:229 +#, c-format +msgid "Unable to set distance threshold: %s.\n" +msgstr "無法設置距離閥值： %s。\n" + +#: ../src/location-geoclue2.c:253 +#, c-format +msgid "Unable to start GeoClue client: %s.\n" +msgstr "無法啟動 GeoClue 客戶端： %s。\n" + +#: ../src/location-geoclue2.c:365 +msgid "Failed to start GeoClue2 provider!\n" +msgstr "啟動 GeoClue2 供應服務失敗！\n" + +#: ../src/location-geoclue2.c:399 +msgid "Use the location as discovered by a GeoClue2 provider.\n" +msgstr "使用位置作為 GeoClue2 供應者所發現的。\n" + +#: ../src/location-corelocation.m:73 +msgid "Not authorized to obtain location from CoreLocation.\n" +msgstr "來自 CoreLocation 取得位置資訊未獲授權。\n" + +#: ../src/location-corelocation.m:111 +#, c-format +msgid "Error obtaining location from CoreLocation: %s\n" +msgstr "來自 CoreLocation 取得位置資訊錯誤：%s\n" + +#: ../src/location-corelocation.m:120 +msgid "Waiting for authorization to obtain location...\n" +msgstr "等待授權以取得位置資訊...\n" + +#: ../src/location-corelocation.m:122 +msgid "Request for location was not authorized!\n" +msgstr "請求位置尚未授權！\n" + +#: ../src/location-corelocation.m:203 +msgid "Failed to start CoreLocation provider!\n" +msgstr "啟動 CoreLocation 供應服務失敗！\n" + +#: ../src/location-corelocation.m:235 +msgid "Use the location as discovered by the Corelocation provider.\n" +msgstr "使用位置作為 Corelocation 供應者所發現的.\n" + +#: ../src/location-manual.c:59 +msgid "Latitude and longitude must be set.\n" +msgstr "經度緯度必須設置。\n" + +#: ../src/location-manual.c:75 +msgid "Specify location manually.\n" +msgstr "手動指定位置。\n" + +#. TRANSLATORS: Manual location help output +#. left column must not be translated +#: ../src/location-manual.c:80 +msgid "" +" lat=N\t\tLatitude\n" +" lon=N\t\tLongitude\n" +msgstr "" +" lat=N\t\t緯度\n" +" lon=N\t\t經度\n" + +#: ../src/location-manual.c:83 +msgid "" +"Both values are expected to be floating point numbers,\n" +"negative values representing west / south, respectively.\n" +msgstr "" +"兩個數均為浮點數字，\n" +"負數分代表西經或南緯。\n" + +#: ../src/location-manual.c:97 +msgid "Malformed argument.\n" +msgstr "異常參數\n" + +#: ../src/redshift-gtk/statusicon.py:78 +msgid "Suspend for" +msgstr "暫緩執行" + +#: ../src/redshift-gtk/statusicon.py:80 +msgid "30 minutes" +msgstr "30 分鐘" + +#: ../src/redshift-gtk/statusicon.py:81 +msgid "1 hour" +msgstr "1 小時" + +#: ../src/redshift-gtk/statusicon.py:82 +msgid "2 hours" +msgstr "2 小時" + +#: ../src/redshift-gtk/statusicon.py:91 +msgid "Autostart" +msgstr "自動啟動" + +#: ../src/redshift-gtk/statusicon.py:103 ../src/redshift-gtk/statusicon.py:113 +msgid "Info" +msgstr "資訊" + +#: ../src/redshift-gtk/statusicon.py:108 +msgid "Quit" +msgstr "停止" + +#: ../src/redshift-gtk/statusicon.py:146 +msgid "Close" +msgstr "關閉" + +#: ../src/redshift-gtk/statusicon.py:300 +msgid "Status: {}" +msgstr "狀態： {}" + +#: ../src/redshift-gtk/statusicon.py:306 ../src/redshift-gtk/statusicon.py:324 +msgid "Color temperature" +msgstr "色溫" + +#: ../src/redshift-gtk/statusicon.py:312 ../src/redshift-gtk/statusicon.py:325 +msgid "Period" +msgstr "期間" + +#: ../src/redshift-gtk/statusicon.py:318 +msgid "Location" +msgstr "位置" + +#: ../src/redshift-gtk/statusicon.py:349 +msgid "Please run `redshift -h` for help output." +msgstr "請執行 `redshift -h` 獲得說明輸出。" diff -Nru redshift-1.11/py-compile redshift-1.12/py-compile --- redshift-1.11/py-compile 2016-01-02 19:04:55.000000000 +0000 +++ redshift-1.12/py-compile 2017-07-28 21:58:10.000000000 +0000 @@ -1,9 +1,9 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2011-06-08.12; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 2000-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2017 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -165,6 +165,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -Nru redshift-1.11/README redshift-1.12/README --- redshift-1.11/README 2016-01-02 19:01:20.000000000 +0000 +++ redshift-1.12/README 2017-10-19 02:36:21.000000000 +0000 @@ -18,13 +18,115 @@ ------------ [![Build Status](https://travis-ci.org/jonls/redshift.svg?branch=master)](https://travis-ci.org/jonls/redshift) +[![Build Status](https://ci.appveyor.com/api/projects/status/github/jonls/redshift?branch=master&svg=true)](https://ci.appveyor.com/project/jonls/redshift) -Building from source --------------------- +FAQ +--- + +**How do I install Redshift?** + +Use the packages provided by your distribution, e.g. for Ubuntu: +`apt-get install redshift` or `apt-get install redshift-gtk`. For developers, +please see _Building from source_ and _Latest builds from master branch_ below. + +**How do I setup a configuration file?** + +A configuration file is not required but is useful for saving custom +configurations and manually defining the location in case of issues with the +automatic location provider. An example configuration can be found in +[redshift.conf.sample](redshift.conf.sample). + +The configuration file should be saved in the following location depending on +the platform: + +- Linux/macOS: `~/.config/redshift.conf`. +- Windows: Put `redshift.conf` in `%USERPROFILE%\AppData\Local\` + (aka `%localappdata%`). + +**Where can I find my coordinates to put in the configuration file?** + +There are multiple web sites that provide coordinates for map locations, for +example clicking anywhere on Google Maps will bring up a box with the +coordinates. Remember that longitudes in the western hemisphere (e.g. the +Americas) must be provided to Redshift as negative numbers. + +**Why does GeoClue fail with access denied error?** + +It is possible that the location services have been disabled completely. The +check for this case varies by desktop environment. For example, in GNOME the +location services can be toggled in Settings > Privacy > Location Services. + +If this is not the case, it is possible that Redshift has been improperly +installed or not been given the required permissions to obtain location +updates from a system administrator. See +https://github.com/jonls/redshift/issues/318 for further discussion on this +issue. + +**Why doesn't Redshift work on my Chromebook/Raspberry Pi?** + +Certain video drivers do not support adjustable gamma ramps. In some cases +Redshift will fail with an error message, but other drivers silently ignore +adjustments to the gamma ramp. + +**Why doesn't Redshift change the backlight when I use the brightness option?** + +Redshift has a brightness adjustment setting but it does not work the way most +people might expect. In fact it is a fake brightness adjustment obtained by +manipulating the gamma ramps which means that it does not reduce the backlight +of the screen. Preferably only use it if your normal backlight adjustment is +too coarse-grained. -See the file [HACKING](HACKING.md) for more details on building from source. +**Why doesn't Redshift work on Wayland (e.g. Fedora 25)?** -Donations ---------- +The Wayland protocol does not support Redshift. There is currently no way for +Redshift to adjust the color temperature in Wayland. + +**Why doesn't Redshift work on Ubuntu with Mir enabled?** + +Mir does not support Redshift. + +**The redness effect is applied during the day instead of at night. Why?** + +This usually happens to users in America when the longitude has been set in the +configuration file to a positive number. Longitudes in the western hemisphere +should be provided as negative numbers (e.g. New York City is at approximately +latitude/longitude 41, -74). + +**Why does the redness effect occasionally switch off for a few seconds?** + +Redshift uses the gamma ramps of the graphics driver to apply the redness +effect but Redshift cannot block other applications from also changing the +gamma ramps. Some applications (particularly games and video players) will +reset the gamma ramps. After a few seconds Redshift will kick in again. There +is no way for Redshift to prevent this from happening. + +**Why does the redness effect continuously flicker?** + +You may have multiple instances of Redshift running simultaneously. Make sure +that only one instance is running for the display where you are seeing the +flicker. + +**Why doesn't Redshift change the color of the mouse cursor?** + +Mouse cursors are usually handled separately by the graphics hardware and is +not affected by gamma ramps. Some graphics drivers can be configured to use +software cursors instead. + +**I have an issue with Redshift but it was not mentioned in this FAQ. What +do I do?** + +Please go to [the issue tracker](https://github.com/jonls/redshift/issues) and +check if your issue has already been reported. If not, please open a new issue +describing you problem. + +Latest builds from master branch +-------------------------------- + +- [Ubuntu PPA](https://launchpad.net/~dobey/+archive/ubuntu/redshift-daily/+packages) (`sudo add-apt-repository ppa:dobey/redshift-daily`) +- [Windows x86_64](https://ci.appveyor.com/api/projects/jonls/redshift/artifacts/redshift-windows-x86_64.zip?branch=master&job=Environment%3A+arch%3Dx86_64&pr=false) +- [Windows x86](https://ci.appveyor.com/api/projects/jonls/redshift/artifacts/redshift-windows-i686.zip?branch=master&job=Environment%3A+arch%3Di686&pr=false) + +Building from source +-------------------- -[![Flattr](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/thing/57936/Redshift) +See the file [CONTRIBUTING](CONTRIBUTING.md) for more details on building from source. diff -Nru redshift-1.11/redshift.1 redshift-1.12/redshift.1 --- redshift-1.11/redshift.1 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/redshift.1 2017-10-19 02:36:21.000000000 +0000 @@ -1,128 +1,149 @@ -.TH REDSHIFT 1 2011-10-01 redshift +.TH REDSHIFT 1 .SH NAME redshift \- set color temperature of display according to time of day .SH SYNOPSIS .B redshift -\fI[\-l LAT:LON | \-l PROVIDER:OPTIONS] [\-t DAY:NIGHT] \fR[\fIOPTIONS\fR...] +\fR[\fB\-l\fR \fILAT\fB:\fILON\fR | \fB\-l\fR \fIPROVIDER\fB:\fIOPTIONS\fR] [\fB\-t\fR \fIDAY\fB:\fINIGHT\fR] [\fIOPTIONS\fR...] .SH DESCRIPTION .B redshift adjusts the color temperature of your screen according to your surroundings. This may help your eyes hurt less or reduce the risk for delayed sleep phase syndrome if you are working in front of the screen at night. - +.PP The color temperature is set according to the position of the sun. A different color temperature is set during night and daytime. During twilight and early morning, the color temperature transitions smoothly from night to daytime temperature to allow your eyes to slowly adapt over a period of about an hour. At night the color temperature should be set to match the lamps in your room. This is typically a low -temperature at around 3000K\-4000K (default is 3700K). During the day, +temperature at around 3000K\-4000K (default is 4500K). During the day, the color temperature should match the light from outside, typically -around 5500K\-6500K (default is 5500K). The light has a higher +around 5500K\-6500K (default is 6500K). The light has a higher temperature on an overcast day. +.PP +In addition to the command-line tool \fBredshift\fR, the GUI +\fBredshift-gtk\fR provides an alternative interface that shows up as a +notification icon in the desktop environment. .SH OPTIONS .TP \fB\-h\fR -Display this help message +Display help message. .TP \fB\-v\fR -Verbose output +Enable verbose output. .TP \fB\-V\fR -Show program version +Show program version. .TP -\fB\-b\fR DAY:NIGHT -Screen brightness to apply (between 0.1 and 1.0) +\fB\-b\fR \fIDAY\fB:\fINIGHT\fR +Screen brightness to apply (between 0.1 and 1.0). .TP -\fB\-c\fR FILE -Load settings from specified configuration file +\fB\-c\fR \fIFILE\fR +Load settings from specified configuration file. .TP -\fB\-g\fR R:G:B -Additional gamma correction to apply +\fB\-g\fR \fIR\fB:\fIG\fB:\fIB\fR +Additional gamma correction to apply. .TP -\fB\-l\fR LAT:LON +\fB\-l\fR \fILAT\fB:\fILON\fR Your current location, in degrees, given as floating point numbers, towards north and east, with negative numbers representing south and west, respectively. .TP -\fB\-l\fR PROVIDER[:OPTIONS] +\fB\-l\fR \fIPROVIDER\fR[\fB:\fIOPTIONS\fR] Select provider for automatic location updates -(Use `-l list' to see available providers) +(Use \fB"\-l list"\fR to see available providers). .TP -\fB\-m\fR METHOD[:OPTIONS] +\fB\-m\fR \fIMETHOD\fR[\fB:\fIOPTIONS\fR] Method to use to set color temperature -(Use `-m list' to see available methods) +(Use \fB"\-m list"\fR to see available methods). .TP \fB\-o\fR -One shot mode (do not continuously adjust color temperature) -.TP -\fB\-O\fR TEMP -One shot manual mode (set color temperature) +One-shot mode (do not continuously adjust color temperature). Use this with the +\fB\-P\fR option to clear the existing gamma ramps before applying the new color +temperature. +.TP +\fB\-O\fR \fITEMP\fR +One-shot manual mode (set color temperature). Use this with the \fB\-P\fR option +to clear the existing gamma ramps before applying the new color temperature. .TP \fB\-p\fR -Print mode (only print parameters and exit) +Print mode (only print parameters and exit). +.TP +\fB\-P\fR +Reset existing gamma ramps before applying new color effect. .TP \fB\-x\fR -Reset mode (remove adjustment from screen) +Reset mode (remove adjustment from screen). .TP \fB\-r\fR -Disable temperature transitions +Disable fading between color temperatures. .TP -\fB\-t\fR DAY:NIGHT -Color temperature to set at daytime/night +\fB\-t\fR \fIDAY\fB:\fINIGHT\fR +Color temperature to set at daytime/night. .PP The neutral temperature is 6500K. Using this value will not change the color temperature of the display. Setting the color temperature to a value higher than this results in more blue light, and setting a lower value will result in more red light. - +.PP Default temperature values: .IP -Daytime: 5500K, night: 3700K +Daytime: 6500K, night: 4500K .SH CONFIGURATION FILE -A configuration file with the name `redshift.conf' can optionally be -placed in `~/.config/'. The file has standard INI format. General -program options are placed under the `redshift' header, while options +A configuration file with the name \fIredshift.conf\fR can optionally be +placed in \fI~/.config/\fR. The file has standard INI format. General +program options are placed under the \fBredshift\fR header, while options for location providers and adjustment methods are placed under a header with the name of that provider or method. General options are: .TP -\fBtemp\-day\fR = integer +\fBtemp\-day\fR = \fIinteger\fR Daytime temperature .TP -\fBtemp\-night\fR = integer +\fBtemp\-night\fR = \fIinteger\fR Night temperature .TP -\fBtransition\fR = 0 or 1 -Disable or enable transitions +\fBfade\fR = \fI0 or 1\fR +Disable or enable fading between color temperatures when Redshift starts or +stops .TP -\fBbrightness\-day\fR = 0.1\-1.0 +\fBbrightness\-day\fR = \fI0.1\-1.0\fR Screen brightness at daytime .TP -\fBbrightness\-night\fR = 0.1\-1.0 +\fBbrightness\-night\fR = \fI0.1\-1.0\fR Screen brightness at night .TP -\fBelevation-high\fR = decimal -The solar elevation for the transition to daytime +\fBelevation-high\fR = \fIdecimal\fR +The solar elevation in degrees for the transition to daytime +.TP +\fBelevation-low\fR = \fIdecimal\fR +The solar elevation in degrees for the transition to night .TP -\fBelevation-low\fR = decimal -The solar elevation for the transition to night +\fBdawn-time\fR = \fIHH\fB:\fIMM\fR[\fB\-\fIHH\fB:\fIMM\fR] +The custom time interval for the transition from night to day in the morning. +When specified, the solar elevation will not be used to determine the current +daytime/night period. If this option is set, dusk-time must also be specified. +.TP +\fBdusk-time\fR = \fIHH\fB:\fIMM\fR[\fB\-\fIHH\fB:\fIMM\fR] +The custom time interval for the transition from day to night in the evening. +When specified, the solar elevation will not be used to determine the current +daytime/night period. If this option is set, dawn-time must also be specified. .TP -\fBgamma\fR = R:G:B +\fBgamma\fR = \fIR\fB:\fIG\fB:\fIB\fR Gamma adjustment to apply (day and night) .TP -\fBgamma-day\fR = R:G:B +\fBgamma-day\fR = \fIR\fB:\fIG\fB:\fIB\fR Gamma adjustment to apply at daytime .TP -\fBgamma-night\fR = R:G:B +\fBgamma-night\fR = \fIR\fB:\fIG\fB:\fIB\fR Gamma adjustment to apply at night .TP -\fBadjustment\-method\fR = name +\fBadjustment\-method\fR = \fIname\fR Select adjustment method. Options for the adjustment method can be given under the configuration file heading of the same name. .TP -\fBlocation\-provider\fR = name +\fBlocation\-provider\fR = \fIname\fR Select location provider. Options for the location provider can be given under the configuration file heading of the same name. .PP @@ -149,15 +170,15 @@ lon=12.6 .fi .SH HOOKS -Executables (e.g. scripts) placed in folder `~/.config/redshift/hooks' +Executables (e.g. scripts) placed in folder \fI~/.config/redshift/hooks\fR will be run when a certain event happens. The first parameter to the script indicates the event and further parameters may indicate -more details about the event. The event `period-changed' is indicated -when the period changes (`night', `daytime', `transition'). The second +more details about the event. The event \fBperiod-changed\fR is indicated +when the period changes (\fBnight\fR, \fBdaytime\fR, \fBtransition\fR). The second parameter is the old period and the third is the new period. The event is also signaled when Redshift starts up with the old period set to -`none'. Any dotfiles in the folder are skipped. - +\fBnone\fR. Any dotfiles in the folder are skipped. +.PP A simple script to handle these events can be written like this: .IP .nf @@ -178,6 +199,7 @@ .SH BUGS Please report bugs to .SH KNOWN ISSUES -Redshift won't affect the color of your cursor when your graphics driver +.B redshift +will not affect the color of your cursor when your graphics driver is configured to use hardware cursors. Some graphics drivers have an -option to disable hardware cursors in xorg.conf. +option to disable hardware cursors. diff -Nru redshift-1.11/redshift.conf.sample redshift-1.12/redshift.conf.sample --- redshift-1.11/redshift.conf.sample 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/redshift.conf.sample 2017-10-19 02:36:21.000000000 +0000 @@ -4,10 +4,25 @@ temp-day=5700 temp-night=3500 -; Enable/Disable a smooth transition between day and night -; 0 will cause a direct change from day to night screen temperature. -; 1 will gradually increase or decrease the screen temperature. -transition=1 +; Disable the smooth fade between temperatures when Redshift starts and stops. +; 0 will cause an immediate change between screen temperatures. +; 1 will gradually apply the new screen temperature over a couple of seconds. +fade=1 + +; Solar elevation thresholds. +; By default, Redshift will use the current elevation of the sun to determine +; whether it is daytime, night or in transition (dawn/dusk). When the sun is +; above the degrees specified with elevation-high it is considered daytime and +; below elevation-low it is considered night. +;elevation-high=3 +;elevation-low=-6 + +; Custom dawn/dusk intervals. +; Instead of using the solar elevation, the time intervals of dawn and dusk +; can be specified manually. The times must be specified as HH:MM in 24-hour +; format. +;dawn-time=6:00-7:45 +;dusk-time=18:35-20:15 ; Set the screen brightness. Default is 1.0. ;brightness=0.9 @@ -24,7 +39,7 @@ ;gamma-day=0.8:0.7:0.8 ;gamma-night=0.6 -; Set the location-provider: 'geoclue', 'geoclue2', 'manual' +; Set the location-provider: 'geoclue2', 'manual' ; type 'redshift -l list' to see possible values. ; The location provider settings are in a different section. location-provider=manual @@ -48,9 +63,8 @@ ; Configuration of the adjustment-method ; type 'redshift -m METHOD:help' to see the settings. ; ex: 'redshift -m randr:help' -; In this example, randr is configured to adjust screen 1. -; Note that the numbering starts from 0, so this is actually the -; second screen. If this option is not specified, Redshift will try -; to adjust _all_ screens. +; In this example, randr is configured to adjust only screen 0. +; Note that the numbering starts from 0, so this is actually the first screen. +; If this option is not specified, Redshift will try to adjust _all_ screens. [randr] -screen=1 +screen=0 diff -Nru redshift-1.11/src/config-ini.c redshift-1.12/src/config-ini.c --- redshift-1.11/src/config-ini.c 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/config-ini.c 2018-05-21 00:56:43.000000000 +0000 @@ -63,8 +63,15 @@ if (f == NULL && (env = getenv("XDG_CONFIG_HOME")) != NULL && env[0] != '\0') { - snprintf(cp, sizeof(cp), "%s/redshift.conf", env); + snprintf(cp, sizeof(cp), + "%s/redshift/redshift.conf", env); f = fopen(cp, "r"); + if (f == NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%s/redshift.conf", env); + f = fopen(cp, "r"); + } } #ifdef _WIN32 @@ -78,8 +85,14 @@ if (f == NULL && (env = getenv("HOME")) != NULL && env[0] != '\0') { snprintf(cp, sizeof(cp), - "%s/.config/redshift.conf", env); + "%s/.config/redshift/redshift.conf", env); f = fopen(cp, "r"); + if (f == NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%s/.config/redshift.conf", env); + f = fopen(cp, "r"); + } } #ifndef _WIN32 @@ -87,8 +100,14 @@ struct passwd *pwd = getpwuid(getuid()); char *home = pwd->pw_dir; snprintf(cp, sizeof(cp), - "%s/.config/redshift.conf", home); + "%s/.config/redshift/redshift.conf", home); f = fopen(cp, "r"); + if (f == NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%s/.config/redshift.conf", home); + f = fopen(cp, "r"); + } } if (f == NULL && (env = getenv("XDG_CONFIG_DIRS")) != NULL && @@ -101,9 +120,14 @@ int len = end - begin; if (len > 0) { snprintf(cp, sizeof(cp), - "%.*s/redshift.conf", len, begin); - + "%.*s/redshift/redshift.conf", len, begin); f = fopen(cp, "r"); + if (f != NULL) { + /* Fall back to formerly used path. */ + snprintf(cp, sizeof(cp), + "%.*s/redshift.conf", len, begin); + f = fopen(cp, "r"); + } if (f != NULL) break; } diff -Nru redshift-1.11/src/gamma-drm.c redshift-1.12/src/gamma-drm.c --- redshift-1.11/src/gamma-drm.c 2016-01-02 19:01:20.000000000 +0000 +++ redshift-1.12/src/gamma-drm.c 2017-10-19 02:36:21.000000000 +0000 @@ -15,13 +15,13 @@ along with Redshift. If not, see . Copyright (c) 2014 Mattias Andrée + Copyright (c) 2017 Jon Lund Steffensen */ #include #include #include #include -#include #include #include #include @@ -38,29 +38,54 @@ #define O_CLOEXEC 02000000 #endif +#include +#include + #include "gamma-drm.h" #include "colorramp.h" -int -drm_init(drm_state_t *state) +typedef struct { + int crtc_num; + int crtc_id; + int gamma_size; + uint16_t* r_gamma; + uint16_t* g_gamma; + uint16_t* b_gamma; +} drm_crtc_state_t; + +typedef struct { + int card_num; + int crtc_num; + int fd; + drmModeRes* res; + drm_crtc_state_t* crtcs; +} drm_state_t; + + +static int +drm_init(drm_state_t **state) { /* Initialize state. */ - state->card_num = 0; - state->crtc_num = -1; - state->fd = -1; - state->res = NULL; - state->crtcs = NULL; + *state = malloc(sizeof(drm_state_t)); + if (*state == NULL) return -1; + + drm_state_t *s = *state; + s->card_num = 0; + s->crtc_num = -1; + s->fd = -1; + s->res = NULL; + s->crtcs = NULL; return 0; } -int +static int drm_start(drm_state_t *state) { /* Acquire access to a graphics card. */ long maxlen = strlen(DRM_DIR_NAME) + strlen(DRM_DEV_NAME) + 10; - char *pathname = alloca(maxlen * sizeof(char)); + char pathname[maxlen]; sprintf(pathname, DRM_DEV_NAME, DRM_DIR_NAME, state->card_num); @@ -69,6 +94,8 @@ /* TODO check if access permissions, normally root or membership of the video group is required. */ perror("open"); + fprintf(stderr, _("Failed to open DRM device: %s\n"), + pathname); return -1; } @@ -171,7 +198,7 @@ return 0; } -void +static void drm_restore(drm_state_t *state) { drm_crtc_state_t *crtcs = state->crtcs; @@ -184,7 +211,7 @@ } } -void +static void drm_free(drm_state_t *state) { if (state->crtcs != NULL) { @@ -205,9 +232,11 @@ close(state->fd); state->fd = -1; } + + free(state); } -void +static void drm_print_help(FILE *f) { fputs(_("Adjust gamma ramps with Direct Rendering Manager.\n"), f); @@ -220,7 +249,7 @@ fputs("\n", f); } -int +static int drm_set_option(drm_state_t *state, const char *key, const char *value) { if (strcasecmp(key, "card") == 0) { @@ -239,8 +268,9 @@ return 0; } -int -drm_set_temperature(drm_state_t *state, const color_setting_t *setting) +static int +drm_set_temperature( + drm_state_t *state, const color_setting_t *setting, int preserve) { drm_crtc_state_t *crtcs = state->crtcs; int last_gamma_size = 0; @@ -287,3 +317,15 @@ return 0; } + + +const gamma_method_t drm_gamma_method = { + "drm", 0, + (gamma_method_init_func *)drm_init, + (gamma_method_start_func *)drm_start, + (gamma_method_free_func *)drm_free, + (gamma_method_print_help_func *)drm_print_help, + (gamma_method_set_option_func *)drm_set_option, + (gamma_method_restore_func *)drm_restore, + (gamma_method_set_temperature_func *)drm_set_temperature +}; diff -Nru redshift-1.11/src/gamma-drm.h redshift-1.12/src/gamma-drm.h --- redshift-1.11/src/gamma-drm.h 2014-12-28 03:49:55.000000000 +0000 +++ redshift-1.12/src/gamma-drm.h 2017-10-19 02:36:21.000000000 +0000 @@ -15,47 +15,14 @@ along with Redshift. If not, see . Copyright (c) 2014 Mattias Andrée + Copyright (c) 2017 Jon Lund Steffensen */ #ifndef REDSHIFT_GAMMA_DRM_H #define REDSHIFT_GAMMA_DRM_H -#include - -#include -#include - #include "redshift.h" - -typedef struct { - int crtc_num; - int crtc_id; - int gamma_size; - uint16_t* r_gamma; - uint16_t* g_gamma; - uint16_t* b_gamma; -} drm_crtc_state_t; - -typedef struct { - int card_num; - int crtc_num; - int fd; - drmModeRes* res; - drm_crtc_state_t* crtcs; -} drm_state_t; - - -int drm_init(drm_state_t *state); -int drm_start(drm_state_t *state); -void drm_free(drm_state_t *state); - -void drm_print_help(FILE *f); -int drm_set_option(drm_state_t *state, const char *key, const char *value); - -void drm_restore(drm_state_t *state); -int drm_set_temperature(drm_state_t *state, - const color_setting_t *setting); - +extern const gamma_method_t drm_gamma_method; #endif /* ! REDSHIFT_GAMMA_DRM_H */ diff -Nru redshift-1.11/src/gamma-dummy.c redshift-1.12/src/gamma-dummy.c --- redshift-1.11/src/gamma-dummy.c 2014-12-28 03:49:55.000000000 +0000 +++ redshift-1.12/src/gamma-dummy.c 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2013-2014 Jon Lund Steffensen + Copyright (c) 2013-2017 Jon Lund Steffensen */ #include @@ -30,46 +30,60 @@ #include "redshift.h" -int -gamma_dummy_init(void *state) +static int +gamma_dummy_init(void **state) { + *state = NULL; return 0; } -int +static int gamma_dummy_start(void *state) { fputs(_("WARNING: Using dummy gamma method! Display will not be affected by this gamma method.\n"), stderr); return 0; } -void +static void gamma_dummy_restore(void *state) { } -void +static void gamma_dummy_free(void *state) { } -void +static void gamma_dummy_print_help(FILE *f) { fputs(_("Does not affect the display but prints the color temperature to the terminal.\n"), f); fputs("\n", f); } -int +static int gamma_dummy_set_option(void *state, const char *key, const char *value) { fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); return -1; } -int -gamma_dummy_set_temperature(void *state, const color_setting_t *setting) +static int +gamma_dummy_set_temperature( + void *state, const color_setting_t *setting, int preserve) { printf(_("Temperature: %i\n"), setting->temperature); return 0; } + + +const gamma_method_t dummy_gamma_method = { + "dummy", 0, + (gamma_method_init_func *)gamma_dummy_init, + (gamma_method_start_func *)gamma_dummy_start, + (gamma_method_free_func *)gamma_dummy_free, + (gamma_method_print_help_func *)gamma_dummy_print_help, + (gamma_method_set_option_func *)gamma_dummy_set_option, + (gamma_method_restore_func *)gamma_dummy_restore, + (gamma_method_set_temperature_func *)gamma_dummy_set_temperature +}; diff -Nru redshift-1.11/src/gamma-dummy.h redshift-1.12/src/gamma-dummy.h --- redshift-1.11/src/gamma-dummy.h 2014-12-28 03:49:55.000000000 +0000 +++ redshift-1.12/src/gamma-dummy.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2013-2014 Jon Lund Steffensen + Copyright (c) 2013-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_GAMMA_DUMMY_H @@ -22,17 +22,6 @@ #include "redshift.h" - -int gamma_dummy_init(void *state); -int gamma_dummy_start(void *state); -void gamma_dummy_free(void *state); - -void gamma_dummy_print_help(FILE *f); -int gamma_dummy_set_option(void *state, const char *key, const char *value); - -void gamma_dummy_restore(void *state); -int gamma_dummy_set_temperature(void *state, - const color_setting_t *setting); - +extern const gamma_method_t dummy_gamma_method; #endif /* ! REDSHIFT_GAMMA_DUMMY_H */ diff -Nru redshift-1.11/src/gamma-quartz.c redshift-1.12/src/gamma-quartz.c --- redshift-1.11/src/gamma-quartz.c 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/gamma-quartz.c 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2014 Jon Lund Steffensen + Copyright (c) 2014-2017 Jon Lund Steffensen */ #ifdef HAVE_CONFIG_H @@ -37,19 +37,33 @@ #include "colorramp.h" -int -quartz_init(quartz_state_t *state) +typedef struct { + CGDirectDisplayID display; + uint32_t ramp_size; + float *saved_ramps; +} quartz_display_state_t; + +typedef struct { + quartz_display_state_t *displays; + uint32_t display_count; +} quartz_state_t; + + +static int +quartz_init(quartz_state_t **state) { - state->preserve = 0; - state->displays = NULL; + *state = malloc(sizeof(quartz_state_t)); + if (*state == NULL) return -1; + + quartz_state_t *s = *state; + s->displays = NULL; return 0; } -int +static int quartz_start(quartz_state_t *state) { - int r; CGError error; uint32_t display_count; @@ -132,13 +146,13 @@ return 0; } -void +static void quartz_restore(quartz_state_t *state) { CGDisplayRestoreColorSyncSettings(); } -void +static void quartz_free(quartz_state_t *state) { if (state->displays != NULL) { @@ -147,27 +161,24 @@ } } free(state->displays); + free(state); } -void +static void quartz_print_help(FILE *f) { - fputs(_("Adjust gamma ramps on OSX using Quartz.\n"), f); - fputs("\n", f); - - /* TRANSLATORS: Quartz help output - left column must not be translated */ - fputs(_(" preserve={0,1}\tWhether existing gamma should be" - " preserved\n"), - f); + fputs(_("Adjust gamma ramps on macOS using Quartz.\n"), f); fputs("\n", f); } -int +static int quartz_set_option(quartz_state_t *state, const char *key, const char *value) { if (strcasecmp(key, "preserve") == 0) { - state->preserve = atoi(value); + fprintf(stderr, _("Parameter `%s` is now always on; " + " Use the `%s` command-line option" + " to disable.\n"), + key, "-P"); } else { fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); return -1; @@ -177,10 +188,12 @@ } static void -quartz_set_temperature_for_display(quartz_state_t *state, int display, - const color_setting_t *setting) +quartz_set_temperature_for_display( + quartz_state_t *state, int display_index, + const color_setting_t *setting, int preserve) { - uint32_t ramp_size = state->displays[display].ramp_size; + CGDirectDisplayID display = state->displays[display_index].display; + uint32_t ramp_size = state->displays[display_index].ramp_size; /* Create new gamma ramps */ float *gamma_ramps = malloc(3*ramp_size*sizeof(float)); @@ -193,9 +206,9 @@ float *gamma_g = &gamma_ramps[1*ramp_size]; float *gamma_b = &gamma_ramps[2*ramp_size]; - if (state->preserve) { + if (preserve) { /* Initialize gamma ramps from saved state */ - memcpy(gamma_ramps, state->displays[display].saved_ramps, + memcpy(gamma_ramps, state->displays[display_index].saved_ramps, 3*ramp_size*sizeof(float)); } else { /* Initialize gamma ramps to pure state */ @@ -221,13 +234,26 @@ free(gamma_ramps); } -int -quartz_set_temperature(quartz_state_t *state, - const color_setting_t *setting) +static int +quartz_set_temperature( + quartz_state_t *state, const color_setting_t *setting, int preserve) { for (int i = 0; i < state->display_count; i++) { - quartz_set_temperature_for_display(state, i, setting); + quartz_set_temperature_for_display( + state, i, setting, preserve); } return 0; } + + +const gamma_method_t quartz_gamma_method = { + "quartz", 1, + (gamma_method_init_func *)quartz_init, + (gamma_method_start_func *)quartz_start, + (gamma_method_free_func *)quartz_free, + (gamma_method_print_help_func *)quartz_print_help, + (gamma_method_set_option_func *)quartz_set_option, + (gamma_method_restore_func *)quartz_restore, + (gamma_method_set_temperature_func *)quartz_set_temperature +}; diff -Nru redshift-1.11/src/gamma-quartz.h redshift-1.12/src/gamma-quartz.h --- redshift-1.11/src/gamma-quartz.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/gamma-quartz.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,43 +14,14 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2014 Jon Lund Steffensen + Copyright (c) 2014-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_GAMMA_QUARTZ_H #define REDSHIFT_GAMMA_QUARTZ_H -#include - -#include - #include "redshift.h" - -typedef struct { - CGDirectDisplayID display; - uint32_t ramp_size; - float *saved_ramps; -} quartz_display_state_t; - -typedef struct { - quartz_display_state_t *displays; - uint32_t display_count; - int preserve; -} quartz_state_t; - - -int quartz_init(quartz_state_t *state); -int quartz_start(quartz_state_t *state); -void quartz_free(quartz_state_t *state); - -void quartz_print_help(FILE *f); -int quartz_set_option(quartz_state_t *state, const char *key, - const char *value); - -void quartz_restore(quartz_state_t *state); -int quartz_set_temperature(quartz_state_t *state, - const color_setting_t *setting); - +extern const gamma_method_t quartz_gamma_method; #endif /* ! REDSHIFT_GAMMA_QUARTZ_H */ diff -Nru redshift-1.11/src/gamma-randr.c redshift-1.12/src/gamma-randr.c --- redshift-1.11/src/gamma-randr.c 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/gamma-randr.c 2017-10-19 02:36:21.000000000 +0000 @@ -14,13 +14,14 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #include #include #include #include +#include #ifdef ENABLE_NLS # include @@ -41,29 +42,50 @@ #define RANDR_VERSION_MINOR 3 -int -randr_init(randr_state_t *state) +typedef struct { + xcb_randr_crtc_t crtc; + unsigned int ramp_size; + uint16_t *saved_ramps; +} randr_crtc_state_t; + +typedef struct { + xcb_connection_t *conn; + xcb_screen_t *screen; + int preferred_screen; + int screen_num; + int crtc_num_count; + int* crtc_num; + unsigned int crtc_count; + randr_crtc_state_t *crtcs; +} randr_state_t; + + +static int +randr_init(randr_state_t **state) { /* Initialize state. */ - state->screen_num = -1; - state->crtc_num = -1; - - state->crtc_count = 0; - state->crtcs = NULL; + *state = malloc(sizeof(randr_state_t)); + if (*state == NULL) return -1; - state->preserve = 0; + randr_state_t *s = *state; + s->screen_num = -1; + s->crtc_num = NULL; + + s->crtc_num_count = 0; + s->crtc_count = 0; + s->crtcs = NULL; xcb_generic_error_t *error; /* Open X server connection */ - state->conn = xcb_connect(NULL, &state->preferred_screen); + s->conn = xcb_connect(NULL, &s->preferred_screen); /* Query RandR version */ xcb_randr_query_version_cookie_t ver_cookie = - xcb_randr_query_version(state->conn, RANDR_VERSION_MAJOR, + xcb_randr_query_version(s->conn, RANDR_VERSION_MAJOR, RANDR_VERSION_MINOR); xcb_randr_query_version_reply_t *ver_reply = - xcb_randr_query_version_reply(state->conn, ver_cookie, &error); + xcb_randr_query_version_reply(s->conn, ver_cookie, &error); /* TODO What does it mean when both error and ver_reply is NULL? Apparently, we have to check both to avoid seg faults. */ @@ -71,7 +93,8 @@ int ec = (error != 0) ? error->error_code : -1; fprintf(stderr, _("`%s' returned error %d\n"), "RANDR Query Version", ec); - xcb_disconnect(state->conn); + xcb_disconnect(s->conn); + free(s); return -1; } @@ -80,7 +103,8 @@ fprintf(stderr, _("Unsupported RANDR version (%u.%u)\n"), ver_reply->major_version, ver_reply->minor_version); free(ver_reply); - xcb_disconnect(state->conn); + xcb_disconnect(s->conn); + free(s); return -1; } @@ -89,7 +113,7 @@ return 0; } -int +static int randr_start(randr_state_t *state) { xcb_generic_error_t *error; @@ -226,7 +250,7 @@ return 0; } -void +static void randr_restore(randr_state_t *state) { xcb_generic_error_t *error; @@ -255,7 +279,7 @@ } } -void +static void randr_free(randr_state_t *state) { /* Free CRTC state */ @@ -263,12 +287,15 @@ free(state->crtcs[i].saved_ramps); } free(state->crtcs); + free(state->crtc_num); /* Close connection */ xcb_disconnect(state->conn); + + free(state); } -void +static void randr_print_help(FILE *f) { fputs(_("Adjust gamma ramps with the X RANDR extension.\n"), f); @@ -277,22 +304,67 @@ /* TRANSLATORS: RANDR help output left column must not be translated */ fputs(_(" screen=N\t\tX screen to apply adjustments to\n" - " crtc=N\t\tCRTC to apply adjustments to\n" - " preserve={0,1}\tWhether existing gamma should be" - " preserved\n"), + " crtc=N\tList of comma separated CRTCs to apply" + " adjustments to\n"), f); fputs("\n", f); } -int +static int randr_set_option(randr_state_t *state, const char *key, const char *value) { if (strcasecmp(key, "screen") == 0) { state->screen_num = atoi(value); } else if (strcasecmp(key, "crtc") == 0) { - state->crtc_num = atoi(value); + char *tail; + + /* Check how many crtcs are configured */ + const char *local_value = value; + while (1) { + errno = 0; + int parsed = strtol(local_value, &tail, 0); + if (parsed == 0 && (errno != 0 || + tail == local_value)) { + fprintf(stderr, _("Unable to read screen" + " number: `%s'.\n"), value); + return -1; + } else { + state->crtc_num_count += 1; + } + local_value = tail; + + if (*local_value == ',') { + local_value += 1; + } else if (*local_value == '\0') { + break; + } + } + + /* Configure all given crtcs */ + state->crtc_num = calloc(state->crtc_num_count, sizeof(int)); + local_value = value; + for (int i = 0; i < state->crtc_num_count; i++) { + errno = 0; + int parsed = strtol(local_value, &tail, 0); + if (parsed == 0 && (errno != 0 || + tail == local_value)) { + return -1; + } else { + state->crtc_num[i] = parsed; + } + local_value = tail; + + if (*local_value == ',') { + local_value += 1; + } else if (*local_value == '\0') { + break; + } + } } else if (strcasecmp(key, "preserve") == 0) { - state->preserve = atoi(value); + fprintf(stderr, _("Parameter `%s` is now always on; " + " Use the `%s` command-line option" + " to disable.\n"), + key, "-P"); } else { fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); return -1; @@ -302,14 +374,15 @@ } static int -randr_set_temperature_for_crtc(randr_state_t *state, int crtc_num, - const color_setting_t *setting) +randr_set_temperature_for_crtc( + randr_state_t *state, int crtc_num, const color_setting_t *setting, + int preserve) { xcb_generic_error_t *error; if (crtc_num >= state->crtc_count || crtc_num < 0) { fprintf(stderr, _("CRTC %d does not exist. "), - state->crtc_num); + crtc_num); if (state->crtc_count > 1) { fprintf(stderr, _("Valid CRTCs are [0-%d].\n"), state->crtc_count-1); @@ -334,7 +407,7 @@ uint16_t *gamma_g = &gamma_ramps[1*ramp_size]; uint16_t *gamma_b = &gamma_ramps[2*ramp_size]; - if (state->preserve) { + if (preserve) { /* Initialize gamma ramps from saved state */ memcpy(gamma_ramps, state->crtcs[crtc_num].saved_ramps, 3*ramp_size*sizeof(uint16_t)); @@ -370,24 +443,39 @@ return 0; } -int -randr_set_temperature(randr_state_t *state, - const color_setting_t *setting) +static int +randr_set_temperature( + randr_state_t *state, const color_setting_t *setting, int preserve) { int r; - /* If no CRTC number has been specified, + /* If no CRTC numbers have been specified, set temperature on all CRTCs. */ - if (state->crtc_num < 0) { + if (state->crtc_num_count == 0) { for (int i = 0; i < state->crtc_count; i++) { - r = randr_set_temperature_for_crtc(state, i, - setting); + r = randr_set_temperature_for_crtc( + state, i, setting, preserve); if (r < 0) return -1; } } else { - return randr_set_temperature_for_crtc(state, state->crtc_num, - setting); + for (int i = 0; i < state->crtc_num_count; ++i) { + r = randr_set_temperature_for_crtc( + state, state->crtc_num[i], setting, preserve); + if (r < 0) return -1; + } } return 0; } + + +const gamma_method_t randr_gamma_method = { + "randr", 1, + (gamma_method_init_func *)randr_init, + (gamma_method_start_func *)randr_start, + (gamma_method_free_func *)randr_free, + (gamma_method_print_help_func *)randr_print_help, + (gamma_method_set_option_func *)randr_set_option, + (gamma_method_restore_func *)randr_restore, + (gamma_method_set_temperature_func *)randr_set_temperature +}; diff -Nru redshift-1.11/src/gamma-randr.h redshift-1.12/src/gamma-randr.h --- redshift-1.11/src/gamma-randr.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/gamma-randr.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,49 +14,14 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_GAMMA_RANDR_H #define REDSHIFT_GAMMA_RANDR_H -#include -#include - -#include -#include - #include "redshift.h" - -typedef struct { - xcb_randr_crtc_t crtc; - unsigned int ramp_size; - uint16_t *saved_ramps; -} randr_crtc_state_t; - -typedef struct { - xcb_connection_t *conn; - xcb_screen_t *screen; - int preferred_screen; - int preserve; - int screen_num; - int crtc_num; - unsigned int crtc_count; - randr_crtc_state_t *crtcs; -} randr_state_t; - - -int randr_init(randr_state_t *state); -int randr_start(randr_state_t *state); -void randr_free(randr_state_t *state); - -void randr_print_help(FILE *f); -int randr_set_option(randr_state_t *state, const char *key, const char *value); - -void randr_restore(randr_state_t *state); -int randr_set_temperature(randr_state_t *state, - const color_setting_t *setting); - +extern const gamma_method_t randr_gamma_method; #endif /* ! REDSHIFT_GAMMA_RANDR_H */ diff -Nru redshift-1.11/src/gamma-vidmode.c redshift-1.12/src/gamma-vidmode.c --- redshift-1.11/src/gamma-vidmode.c 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/gamma-vidmode.c 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #include @@ -37,26 +37,35 @@ #include "colorramp.h" -int -vidmode_init(vidmode_state_t *state) -{ - state->screen_num = -1; - state->saved_ramps = NULL; - - state->preserve = 0; +typedef struct { + Display *display; + int screen_num; + int ramp_size; + uint16_t *saved_ramps; +} vidmode_state_t; + + +static int +vidmode_init(vidmode_state_t **state) +{ + *state = malloc(sizeof(vidmode_state_t)); + if (*state == NULL) return -1; + + vidmode_state_t *s = *state; + s->screen_num = -1; + s->saved_ramps = NULL; /* Open display */ - state->display = XOpenDisplay(NULL); - if (state->display == NULL) { - fprintf(stderr, _("X request failed: %s\n"), - "XOpenDisplay"); + s->display = XOpenDisplay(NULL); + if (s->display == NULL) { + fprintf(stderr, _("X request failed: %s\n"), "XOpenDisplay"); return -1; } return 0; } -int +static int vidmode_start(vidmode_state_t *state) { int r; @@ -113,7 +122,7 @@ return 0; } -void +static void vidmode_free(vidmode_state_t *state) { /* Free saved ramps */ @@ -121,9 +130,11 @@ /* Close display connection */ XCloseDisplay(state->display); + + free(state); } -void +static void vidmode_print_help(FILE *f) { fputs(_("Adjust gamma ramps with the X VidMode extension.\n"), f); @@ -131,20 +142,21 @@ /* TRANSLATORS: VidMode help output left column must not be translated */ - fputs(_(" screen=N\t\tX screen to apply adjustments to\n" - " preserve={0,1}\tWhether existing gamma should be" - " preserved\n"), + fputs(_(" screen=N\t\tX screen to apply adjustments to\n"), f); fputs("\n", f); } -int +static int vidmode_set_option(vidmode_state_t *state, const char *key, const char *value) { if (strcasecmp(key, "screen") == 0) { state->screen_num = atoi(value); } else if (strcasecmp(key, "preserve") == 0) { - state->preserve = atoi(value); + fprintf(stderr, _("Parameter `%s` is now always on; " + " Use the `%s` command-line option" + " to disable.\n"), + key, "-P"); } else { fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); return -1; @@ -153,7 +165,7 @@ return 0; } -void +static void vidmode_restore(vidmode_state_t *state) { uint16_t *gamma_r = &state->saved_ramps[0*state->ramp_size]; @@ -170,9 +182,9 @@ } } -int -vidmode_set_temperature(vidmode_state_t *state, - const color_setting_t *setting) +static int +vidmode_set_temperature( + vidmode_state_t *state, const color_setting_t *setting, int preserve) { int r; @@ -187,7 +199,7 @@ uint16_t *gamma_g = &gamma_ramps[1*state->ramp_size]; uint16_t *gamma_b = &gamma_ramps[2*state->ramp_size]; - if (state->preserve) { + if (preserve) { /* Initialize gamma ramps from saved state */ memcpy(gamma_ramps, state->saved_ramps, 3*state->ramp_size*sizeof(uint16_t)); @@ -220,3 +232,15 @@ return 0; } + + +const gamma_method_t vidmode_gamma_method = { + "vidmode", 1, + (gamma_method_init_func *)vidmode_init, + (gamma_method_start_func *)vidmode_start, + (gamma_method_free_func *)vidmode_free, + (gamma_method_print_help_func *)vidmode_print_help, + (gamma_method_set_option_func *)vidmode_set_option, + (gamma_method_restore_func *)vidmode_restore, + (gamma_method_set_temperature_func *)vidmode_set_temperature +}; diff -Nru redshift-1.11/src/gamma-vidmode.h redshift-1.12/src/gamma-vidmode.h --- redshift-1.11/src/gamma-vidmode.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/gamma-vidmode.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_GAMMA_VIDMODE_H @@ -22,31 +22,6 @@ #include "redshift.h" -#include -#include - -#include - -typedef struct { - Display *display; - int preserve; - int screen_num; - int ramp_size; - uint16_t *saved_ramps; -} vidmode_state_t; - - -int vidmode_init(vidmode_state_t *state); -int vidmode_start(vidmode_state_t *state); -void vidmode_free(vidmode_state_t *state); - -void vidmode_print_help(FILE *f); -int vidmode_set_option(vidmode_state_t *state, const char *key, - const char *value); - -void vidmode_restore(vidmode_state_t *state); -int vidmode_set_temperature(vidmode_state_t *state, - const color_setting_t *setting); - +extern const gamma_method_t vidmode_gamma_method; #endif /* ! REDSHIFT_GAMMA_VIDMODE_H */ diff -Nru redshift-1.11/src/gamma-w32gdi.c redshift-1.12/src/gamma-w32gdi.c --- redshift-1.11/src/gamma-w32gdi.c 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/gamma-w32gdi.c 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #include @@ -37,18 +37,27 @@ #include "colorramp.h" #define GAMMA_RAMP_SIZE 256 +#define MAX_ATTEMPTS 10 -int -w32gdi_init(w32gdi_state_t *state) +typedef struct { + WORD *saved_ramps; +} w32gdi_state_t; + + +static int +w32gdi_init(w32gdi_state_t **state) { - state->saved_ramps = NULL; - state->preserve = 0; + *state = malloc(sizeof(w32gdi_state_t)); + if (state == NULL) return -1; + + w32gdi_state_t *s = *state; + s->saved_ramps = NULL; return 0; } -int +static int w32gdi_start(w32gdi_state_t *state) { BOOL r; @@ -90,33 +99,31 @@ return 0; } -void +static void w32gdi_free(w32gdi_state_t *state) { /* Free saved ramps */ free(state->saved_ramps); + + free(state); } -void +static void w32gdi_print_help(FILE *f) { fputs(_("Adjust gamma ramps with the Windows GDI.\n"), f); fputs("\n", f); - - /* TRANSLATORS: Windows GDI help output - left column must not be translated */ - fputs(_(" preserve={0,1}\tWhether existing gamma should be" - " preserved\n"), - f); - fputs("\n", f); } -int +static int w32gdi_set_option(w32gdi_state_t *state, const char *key, const char *value) { if (strcasecmp(key, "preserve") == 0) { - state->preserve = atoi(value); + fprintf(stderr, _("Parameter `%s` is now always on; " + " Use the `%s` command-line option" + " to disable.\n"), + key, "-P"); } else { fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); return -1; @@ -125,7 +132,7 @@ return 0; } -void +static void w32gdi_restore(w32gdi_state_t *state) { /* Open device context */ @@ -136,16 +143,22 @@ } /* Restore gamma ramps */ - BOOL r = SetDeviceGammaRamp(hDC, state->saved_ramps); + BOOL r = FALSE; + for (int i = 0; i < MAX_ATTEMPTS && !r; i++) { + /* We retry a few times before giving up because some + buggy drivers fail on the first invocation of + SetDeviceGammaRamp just to succeed on the second. */ + r = SetDeviceGammaRamp(hDC, state->saved_ramps); + } if (!r) fputs(_("Unable to restore gamma ramps.\n"), stderr); /* Release device context */ ReleaseDC(NULL, hDC); } -int -w32gdi_set_temperature(w32gdi_state_t *state, - const color_setting_t *setting) +static int +w32gdi_set_temperature( + w32gdi_state_t *state, const color_setting_t *setting, int preserve) { BOOL r; @@ -168,7 +181,7 @@ WORD *gamma_g = &gamma_ramps[1*GAMMA_RAMP_SIZE]; WORD *gamma_b = &gamma_ramps[2*GAMMA_RAMP_SIZE]; - if (state->preserve) { + if (preserve) { /* Initialize gamma ramps from saved state */ memcpy(gamma_ramps, state->saved_ramps, 3*GAMMA_RAMP_SIZE*sizeof(WORD)); @@ -187,11 +200,14 @@ setting); /* Set new gamma ramps */ - r = SetDeviceGammaRamp(hDC, gamma_ramps); + r = FALSE; + for (int i = 0; i < MAX_ATTEMPTS && !r; i++) { + /* We retry a few times before giving up because some + buggy drivers fail on the first invocation of + SetDeviceGammaRamp just to succeed on the second. */ + r = SetDeviceGammaRamp(hDC, gamma_ramps); + } if (!r) { - /* TODO it happens that SetDeviceGammaRamp returns FALSE on - occasions where the adjustment seems to be successful. - Does this only happen with multiple monitors connected? */ fputs(_("Unable to set gamma ramps.\n"), stderr); free(gamma_ramps); ReleaseDC(NULL, hDC); @@ -205,3 +221,15 @@ return 0; } + + +const gamma_method_t w32gdi_gamma_method = { + "wingdi", 1, + (gamma_method_init_func *)w32gdi_init, + (gamma_method_start_func *)w32gdi_start, + (gamma_method_free_func *)w32gdi_free, + (gamma_method_print_help_func *)w32gdi_print_help, + (gamma_method_set_option_func *)w32gdi_set_option, + (gamma_method_restore_func *)w32gdi_restore, + (gamma_method_set_temperature_func *)w32gdi_set_temperature +}; diff -Nru redshift-1.11/src/gamma-w32gdi.h redshift-1.12/src/gamma-w32gdi.h --- redshift-1.11/src/gamma-w32gdi.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/gamma-w32gdi.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,35 +14,14 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_GAMMA_W32GDI_H #define REDSHIFT_GAMMA_W32GDI_H -#include -#include - #include "redshift.h" - -typedef struct { - WORD *saved_ramps; - int preserve; -} w32gdi_state_t; - - -int w32gdi_init(w32gdi_state_t *state); -int w32gdi_start(w32gdi_state_t *state); -void w32gdi_free(w32gdi_state_t *state); - -void w32gdi_print_help(FILE *f); -int w32gdi_set_option(w32gdi_state_t *state, const char *key, - const char *value); - -void w32gdi_restore(w32gdi_state_t *state); -int w32gdi_set_temperature(w32gdi_state_t *state, - const color_setting_t *color); - +extern const gamma_method_t w32gdi_gamma_method; #endif /* ! REDSHIFT_GAMMA_W32GDI_H */ diff -Nru redshift-1.11/src/location-corelocation.h redshift-1.12/src/location-corelocation.h --- redshift-1.11/src/location-corelocation.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/location-corelocation.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,27 +14,14 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2014 Jon Lund Steffense + Copyright (c) 2014-2017 Jon Lund Steffense */ #ifndef REDSHIFT_LOCATION_CORELOCATION_H #define REDSHIFT_LOCATION_CORELOCATION_H -#include - #include "redshift.h" - -int location_corelocation_init(void *state); -int location_corelocation_start(void *state); -void location_corelocation_free(void *state); - -void location_corelocation_print_help(FILE *f); -int location_corelocation_set_option(void *state, - const char *key, const char *value); - -int location_corelocation_get_location(void *state, - location_t *location); - +extern const location_provider_t corelocation_location_provider; #endif /* ! REDSHIFT_LOCATION_CORELOCATION_H */ diff -Nru redshift-1.11/src/location-corelocation.m redshift-1.12/src/location-corelocation.m --- redshift-1.11/src/location-corelocation.m 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/location-corelocation.m 2018-05-21 00:56:43.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2014 Jon Lund Steffensen + Copyright (c) 2014-2017 Jon Lund Steffensen */ #ifdef HAVE_CONFIG_H @@ -25,9 +25,11 @@ #import #include "location-corelocation.h" +#include "pipeutils.h" #include "redshift.h" #include +#include #ifdef ENABLE_NLS # include @@ -37,128 +39,261 @@ #endif -@interface Delegate : NSObject +typedef struct { + NSThread *thread; + NSLock *lock; + int pipe_fd_read; + int pipe_fd_write; + int available; + int error; + float latitude; + float longitude; +} location_corelocation_state_t; + + +@interface LocationDelegate : NSObject @property (strong, nonatomic) CLLocationManager *locationManager; -@property (nonatomic) BOOL success; -@property (nonatomic) float latitude; -@property (nonatomic) float longitude; +@property (nonatomic) location_corelocation_state_t *state; @end -@implementation Delegate; +@implementation LocationDelegate; - (void)start { - self.locationManager = [[CLLocationManager alloc] init]; - self.locationManager.delegate = self; + self.locationManager = [[CLLocationManager alloc] init]; + self.locationManager.delegate = self; + self.locationManager.distanceFilter = 50000; + self.locationManager.desiredAccuracy = kCLLocationAccuracyKilometer; + + CLAuthorizationStatus authStatus = + [CLLocationManager authorizationStatus]; - CLAuthorizationStatus authStatus = - [CLLocationManager authorizationStatus]; + if (authStatus != kCLAuthorizationStatusNotDetermined && + authStatus != kCLAuthorizationStatusAuthorized) { + fputs(_("Not authorized to obtain location" + " from CoreLocation.\n"), stderr); + [self markError]; + } else { + [self.locationManager startUpdatingLocation]; + } +} + +- (void)markError +{ + [self.state->lock lock]; - if (authStatus != kCLAuthorizationStatusNotDetermined && - authStatus != kCLAuthorizationStatusAuthorized) { - fputs(_("Not authorized to obtain location" - " from CoreLocation.\n"), stderr); - CFRunLoopStop(CFRunLoopGetCurrent()); - } + self.state->error = 1; - [self.locationManager startUpdatingLocation]; + [self.state->lock unlock]; + + pipeutils_signal(self.state->pipe_fd_write); } -- (void)stop +- (void)markUnavailable { - [self.locationManager stopUpdatingLocation]; - CFRunLoopStop(CFRunLoopGetCurrent()); + [self.state->lock lock]; + + self.state->available = 0; + + [self.state->lock unlock]; + + pipeutils_signal(self.state->pipe_fd_write); } - (void)locationManager:(CLLocationManager *)manager - didUpdateLocations:(NSArray *)locations + didUpdateLocations:(NSArray *)locations { - CLLocation *newLocation = [locations firstObject]; - self.latitude = newLocation.coordinate.latitude; - self.longitude = newLocation.coordinate.longitude; - self.success = YES; + CLLocation *newLocation = [locations firstObject]; + + [self.state->lock lock]; - [self stop]; + self.state->latitude = newLocation.coordinate.latitude; + self.state->longitude = newLocation.coordinate.longitude; + self.state->available = 1; + + [self.state->lock unlock]; + + pipeutils_signal(self.state->pipe_fd_write); } - (void)locationManager:(CLLocationManager *)manager - didFailWithError:(NSError *)error + didFailWithError:(NSError *)error { - fprintf(stderr, _("Error obtaining location from CoreLocation: %s\n"), - [[error localizedDescription] UTF8String]); - [self stop]; + fprintf(stderr, _("Error obtaining location from CoreLocation: %s\n"), + [[error localizedDescription] UTF8String]); + if ([error code] == kCLErrorDenied) { + [self markError]; + } else { + [self markUnavailable]; + } } - (void)locationManager:(CLLocationManager *)manager - didChangeAuthorizationStatus:(CLAuthorizationStatus)status + didChangeAuthorizationStatus:(CLAuthorizationStatus)status { - if (status == kCLAuthorizationStatusNotDetermined) { - fputs(_("Waiting for authorization to obtain location...\n"), - stderr); - } else if (status != kCLAuthorizationStatusAuthorized) { - fputs(_("Request for location was not authorized!\n"), - stderr); - [self stop]; - } + if (status == kCLAuthorizationStatusNotDetermined) { + fputs(_("Waiting for authorization to obtain location...\n"), stderr); + } else if (status != kCLAuthorizationStatusAuthorized) { + fputs(_("Request for location was not authorized!\n"), stderr); + [self markError]; + } } @end -int -location_corelocation_init(void *state) +// Callback when the pipe is closed. +// +// Stops the run loop causing the thread to end. +static void +pipe_close_callback( + CFFileDescriptorRef fdref, CFOptionFlags callBackTypes, void *info) { - return 0; + CFFileDescriptorInvalidate(fdref); + CFRelease(fdref); + + CFRunLoopStop(CFRunLoopGetCurrent()); } -int -location_corelocation_start(void *state) + +@interface LocationThread : NSThread +@property (nonatomic) location_corelocation_state_t *state; +@end + +@implementation LocationThread; + +// Run loop for location provider thread. +- (void)main { - return 0; + @autoreleasepool { + LocationDelegate *locationDelegate = [[LocationDelegate alloc] init]; + locationDelegate.state = self.state; + + // Start the location delegate on the run loop in this thread. + [locationDelegate performSelector:@selector(start) + withObject:nil afterDelay:0]; + + // Create a callback that is triggered when the pipe is closed. This will + // trigger the main loop to quit and the thread to stop. + CFFileDescriptorRef fdref = CFFileDescriptorCreate( + kCFAllocatorDefault, self.state->pipe_fd_write, false, + pipe_close_callback, NULL); + CFFileDescriptorEnableCallBacks(fdref, kCFFileDescriptorReadCallBack); + CFRunLoopSourceRef source = CFFileDescriptorCreateRunLoopSource( + kCFAllocatorDefault, fdref, 0); + CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode); + + // Run the loop + CFRunLoopRun(); + + close(self.state->pipe_fd_write); + } } -void -location_corelocation_free(void *state) +@end + + +static int +location_corelocation_init(location_corelocation_state_t **state) +{ + *state = malloc(sizeof(location_corelocation_state_t)); + if (*state == NULL) return -1; + return 0; +} + +static int +location_corelocation_start(location_corelocation_state_t *state) { + state->pipe_fd_read = -1; + state->pipe_fd_write = -1; + + state->available = 0; + state->error = 0; + state->latitude = 0; + state->longitude = 0; + + int pipefds[2]; + int r = pipeutils_create_nonblocking(pipefds); + if (r < 0) { + fputs(_("Failed to start CoreLocation provider!\n"), stderr); + return -1; + } + + state->pipe_fd_read = pipefds[0]; + state->pipe_fd_write = pipefds[1]; + + pipeutils_signal(state->pipe_fd_write); + + state->lock = [[NSLock alloc] init]; + + LocationThread *thread = [[LocationThread alloc] init]; + thread.state = state; + [thread start]; + state->thread = thread; + + return 0; } -void +static void +location_corelocation_free(location_corelocation_state_t *state) +{ + if (state->pipe_fd_read != -1) { + close(state->pipe_fd_read); + } + + free(state); +} + +static void location_corelocation_print_help(FILE *f) { - fputs(_("Use the location as discovered by the Corelocation provider.\n"), f); - fputs("\n", f); + fputs(_("Use the location as discovered by the Corelocation provider.\n"), f); + fputs("\n", f); +} - fprintf(f, _("NOTE: currently Redshift doesn't recheck %s once started,\n" - "which means it has to be restarted to take notice after travel.\n"), - "CoreLocation"); - fputs("\n", f); +static int +location_corelocation_set_option( + location_corelocation_state_t *state, const char *key, const char *value) +{ + fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); + return -1; } -int -location_corelocation_set_option(void *state, - const char *key, const char *value) +static int +location_corelocation_get_fd(location_corelocation_state_t *state) { - fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); - return -1; + return state->pipe_fd_read; } -int -location_corelocation_get_location(void *state, - location_t *location) +static int +location_corelocation_handle( + location_corelocation_state_t *state, + location_t *location, int *available) { - int result = -1; + pipeutils_handle_signal(state->pipe_fd_read); + + [state->lock lock]; + + int error = state->error; + location->lat = state->latitude; + location->lon = state->longitude; + *available = state->available; - @autoreleasepool { - Delegate *delegate = [[Delegate alloc] init]; - [delegate performSelectorOnMainThread:@selector(start) withObject:nil waitUntilDone:NO]; - CFRunLoopRun(); + [state->lock unlock]; - if (delegate.success) { - location->lat = delegate.latitude; - location->lon = delegate.longitude; - result = 0; - } - } + if (error) return -1; - return result; + return 0; } + + +const location_provider_t corelocation_location_provider = { + "corelocation", + (location_provider_init_func *)location_corelocation_init, + (location_provider_start_func *)location_corelocation_start, + (location_provider_free_func *)location_corelocation_free, + (location_provider_print_help_func *)location_corelocation_print_help, + (location_provider_set_option_func *)location_corelocation_set_option, + (location_provider_get_fd_func *)location_corelocation_get_fd, + (location_provider_handle_func *)location_corelocation_handle +}; diff -Nru redshift-1.11/src/location-geoclue2.c redshift-1.12/src/location-geoclue2.c --- redshift-1.11/src/location-geoclue2.c 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/location-geoclue2.c 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2014 Jon Lund Steffensen + Copyright (c) 2014-2017 Jon Lund Steffensen */ #include @@ -26,6 +26,7 @@ #include "location-geoclue2.h" #include "redshift.h" +#include "pipeutils.h" #ifdef ENABLE_NLS # include @@ -34,62 +35,54 @@ # define _(s) s #endif +#define DBUS_ACCESS_ERROR "org.freedesktop.DBus.Error.AccessDenied" + typedef struct { GMainLoop *loop; - + GThread *thread; + GMutex lock; + int pipe_fd_read; + int pipe_fd_write; int available; - location_t location; -} get_location_data_t; + int error; + float latitude; + float longitude; +} location_geoclue2_state_t; -int -location_geoclue2_init(void *state) -{ -#if !GLIB_CHECK_VERSION(2, 35, 0) - g_type_init(); -#endif - return 0; -} - -int -location_geoclue2_start(void *state) +/* Print the message explaining denial from GeoClue. */ +static void +print_denial_message() { - return 0; + g_printerr(_( + "Access to the current location was denied by GeoClue!\n" + "Make sure that location services are enabled and that" + " Redshift is permitted\nto use location services." + " See https://github.com/jonls/redshift#faq for more\n" + "information.\n")); } -void -location_geoclue2_free(void *state) +/* Indicate an unrecoverable error during GeoClue2 communication. */ +static void +mark_error(location_geoclue2_state_t *state) { -} + g_mutex_lock(&state->lock); -void -location_geoclue2_print_help(FILE *f) -{ - fputs(_("Use the location as discovered by a GeoClue2 provider.\n"), f); - fputs("\n", f); + state->error = 1; - fprintf(f, _("NOTE: currently Redshift doesn't recheck %s once started,\n" - "which means it has to be restarted to take notice after travel.\n"), - "GeoClue2"); - fputs("\n", f); -} + g_mutex_unlock(&state->lock); -int -location_geoclue2_set_option(void *state, - const char *key, const char *value) -{ - fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); - return -1; + pipeutils_signal(state->pipe_fd_write); } /* Handle position change callbacks */ static void geoclue_client_signal_cb(GDBusProxy *client, gchar *sender_name, gchar *signal_name, GVariant *parameters, - gpointer *user_data) + gpointer user_data) { - get_location_data_t *data = (get_location_data_t *)user_data; + location_geoclue2_state_t *state = user_data; /* Only handle LocationUpdated signals */ if (g_strcmp0(signal_name, "LocationUpdated") != 0) { @@ -102,34 +95,38 @@ /* Obtain location */ GError *error = NULL; - GDBusProxy *location = - g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, - G_DBUS_PROXY_FLAGS_NONE, - NULL, - "org.freedesktop.GeoClue2", - location_path, - "org.freedesktop.GeoClue2.Location", - NULL, &error); + GDBusProxy *location = g_dbus_proxy_new_sync( + g_dbus_proxy_get_connection(client), + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.GeoClue2", + location_path, + "org.freedesktop.GeoClue2.Location", + NULL, &error); if (location == NULL) { g_printerr(_("Unable to obtain location: %s.\n"), error->message); g_error_free(error); + mark_error(state); return; } + g_mutex_lock(&state->lock); + /* Read location properties */ - GVariant *lat_v = g_dbus_proxy_get_cached_property(location, - "Latitude"); - data->location.lat = g_variant_get_double(lat_v); - - GVariant *lon_v = g_dbus_proxy_get_cached_property(location, - "Longitude"); - data->location.lon = g_variant_get_double(lon_v); + GVariant *lat_v = g_dbus_proxy_get_cached_property( + location, "Latitude"); + state->latitude = g_variant_get_double(lat_v); + + GVariant *lon_v = g_dbus_proxy_get_cached_property( + location, "Longitude"); + state->longitude = g_variant_get_double(lon_v); + + state->available = 1; - data->available = 1; + g_mutex_unlock(&state->lock); - /* Return from main loop */ - g_main_loop_quit(data->loop); + pipeutils_signal(state->pipe_fd_write); } /* Callback when GeoClue name appears on the bus */ @@ -137,22 +134,23 @@ on_name_appeared(GDBusConnection *conn, const gchar *name, const gchar *name_owner, gpointer user_data) { - get_location_data_t *data = (get_location_data_t *)user_data; + location_geoclue2_state_t *state = user_data; /* Obtain GeoClue Manager */ GError *error = NULL; - GDBusProxy *geoclue_manager = - g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, - G_DBUS_PROXY_FLAGS_NONE, - NULL, - "org.freedesktop.GeoClue2", - "/org/freedesktop/GeoClue2/Manager", - "org.freedesktop.GeoClue2.Manager", - NULL, &error); + GDBusProxy *geoclue_manager = g_dbus_proxy_new_sync( + conn, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.GeoClue2", + "/org/freedesktop/GeoClue2/Manager", + "org.freedesktop.GeoClue2.Manager", + NULL, &error); if (geoclue_manager == NULL) { g_printerr(_("Unable to obtain GeoClue Manager: %s.\n"), error->message); g_error_free(error); + mark_error(state); return; } @@ -169,6 +167,7 @@ error->message); g_error_free(error); g_object_unref(geoclue_manager); + mark_error(state); return; } @@ -177,20 +176,21 @@ /* Obtain GeoClue client */ error = NULL; - GDBusProxy *geoclue_client = - g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, - G_DBUS_PROXY_FLAGS_NONE, - NULL, - "org.freedesktop.GeoClue2", - client_path, - "org.freedesktop.GeoClue2.Client", - NULL, &error); + GDBusProxy *geoclue_client = g_dbus_proxy_new_sync( + conn, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.GeoClue2", + client_path, + "org.freedesktop.GeoClue2.Client", + NULL, &error); if (geoclue_client == NULL) { g_printerr(_("Unable to obtain GeoClue Client: %s.\n"), error->message); g_error_free(error); g_variant_unref(client_path_v); g_object_unref(geoclue_manager); + mark_error(state); return; } @@ -198,15 +198,15 @@ /* Set desktop id (basename of the .desktop file) */ error = NULL; - GVariant *ret_v = - g_dbus_proxy_call_sync(geoclue_client, - "org.freedesktop.DBus.Properties.Set", - g_variant_new("(ssv)", - "org.freedesktop.GeoClue2.Client", - "DesktopId", - g_variant_new("s", "redshift")), - G_DBUS_CALL_FLAGS_NONE, - -1, NULL, &error); + GVariant *ret_v = g_dbus_proxy_call_sync( + geoclue_client, + "org.freedesktop.DBus.Properties.Set", + g_variant_new("(ssv)", + "org.freedesktop.GeoClue2.Client", + "DesktopId", + g_variant_new("s", "redshift")), + G_DBUS_CALL_FLAGS_NONE, + -1, NULL, &error); if (ret_v == NULL) { /* Ignore this error for now. The property is not available in early versions of GeoClue2. */ @@ -216,20 +216,22 @@ /* Set distance threshold */ error = NULL; - ret_v = g_dbus_proxy_call_sync(geoclue_client, - "org.freedesktop.DBus.Properties.Set", - g_variant_new("(ssv)", - "org.freedesktop.GeoClue2.Client", - "DistanceThreshold", - g_variant_new("u", 50000)), - G_DBUS_CALL_FLAGS_NONE, - -1, NULL, &error); + ret_v = g_dbus_proxy_call_sync( + geoclue_client, + "org.freedesktop.DBus.Properties.Set", + g_variant_new("(ssv)", + "org.freedesktop.GeoClue2.Client", + "DistanceThreshold", + g_variant_new("u", 50000)), + G_DBUS_CALL_FLAGS_NONE, + -1, NULL, &error); if (ret_v == NULL) { g_printerr(_("Unable to set distance threshold: %s.\n"), error->message); g_error_free(error); g_object_unref(geoclue_client); g_object_unref(geoclue_manager); + mark_error(state); return; } @@ -238,7 +240,7 @@ /* Attach signal callback to client */ g_signal_connect(geoclue_client, "g-signal", G_CALLBACK(geoclue_client_signal_cb), - data); + user_data); /* Start GeoClue client */ error = NULL; @@ -250,9 +252,18 @@ if (ret_v == NULL) { g_printerr(_("Unable to start GeoClue client: %s.\n"), error->message); + if (g_dbus_error_is_remote_error(error)) { + gchar *dbus_error = g_dbus_error_get_remote_error( + error); + if (g_strcmp0(dbus_error, DBUS_ACCESS_ERROR) == 0) { + print_denial_message(); + } + g_free(dbus_error); + } g_error_free(error); g_object_unref(geoclue_client); g_object_unref(geoclue_manager); + mark_error(state); return; } @@ -264,34 +275,175 @@ on_name_vanished(GDBusConnection *connection, const gchar *name, gpointer user_data) { - get_location_data_t *data = (get_location_data_t *)user_data; + location_geoclue2_state_t *state = user_data; + + g_mutex_lock(&state->lock); - g_fprintf(stderr, _("Unable to connect to GeoClue.\n")); + state->available = 0; - g_main_loop_quit(data->loop); + g_mutex_unlock(&state->lock); + + pipeutils_signal(state->pipe_fd_write); } -int -location_geoclue2_get_location(void *state, - location_t *location) +/* Callback when the pipe to the main thread is closed. */ +static gboolean +on_pipe_closed(GIOChannel *channel, GIOCondition condition, gpointer user_data) { - get_location_data_t data; - data.available = 0; + location_geoclue2_state_t *state = user_data; + g_main_loop_quit(state->loop); - guint watcher_id = g_bus_watch_name(G_BUS_TYPE_SYSTEM, - "org.freedesktop.GeoClue2", - G_BUS_NAME_WATCHER_FLAGS_AUTO_START, - on_name_appeared, - on_name_vanished, - &data, NULL); - data.loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(data.loop); + return FALSE; +} + + +/* Run loop for location provider thread. */ +static void * +run_geoclue2_loop(void *state_) +{ + location_geoclue2_state_t *state = state_; + + GMainContext *context = g_main_context_new(); + g_main_context_push_thread_default(context); + state->loop = g_main_loop_new(context, FALSE); + + guint watcher_id = g_bus_watch_name( + G_BUS_TYPE_SYSTEM, + "org.freedesktop.GeoClue2", + G_BUS_NAME_WATCHER_FLAGS_AUTO_START, + on_name_appeared, + on_name_vanished, + state, NULL); + + /* Listen for closure of pipe */ + GIOChannel *pipe_channel = g_io_channel_unix_new(state->pipe_fd_write); + GSource *pipe_source = g_io_create_watch( + pipe_channel, G_IO_IN | G_IO_HUP | G_IO_ERR); + g_source_set_callback( + pipe_source, (GSourceFunc)on_pipe_closed, state, NULL); + g_source_attach(pipe_source, context); + + g_main_loop_run(state->loop); + + g_source_unref(pipe_source); + g_io_channel_unref(pipe_channel); + close(state->pipe_fd_write); g_bus_unwatch_name(watcher_id); - if (!data.available) return -1; + g_main_loop_unref(state->loop); + g_main_context_unref(context); + + return NULL; +} + +static int +location_geoclue2_init(location_geoclue2_state_t **state) +{ +#if !GLIB_CHECK_VERSION(2, 35, 0) + g_type_init(); +#endif + *state = malloc(sizeof(location_geoclue2_state_t)); + if (*state == NULL) return -1; + return 0; +} + +static int +location_geoclue2_start(location_geoclue2_state_t *state) +{ + state->pipe_fd_read = -1; + state->pipe_fd_write = -1; + + state->available = 0; + state->error = 0; + state->latitude = 0; + state->longitude = 0; + + int pipefds[2]; + int r = pipeutils_create_nonblocking(pipefds); + if (r < 0) { + fputs(_("Failed to start GeoClue2 provider!\n"), stderr); + return -1; + } + + state->pipe_fd_read = pipefds[0]; + state->pipe_fd_write = pipefds[1]; + + pipeutils_signal(state->pipe_fd_write); + + g_mutex_init(&state->lock); + state->thread = g_thread_new("geoclue2", run_geoclue2_loop, state); + + return 0; +} + +static void +location_geoclue2_free(location_geoclue2_state_t *state) +{ + if (state->pipe_fd_read != -1) { + close(state->pipe_fd_read); + } + + /* Closing the pipe should cause the thread to exit. */ + g_thread_join(state->thread); + state->thread = NULL; + + g_mutex_clear(&state->lock); + + free(state); +} + +static void +location_geoclue2_print_help(FILE *f) +{ + fputs(_("Use the location as discovered by a GeoClue2 provider.\n"), + f); + fputs("\n", f); +} - *location = data.location; +static int +location_geoclue2_set_option(location_geoclue2_state_t *state, + const char *key, const char *value) +{ + fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); + return -1; +} + +static int +location_geoclue2_get_fd(location_geoclue2_state_t *state) +{ + return state->pipe_fd_read; +} + +static int +location_geoclue2_handle( + location_geoclue2_state_t *state, + location_t *location, int *available) +{ + pipeutils_handle_signal(state->pipe_fd_read); + + g_mutex_lock(&state->lock); + + int error = state->error; + location->lat = state->latitude; + location->lon = state->longitude; + *available = state->available; + + g_mutex_unlock(&state->lock); + + if (error) return -1; return 0; } + + +const location_provider_t geoclue2_location_provider = { + "geoclue2", + (location_provider_init_func *)location_geoclue2_init, + (location_provider_start_func *)location_geoclue2_start, + (location_provider_free_func *)location_geoclue2_free, + (location_provider_print_help_func *)location_geoclue2_print_help, + (location_provider_set_option_func *)location_geoclue2_set_option, + (location_provider_get_fd_func *)location_geoclue2_get_fd, + (location_provider_handle_func *)location_geoclue2_handle +}; diff -Nru redshift-1.11/src/location-geoclue2.h redshift-1.12/src/location-geoclue2.h --- redshift-1.11/src/location-geoclue2.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/location-geoclue2.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,27 +14,14 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2014 Jon Lund Steffensen + Copyright (c) 2014-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_LOCATION_GEOCLUE2_H #define REDSHIFT_LOCATION_GEOCLUE2_H -#include - #include "redshift.h" - -int location_geoclue2_init(void *state); -int location_geoclue2_start(void *state); -void location_geoclue2_free(void *state); - -void location_geoclue2_print_help(FILE *f); -int location_geoclue2_set_option(void *state, - const char *key, const char *value); - -int location_geoclue2_get_location(void *state, - location_t *loc); - +extern const location_provider_t geoclue2_location_provider; #endif /* ! REDSHIFT_LOCATION_GEOCLUE2_H */ diff -Nru redshift-1.11/src/location-geoclue.c redshift-1.12/src/location-geoclue.c --- redshift-1.11/src/location-geoclue.c 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/location-geoclue.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ -/* location-geoclue.c -- Geoclue location provider source - This file is part of Redshift. - - Redshift is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Redshift 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 Redshift. If not, see . - - Copyright (c) 2010 Mathieu Trudel-Lapierre -*/ - -#include -#include -#include - -#include -#include - -#include -#include - -#include "location-geoclue.h" -#include "redshift.h" - -#ifdef ENABLE_NLS -# include -# define _(s) gettext(s) -#else -# define _(s) s -#endif - -#define DEFAULT_PROVIDER "org.freedesktop.Geoclue.Providers.UbuntuGeoIP" -#define DEFAULT_PROVIDER_PATH "/org/freedesktop/Geoclue/Providers/UbuntuGeoIP" - -int -location_geoclue_init(location_geoclue_state_t *state) -{ -#if !GLIB_CHECK_VERSION(2, 35, 0) - g_type_init(); -#endif - - state->position = NULL; - state->provider = NULL; - state->provider_path = NULL; - - return 0; -} - -int -location_geoclue_start(location_geoclue_state_t *state) -{ - if (state->provider && state->provider_path) { - state->position = geoclue_position_new(state->provider, - state->provider_path); - } else { - if (getenv("DISPLAY") == NULL || *getenv("DISPLAY") == '\0') { - /* TODO This (hack) should be removed when GeoClue has been patched. */ - putenv("DISPLAY=:0"); - } - GError *error = NULL; - GeoclueMaster *master = geoclue_master_get_default(); - GeoclueMasterClient *client = geoclue_master_create_client(master, - NULL, &error); - g_object_unref(master); - - if (client == NULL) { - if (error != NULL) { - g_printerr(_("Unable to obtain master client: %s\n"), - error->message); - g_error_free(error); - } else { - g_printerr(_("Unable to obtain master client\n")); - } - return -1; - } - - if (!geoclue_master_client_set_requirements(client, - GEOCLUE_ACCURACY_LEVEL_REGION, - 0, FALSE, - GEOCLUE_RESOURCE_NETWORK, - &error)) { - if (error != NULL) { - g_printerr(_("Can't set requirements for master: %s\n"), - error->message); - g_error_free(error); - } else { - g_printerr(_("Can't set requirements for master\n")); - } - g_object_unref(client); - - return -1; - } - - state->position = geoclue_master_client_create_position(client, NULL); - - g_object_unref(client); - } - - gchar *name = NULL; - - if (geoclue_provider_get_provider_info(GEOCLUE_PROVIDER(state->position), - &name, NULL, NULL)) { - fprintf(stdout, _("Started Geoclue provider `%s'.\n"), name); - g_free(name); - } else { - fputs(_("Could not find a usable Geoclue provider.\n"), stderr); - fputs(_("Try setting name and path to specify which to use.\n"), stderr); - return -1; - } - - return 0; -} - -void -location_geoclue_free(location_geoclue_state_t *state) -{ - if (state->position != NULL) g_object_unref(state->position); - free(state->provider); - free(state->provider_path); -} - -void -location_geoclue_print_help(FILE *f) -{ - fputs(_("Use the location as discovered by a Geoclue provider.\n"), f); - fputs("\n", f); - - /* TRANSLATORS: Geoclue help output - left column must not be translated */ - fputs(_(" name=N\tName of Geoclue provider (or `default')\n" - " path=N\tPath of Geoclue provider (or `default')\n"), f); - fputs("\n", f); - fprintf(f, _("NOTE: currently Redshift doesn't recheck %s once started,\n" - "which means it has to be restarted to take notice after travel.\n"), - "GeoClue"); - fputs("\n", f); -} - -int -location_geoclue_set_option(location_geoclue_state_t *state, - const char *key, const char *value) -{ - const char *provider = NULL; - const char *path = NULL; - - /* Parse string value */ - if (strcasecmp(key, "name") == 0) { - if (strcasecmp(value, "default") == 0) { - provider = DEFAULT_PROVIDER; - } else { - provider = value; - } - - state->provider = strdup(provider); - if (state->provider == NULL) { - perror("strdup"); - return -1; - } - } else if (strcasecmp(key, "path") == 0) { - if (value != NULL && strcasecmp(value, "default") == 0) { - path = DEFAULT_PROVIDER_PATH; - } else { - path = value; - } - - state->provider_path = strdup(path); - if (state->provider_path == NULL) { - perror("strdup"); - return -1; - } - } else { - fprintf(stderr, _("Unknown method parameter: `%s'.\n"), key); - return -1; - } - - return 0; -} - -int -location_geoclue_get_location(location_geoclue_state_t *state, - location_t *location) -{ - GeocluePositionFields fields; - GError *error = NULL; - double latitude = 0, longitude = 0; - - fields = geoclue_position_get_position(state->position, NULL, - &latitude, &longitude, NULL, - NULL, &error); - if (error) { - g_printerr(_("Could not get location: %s.\n"), error->message); - g_error_free(error); - return -1; - } - - if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE && - fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) { - fprintf(stdout, _("According to the geoclue provider" - " we're at: %.2f, %.2f\n"), - latitude, longitude); - } else { - g_warning(_("Provider does not have a valid location available.")); - return -1; - } - - location->lat = latitude; - location->lon = longitude; - - return 0; -} diff -Nru redshift-1.11/src/location-geoclue.h redshift-1.12/src/location-geoclue.h --- redshift-1.11/src/location-geoclue.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/location-geoclue.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -/* location-geoclue.h -- Geoclue location provider header - This file is part of Redshift. - - Redshift is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Redshift 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 Redshift. If not, see . - - Copyright (c) 2010 Mathieu Trudel-Lapierre -*/ - -#ifndef REDSHIFT_LOCATION_GEOCLUE_H -#define REDSHIFT_LOCATION_GEOCLUE_H - -#include -#include - -#include "redshift.h" - -typedef struct { - GeocluePosition *position; /* main geoclue object */ - char *provider; /* name of a geoclue provider */ - char *provider_path; /* path of the geoclue provider */ -} location_geoclue_state_t; - -int location_geoclue_init(location_geoclue_state_t *state); -int location_geoclue_start(location_geoclue_state_t *state); -void location_geoclue_free(location_geoclue_state_t *state); - -void location_geoclue_print_help(FILE *f); -int location_geoclue_set_option(location_geoclue_state_t *state, - const char *key, const char *value); - -int location_geoclue_get_location(location_geoclue_state_t *state, - location_t *loc); - - -#endif /* ! REDSHIFT_LOCATION_GEOCLUE_H */ diff -Nru redshift-1.11/src/location-manual.c redshift-1.12/src/location-manual.c --- redshift-1.11/src/location-manual.c 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/location-manual.c 2017-10-19 02:36:21.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #include @@ -33,16 +33,25 @@ #endif -int -location_manual_init(location_manual_state_t *state) +typedef struct { + location_t loc; +} location_manual_state_t; + + +static int +location_manual_init(location_manual_state_t **state) { - state->loc.lat = NAN; - state->loc.lon = NAN; + *state = malloc(sizeof(location_manual_state_t)); + if (*state == NULL) return -1; + + location_manual_state_t *s = *state; + s->loc.lat = NAN; + s->loc.lon = NAN; return 0; } -int +static int location_manual_start(location_manual_state_t *state) { /* Latitude and longitude must be set */ @@ -54,12 +63,13 @@ return 0; } -void +static void location_manual_free(location_manual_state_t *state) { + free(state); } -void +static void location_manual_print_help(FILE *f) { fputs(_("Specify location manually.\n"), f); @@ -75,7 +85,7 @@ fputs("\n", f); } -int +static int location_manual_set_option(location_manual_state_t *state, const char *key, const char *value) { @@ -100,11 +110,30 @@ return 0; } -int -location_manual_get_location(location_manual_state_t *state, - location_t *loc) +static int +location_manual_get_fd(location_manual_state_t *state) +{ + return -1; +} + +static int +location_manual_handle( + location_manual_state_t *state, location_t *location, int *available) { - *loc = state->loc; + *location = state->loc; + *available = 1; return 0; } + + +const location_provider_t manual_location_provider = { + "manual", + (location_provider_init_func *)location_manual_init, + (location_provider_start_func *)location_manual_start, + (location_provider_free_func *)location_manual_free, + (location_provider_print_help_func *)location_manual_print_help, + (location_provider_set_option_func *)location_manual_set_option, + (location_provider_get_fd_func *)location_manual_get_fd, + (location_provider_handle_func *)location_manual_handle +}; diff -Nru redshift-1.11/src/location-manual.h redshift-1.12/src/location-manual.h --- redshift-1.11/src/location-manual.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/location-manual.h 2017-10-19 02:36:21.000000000 +0000 @@ -14,32 +14,14 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2010-2014 Jon Lund Steffensen + Copyright (c) 2010-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_LOCATION_MANUAL_H #define REDSHIFT_LOCATION_MANUAL_H -#include - #include "redshift.h" - -typedef struct { - location_t loc; -} location_manual_state_t; - - -int location_manual_init(location_manual_state_t *state); -int location_manual_start(location_manual_state_t *state); -void location_manual_free(location_manual_state_t *state); - -void location_manual_print_help(FILE *f); -int location_manual_set_option(location_manual_state_t *state, - const char *key, const char *value); - -int location_manual_get_location(location_manual_state_t *state, - location_t *loc); - +extern const location_provider_t manual_location_provider; #endif /* ! REDSHIFT_LOCATION_MANUAL_H */ diff -Nru redshift-1.11/src/Makefile.am redshift-1.12/src/Makefile.am --- redshift-1.11/src/Makefile.am 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/Makefile.am 2017-11-02 02:34:45.000000000 +0000 @@ -9,15 +9,17 @@ bin_PROGRAMS = redshift redshift_SOURCES = \ - redshift.c redshift.h \ - signals.c signals.h \ colorramp.c colorramp.h \ config-ini.c config-ini.h \ + gamma-dummy.c gamma-dummy.h \ + hooks.c hooks.h \ location-manual.c location-manual.h \ + options.c options.h \ + pipeutils.c pipeutils.h \ + redshift.c redshift.h \ + signals.c signals.h \ solar.c solar.h \ - systemtime.c systemtime.h \ - hooks.c hooks.h \ - gamma-dummy.c gamma-dummy.h + systemtime.c systemtime.h EXTRA_redshift_SOURCES = \ gamma-drm.c gamma-drm.h \ @@ -25,11 +27,14 @@ gamma-vidmode.c gamma-vidmode.h \ gamma-quartz.c gamma-quartz.h \ gamma-w32gdi.c gamma-w32gdi.h \ - location-geoclue.c location-geoclue.h + location-geoclue2.c location-geoclue2.h \ + location-corelocation.m location-corelocation.h \ + windows/appicon.rc \ + windows/versioninfo.rc AM_CFLAGS = redshift_LDADD = @LIBINTL@ -EXTRA_DIST = +EXTRA_DIST = windows/redshift.ico if ENABLE_DRM redshift_SOURCES += gamma-drm.c gamma-drm.h @@ -67,16 +72,6 @@ endif -if ENABLE_GEOCLUE -redshift_SOURCES += location-geoclue.c location-geoclue.h -AM_CFLAGS += \ - $(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) \ - $(GLIB_CFLAGS) $(GLIB_LIBS) -redshift_LDADD += \ - $(GEOCLUE_LIBS) $(GEOCLUE_CFLAGS) - $(GLIB_LIBS) $(GLIB_CFLAGS) -endif - if ENABLE_GEOCLUE2 redshift_SOURCES += location-geoclue2.c location-geoclue2.h AM_CFLAGS += \ @@ -99,3 +94,12 @@ $(CORELOCATION_CFLAGS) $(CORELOCATION_LIBS) redshift_LDADD += liblocation-corelocation.la endif + + +# Windows resources +if ENABLE_WINDOWS_RESOURCE +redshift_SOURCES += windows/appicon.rc windows/versioninfo.rc +endif + +.rc.o: + $(AM_V_GEN)$(WINDRES) -I$(top_builddir) -i $< -o $@ diff -Nru redshift-1.11/src/Makefile.in redshift-1.12/src/Makefile.in --- redshift-1.11/src/Makefile.in 2016-01-02 22:53:19.000000000 +0000 +++ redshift-1.12/src/Makefile.in 2018-05-21 01:20:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -104,25 +114,18 @@ @ENABLE_WINGDI_TRUE@am__append_13 = gamma-w32gdi.c gamma-w32gdi.h @ENABLE_WINGDI_TRUE@am__append_14 = -lgdi32 -@ENABLE_GEOCLUE_TRUE@am__append_15 = location-geoclue.c location-geoclue.h -@ENABLE_GEOCLUE_TRUE@am__append_16 = \ -@ENABLE_GEOCLUE_TRUE@ $(GEOCLUE_CFLAGS) $(GEOCLUE_LIBS) \ -@ENABLE_GEOCLUE_TRUE@ $(GLIB_CFLAGS) $(GLIB_LIBS) - -@ENABLE_GEOCLUE_TRUE@am__append_17 = \ -@ENABLE_GEOCLUE_TRUE@ $(GEOCLUE_LIBS) $(GEOCLUE_CFLAGS) - -@ENABLE_GEOCLUE2_TRUE@am__append_18 = location-geoclue2.c location-geoclue2.h -@ENABLE_GEOCLUE2_TRUE@am__append_19 = \ +@ENABLE_GEOCLUE2_TRUE@am__append_15 = location-geoclue2.c location-geoclue2.h +@ENABLE_GEOCLUE2_TRUE@am__append_16 = \ @ENABLE_GEOCLUE2_TRUE@ $(GEOCLUE2_CFLAGS) -@ENABLE_GEOCLUE2_TRUE@am__append_20 = \ +@ENABLE_GEOCLUE2_TRUE@am__append_17 = \ @ENABLE_GEOCLUE2_TRUE@ $(GEOCLUE2_LIBS) $(GEOCLUE2_CFLAGS) -@ENABLE_CORELOCATION_TRUE@am__append_21 = liblocation-corelocation.la +@ENABLE_CORELOCATION_TRUE@am__append_18 = liblocation-corelocation.la + +# Windows resources +@ENABLE_WINDOWS_RESOURCE_TRUE@am__append_19 = windows/appicon.rc windows/versioninfo.rc subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -135,6 +138,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -160,26 +164,30 @@ @ENABLE_CORELOCATION_TRUE@am_liblocation_corelocation_la_rpath = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) -am__redshift_SOURCES_DIST = redshift.c redshift.h signals.c signals.h \ - colorramp.c colorramp.h config-ini.c config-ini.h \ - location-manual.c location-manual.h solar.c solar.h \ - systemtime.c systemtime.h hooks.c hooks.h gamma-dummy.c \ - gamma-dummy.h gamma-drm.c gamma-drm.h gamma-randr.c \ - gamma-randr.h gamma-vidmode.c gamma-vidmode.h gamma-quartz.c \ - gamma-quartz.h gamma-w32gdi.c gamma-w32gdi.h \ - location-geoclue.c location-geoclue.h location-geoclue2.c \ - location-geoclue2.h +am__redshift_SOURCES_DIST = colorramp.c colorramp.h config-ini.c \ + config-ini.h gamma-dummy.c gamma-dummy.h hooks.c hooks.h \ + location-manual.c location-manual.h options.c options.h \ + pipeutils.c pipeutils.h redshift.c redshift.h signals.c \ + signals.h solar.c solar.h systemtime.c systemtime.h \ + gamma-drm.c gamma-drm.h gamma-randr.c gamma-randr.h \ + gamma-vidmode.c gamma-vidmode.h gamma-quartz.c gamma-quartz.h \ + gamma-w32gdi.c gamma-w32gdi.h location-geoclue2.c \ + location-geoclue2.h windows/appicon.rc windows/versioninfo.rc @ENABLE_DRM_TRUE@am__objects_1 = gamma-drm.$(OBJEXT) @ENABLE_RANDR_TRUE@am__objects_2 = gamma-randr.$(OBJEXT) @ENABLE_VIDMODE_TRUE@am__objects_3 = gamma-vidmode.$(OBJEXT) @ENABLE_QUARTZ_TRUE@am__objects_4 = gamma-quartz.$(OBJEXT) @ENABLE_WINGDI_TRUE@am__objects_5 = gamma-w32gdi.$(OBJEXT) -@ENABLE_GEOCLUE_TRUE@am__objects_6 = location-geoclue.$(OBJEXT) -@ENABLE_GEOCLUE2_TRUE@am__objects_7 = location-geoclue2.$(OBJEXT) -am_redshift_OBJECTS = redshift.$(OBJEXT) signals.$(OBJEXT) \ - colorramp.$(OBJEXT) config-ini.$(OBJEXT) \ - location-manual.$(OBJEXT) solar.$(OBJEXT) systemtime.$(OBJEXT) \ - hooks.$(OBJEXT) gamma-dummy.$(OBJEXT) $(am__objects_1) \ +@ENABLE_GEOCLUE2_TRUE@am__objects_6 = location-geoclue2.$(OBJEXT) +am__dirstamp = $(am__leading_dot)dirstamp +@ENABLE_WINDOWS_RESOURCE_TRUE@am__objects_7 = \ +@ENABLE_WINDOWS_RESOURCE_TRUE@ windows/appicon.$(OBJEXT) \ +@ENABLE_WINDOWS_RESOURCE_TRUE@ windows/versioninfo.$(OBJEXT) +am_redshift_OBJECTS = colorramp.$(OBJEXT) config-ini.$(OBJEXT) \ + gamma-dummy.$(OBJEXT) hooks.$(OBJEXT) \ + location-manual.$(OBJEXT) options.$(OBJEXT) \ + pipeutils.$(OBJEXT) redshift.$(OBJEXT) signals.$(OBJEXT) \ + solar.$(OBJEXT) systemtime.$(OBJEXT) $(am__objects_1) \ $(am__objects_2) $(am__objects_3) $(am__objects_4) \ $(am__objects_5) $(am__objects_6) $(am__objects_7) redshift_OBJECTS = $(am_redshift_OBJECTS) @@ -194,14 +202,11 @@ @ENABLE_VIDMODE_TRUE@ $(am__DEPENDENCIES_1) @ENABLE_QUARTZ_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) \ @ENABLE_QUARTZ_TRUE@ $(am__DEPENDENCIES_1) -@ENABLE_GEOCLUE_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) \ -@ENABLE_GEOCLUE_TRUE@ $(am__DEPENDENCIES_1) -@ENABLE_GEOCLUE2_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) \ +@ENABLE_GEOCLUE2_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) \ @ENABLE_GEOCLUE2_TRUE@ $(am__DEPENDENCIES_1) redshift_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_5) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) \ - $(am__DEPENDENCIES_7) $(am__append_21) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_6) $(am__append_18) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -299,6 +304,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -342,7 +348,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -358,8 +363,6 @@ FGREP = @FGREP@ GEOCLUE2_CFLAGS = @GEOCLUE2_CFLAGS@ GEOCLUE2_LIBS = @GEOCLUE2_LIBS@ -GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ -GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ @@ -375,7 +378,6 @@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ @@ -394,6 +396,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -435,6 +438,7 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WINDRES = @WINDRES@ X11_CFLAGS = @X11_CFLAGS@ X11_LIBS = @X11_LIBS@ XCB_CFLAGS = @XCB_CFLAGS@ @@ -510,27 +514,30 @@ top_srcdir = @top_srcdir@ SUBDIRS = redshift-gtk AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -redshift_SOURCES = redshift.c redshift.h signals.c signals.h \ - colorramp.c colorramp.h config-ini.c config-ini.h \ - location-manual.c location-manual.h solar.c solar.h \ - systemtime.c systemtime.h hooks.c hooks.h gamma-dummy.c \ - gamma-dummy.h $(am__append_1) $(am__append_4) $(am__append_7) \ - $(am__append_10) $(am__append_13) $(am__append_15) \ - $(am__append_18) +redshift_SOURCES = colorramp.c colorramp.h config-ini.c config-ini.h \ + gamma-dummy.c gamma-dummy.h hooks.c hooks.h location-manual.c \ + location-manual.h options.c options.h pipeutils.c pipeutils.h \ + redshift.c redshift.h signals.c signals.h solar.c solar.h \ + systemtime.c systemtime.h $(am__append_1) $(am__append_4) \ + $(am__append_7) $(am__append_10) $(am__append_13) \ + $(am__append_15) $(am__append_19) EXTRA_redshift_SOURCES = \ gamma-drm.c gamma-drm.h \ gamma-randr.c gamma-randr.h \ gamma-vidmode.c gamma-vidmode.h \ gamma-quartz.c gamma-quartz.h \ gamma-w32gdi.c gamma-w32gdi.h \ - location-geoclue.c location-geoclue.h + location-geoclue2.c location-geoclue2.h \ + location-corelocation.m location-corelocation.h \ + windows/appicon.rc \ + windows/versioninfo.rc AM_CFLAGS = $(am__append_2) $(am__append_5) $(am__append_8) \ - $(am__append_11) $(am__append_16) $(am__append_19) + $(am__append_11) $(am__append_16) redshift_LDADD = @LIBINTL@ $(am__append_3) $(am__append_6) \ $(am__append_9) $(am__append_12) $(am__append_14) \ - $(am__append_17) $(am__append_20) $(am__append_21) -EXTRA_DIST = + $(am__append_17) $(am__append_18) +EXTRA_DIST = windows/redshift.ico # Build CoreLocation module as a separate convenience # library since it is using a separate compiler @@ -548,7 +555,7 @@ all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .m .o .obj +.SUFFIXES: .c .lo .m .o .obj .rc $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -561,7 +568,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -642,13 +648,24 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list +windows/$(am__dirstamp): + @$(MKDIR_P) windows + @: > windows/$(am__dirstamp) +windows/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) windows/$(DEPDIR) + @: > windows/$(DEPDIR)/$(am__dirstamp) +windows/appicon.$(OBJEXT): windows/$(am__dirstamp) \ + windows/$(DEPDIR)/$(am__dirstamp) +windows/versioninfo.$(OBJEXT): windows/$(am__dirstamp) \ + windows/$(DEPDIR)/$(am__dirstamp) redshift$(EXEEXT): $(redshift_OBJECTS) $(redshift_DEPENDENCIES) $(EXTRA_redshift_DEPENDENCIES) @rm -f redshift$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(redshift_OBJECTS) $(redshift_LDADD) $(LIBS) + $(AM_V_OBJCLD)$(OBJCLINK) $(redshift_OBJECTS) $(redshift_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) + -rm -f windows/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -663,9 +680,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gamma-w32gdi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hooks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblocation_corelocation_la-location-corelocation.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/location-geoclue.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/location-corelocation.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/location-geoclue2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/location-manual.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/options.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipeutils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/redshift.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/solar.Po@am__quote@ @@ -920,6 +939,8 @@ 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) + -rm -f windows/$(DEPDIR)/$(am__dirstamp) + -rm -f windows/$(am__dirstamp) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1012,7 +1033,11 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS -@ENABLE_GEOCLUE_TRUE@ $(GLIB_LIBS) $(GLIB_CFLAGS) +.PRECIOUS: Makefile + + +.rc.o: + $(AM_V_GEN)$(WINDRES) -I$(top_builddir) -i $< -o $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru redshift-1.11/src/options.c redshift-1.12/src/options.c --- redshift-1.11/src/options.c 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/src/options.c 2018-05-21 00:56:43.000000000 +0000 @@ -0,0 +1,679 @@ +/* options.c -- Program options + This file is part of Redshift. + + Redshift is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Redshift 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 Redshift. If not, see . + + Copyright (c) 2017 Jon Lund Steffensen +*/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include + +#ifdef ENABLE_NLS +# include +# define _(s) gettext(s) +#else +# define _(s) s +#endif + +#include "redshift.h" +#include "config-ini.h" +#include "options.h" +#include "solar.h" + +/* Angular elevation of the sun at which the color temperature + transition period starts and ends (in degress). + Transition during twilight, and while the sun is lower than + 3.0 degrees above the horizon. */ +#define TRANSITION_LOW SOLAR_CIVIL_TWILIGHT_ELEV +#define TRANSITION_HIGH 3.0 + +/* Default values for parameters. */ +#define DEFAULT_DAY_TEMP 6500 +#define DEFAULT_NIGHT_TEMP 4500 +#define DEFAULT_BRIGHTNESS 1.0 +#define DEFAULT_GAMMA 1.0 + + +/* A brightness string contains either one floating point value, + or two values separated by a colon. */ +static void +parse_brightness_string( + const char *str, float *bright_day, float *bright_night) +{ + char *s = strchr(str, ':'); + if (s == NULL) { + /* Same value for day and night. */ + *bright_day = *bright_night = atof(str); + } else { + *(s++) = '\0'; + *bright_day = atof(str); + *bright_night = atof(s); + } +} + +/* A gamma string contains either one floating point value, + or three values separated by colon. */ +static int +parse_gamma_string(const char *str, float gamma[]) +{ + char *s = strchr(str, ':'); + if (s == NULL) { + /* Use value for all channels */ + float g = atof(str); + gamma[0] = gamma[1] = gamma[2] = g; + } else { + /* Parse separate value for each channel */ + *(s++) = '\0'; + char *g_s = s; + s = strchr(s, ':'); + if (s == NULL) return -1; + + *(s++) = '\0'; + gamma[0] = atof(str); /* Red */ + gamma[1] = atof(g_s); /* Blue */ + gamma[2] = atof(s); /* Green */ + } + + return 0; +} + +/* Parse transition time string e.g. "04:50". Returns negative on failure, + otherwise the parsed time is returned as seconds since midnight. */ +static int +parse_transition_time(const char *str, const char **end) +{ + const char *min = NULL; + errno = 0; + long hours = strtol(str, (char **)&min, 10); + if (errno != 0 || min == str || min[0] != ':' || + hours < 0 || hours >= 24) { + return -1; + } + + min += 1; + errno = 0; + long minutes = strtol(min, (char **)end, 10); + if (errno != 0 || *end == min || minutes < 0 || minutes >= 60) { + return -1; + } + + return minutes * 60 + hours * 3600; +} + +/* Parse transition range string e.g. "04:50-6:20". Returns negative on + failure, otherwise zero. Parsed start and end times are returned as seconds + since midnight. */ +static int +parse_transition_range(const char *str, time_range_t *range) +{ + const char *next = NULL; + int start_time = parse_transition_time(str, &next); + if (start_time < 0) return -1; + + int end_time; + if (next[0] == '\0') { + end_time = start_time; + } else if (next[0] == '-') { + next += 1; + const char *end = NULL; + end_time = parse_transition_time(next, &end); + if (end_time < 0 || end[0] != '\0') return -1; + } else { + return -1; + } + + range->start = start_time; + range->end = end_time; + + return 0; +} + +/* Print help text. */ +static void +print_help(const char *program_name) +{ + /* TRANSLATORS: help output 1 + LAT is latitude, LON is longitude, + DAY is temperature at daytime, + NIGHT is temperature at night + no-wrap */ + printf(_("Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"), + program_name); + fputs("\n", stdout); + + /* TRANSLATORS: help output 2 + no-wrap */ + fputs(_("Set color temperature of display" + " according to time of day.\n"), stdout); + fputs("\n", stdout); + + /* TRANSLATORS: help output 3 + no-wrap */ + fputs(_(" -h\t\tDisplay this help message\n" + " -v\t\tVerbose output\n" + " -V\t\tShow program version\n"), stdout); + fputs("\n", stdout); + + /* TRANSLATORS: help output 4 + `list' must not be translated + no-wrap */ + fputs(_(" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" + " -c FILE\tLoad settings from specified configuration file\n" + " -g R:G:B\tAdditional gamma correction to apply\n" + " -l LAT:LON\tYour current location\n" + " -l PROVIDER\tSelect provider for automatic" + " location updates\n" + " \t\t(Type `list' to see available providers)\n" + " -m METHOD\tMethod to use to set color temperature\n" + " \t\t(Type `list' to see available methods)\n" + " -o\t\tOne shot mode (do not continuously adjust" + " color temperature)\n" + " -O TEMP\tOne shot manual mode (set color temperature)\n" + " -p\t\tPrint mode (only print parameters and exit)\n" + " -P\t\tReset existing gamma ramps before applying new" + " color effect\n" + " -x\t\tReset mode (remove adjustment from screen)\n" + " -r\t\tDisable fading between color temperatures\n" + " -t DAY:NIGHT\tColor temperature to set at daytime/night\n"), + stdout); + fputs("\n", stdout); + + /* TRANSLATORS: help output 5 */ + printf(_("The neutral temperature is %uK. Using this value will not change " + "the color\ntemperature of the display. Setting the color temperature " + "to a value higher\nthan this results in more blue light, and setting " + "a lower value will result in\nmore red light.\n"), + NEUTRAL_TEMP); + + fputs("\n", stdout); + + /* TRANSLATORS: help output 6 */ + printf(_("Default values:\n\n" + " Daytime temperature: %uK\n" + " Night temperature: %uK\n"), + DEFAULT_DAY_TEMP, DEFAULT_NIGHT_TEMP); + + fputs("\n", stdout); + + /* TRANSLATORS: help output 7 */ + printf(_("Please report bugs to <%s>\n"), PACKAGE_BUGREPORT); +} + +/* Print list of adjustment methods. */ +static void +print_method_list(const gamma_method_t *gamma_methods) +{ + fputs(_("Available adjustment methods:\n"), stdout); + for (int i = 0; gamma_methods[i].name != NULL; i++) { + printf(" %s\n", gamma_methods[i].name); + } + + fputs("\n", stdout); + fputs(_("Specify colon-separated options with" + " `-m METHOD:OPTIONS'.\n"), stdout); + /* TRANSLATORS: `help' must not be translated. */ + fputs(_("Try `-m METHOD:help' for help.\n"), stdout); +} + +/* Print list of location providers. */ +static void +print_provider_list(const location_provider_t location_providers[]) +{ + fputs(_("Available location providers:\n"), stdout); + for (int i = 0; location_providers[i].name != NULL; i++) { + printf(" %s\n", location_providers[i].name); + } + + fputs("\n", stdout); + fputs(_("Specify colon-separated options with" + "`-l PROVIDER:OPTIONS'.\n"), stdout); + /* TRANSLATORS: `help' must not be translated. */ + fputs(_("Try `-l PROVIDER:help' for help.\n"), stdout); +} + +/* Return the gamma method with the given name. */ +static const gamma_method_t * +find_gamma_method(const gamma_method_t gamma_methods[], const char *name) +{ + const gamma_method_t *method = NULL; + for (int i = 0; gamma_methods[i].name != NULL; i++) { + const gamma_method_t *m = &gamma_methods[i]; + if (strcasecmp(name, m->name) == 0) { + method = m; + break; + } + } + + return method; +} + +/* Return location provider with the given name. */ +static const location_provider_t * +find_location_provider( + const location_provider_t location_providers[], const char *name) +{ + const location_provider_t *provider = NULL; + for (int i = 0; location_providers[i].name != NULL; i++) { + const location_provider_t *p = &location_providers[i]; + if (strcasecmp(name, p->name) == 0) { + provider = p; + break; + } + } + + return provider; +} + + +/* Initialize options struct. */ +void +options_init(options_t *options) +{ + options->config_filepath = NULL; + + /* Default elevation values. */ + options->scheme.high = TRANSITION_HIGH; + options->scheme.low = TRANSITION_LOW; + + /* Settings for day, night and transition period. + Initialized to indicate that the values are not set yet. */ + options->scheme.use_time = 0; + options->scheme.dawn.start = -1; + options->scheme.dawn.end = -1; + options->scheme.dusk.start = -1; + options->scheme.dusk.end = -1; + + options->scheme.day.temperature = -1; + options->scheme.day.gamma[0] = NAN; + options->scheme.day.brightness = NAN; + + options->scheme.night.temperature = -1; + options->scheme.night.gamma[0] = NAN; + options->scheme.night.brightness = NAN; + + /* Temperature for manual mode */ + options->temp_set = -1; + + options->method = NULL; + options->method_args = NULL; + + options->provider = NULL; + options->provider_args = NULL; + + options->use_fade = -1; + options->preserve_gamma = 1; + options->mode = PROGRAM_MODE_CONTINUAL; + options->verbose = 0; +} + +/* Parse a single option from the command-line. */ +static int +parse_command_line_option( + const char option, char *value, options_t *options, + const char *program_name, const gamma_method_t *gamma_methods, + const location_provider_t *location_providers) +{ + int r; + char *s; + + switch (option) { + case 'b': + parse_brightness_string( + value, &options->scheme.day.brightness, + &options->scheme.night.brightness); + break; + case 'c': + free(options->config_filepath); + options->config_filepath = strdup(value); + break; + case 'g': + r = parse_gamma_string(value, options->scheme.day.gamma); + if (r < 0) { + fputs(_("Malformed gamma argument.\n"), stderr); + fputs(_("Try `-h' for more information.\n"), stderr); + return -1; + } + + /* Set night gamma to the same value as day gamma. + To set these to distinct values use the config + file. */ + memcpy(options->scheme.night.gamma, + options->scheme.day.gamma, + sizeof(options->scheme.night.gamma)); + break; + case 'h': + print_help(program_name); + exit(EXIT_SUCCESS); + break; + case 'l': + /* Print list of providers if argument is `list' */ + if (strcasecmp(value, "list") == 0) { + print_provider_list(location_providers); + exit(EXIT_SUCCESS); + } + + char *provider_name = NULL; + + /* Don't save the result of strtof(); we simply want + to know if value can be parsed as a float. */ + errno = 0; + char *end; + strtof(value, &end); + if (errno == 0 && *end == ':') { + /* Use instead as arguments to `manual'. */ + provider_name = "manual"; + options->provider_args = value; + } else { + /* Split off provider arguments. */ + s = strchr(value, ':'); + if (s != NULL) { + *(s++) = '\0'; + options->provider_args = s; + } + + provider_name = value; + } + + /* Lookup provider from name. */ + options->provider = find_location_provider( + location_providers, provider_name); + if (options->provider == NULL) { + fprintf(stderr, _("Unknown location provider `%s'.\n"), + provider_name); + return -1; + } + + /* Print provider help if arg is `help'. */ + if (options->provider_args != NULL && + strcasecmp(options->provider_args, "help") == 0) { + options->provider->print_help(stdout); + exit(EXIT_SUCCESS); + } + break; + case 'm': + /* Print list of methods if argument is `list' */ + if (strcasecmp(value, "list") == 0) { + print_method_list(gamma_methods); + exit(EXIT_SUCCESS); + } + + /* Split off method arguments. */ + s = strchr(value, ':'); + if (s != NULL) { + *(s++) = '\0'; + options->method_args = s; + } + + /* Find adjustment method by name. */ + options->method = find_gamma_method(gamma_methods, value); + if (options->method == NULL) { + /* TRANSLATORS: This refers to the method + used to adjust colors e.g VidMode */ + fprintf(stderr, _("Unknown adjustment method `%s'.\n"), + value); + return -1; + } + + /* Print method help if arg is `help'. */ + if (options->method_args != NULL && + strcasecmp(options->method_args, "help") == 0) { + options->method->print_help(stdout); + exit(EXIT_SUCCESS); + } + break; + case 'o': + options->mode = PROGRAM_MODE_ONE_SHOT; + break; + case 'O': + options->mode = PROGRAM_MODE_MANUAL; + options->temp_set = atoi(value); + break; + case 'p': + options->mode = PROGRAM_MODE_PRINT; + break; + case 'P': + options->preserve_gamma = 0; + break; + case 'r': + options->use_fade = 0; + break; + case 't': + s = strchr(value, ':'); + if (s == NULL) { + fputs(_("Malformed temperature argument.\n"), stderr); + fputs(_("Try `-h' for more information.\n"), stderr); + return -1; + } + *(s++) = '\0'; + options->scheme.day.temperature = atoi(value); + options->scheme.night.temperature = atoi(s); + break; + case 'v': + options->verbose = 1; + break; + case 'V': + printf("%s\n", PACKAGE_STRING); + exit(EXIT_SUCCESS); + break; + case 'x': + options->mode = PROGRAM_MODE_RESET; + break; + case '?': + fputs(_("Try `-h' for more information.\n"), stderr); + return -1; + break; + } + + return 0; +} + +/* Parse command line arguments. */ +void +options_parse_args( + options_t *options, int argc, char *argv[], + const gamma_method_t *gamma_methods, + const location_provider_t *location_providers) +{ + const char* program_name = argv[0]; + int opt; + while ((opt = getopt(argc, argv, "b:c:g:hl:m:oO:pPrt:vVx")) != -1) { + char option = opt; + int r = parse_command_line_option( + option, optarg, options, program_name, gamma_methods, + location_providers); + if (r < 0) exit(EXIT_FAILURE); + } +} + +/* Parse a single key-value pair from the configuration file. */ +static int +parse_config_file_option( + const char *key, const char *value, options_t *options, + const gamma_method_t *gamma_methods, + const location_provider_t *location_providers) +{ + if (strcasecmp(key, "temp-day") == 0) { + if (options->scheme.day.temperature < 0) { + options->scheme.day.temperature = atoi(value); + } + } else if (strcasecmp(key, "temp-night") == 0) { + if (options->scheme.night.temperature < 0) { + options->scheme.night.temperature = atoi(value); + } + } else if (strcasecmp(key, "transition") == 0 || + strcasecmp(key, "fade") == 0) { + /* "fade" is preferred, "transition" is + deprecated as the setting key. */ + if (options->use_fade < 0) { + options->use_fade = !!atoi(value); + } + } else if (strcasecmp(key, "brightness") == 0) { + if (isnan(options->scheme.day.brightness)) { + options->scheme.day.brightness = atof(value); + } + if (isnan(options->scheme.night.brightness)) { + options->scheme.night.brightness = atof(value); + } + } else if (strcasecmp(key, "brightness-day") == 0) { + if (isnan(options->scheme.day.brightness)) { + options->scheme.day.brightness = atof(value); + } + } else if (strcasecmp(key, "brightness-night") == 0) { + if (isnan(options->scheme.night.brightness)) { + options->scheme.night.brightness = atof(value); + } + } else if (strcasecmp(key, "elevation-high") == 0) { + options->scheme.high = atof(value); + } else if (strcasecmp(key, "elevation-low") == 0) { + options->scheme.low = atof(value); + } else if (strcasecmp(key, "gamma") == 0) { + if (isnan(options->scheme.day.gamma[0])) { + int r = parse_gamma_string( + value, options->scheme.day.gamma); + if (r < 0) { + fputs(_("Malformed gamma setting.\n"), stderr); + return -1; + } + memcpy(options->scheme.night.gamma, + options->scheme.day.gamma, + sizeof(options->scheme.night.gamma)); + } + } else if (strcasecmp(key, "gamma-day") == 0) { + if (isnan(options->scheme.day.gamma[0])) { + int r = parse_gamma_string( + value, options->scheme.day.gamma); + if (r < 0) { + fputs(_("Malformed gamma setting.\n"), stderr); + return -1; + } + } + } else if (strcasecmp(key, "gamma-night") == 0) { + if (isnan(options->scheme.night.gamma[0])) { + int r = parse_gamma_string( + value, options->scheme.night.gamma); + if (r < 0) { + fputs(_("Malformed gamma setting.\n"), stderr); + return -1; + } + } + } else if (strcasecmp(key, "adjustment-method") == 0) { + if (options->method == NULL) { + options->method = find_gamma_method( + gamma_methods, value); + if (options->method == NULL) { + fprintf(stderr, _("Unknown adjustment" + " method `%s'.\n"), value); + return -1; + } + } + } else if (strcasecmp(key, "location-provider") == 0) { + if (options->provider == NULL) { + options->provider = find_location_provider( + location_providers, value); + if (options->provider == NULL) { + fprintf(stderr, _("Unknown location" + " provider `%s'.\n"), value); + return -1; + } + } + } else if (strcasecmp(key, "dawn-time") == 0) { + if (options->scheme.dawn.start < 0) { + int r = parse_transition_range( + value, &options->scheme.dawn); + if (r < 0) { + fprintf(stderr, _("Malformed dawn-time" + " setting `%s'.\n"), value); + return -1; + } + } + } else if (strcasecmp(key, "dusk-time") == 0) { + if (options->scheme.dusk.start < 0) { + int r = parse_transition_range( + value, &options->scheme.dusk); + if (r < 0) { + fprintf(stderr, _("Malformed dusk-time" + " setting `%s'.\n"), value); + return -1; + } + } + } else { + fprintf(stderr, _("Unknown configuration setting `%s'.\n"), + key); + } + + return 0; +} + +/* Parse options defined in the config file. */ +void +options_parse_config_file( + options_t *options, config_ini_state_t *config_state, + const gamma_method_t *gamma_methods, + const location_provider_t *location_providers) +{ + /* Read global config settings. */ + config_ini_section_t *section = config_ini_get_section( + config_state, "redshift"); + if (section == NULL) return; + + config_ini_setting_t *setting = section->settings; + while (setting != NULL) { + int r = parse_config_file_option( + setting->name, setting->value, options, + gamma_methods, location_providers); + if (r < 0) exit(EXIT_FAILURE); + + setting = setting->next; + } +} + +/* Replace unspecified options with default values. */ +void +options_set_defaults(options_t *options) +{ + if (options->scheme.day.temperature < 0) { + options->scheme.day.temperature = DEFAULT_DAY_TEMP; + } + if (options->scheme.night.temperature < 0) { + options->scheme.night.temperature = DEFAULT_NIGHT_TEMP; + } + + if (isnan(options->scheme.day.brightness)) { + options->scheme.day.brightness = DEFAULT_BRIGHTNESS; + } + if (isnan(options->scheme.night.brightness)) { + options->scheme.night.brightness = DEFAULT_BRIGHTNESS; + } + + if (isnan(options->scheme.day.gamma[0])) { + options->scheme.day.gamma[0] = DEFAULT_GAMMA; + options->scheme.day.gamma[1] = DEFAULT_GAMMA; + options->scheme.day.gamma[2] = DEFAULT_GAMMA; + } + if (isnan(options->scheme.night.gamma[0])) { + options->scheme.night.gamma[0] = DEFAULT_GAMMA; + options->scheme.night.gamma[1] = DEFAULT_GAMMA; + options->scheme.night.gamma[2] = DEFAULT_GAMMA; + } + + if (options->use_fade < 0) options->use_fade = 1; +} diff -Nru redshift-1.11/src/options.h redshift-1.12/src/options.h --- redshift-1.11/src/options.h 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/src/options.h 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1,63 @@ +/* options.h -- Program options header + This file is part of Redshift. + + Redshift is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Redshift 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 Redshift. If not, see . + + Copyright (c) 2017 Jon Lund Steffensen +*/ + +#ifndef REDSHIFT_OPTIONS_H +#define REDSHIFT_OPTIONS_H + +#include "redshift.h" + +typedef struct { + /* Path to config file */ + char *config_filepath; + + transition_scheme_t scheme; + program_mode_t mode; + int verbose; + + /* Temperature to set in manual mode. */ + int temp_set; + /* Whether to fade between large skips in color temperature. */ + int use_fade; + /* Whether to preserve gamma ramps if supported by gamma method. */ + int preserve_gamma; + + /* Selected gamma method. */ + const gamma_method_t *method; + /* Arguments for gamma method. */ + char *method_args; + + /* Selected location provider. */ + const location_provider_t *provider; + /* Arguments for location provider. */ + char *provider_args; +} options_t; + + +void options_init(options_t *options); +void options_parse_args( + options_t *options, int argc, char *argv[], + const gamma_method_t *gamma_methods, + const location_provider_t *location_providers); +void options_parse_config_file( + options_t *options, config_ini_state_t *config_state, + const gamma_method_t *gamma_methods, + const location_provider_t *location_providers); +void options_set_defaults(options_t *options); + +#endif /* ! REDSHIFT_OPTIONS_H */ diff -Nru redshift-1.11/src/pipeutils.c redshift-1.12/src/pipeutils.c --- redshift-1.11/src/pipeutils.c 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/src/pipeutils.c 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1,98 @@ +/* pipeutils.c -- Utilities for using pipes as signals + This file is part of Redshift. + + Redshift is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Redshift 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 Redshift. If not, see . + + Copyright (c) 2017 Jon Lund Steffensen +*/ + +#include +#include +#include + + +#ifndef _WIN32 + +/* Create non-blocking set of pipe fds. */ +int +pipeutils_create_nonblocking(int pipefds[2]) +{ + int r = pipe(pipefds); + if (r == -1) { + perror("pipe"); + return -1; + } + + int flags = fcntl(pipefds[0], F_GETFL); + if (flags == -1) { + perror("fcntl"); + close(pipefds[0]); + close(pipefds[1]); + return -1; + } + + r = fcntl(pipefds[0], F_SETFL, flags | O_NONBLOCK); + if (r == -1) { + perror("fcntl"); + close(pipefds[0]); + close(pipefds[1]); + return -1; + } + + flags = fcntl(pipefds[1], F_GETFL); + if (flags == -1) { + perror("fcntl"); + close(pipefds[0]); + close(pipefds[1]); + return -1; + } + + r = fcntl(pipefds[1], F_SETFL, flags | O_NONBLOCK); + if (r == -1) { + perror("fcntl"); + close(pipefds[0]); + close(pipefds[1]); + return -1; + } + + return 0; +} + +#else /* _WIN32 */ + +/* Create non-blocking set of pipe fds. + + Not supported on Windows! Always fails. */ +int +pipeutils_create_nonblocking(int pipefds[2]) +{ + return -1; +} + +#endif + +/* Signal on write-end of pipe. */ +void +pipeutils_signal(int write_fd) +{ + write(write_fd, "", 1); +} + +/* Mark signal as handled on read-end of pipe. */ +void +pipeutils_handle_signal(int read_fd) +{ + char data; + read(read_fd, &data, 1); +} diff -Nru redshift-1.11/src/pipeutils.h redshift-1.12/src/pipeutils.h --- redshift-1.11/src/pipeutils.h 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/src/pipeutils.h 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1,28 @@ +/* pipeutils.h -- Utilities for using pipes as signals + This file is part of Redshift. + + Redshift is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Redshift 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 Redshift. If not, see . + + Copyright (c) 2017 Jon Lund Steffensen +*/ + +#ifndef REDSHIFT_PIPEUTILS_H +#define REDSHIFT_PIPEUTILS_H + +int pipeutils_create_nonblocking(int pipefds[2]); + +void pipeutils_signal(int write_fd); +void pipeutils_handle_signal(int read_fd); + +#endif /* ! REDSHIFT_PIPEUTILS_H */ diff -Nru redshift-1.11/src/redshift.c redshift-1.12/src/redshift.c --- redshift-1.11/src/redshift.c 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/redshift.c 2018-05-21 00:56:43.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2009-2015 Jon Lund Steffensen + Copyright (c) 2009-2017 Jon Lund Steffensen */ #ifdef HAVE_CONFIG_H @@ -29,6 +29,21 @@ #include #include +/* poll.h is not available on Windows but there is no Windows location provider + using polling. On Windows, we just define some stubs to make things compile. + */ +#ifndef _WIN32 +# include +#else +#define POLLIN 0 +struct pollfd { + int fd; + short events; + short revents; +}; +int poll(struct pollfd *fds, int nfds, int timeout) { abort(); return -1; } +#endif + #if defined(HAVE_SIGNAL_H) && !defined(__WIN32__) # include #endif @@ -49,6 +64,7 @@ #include "systemtime.h" #include "hooks.h" #include "signals.h" +#include "options.h" /* pause() is not defined on windows platform but is not needed either. Use a noop macro instead. */ @@ -81,10 +97,6 @@ #include "location-manual.h" -#ifdef ENABLE_GEOCLUE -# include "location-geoclue.h" -#endif - #ifdef ENABLE_GEOCLUE2 # include "location-geoclue2.h" #endif @@ -96,169 +108,6 @@ #undef CLAMP #define CLAMP(lo,mid,up) (((lo) > (mid)) ? (lo) : (((mid) < (up)) ? (mid) : (up))) -/* Union of state data for gamma adjustment methods */ -typedef union { -#ifdef ENABLE_DRM - drm_state_t drm; -#endif -#ifdef ENABLE_RANDR - randr_state_t randr; -#endif -#ifdef ENABLE_VIDMODE - vidmode_state_t vidmode; -#endif -#ifdef ENABLE_QUARTZ - quartz_state_t quartz; -#endif -#ifdef ENABLE_WINGDI - w32gdi_state_t w32gdi; -#endif -} gamma_state_t; - - -/* Gamma adjustment method structs */ -static const gamma_method_t gamma_methods[] = { -#ifdef ENABLE_DRM - { - "drm", 0, - (gamma_method_init_func *)drm_init, - (gamma_method_start_func *)drm_start, - (gamma_method_free_func *)drm_free, - (gamma_method_print_help_func *)drm_print_help, - (gamma_method_set_option_func *)drm_set_option, - (gamma_method_restore_func *)drm_restore, - (gamma_method_set_temperature_func *)drm_set_temperature - }, -#endif -#ifdef ENABLE_RANDR - { - "randr", 1, - (gamma_method_init_func *)randr_init, - (gamma_method_start_func *)randr_start, - (gamma_method_free_func *)randr_free, - (gamma_method_print_help_func *)randr_print_help, - (gamma_method_set_option_func *)randr_set_option, - (gamma_method_restore_func *)randr_restore, - (gamma_method_set_temperature_func *)randr_set_temperature - }, -#endif -#ifdef ENABLE_VIDMODE - { - "vidmode", 1, - (gamma_method_init_func *)vidmode_init, - (gamma_method_start_func *)vidmode_start, - (gamma_method_free_func *)vidmode_free, - (gamma_method_print_help_func *)vidmode_print_help, - (gamma_method_set_option_func *)vidmode_set_option, - (gamma_method_restore_func *)vidmode_restore, - (gamma_method_set_temperature_func *)vidmode_set_temperature - }, -#endif -#ifdef ENABLE_QUARTZ - { - "quartz", 1, - (gamma_method_init_func *)quartz_init, - (gamma_method_start_func *)quartz_start, - (gamma_method_free_func *)quartz_free, - (gamma_method_print_help_func *)quartz_print_help, - (gamma_method_set_option_func *)quartz_set_option, - (gamma_method_restore_func *)quartz_restore, - (gamma_method_set_temperature_func *)quartz_set_temperature - }, -#endif -#ifdef ENABLE_WINGDI - { - "wingdi", 1, - (gamma_method_init_func *)w32gdi_init, - (gamma_method_start_func *)w32gdi_start, - (gamma_method_free_func *)w32gdi_free, - (gamma_method_print_help_func *)w32gdi_print_help, - (gamma_method_set_option_func *)w32gdi_set_option, - (gamma_method_restore_func *)w32gdi_restore, - (gamma_method_set_temperature_func *)w32gdi_set_temperature - }, -#endif - { - "dummy", 0, - (gamma_method_init_func *)gamma_dummy_init, - (gamma_method_start_func *)gamma_dummy_start, - (gamma_method_free_func *)gamma_dummy_free, - (gamma_method_print_help_func *)gamma_dummy_print_help, - (gamma_method_set_option_func *)gamma_dummy_set_option, - (gamma_method_restore_func *)gamma_dummy_restore, - (gamma_method_set_temperature_func *)gamma_dummy_set_temperature - }, - { NULL } -}; - - -/* Union of state data for location providers */ -typedef union { - location_manual_state_t manual; -#ifdef ENABLE_GEOCLUE - location_geoclue_state_t geoclue; -#endif -} location_state_t; - - -/* Location provider method structs */ -static const location_provider_t location_providers[] = { -#ifdef ENABLE_GEOCLUE - { - "geoclue", - (location_provider_init_func *)location_geoclue_init, - (location_provider_start_func *)location_geoclue_start, - (location_provider_free_func *)location_geoclue_free, - (location_provider_print_help_func *) - location_geoclue_print_help, - (location_provider_set_option_func *) - location_geoclue_set_option, - (location_provider_get_location_func *) - location_geoclue_get_location - }, -#endif -#ifdef ENABLE_GEOCLUE2 - { - "geoclue2", - (location_provider_init_func *)location_geoclue2_init, - (location_provider_start_func *)location_geoclue2_start, - (location_provider_free_func *)location_geoclue2_free, - (location_provider_print_help_func *) - location_geoclue2_print_help, - (location_provider_set_option_func *) - location_geoclue2_set_option, - (location_provider_get_location_func *) - location_geoclue2_get_location - }, -#endif -#ifdef ENABLE_CORELOCATION - { - "corelocation", - (location_provider_init_func *)location_corelocation_init, - (location_provider_start_func *)location_corelocation_start, - (location_provider_free_func *)location_corelocation_free, - (location_provider_print_help_func *) - location_corelocation_print_help, - (location_provider_set_option_func *) - location_corelocation_set_option, - (location_provider_get_location_func *) - location_corelocation_get_location - }, -#endif - { - "manual", - (location_provider_init_func *)location_manual_init, - (location_provider_start_func *)location_manual_start, - (location_provider_free_func *)location_manual_free, - (location_provider_print_help_func *) - location_manual_print_help, - (location_provider_set_option_func *) - location_manual_set_option, - (location_provider_get_location_func *) - location_manual_get_location - }, - { NULL } -}; /* Bounds for parameters. */ #define MIN_LAT -90.0 @@ -272,44 +121,13 @@ #define MIN_GAMMA 0.1 #define MAX_GAMMA 10.0 -/* Default values for parameters. */ -#define DEFAULT_DAY_TEMP 5500 -#define DEFAULT_NIGHT_TEMP 3500 -#define DEFAULT_BRIGHTNESS 1.0 -#define DEFAULT_GAMMA 1.0 - -/* The color temperature when no adjustment is applied. */ -#define NEUTRAL_TEMP 6500 - -/* Angular elevation of the sun at which the color temperature - transition period starts and ends (in degress). - Transition during twilight, and while the sun is lower than - 3.0 degrees above the horizon. */ -#define TRANSITION_LOW SOLAR_CIVIL_TWILIGHT_ELEV -#define TRANSITION_HIGH 3.0 - /* Duration of sleep between screen updates (milliseconds). */ #define SLEEP_DURATION 5000 #define SLEEP_DURATION_SHORT 100 -/* Program modes. */ -typedef enum { - PROGRAM_MODE_CONTINUAL, - PROGRAM_MODE_ONE_SHOT, - PROGRAM_MODE_PRINT, - PROGRAM_MODE_RESET, - PROGRAM_MODE_MANUAL -} program_mode_t; - -/* Transition scheme. - The solar elevations at which the transition begins/ends, - and the association color settings. */ -typedef struct { - double high; - double low; - color_setting_t day; - color_setting_t night; -} transition_scheme_t; +/* Length of fade in numbers of short sleep durations. */ +#define FADE_LENGTH 40 + /* Names of periods of day */ static const char *period_names[] = { @@ -321,10 +139,25 @@ }; -/* Determine which period we are currently in. */ +/* Determine which period we are currently in based on time offset. */ static period_t -get_period(const transition_scheme_t *transition, - double elevation) +get_period_from_time(const transition_scheme_t *transition, int time_offset) +{ + if (time_offset < transition->dawn.start || + time_offset >= transition->dusk.end) { + return PERIOD_NIGHT; + } else if (time_offset >= transition->dawn.end && + time_offset < transition->dusk.start) { + return PERIOD_DAYTIME; + } else { + return PERIOD_TRANSITION; + } +} + +/* Determine which period we are currently in based on solar elevation. */ +static period_t +get_period_from_elevation( + const transition_scheme_t *transition, double elevation) { if (elevation < transition->low) { return PERIOD_NIGHT; @@ -335,10 +168,31 @@ } } -/* Determine how far through the transition we are. */ +/* Determine how far through the transition we are based on time offset. */ +static double +get_transition_progress_from_time( + const transition_scheme_t *transition, int time_offset) +{ + if (time_offset < transition->dawn.start || + time_offset >= transition->dusk.end) { + return 0.0; + } else if (time_offset < transition->dawn.end) { + return (transition->dawn.start - time_offset) / + (double)(transition->dawn.start - + transition->dawn.end); + } else if (time_offset > transition->dusk.start) { + return (transition->dusk.end - time_offset) / + (double)(transition->dusk.end - + transition->dusk.start); + } else { + return 1.0; + } +} + +/* Determine how far through the transition we are based on elevation. */ static double -get_transition_progress(const transition_scheme_t *transition, - double elevation) +get_transition_progress_from_elevation( + const transition_scheme_t *transition, double elevation) { if (elevation < transition->low) { return 0.0; @@ -350,6 +204,16 @@ } } +/* Return number of seconds since midnight from timestamp. */ +static int +get_seconds_since_midnight(double timestamp) +{ + time_t t = (time_t)timestamp; + struct tm tm; + localtime_r(&t, &tm); + return tm.tm_sec + tm.tm_min * 60 + tm.tm_hour * 3600; +} + /* Print verbose description of the given period. */ static void print_period(period_t period, double transition) @@ -389,134 +253,70 @@ fabs(location->lon), location->lon >= 0.f ? east : west); } -/* Interpolate color setting structs based on solar elevation */ +/* Interpolate color setting structs given alpha. */ static void -interpolate_color_settings(const transition_scheme_t *transition, - double elevation, - color_setting_t *result) +interpolate_color_settings( + const color_setting_t *first, + const color_setting_t *second, + double alpha, + color_setting_t *result) { - const color_setting_t *day = &transition->day; - const color_setting_t *night = &transition->night; - - double alpha = (transition->low - elevation) / - (transition->low - transition->high); alpha = CLAMP(0.0, alpha, 1.0); - result->temperature = (1.0-alpha)*night->temperature + - alpha*day->temperature; - result->brightness = (1.0-alpha)*night->brightness + - alpha*day->brightness; + result->temperature = (1.0-alpha)*first->temperature + + alpha*second->temperature; + result->brightness = (1.0-alpha)*first->brightness + + alpha*second->brightness; for (int i = 0; i < 3; i++) { - result->gamma[i] = (1.0-alpha)*night->gamma[i] + - alpha*day->gamma[i]; + result->gamma[i] = (1.0-alpha)*first->gamma[i] + + alpha*second->gamma[i]; } } - +/* Interpolate color setting structs transition scheme. */ static void -print_help(const char *program_name) +interpolate_transition_scheme( + const transition_scheme_t *transition, + double alpha, + color_setting_t *result) { - /* TRANSLATORS: help output 1 - LAT is latitude, LON is longitude, - DAY is temperature at daytime, - NIGHT is temperature at night - no-wrap */ - printf(_("Usage: %s -l LAT:LON -t DAY:NIGHT [OPTIONS...]\n"), - program_name); - fputs("\n", stdout); - - /* TRANSLATORS: help output 2 - no-wrap */ - fputs(_("Set color temperature of display" - " according to time of day.\n"), stdout); - fputs("\n", stdout); - - /* TRANSLATORS: help output 3 - no-wrap */ - fputs(_(" -h\t\tDisplay this help message\n" - " -v\t\tVerbose output\n" - " -V\t\tShow program version\n"), stdout); - fputs("\n", stdout); - - /* TRANSLATORS: help output 4 - `list' must not be translated - no-wrap */ - fputs(_(" -b DAY:NIGHT\tScreen brightness to apply (between 0.1 and 1.0)\n" - " -c FILE\tLoad settings from specified configuration file\n" - " -g R:G:B\tAdditional gamma correction to apply\n" - " -l LAT:LON\tYour current location\n" - " -l PROVIDER\tSelect provider for automatic" - " location updates\n" - " \t\t(Type `list' to see available providers)\n" - " -m METHOD\tMethod to use to set color temperature\n" - " \t\t(Type `list' to see available methods)\n" - " -o\t\tOne shot mode (do not continuously adjust" - " color temperature)\n" - " -O TEMP\tOne shot manual mode (set color temperature)\n" - " -p\t\tPrint mode (only print parameters and exit)\n" - " -x\t\tReset mode (remove adjustment from screen)\n" - " -r\t\tDisable temperature transitions\n" - " -t DAY:NIGHT\tColor temperature to set at daytime/night\n"), - stdout); - fputs("\n", stdout); - - /* TRANSLATORS: help output 5 */ - printf(_("The neutral temperature is %uK. Using this value will not\n" - "change the color temperature of the display. Setting the\n" - "color temperature to a value higher than this results in\n" - "more blue light, and setting a lower value will result in\n" - "more red light.\n"), - NEUTRAL_TEMP); - - fputs("\n", stdout); - - /* TRANSLATORS: help output 6 */ - printf(_("Default values:\n\n" - " Daytime temperature: %uK\n" - " Night temperature: %uK\n"), - DEFAULT_DAY_TEMP, DEFAULT_NIGHT_TEMP); - - fputs("\n", stdout); + const color_setting_t *day = &transition->day; + const color_setting_t *night = &transition->night; - /* TRANSLATORS: help output 7 */ - printf(_("Please report bugs to <%s>\n"), PACKAGE_BUGREPORT); + alpha = CLAMP(0.0, alpha, 1.0); + interpolate_color_settings(night, day, alpha, result); } -static void -print_method_list() +/* Return 1 if color settings have major differences, otherwise 0. + Used to determine if a fade should be applied in continual mode. */ +static int +color_setting_diff_is_major( + const color_setting_t *first, + const color_setting_t *second) { - fputs(_("Available adjustment methods:\n"), stdout); - for (int i = 0; gamma_methods[i].name != NULL; i++) { - printf(" %s\n", gamma_methods[i].name); - } - - fputs("\n", stdout); - fputs(_("Specify colon-separated options with" - " `-m METHOD:OPTIONS'.\n"), stdout); - /* TRANSLATORS: `help' must not be translated. */ - fputs(_("Try `-m METHOD:help' for help.\n"), stdout); + return (abs(first->temperature - second->temperature) > 25 || + fabsf(first->brightness - second->brightness) > 0.1 || + fabsf(first->gamma[0] - second->gamma[0]) > 0.1 || + fabsf(first->gamma[1] - second->gamma[1]) > 0.1 || + fabsf(first->gamma[2] - second->gamma[2]) > 0.1); } +/* Reset color setting to default values. */ static void -print_provider_list() +color_setting_reset(color_setting_t *color) { - fputs(_("Available location providers:\n"), stdout); - for (int i = 0; location_providers[i].name != NULL; i++) { - printf(" %s\n", location_providers[i].name); - } - - fputs("\n", stdout); - fputs(_("Specify colon-separated options with" - "`-l PROVIDER:OPTIONS'.\n"), stdout); - /* TRANSLATORS: `help' must not be translated. */ - fputs(_("Try `-l PROVIDER:help' for help.\n"), stdout); + color->temperature = NEUTRAL_TEMP; + color->gamma[0] = 1.0; + color->gamma[1] = 1.0; + color->gamma[2] = 1.0; + color->brightness = 1.0; } static int provider_try_start(const location_provider_t *provider, - location_state_t *state, - config_ini_state_t *config, char *args) + location_state_t **state, config_ini_state_t *config, + char *args) { int r; @@ -533,10 +333,10 @@ if (section != NULL) { config_ini_setting_t *setting = section->settings; while (setting != NULL) { - r = provider->set_option(state, setting->name, + r = provider->set_option(*state, setting->name, setting->value); if (r < 0) { - provider->free(state); + provider->free(*state); fprintf(stderr, _("Failed to set %s" " option.\n"), provider->name); @@ -578,9 +378,9 @@ *(value++) = '\0'; } - r = provider->set_option(state, key, value); + r = provider->set_option(*state, key, value); if (r < 0) { - provider->free(state); + provider->free(*state); fprintf(stderr, _("Failed to set %s option.\n"), provider->name); /* TRANSLATORS: `help' must not be translated. */ @@ -594,9 +394,9 @@ } /* Start provider. */ - r = provider->start(state); + r = provider->start(*state); if (r < 0) { - provider->free(state); + provider->free(*state); fprintf(stderr, _("Failed to start provider %s.\n"), provider->name); return -1; @@ -607,8 +407,7 @@ static int method_try_start(const gamma_method_t *method, - gamma_state_t *state, - config_ini_state_t *config, char *args) + gamma_state_t **state, config_ini_state_t *config, char *args) { int r; @@ -625,10 +424,10 @@ if (section != NULL) { config_ini_setting_t *setting = section->settings; while (setting != NULL) { - r = method->set_option(state, setting->name, - setting->value); + r = method->set_option( + *state, setting->name, setting->value); if (r < 0) { - method->free(state); + method->free(*state); fprintf(stderr, _("Failed to set %s" " option.\n"), method->name); @@ -658,9 +457,9 @@ *(value++) = '\0'; } - r = method->set_option(state, key, value); + r = method->set_option(*state, key, value); if (r < 0) { - method->free(state); + method->free(*state); fprintf(stderr, _("Failed to set %s option.\n"), method->name); /* TRANSLATORS: `help' must not be translated. */ @@ -673,9 +472,9 @@ } /* Start method. */ - r = method->start(state); + r = method->start(*state); if (r < 0) { - method->free(state); + method->free(*state); fprintf(stderr, _("Failed to start adjustment method %s.\n"), method->name); return -1; @@ -684,47 +483,6 @@ return 0; } -/* A gamma string contains either one floating point value, - or three values separated by colon. */ -static int -parse_gamma_string(const char *str, float gamma[]) -{ - char *s = strchr(str, ':'); - if (s == NULL) { - /* Use value for all channels */ - float g = atof(str); - gamma[0] = gamma[1] = gamma[2] = g; - } else { - /* Parse separate value for each channel */ - *(s++) = '\0'; - char *g_s = s; - s = strchr(s, ':'); - if (s == NULL) return -1; - - *(s++) = '\0'; - gamma[0] = atof(str); /* Red */ - gamma[1] = atof(g_s); /* Blue */ - gamma[2] = atof(s); /* Green */ - } - - return 0; -} - -/* A brightness string contains either one floating point value, - or two values separated by a colon. */ -static void -parse_brightness_string(const char *str, float *bright_day, float *bright_night) -{ - char *s = strchr(str, ':'); - if (s == NULL) { - /* Same value for day and night. */ - *bright_day = *bright_night = atof(str); - } else { - *(s++) = '\0'; - *bright_day = atof(str); - *bright_night = atof(s); - } -} /* Check whether gamma is within allowed levels. */ static int @@ -736,37 +494,102 @@ gamma[1] > MAX_GAMMA || gamma[2] < MIN_GAMMA || gamma[2] > MAX_GAMMA); - } -static const gamma_method_t * -find_gamma_method(const char *name) +/* Check whether location is valid. + Prints error message on stderr and returns 0 if invalid, otherwise + returns 1. */ +static int +location_is_valid(const location_t *location) { - const gamma_method_t *method = NULL; - for (int i = 0; gamma_methods[i].name != NULL; i++) { - const gamma_method_t *m = &gamma_methods[i]; - if (strcasecmp(name, m->name) == 0) { - method = m; - break; - } + /* Latitude */ + if (location->lat < MIN_LAT || location->lat > MAX_LAT) { + /* TRANSLATORS: Append degree symbols if possible. */ + fprintf(stderr, + _("Latitude must be between %.1f and %.1f.\n"), + MIN_LAT, MAX_LAT); + return 0; + } + + /* Longitude */ + if (location->lon < MIN_LON || location->lon > MAX_LON) { + /* TRANSLATORS: Append degree symbols if possible. */ + fprintf(stderr, + _("Longitude must be between" + " %.1f and %.1f.\n"), MIN_LON, MAX_LON); + return 0; } - return method; + return 1; } -static const location_provider_t * -find_location_provider(const char *name) +/* Wait for location to become available from provider. + Waits until timeout (milliseconds) has elapsed or forever if timeout + is -1. Writes location to loc. Returns -1 on error, + 0 if timeout was reached, 1 if location became available. */ +static int +provider_get_location( + const location_provider_t *provider, location_state_t *state, + int timeout, location_t *loc) { - const location_provider_t *provider = NULL; - for (int i = 0; location_providers[i].name != NULL; i++) { - const location_provider_t *p = &location_providers[i]; - if (strcasecmp(name, p->name) == 0) { - provider = p; - break; + int available = 0; + struct pollfd pollfds[1]; + while (!available) { + int loc_fd = provider->get_fd(state); + if (loc_fd >= 0) { + /* Provider is dynamic. */ + /* TODO: This should use a monotonic time source. */ + double now; + int r = systemtime_get_time(&now); + if (r < 0) { + fputs(_("Unable to read system time.\n"), + stderr); + return -1; + } + + /* Poll on file descriptor until ready. */ + pollfds[0].fd = loc_fd; + pollfds[0].events = POLLIN; + r = poll(pollfds, 1, timeout); + if (r < 0) { + perror("poll"); + return -1; + } else if (r == 0) { + return 0; + } + + double later; + r = systemtime_get_time(&later); + if (r < 0) { + fputs(_("Unable to read system time.\n"), + stderr); + return -1; + } + + /* Adjust timeout by elapsed time */ + if (timeout >= 0) { + timeout -= (later - now) * 1000; + timeout = timeout < 0 ? 0 : timeout; + } } + + + int r = provider->handle(state, loc, &available); + if (r < 0) return -1; } - return provider; + return 1; +} + +/* Easing function for fade. + See https://github.com/mietek/ease-tween */ +static double +ease_fade(double t) +{ + if (t <= 0) return 0; + if (t >= 1) return 1; + return 1.0042954579734844 * exp( + -6.4041738958415664 * exp(-7.2908241330981340 * t)); } @@ -775,82 +598,97 @@ current time and continuously updates the screen to the appropriate color temperature. */ static int -run_continual_mode(const location_t *loc, +run_continual_mode(const location_provider_t *provider, + location_state_t *location_state, const transition_scheme_t *scheme, const gamma_method_t *method, - gamma_state_t *state, - int transition, int verbose) + gamma_state_t *method_state, + int use_fade, int preserve_gamma, int verbose) { int r; - /* Make an initial transition from 6500K */ - int short_trans_delta = -1; - int short_trans_len = 10; - - /* Amount of adjustment to apply. At zero the color - temperature will be exactly as calculated, and at one it - will be exactly 6500K. */ - double adjustment_alpha = 1.0; + /* Short fade parameters */ + int fade_length = 0; + int fade_time = 0; + color_setting_t fade_start_interp; r = signals_install_handlers(); if (r < 0) { return r; } - if (verbose) { - printf(_("Status: %s\n"), _("Enabled")); + /* Save previous parameters so we can avoid printing status updates if + the values did not change. */ + period_t prev_period = PERIOD_NONE; + + /* Previous target color setting and current actual color setting. + Actual color setting takes into account the current color fade. */ + color_setting_t prev_target_interp; + color_setting_reset(&prev_target_interp); + + color_setting_t interp; + color_setting_reset(&interp); + + location_t loc = { NAN, NAN }; + int need_location = !scheme->use_time; + if (need_location) { + fputs(_("Waiting for initial location" + " to become available...\n"), stderr); + + /* Get initial location from provider */ + r = provider_get_location(provider, location_state, -1, &loc); + if (r < 0) { + fputs(_("Unable to get location" + " from provider.\n"), stderr); + return -1; + } + + if (!location_is_valid(&loc)) { + fputs(_("Invalid location returned from provider.\n"), + stderr); + return -1; + } + + print_location(&loc); } - /* Save previous colors so we can avoid - printing status updates if the values - did not change. */ - period_t prev_period = PERIOD_NONE; - color_setting_t prev_interp = - { -1, { NAN, NAN, NAN }, NAN }; + if (verbose) { + printf(_("Color temperature: %uK\n"), interp.temperature); + printf(_("Brightness: %.2f\n"), interp.brightness); + } /* Continuously adjust color temperature */ int done = 0; + int prev_disabled = 1; int disabled = 0; + int location_available = 1; while (1) { /* Check to see if disable signal was caught */ - if (disable) { - short_trans_len = 2; - if (!disabled) { - /* Transition to disabled state */ - short_trans_delta = 1; - } else { - /* Transition back to enabled */ - short_trans_delta = -1; - } + if (disable && !done) { disabled = !disabled; disable = 0; - - if (verbose) { - printf(_("Status: %s\n"), disabled ? - _("Disabled") : _("Enabled")); - } } /* Check to see if exit signal was caught */ if (exiting) { if (done) { - /* On second signal stop the ongoing - transition */ - short_trans_delta = 0; - adjustment_alpha = 0.0; + /* On second signal stop the ongoing fade. */ + break; } else { - if (!disabled) { - /* Make a short transition - back to 6500K */ - short_trans_delta = 1; - short_trans_len = 2; - } - done = 1; + disabled = 1; } exiting = 0; } + /* Print status change */ + if (verbose && disabled != prev_disabled) { + printf(_("Status: %s\n"), disabled ? + _("Disabled") : _("Enabled")); + } + + prev_disabled = disabled; + /* Read timestamp */ double now; r = systemtime_get_time(&now); @@ -859,36 +697,47 @@ return -1; } - /* Skip over transition if transitions are disabled */ - int set_adjustments = 0; - if (!transition) { - if (short_trans_delta) { - adjustment_alpha = short_trans_delta < 0 ? - 0.0 : 1.0; - short_trans_delta = 0; - set_adjustments = 1; - } + period_t period; + double transition_prog; + if (scheme->use_time) { + int time_offset = get_seconds_since_midnight(now); + + period = get_period_from_time(scheme, time_offset); + transition_prog = get_transition_progress_from_time( + scheme, time_offset); + } else { + /* Current angular elevation of the sun */ + double elevation = solar_elevation( + now, loc.lat, loc.lon); + + period = get_period_from_elevation(scheme, elevation); + transition_prog = + get_transition_progress_from_elevation( + scheme, elevation); } - /* Current angular elevation of the sun */ - double elevation = solar_elevation(now, loc->lat, - loc->lon); + /* Use transition progress to get target color + temperature. */ + color_setting_t target_interp; + interpolate_transition_scheme( + scheme, transition_prog, &target_interp); - /* Use elevation of sun to set color temperature */ - color_setting_t interp; - interpolate_color_settings(scheme, elevation, &interp); + if (disabled) { + period = PERIOD_NONE; + color_setting_reset(&target_interp); + } + + if (done) { + period = PERIOD_NONE; + } /* Print period if it changed during this update, - or if we are in transition. In transition we + or if we are in the transition period. In transition we print the progress, so we always print it in that case. */ - period_t period = get_period(scheme, elevation); if (verbose && (period != prev_period || period == PERIOD_TRANSITION)) { - double transition = - get_transition_progress(scheme, - elevation); - print_period(period, transition); + print_period(period, transition_prog); } /* Activate hooks if period changed */ @@ -896,75 +745,146 @@ hooks_signal_period_change(prev_period, period); } - /* Ongoing short transition */ - if (short_trans_delta) { - /* Calculate alpha */ - adjustment_alpha += short_trans_delta * 0.1 / - (float)short_trans_len; - - /* Stop transition when done */ - if (adjustment_alpha <= 0.0 || - adjustment_alpha >= 1.0) { - short_trans_delta = 0; + /* Start fade if the parameter differences are too big to apply + instantly. */ + if (use_fade) { + if ((fade_length == 0 && + color_setting_diff_is_major( + &interp, + &target_interp)) || + (fade_length != 0 && + color_setting_diff_is_major( + &target_interp, + &prev_target_interp))) { + fade_length = FADE_LENGTH; + fade_time = 0; + fade_start_interp = interp; } - - /* Clamp alpha value */ - adjustment_alpha = CLAMP(0.0, adjustment_alpha, 1.0); } - /* Interpolate between 6500K and calculated - temperature */ - interp.temperature = adjustment_alpha*6500 + - (1.0-adjustment_alpha)*interp.temperature; - - interp.brightness = adjustment_alpha*1.0 + - (1.0-adjustment_alpha)*interp.brightness; + /* Handle ongoing fade */ + if (fade_length != 0) { + fade_time += 1; + double frac = fade_time / (double)fade_length; + double alpha = CLAMP(0.0, ease_fade(frac), 1.0); + + interpolate_color_settings( + &fade_start_interp, &target_interp, alpha, + &interp); + + if (fade_time > fade_length) { + fade_time = 0; + fade_length = 0; + } + } else { + interp = target_interp; + } - /* Quit loop when done */ - if (done && !short_trans_delta) break; + /* Break loop when done and final fade is over */ + if (done && fade_length == 0) break; if (verbose) { - if (interp.temperature != - prev_interp.temperature) { + if (prev_target_interp.temperature != + target_interp.temperature) { printf(_("Color temperature: %uK\n"), - interp.temperature); + target_interp.temperature); } - if (interp.brightness != - prev_interp.brightness) { + if (prev_target_interp.brightness != + target_interp.brightness) { printf(_("Brightness: %.2f\n"), - interp.brightness); + target_interp.brightness); } } /* Adjust temperature */ - if (!disabled || short_trans_delta || set_adjustments) { - r = method->set_temperature(state, &interp); + r = method->set_temperature( + method_state, &interp, preserve_gamma); + if (r < 0) { + fputs(_("Temperature adjustment failed.\n"), + stderr); + return -1; + } + + /* Save period and target color setting as previous */ + prev_period = period; + prev_target_interp = target_interp; + + /* Sleep length depends on whether a fade is ongoing. */ + int delay = SLEEP_DURATION; + if (fade_length != 0) { + delay = SLEEP_DURATION_SHORT; + } + + /* Update location. */ + int loc_fd = -1; + if (need_location) { + loc_fd = provider->get_fd(location_state); + } + + if (loc_fd >= 0) { + /* Provider is dynamic. */ + struct pollfd pollfds[1]; + pollfds[0].fd = loc_fd; + pollfds[0].events = POLLIN; + int r = poll(pollfds, 1, delay); if (r < 0) { - fputs(_("Temperature adjustment" - " failed.\n"), stderr); + if (errno == EINTR) continue; + perror("poll"); + fputs(_("Unable to get location" + " from provider.\n"), stderr); return -1; + } else if (r == 0) { + continue; } - } - /* Save temperature as previous */ - prev_period = period; - memcpy(&prev_interp, &interp, - sizeof(color_setting_t)); + /* Get new location and availability + information. */ + location_t new_loc; + int new_available; + r = provider->handle( + location_state, &new_loc, + &new_available); + if (r < 0) { + fputs(_("Unable to get location" + " from provider.\n"), stderr); + return -1; + } - /* Sleep for 5 seconds or 0.1 second. */ - if (short_trans_delta) { - systemtime_msleep(SLEEP_DURATION_SHORT); + if (!new_available && + new_available != location_available) { + fputs(_("Location is temporarily" + " unavailable; Using previous" + " location until it becomes" + " available...\n"), stderr); + } + + if (new_available && + (new_loc.lat != loc.lat || + new_loc.lon != loc.lon || + new_available != location_available)) { + loc = new_loc; + print_location(&loc); + } + + location_available = new_available; + + if (!location_is_valid(&loc)) { + fputs(_("Invalid location returned" + " from provider.\n"), stderr); + return -1; + } } else { - systemtime_msleep(SLEEP_DURATION); + systemtime_msleep(delay); } } /* Restore saved gamma ramps */ - method->restore(state); + method->restore(method_state); return 0; } + int main(int argc, char *argv[]) { @@ -980,35 +900,38 @@ textdomain(PACKAGE); #endif - /* Initialize settings to NULL values. */ - char *config_filepath = NULL; + /* List of gamma methods. */ + const gamma_method_t gamma_methods[] = { +#ifdef ENABLE_DRM + drm_gamma_method, +#endif +#ifdef ENABLE_RANDR + randr_gamma_method, +#endif +#ifdef ENABLE_VIDMODE + vidmode_gamma_method, +#endif +#ifdef ENABLE_QUARTZ + quartz_gamma_method, +#endif +#ifdef ENABLE_WINGDI + w32gdi_gamma_method, +#endif + dummy_gamma_method, + { NULL } + }; - /* Settings for day, night and transition. - Initialized to indicate that the values are not set yet. */ - transition_scheme_t scheme = - { TRANSITION_HIGH, TRANSITION_LOW }; - - scheme.day.temperature = -1; - scheme.day.gamma[0] = NAN; - scheme.day.brightness = NAN; - - scheme.night.temperature = -1; - scheme.night.gamma[0] = NAN; - scheme.night.brightness = NAN; - - /* Temperature for manual mode */ - int temp_set = -1; - - const gamma_method_t *method = NULL; - char *method_args = NULL; - - const location_provider_t *provider = NULL; - char *provider_args = NULL; - - int transition = -1; - program_mode_t mode = PROGRAM_MODE_CONTINUAL; - int verbose = 0; - char *s; + /* List of location providers. */ + const location_provider_t location_providers[] = { +#ifdef ENABLE_GEOCLUE2 + geoclue2_location_provider, +#endif +#ifdef ENABLE_CORELOCATION + corelocation_location_provider, +#endif + manual_location_provider, + { NULL } + }; /* Flush messages consistently even if redirected to a pipe or file. Change the flush behaviour to line-buffered, without @@ -1016,331 +939,63 @@ setvbuf(stdout, NULL, _IOLBF, 0); setvbuf(stderr, NULL, _IOLBF, 0); - /* Parse command line arguments. */ - int opt; - while ((opt = getopt(argc, argv, "b:c:g:hl:m:oO:prt:vVx")) != -1) { - switch (opt) { - case 'b': - parse_brightness_string(optarg, - &scheme.day.brightness, - &scheme.night.brightness); - break; - case 'c': - free(config_filepath); - config_filepath = strdup(optarg); - break; - case 'g': - r = parse_gamma_string(optarg, scheme.day.gamma); - if (r < 0) { - fputs(_("Malformed gamma argument.\n"), - stderr); - fputs(_("Try `-h' for more" - " information.\n"), stderr); - exit(EXIT_FAILURE); - } - - /* Set night gamma to the same value as day gamma. - To set these to distinct values use the config - file. */ - memcpy(scheme.night.gamma, scheme.day.gamma, - sizeof(scheme.night.gamma)); - break; - case 'h': - print_help(argv[0]); - exit(EXIT_SUCCESS); - break; - case 'l': - /* Print list of providers if argument is `list' */ - if (strcasecmp(optarg, "list") == 0) { - print_provider_list(); - exit(EXIT_SUCCESS); - } - - char *provider_name = NULL; - - /* Don't save the result of strtof(); we simply want - to know if optarg can be parsed as a float. */ - errno = 0; - char *end; - strtof(optarg, &end); - if (errno == 0 && *end == ':') { - /* Use instead as arguments to `manual'. */ - provider_name = "manual"; - provider_args = optarg; - } else { - /* Split off provider arguments. */ - s = strchr(optarg, ':'); - if (s != NULL) { - *(s++) = '\0'; - provider_args = s; - } - - provider_name = optarg; - } - - /* Lookup provider from name. */ - provider = find_location_provider(provider_name); - if (provider == NULL) { - fprintf(stderr, _("Unknown location provider" - " `%s'.\n"), provider_name); - exit(EXIT_FAILURE); - } - - /* Print provider help if arg is `help'. */ - if (provider_args != NULL && - strcasecmp(provider_args, "help") == 0) { - provider->print_help(stdout); - exit(EXIT_SUCCESS); - } - break; - case 'm': - /* Print list of methods if argument is `list' */ - if (strcasecmp(optarg, "list") == 0) { - print_method_list(); - exit(EXIT_SUCCESS); - } - - /* Split off method arguments. */ - s = strchr(optarg, ':'); - if (s != NULL) { - *(s++) = '\0'; - method_args = s; - } - - /* Find adjustment method by name. */ - method = find_gamma_method(optarg); - if (method == NULL) { - /* TRANSLATORS: This refers to the method - used to adjust colors e.g VidMode */ - fprintf(stderr, _("Unknown adjustment method" - " `%s'.\n"), optarg); - exit(EXIT_FAILURE); - } - - /* Print method help if arg is `help'. */ - if (method_args != NULL && - strcasecmp(method_args, "help") == 0) { - method->print_help(stdout); - exit(EXIT_SUCCESS); - } - break; - case 'o': - mode = PROGRAM_MODE_ONE_SHOT; - break; - case 'O': - mode = PROGRAM_MODE_MANUAL; - temp_set = atoi(optarg); - break; - case 'p': - mode = PROGRAM_MODE_PRINT; - break; - case 'r': - transition = 0; - break; - case 't': - s = strchr(optarg, ':'); - if (s == NULL) { - fputs(_("Malformed temperature argument.\n"), - stderr); - fputs(_("Try `-h' for more information.\n"), - stderr); - exit(EXIT_FAILURE); - } - *(s++) = '\0'; - scheme.day.temperature = atoi(optarg); - scheme.night.temperature = atoi(s); - break; - case 'v': - verbose = 1; - break; - case 'V': - printf("%s\n", PACKAGE_STRING); - exit(EXIT_SUCCESS); - break; - case 'x': - mode = PROGRAM_MODE_RESET; - break; - case '?': - fputs(_("Try `-h' for more information.\n"), stderr); - exit(EXIT_FAILURE); - break; - } - } + options_t options; + options_init(&options); + options_parse_args( + &options, argc, argv, gamma_methods, location_providers); /* Load settings from config file. */ config_ini_state_t config_state; - r = config_ini_init(&config_state, config_filepath); + r = config_ini_init(&config_state, options.config_filepath); if (r < 0) { fputs("Unable to load config file.\n", stderr); exit(EXIT_FAILURE); } - free(config_filepath); + free(options.config_filepath); - /* Read global config settings. */ - config_ini_section_t *section = config_ini_get_section(&config_state, - "redshift"); - if (section != NULL) { - config_ini_setting_t *setting = section->settings; - while (setting != NULL) { - if (strcasecmp(setting->name, "temp-day") == 0) { - if (scheme.day.temperature < 0) { - scheme.day.temperature = - atoi(setting->value); - } - } else if (strcasecmp(setting->name, - "temp-night") == 0) { - if (scheme.night.temperature < 0) { - scheme.night.temperature = - atoi(setting->value); - } - } else if (strcasecmp(setting->name, - "transition") == 0) { - if (transition < 0) { - transition = !!atoi(setting->value); - } - } else if (strcasecmp(setting->name, - "brightness") == 0) { - if (isnan(scheme.day.brightness)) { - scheme.day.brightness = - atof(setting->value); - } - if (isnan(scheme.night.brightness)) { - scheme.night.brightness = - atof(setting->value); - } - } else if (strcasecmp(setting->name, - "brightness-day") == 0) { - if (isnan(scheme.day.brightness)) { - scheme.day.brightness = - atof(setting->value); - } - } else if (strcasecmp(setting->name, - "brightness-night") == 0) { - if (isnan(scheme.night.brightness)) { - scheme.night.brightness = - atof(setting->value); - } - } else if (strcasecmp(setting->name, - "elevation-high") == 0) { - scheme.high = atof(setting->value); - } else if (strcasecmp(setting->name, - "elevation-low") == 0) { - scheme.low = atof(setting->value); - } else if (strcasecmp(setting->name, "gamma") == 0) { - if (isnan(scheme.day.gamma[0])) { - r = parse_gamma_string(setting->value, - scheme.day.gamma); - if (r < 0) { - fputs(_("Malformed gamma" - " setting.\n"), - stderr); - exit(EXIT_FAILURE); - } - memcpy(scheme.night.gamma, scheme.day.gamma, - sizeof(scheme.night.gamma)); - } - } else if (strcasecmp(setting->name, "gamma-day") == 0) { - if (isnan(scheme.day.gamma[0])) { - r = parse_gamma_string(setting->value, - scheme.day.gamma); - if (r < 0) { - fputs(_("Malformed gamma" - " setting.\n"), - stderr); - exit(EXIT_FAILURE); - } - } - } else if (strcasecmp(setting->name, "gamma-night") == 0) { - if (isnan(scheme.night.gamma[0])) { - r = parse_gamma_string(setting->value, - scheme.night.gamma); - if (r < 0) { - fputs(_("Malformed gamma" - " setting.\n"), - stderr); - exit(EXIT_FAILURE); - } - } - } else if (strcasecmp(setting->name, - "adjustment-method") == 0) { - if (method == NULL) { - method = find_gamma_method( - setting->value); - if (method == NULL) { - fprintf(stderr, _("Unknown" - " adjustment" - " method" - " `%s'.\n"), - setting->value); - exit(EXIT_FAILURE); - } - } - } else if (strcasecmp(setting->name, - "location-provider") == 0) { - if (provider == NULL) { - provider = find_location_provider( - setting->value); - if (provider == NULL) { - fprintf(stderr, _("Unknown" - " location" - " provider" - " `%s'.\n"), - setting->value); - exit(EXIT_FAILURE); - } - } - } else { - fprintf(stderr, _("Unknown configuration" - " setting `%s'.\n"), - setting->name); - } - setting = setting->next; - } - } - - /* Use default values for settings that were neither defined in - the config file nor on the command line. */ - if (scheme.day.temperature < 0) { - scheme.day.temperature = DEFAULT_DAY_TEMP; - } - if (scheme.night.temperature < 0) { - scheme.night.temperature = DEFAULT_NIGHT_TEMP; - } + options_parse_config_file( + &options, &config_state, gamma_methods, location_providers); - if (isnan(scheme.day.brightness)) { - scheme.day.brightness = DEFAULT_BRIGHTNESS; - } - if (isnan(scheme.night.brightness)) { - scheme.night.brightness = DEFAULT_BRIGHTNESS; - } + options_set_defaults(&options); - if (isnan(scheme.day.gamma[0])) { - scheme.day.gamma[0] = DEFAULT_GAMMA; - scheme.day.gamma[1] = DEFAULT_GAMMA; - scheme.day.gamma[2] = DEFAULT_GAMMA; - } - if (isnan(scheme.night.gamma[0])) { - scheme.night.gamma[0] = DEFAULT_GAMMA; - scheme.night.gamma[1] = DEFAULT_GAMMA; - scheme.night.gamma[2] = DEFAULT_GAMMA; - } + if (options.scheme.dawn.start >= 0 || options.scheme.dawn.end >= 0 || + options.scheme.dusk.start >= 0 || options.scheme.dusk.end >= 0) { + if (options.scheme.dawn.start < 0 || + options.scheme.dawn.end < 0 || + options.scheme.dusk.start < 0 || + options.scheme.dusk.end < 0) { + fputs(_("Partitial time-configuration not" + " supported!\n"), stderr); + exit(EXIT_FAILURE); + } - if (transition < 0) transition = 1; + if (options.scheme.dawn.start > options.scheme.dawn.end || + options.scheme.dawn.end > options.scheme.dusk.start || + options.scheme.dusk.start > options.scheme.dusk.end) { + fputs(_("Invalid dawn/dusk time configuration!\n"), + stderr); + exit(EXIT_FAILURE); + } - location_t loc = { NAN, NAN }; + options.scheme.use_time = 1; + } - /* Initialize location provider. If provider is NULL + /* Initialize location provider if needed. If provider is NULL try all providers until one that works is found. */ - location_state_t location_state; + location_state_t *location_state; /* Location is not needed for reset mode and manual mode. */ - if (mode != PROGRAM_MODE_RESET && - mode != PROGRAM_MODE_MANUAL) { - if (provider != NULL) { + int need_location = + options.mode != PROGRAM_MODE_RESET && + options.mode != PROGRAM_MODE_MANUAL && + !options.scheme.use_time; + if (need_location) { + if (options.provider != NULL) { /* Use provider specified on command line. */ - r = provider_try_start(provider, &location_state, - &config_state, provider_args); + r = provider_try_start( + options.provider, &location_state, + &config_state, options.provider_args); if (r < 0) exit(EXIT_FAILURE); } else { /* Try all providers, use the first that works. */ @@ -1361,82 +1016,58 @@ /* Found provider that works. */ printf(_("Using provider `%s'.\n"), p->name); - provider = p; + options.provider = p; break; } /* Failure if no providers were successful at this point. */ - if (provider == NULL) { + if (options.provider == NULL) { fputs(_("No more location providers" " to try.\n"), stderr); exit(EXIT_FAILURE); } } - /* Get current location. */ - r = provider->get_location(&location_state, &loc); - if (r < 0) { - fputs(_("Unable to get location from provider.\n"), - stderr); - exit(EXIT_FAILURE); + /* Solar elevations */ + if (options.scheme.high < options.scheme.low) { + fprintf(stderr, + _("High transition elevation cannot be lower than" + " the low transition elevation.\n")); + exit(EXIT_FAILURE); } - provider->free(&location_state); - - if (verbose) { - print_location(&loc); - - printf(_("Temperatures: %dK at day, %dK at night\n"), - scheme.day.temperature, - scheme.night.temperature); - - /* TRANSLATORS: Append degree symbols if possible. */ + if (options.verbose) { + /* TRANSLATORS: Append degree symbols if possible. */ printf(_("Solar elevations: day above %.1f, night below %.1f\n"), - scheme.high, scheme.low); + options.scheme.high, options.scheme.low); } + } - /* Latitude */ - if (loc.lat < MIN_LAT || loc.lat > MAX_LAT) { - /* TRANSLATORS: Append degree symbols if possible. */ - fprintf(stderr, - _("Latitude must be between %.1f and %.1f.\n"), - MIN_LAT, MAX_LAT); - exit(EXIT_FAILURE); - } - - /* Longitude */ - if (loc.lon < MIN_LON || loc.lon > MAX_LON) { - /* TRANSLATORS: Append degree symbols if possible. */ - fprintf(stderr, - _("Longitude must be between" - " %.1f and %.1f.\n"), MIN_LON, MAX_LON); - exit(EXIT_FAILURE); + if (options.mode != PROGRAM_MODE_RESET && + options.mode != PROGRAM_MODE_MANUAL) { + if (options.verbose) { + printf(_("Temperatures: %dK at day, %dK at night\n"), + options.scheme.day.temperature, + options.scheme.night.temperature); } /* Color temperature */ - if (scheme.day.temperature < MIN_TEMP || - scheme.day.temperature > MAX_TEMP || - scheme.night.temperature < MIN_TEMP || - scheme.night.temperature > MAX_TEMP) { + if (options.scheme.day.temperature < MIN_TEMP || + options.scheme.day.temperature > MAX_TEMP || + options.scheme.night.temperature < MIN_TEMP || + options.scheme.night.temperature > MAX_TEMP) { fprintf(stderr, _("Temperature must be between %uK and %uK.\n"), MIN_TEMP, MAX_TEMP); exit(EXIT_FAILURE); } - - /* Solar elevations */ - if (scheme.high < scheme.low) { - fprintf(stderr, - _("High transition elevation cannot be lower than" - " the low transition elevation.\n")); - exit(EXIT_FAILURE); - } } - if (mode == PROGRAM_MODE_MANUAL) { + if (options.mode == PROGRAM_MODE_MANUAL) { /* Check color temperature to be set */ - if (temp_set < MIN_TEMP || temp_set > MAX_TEMP) { + if (options.temp_set < MIN_TEMP || + options.temp_set > MAX_TEMP) { fprintf(stderr, _("Temperature must be between %uK and %uK.\n"), MIN_TEMP, MAX_TEMP); @@ -1445,51 +1076,57 @@ } /* Brightness */ - if (scheme.day.brightness < MIN_BRIGHTNESS || - scheme.day.brightness > MAX_BRIGHTNESS || - scheme.night.brightness < MIN_BRIGHTNESS || - scheme.night.brightness > MAX_BRIGHTNESS) { + if (options.scheme.day.brightness < MIN_BRIGHTNESS || + options.scheme.day.brightness > MAX_BRIGHTNESS || + options.scheme.night.brightness < MIN_BRIGHTNESS || + options.scheme.night.brightness > MAX_BRIGHTNESS) { fprintf(stderr, _("Brightness values must be between %.1f and %.1f.\n"), MIN_BRIGHTNESS, MAX_BRIGHTNESS); exit(EXIT_FAILURE); } - if (verbose) { + if (options.verbose) { printf(_("Brightness: %.2f:%.2f\n"), - scheme.day.brightness, scheme.night.brightness); + options.scheme.day.brightness, + options.scheme.night.brightness); } /* Gamma */ - if (!gamma_is_valid(scheme.day.gamma) || - !gamma_is_valid(scheme.night.gamma)) { + if (!gamma_is_valid(options.scheme.day.gamma) || + !gamma_is_valid(options.scheme.night.gamma)) { fprintf(stderr, _("Gamma value must be between %.1f and %.1f.\n"), MIN_GAMMA, MAX_GAMMA); exit(EXIT_FAILURE); } - if (verbose) { + if (options.verbose) { /* TRANSLATORS: The string in parenthesis is either Daytime or Night (translated). */ printf(_("Gamma (%s): %.3f, %.3f, %.3f\n"), - _("Daytime"), scheme.day.gamma[0], - scheme.day.gamma[1], scheme.day.gamma[2]); + _("Daytime"), options.scheme.day.gamma[0], + options.scheme.day.gamma[1], + options.scheme.day.gamma[2]); printf(_("Gamma (%s): %.3f, %.3f, %.3f\n"), - _("Night"), scheme.night.gamma[0], - scheme.night.gamma[1], scheme.night.gamma[2]); + _("Night"), options.scheme.night.gamma[0], + options.scheme.night.gamma[1], + options.scheme.night.gamma[2]); } + transition_scheme_t *scheme = &options.scheme; + /* Initialize gamma adjustment method. If method is NULL try all methods until one that works is found. */ - gamma_state_t state; + gamma_state_t *method_state; /* Gamma adjustment not needed for print mode */ - if (mode != PROGRAM_MODE_PRINT) { - if (method != NULL) { + if (options.mode != PROGRAM_MODE_PRINT) { + if (options.method != NULL) { /* Use method specified on command line. */ - r = method_try_start(method, &state, &config_state, - method_args); + r = method_try_start( + options.method, &method_state, &config_state, + options.method_args); if (r < 0) exit(EXIT_FAILURE); } else { /* Try all methods, use the first that works. */ @@ -1497,7 +1134,8 @@ const gamma_method_t *m = &gamma_methods[i]; if (!m->autostart) continue; - r = method_try_start(m, &state, &config_state, NULL); + r = method_try_start( + m, &method_state, &config_state, NULL); if (r < 0) { fputs(_("Trying next method...\n"), stderr); continue; @@ -1505,12 +1143,12 @@ /* Found method that works. */ printf(_("Using method `%s'.\n"), m->name); - method = m; + options.method = m; break; } /* Failure if no methods were successful at this point. */ - if (method == NULL) { + if (options.method == NULL) { fputs(_("No more methods to try.\n"), stderr); exit(EXIT_FAILURE); } @@ -1519,83 +1157,119 @@ config_ini_free(&config_state); - switch (mode) { + switch (options.mode) { case PROGRAM_MODE_ONE_SHOT: case PROGRAM_MODE_PRINT: { - /* Current angular elevation of the sun */ + location_t loc = { NAN, NAN }; + if (need_location) { + fputs(_("Waiting for current location" + " to become available...\n"), stderr); + + /* Wait for location provider. */ + int r = provider_get_location( + options.provider, location_state, -1, &loc); + if (r < 0) { + fputs(_("Unable to get location" + " from provider.\n"), stderr); + exit(EXIT_FAILURE); + } + + if (!location_is_valid(&loc)) { + exit(EXIT_FAILURE); + } + + print_location(&loc); + } + double now; r = systemtime_get_time(&now); if (r < 0) { fputs(_("Unable to read system time.\n"), stderr); - method->free(&state); + options.method->free(method_state); exit(EXIT_FAILURE); } - double elevation = solar_elevation(now, loc.lat, loc.lon); - - if (verbose) { - /* TRANSLATORS: Append degree symbol if possible. */ - printf(_("Solar elevation: %f\n"), elevation); + period_t period; + double transition_prog; + if (options.scheme.use_time) { + int time_offset = get_seconds_since_midnight(now); + period = get_period_from_time(scheme, time_offset); + transition_prog = get_transition_progress_from_time( + scheme, time_offset); + } else { + /* Current angular elevation of the sun */ + double elevation = solar_elevation( + now, loc.lat, loc.lon); + if (options.verbose) { + /* TRANSLATORS: Append degree symbol if + possible. */ + printf(_("Solar elevation: %f\n"), elevation); + } + + period = get_period_from_elevation(scheme, elevation); + transition_prog = + get_transition_progress_from_elevation( + scheme, elevation); } - /* Use elevation of sun to set color temperature */ + /* Use transition progress to set color temperature */ color_setting_t interp; - interpolate_color_settings(&scheme, elevation, &interp); + interpolate_transition_scheme( + scheme, transition_prog, &interp); - if (verbose || mode == PROGRAM_MODE_PRINT) { - period_t period = get_period(&scheme, - elevation); - double transition = - get_transition_progress(&scheme, - elevation); - print_period(period, transition); + if (options.verbose || options.mode == PROGRAM_MODE_PRINT) { + print_period(period, transition_prog); printf(_("Color temperature: %uK\n"), interp.temperature); printf(_("Brightness: %.2f\n"), interp.brightness); } - if (mode == PROGRAM_MODE_PRINT) { - exit(EXIT_SUCCESS); - } - - /* Adjust temperature */ - r = method->set_temperature(&state, &interp); - if (r < 0) { - fputs(_("Temperature adjustment failed.\n"), stderr); - method->free(&state); - exit(EXIT_FAILURE); - } + if (options.mode != PROGRAM_MODE_PRINT) { + /* Adjust temperature */ + r = options.method->set_temperature( + method_state, &interp, options.preserve_gamma); + if (r < 0) { + fputs(_("Temperature adjustment failed.\n"), + stderr); + options.method->free(method_state); + exit(EXIT_FAILURE); + } - /* In Quartz (OSX) the gamma adjustments will automatically - revert when the process exits. Therefore, we have to loop - until CTRL-C is received. */ - if (strcmp(method->name, "quartz") == 0) { - fputs(_("Press ctrl-c to stop...\n"), stderr); - pause(); + /* In Quartz (macOS) the gamma adjustments will + automatically revert when the process exits. + Therefore, we have to loop until CTRL-C is received. + */ + if (strcmp(options.method->name, "quartz") == 0) { + fputs(_("Press ctrl-c to stop...\n"), stderr); + pause(); + } } } break; case PROGRAM_MODE_MANUAL: { - if (verbose) printf(_("Color temperature: %uK\n"), temp_set); + if (options.verbose) { + printf(_("Color temperature: %uK\n"), + options.temp_set); + } /* Adjust temperature */ - color_setting_t manual; - memcpy(&manual, &scheme.day, sizeof(color_setting_t)); - manual.temperature = temp_set; - r = method->set_temperature(&state, &manual); + color_setting_t manual = scheme->day; + manual.temperature = options.temp_set; + r = options.method->set_temperature( + method_state, &manual, options.preserve_gamma); if (r < 0) { fputs(_("Temperature adjustment failed.\n"), stderr); - method->free(&state); + options.method->free(method_state); exit(EXIT_FAILURE); } /* In Quartz (OSX) the gamma adjustments will automatically revert when the process exits. Therefore, we have to loop until CTRL-C is received. */ - if (strcmp(method->name, "quartz") == 0) { + if (strcmp(options.method->name, "quartz") == 0) { fputs(_("Press ctrl-c to stop...\n"), stderr); pause(); } @@ -1604,18 +1278,20 @@ case PROGRAM_MODE_RESET: { /* Reset screen */ - color_setting_t reset = { NEUTRAL_TEMP, { 1.0, 1.0, 1.0 }, 1.0 }; - r = method->set_temperature(&state, &reset); + color_setting_t reset; + color_setting_reset(&reset); + + r = options.method->set_temperature(method_state, &reset, 0); if (r < 0) { fputs(_("Temperature adjustment failed.\n"), stderr); - method->free(&state); + options.method->free(method_state); exit(EXIT_FAILURE); } /* In Quartz (OSX) the gamma adjustments will automatically revert when the process exits. Therefore, we have to loop until CTRL-C is received. */ - if (strcmp(method->name, "quartz") == 0) { + if (strcmp(options.method->name, "quartz") == 0) { fputs(_("Press ctrl-c to stop...\n"), stderr); pause(); } @@ -1623,16 +1299,25 @@ break; case PROGRAM_MODE_CONTINUAL: { - r = run_continual_mode(&loc, &scheme, - method, &state, - transition, verbose); + r = run_continual_mode( + options.provider, location_state, scheme, + options.method, method_state, + options.use_fade, options.preserve_gamma, + options.verbose); if (r < 0) exit(EXIT_FAILURE); } break; } /* Clean up gamma adjustment state */ - method->free(&state); + if (options.mode != PROGRAM_MODE_PRINT) { + options.method->free(method_state); + } + + /* Clean up location provider state */ + if (need_location) { + options.provider->free(location_state); + } return EXIT_SUCCESS; } diff -Nru redshift-1.11/src/redshift-gtk/controller.py redshift-1.12/src/redshift-gtk/controller.py --- redshift-1.11/src/redshift-gtk/controller.py 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/src/redshift-gtk/controller.py 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1,227 @@ +# controller.py -- Redshift child process controller +# This file is part of Redshift. + +# Redshift is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# Redshift 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 Redshift. If not, see . + +# Copyright (c) 2013-2017 Jon Lund Steffensen + +import os +import re +import fcntl +import signal + +import gi +gi.require_version('GLib', '2.0') + +from gi.repository import GLib, GObject + +from . import defs + + +class RedshiftController(GObject.GObject): + """GObject wrapper around the Redshift child process.""" + + __gsignals__ = { + 'inhibit-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool,)), + 'temperature-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)), + 'period-changed': (GObject.SIGNAL_RUN_FIRST, None, (str,)), + 'location-changed': (GObject.SIGNAL_RUN_FIRST, None, (float, float)), + 'error-occured': (GObject.SIGNAL_RUN_FIRST, None, (str,)), + 'stopped': (GObject.SIGNAL_RUN_FIRST, None, ()), + } + + def __init__(self, args): + """Initialize controller and start child process. + + The parameter args is a list of command line arguments to pass on to + the child process. The "-v" argument is automatically added. + """ + GObject.GObject.__init__(self) + + # Initialize state variables + self._inhibited = False + self._temperature = 0 + self._period = 'Unknown' + self._location = (0.0, 0.0) + + # Start redshift with arguments + args.insert(0, os.path.join(defs.BINDIR, 'redshift')) + if '-v' not in args: + args.insert(1, '-v') + + # Start child process with C locale so we can parse the output + env = os.environ.copy() + for key in ('LANG', 'LANGUAGE', 'LC_ALL', 'LC_MESSAGES'): + env[key] = 'C' + self._process = GLib.spawn_async( + args, envp=['{}={}'.format(k, v) for k, v in env.items()], + flags=GLib.SPAWN_DO_NOT_REAP_CHILD, + standard_output=True, standard_error=True) + + # Wrap remaining contructor in try..except to avoid that the child + # process is not closed properly. + try: + # Handle child input + # The buffer is encapsulated in a class so we + # can pass an instance to the child callback. + class InputBuffer(object): + buf = '' + + self._input_buffer = InputBuffer() + self._error_buffer = InputBuffer() + self._errors = '' + + # Set non blocking + fcntl.fcntl( + self._process[2], fcntl.F_SETFL, + fcntl.fcntl(self._process[2], fcntl.F_GETFL) | os.O_NONBLOCK) + + # Add watch on child process + GLib.child_watch_add( + GLib.PRIORITY_DEFAULT, self._process[0], self._child_cb) + GLib.io_add_watch( + self._process[2], GLib.PRIORITY_DEFAULT, GLib.IO_IN, + self._child_data_cb, (True, self._input_buffer)) + GLib.io_add_watch( + self._process[3], GLib.PRIORITY_DEFAULT, GLib.IO_IN, + self._child_data_cb, (False, self._error_buffer)) + + # Signal handler to relay USR1 signal to redshift process + def relay_signal_handler(signal): + os.kill(self._process[0], signal) + return True + + GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGUSR1, + relay_signal_handler, signal.SIGUSR1) + except: + self.termwait() + raise + + @property + def inhibited(self): + """Current inhibition state.""" + return self._inhibited + + @property + def temperature(self): + """Current screen temperature.""" + return self._temperature + + @property + def period(self): + """Current period of day.""" + return self._period + + @property + def location(self): + """Current location.""" + return self._location + + def set_inhibit(self, inhibit): + """Set inhibition state.""" + if inhibit != self._inhibited: + self._child_toggle_inhibit() + + def _child_signal(self, sg): + """Send signal to child process.""" + os.kill(self._process[0], sg) + + def _child_toggle_inhibit(self): + """Sends a request to the child process to toggle state.""" + self._child_signal(signal.SIGUSR1) + + def _child_cb(self, pid, status, data=None): + """Called when the child process exists.""" + + # Empty stdout and stderr + for f in (self._process[2], self._process[3]): + while True: + buf = os.read(f, 256).decode('utf-8') + if buf == '': + break + if f == self._process[3]: # stderr + self._errors += buf + + # Check exit status of child + try: + GLib.spawn_check_exit_status(status) + except GLib.GError: + self.emit('error-occured', self._errors) + + GLib.spawn_close_pid(self._process[0]) + self.emit('stopped') + + def _child_key_change_cb(self, key, value): + """Called when the child process reports a change of internal state.""" + + def parse_coord(s): + """Parse coordinate like `42.0 N` or `91.5 W`.""" + v, d = s.split(' ') + return float(v) * (1 if d in 'NE' else -1) + + if key == 'Status': + new_inhibited = value != 'Enabled' + if new_inhibited != self._inhibited: + self._inhibited = new_inhibited + self.emit('inhibit-changed', new_inhibited) + elif key == 'Color temperature': + new_temperature = int(value.rstrip('K'), 10) + if new_temperature != self._temperature: + self._temperature = new_temperature + self.emit('temperature-changed', new_temperature) + elif key == 'Period': + new_period = value + if new_period != self._period: + self._period = new_period + self.emit('period-changed', new_period) + elif key == 'Location': + new_location = tuple(parse_coord(x) for x in value.split(', ')) + if new_location != self._location: + self._location = new_location + self.emit('location-changed', *new_location) + + def _child_stdout_line_cb(self, line): + """Called when the child process outputs a line to stdout.""" + if line: + m = re.match(r'([\w ]+): (.+)', line) + if m: + key = m.group(1) + value = m.group(2) + self._child_key_change_cb(key, value) + + def _child_data_cb(self, f, cond, data): + """Called when the child process has new data on stdout/stderr.""" + stdout, ib = data + ib.buf += os.read(f, 256).decode('utf-8') + + # Split input at line break + while True: + first, sep, last = ib.buf.partition('\n') + if sep == '': + break + ib.buf = last + if stdout: + self._child_stdout_line_cb(first) + else: + self._errors += first + '\n' + + return True + + def terminate_child(self): + """Send SIGINT to child process.""" + self._child_signal(signal.SIGINT) + + def kill_child(self): + """Send SIGKILL to child process.""" + self._child_signal(signal.SIGKILL) diff -Nru redshift-1.11/src/redshift-gtk/Makefile.am redshift-1.12/src/redshift-gtk/Makefile.am --- redshift-1.11/src/redshift-gtk/Makefile.am 2014-05-07 21:14:33.000000000 +0000 +++ redshift-1.12/src/redshift-gtk/Makefile.am 2017-10-19 02:36:21.000000000 +0000 @@ -2,8 +2,9 @@ if ENABLE_GUI redshift_gtk_PYTHON = \ __init__.py \ - utils.py \ - statusicon.py + controller.py \ + statusicon.py \ + utils.py nodist_redshift_gtk_PYTHON = \ defs.py redshift_gtkdir = $(pythondir)/redshift_gtk diff -Nru redshift-1.11/src/redshift-gtk/Makefile.in redshift-1.12/src/redshift-gtk/Makefile.in --- redshift-1.11/src/redshift-gtk/Makefile.in 2016-01-02 22:53:19.000000000 +0000 +++ redshift-1.12/src/redshift-gtk/Makefile.in 2018-05-21 01:20:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2017 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,8 +89,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/redshift-gtk -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(am__redshift_gtk_PYTHON_DIST) $(top_srcdir)/py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ @@ -93,6 +101,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__redshift_gtk_PYTHON_DIST) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -149,9 +159,11 @@ am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__pep3147_tweak = \ sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' -am__redshift_gtk_PYTHON_DIST = __init__.py utils.py statusicon.py +am__redshift_gtk_PYTHON_DIST = __init__.py controller.py statusicon.py \ + utils.py py_compile = $(top_srcdir)/py-compile am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/py-compile DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -170,7 +182,6 @@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -186,8 +197,6 @@ FGREP = @FGREP@ GEOCLUE2_CFLAGS = @GEOCLUE2_CFLAGS@ GEOCLUE2_LIBS = @GEOCLUE2_LIBS@ -GEOCLUE_CFLAGS = @GEOCLUE_CFLAGS@ -GEOCLUE_LIBS = @GEOCLUE_LIBS@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ @@ -203,7 +212,6 @@ INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ @@ -222,6 +230,7 @@ LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -263,6 +272,7 @@ STRIP = @STRIP@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ +WINDRES = @WINDRES@ X11_CFLAGS = @X11_CFLAGS@ X11_LIBS = @X11_LIBS@ XCB_CFLAGS = @XCB_CFLAGS@ @@ -336,8 +346,9 @@ top_srcdir = @top_srcdir@ @ENABLE_GUI_TRUE@redshift_gtk_PYTHON = \ @ENABLE_GUI_TRUE@ __init__.py \ -@ENABLE_GUI_TRUE@ utils.py \ -@ENABLE_GUI_TRUE@ statusicon.py +@ENABLE_GUI_TRUE@ controller.py \ +@ENABLE_GUI_TRUE@ statusicon.py \ +@ENABLE_GUI_TRUE@ utils.py @ENABLE_GUI_TRUE@nodist_redshift_gtk_PYTHON = \ @ENABLE_GUI_TRUE@ defs.py @@ -361,7 +372,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/redshift-gtk/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/redshift-gtk/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -677,6 +687,8 @@ uninstall-nodist_redshift_gtkPYTHON \ uninstall-redshift_gtkPYTHON +.PRECIOUS: Makefile + # Local python definitions defs.py: defs.py.in diff -Nru redshift-1.11/src/redshift-gtk/statusicon.py redshift-1.12/src/redshift-gtk/statusicon.py --- redshift-1.11/src/redshift-gtk/statusicon.py 2016-01-02 21:54:24.000000000 +0000 +++ redshift-1.12/src/redshift-gtk/statusicon.py 2017-10-19 22:51:59.000000000 +0000 @@ -14,25 +14,23 @@ # You should have received a copy of the GNU General Public License # along with Redshift. If not, see . -# Copyright (c) 2013-2014 Jon Lund Steffensen +# Copyright (c) 2013-2017 Jon Lund Steffensen -'''GUI status icon for Redshift. +"""GUI status icon for Redshift. The run method will try to start an appindicator for Redshift. If the appindicator module isn't present it will fall back to a GTK status icon. -''' +""" -import sys, os -import fcntl +import sys import signal -import re import gettext import gi gi.require_version('Gtk', '3.0') -from gi.repository import Gtk, GLib, GObject +from gi.repository import Gtk, GLib try: gi.require_version('AppIndicator3', '0.1') @@ -40,218 +38,27 @@ except (ImportError, ValueError): appindicator = None +from .controller import RedshiftController from . import defs from . import utils _ = gettext.gettext -class RedshiftController(GObject.GObject): - '''A GObject wrapper around the child process''' - - __gsignals__ = { - 'inhibit-changed': (GObject.SIGNAL_RUN_FIRST, None, (bool,)), - 'temperature-changed': (GObject.SIGNAL_RUN_FIRST, None, (int,)), - 'period-changed': (GObject.SIGNAL_RUN_FIRST, None, (str,)), - 'location-changed': (GObject.SIGNAL_RUN_FIRST, None, (float, float)), - 'error-occured': (GObject.SIGNAL_RUN_FIRST, None, (str,)) - } - - def __init__(self, args): - '''Initialize controller and start child process - - The parameter args is a list of command line arguments to pass on to - the child process. The "-v" argument is automatically added.''' - - GObject.GObject.__init__(self) - - # Initialize state variables - self._inhibited = False - self._temperature = 0 - self._period = 'Unknown' - self._location = (0.0, 0.0) - - # Start redshift with arguments - args.insert(0, os.path.join(defs.BINDIR, 'redshift')) - if '-v' not in args: - args.insert(1, '-v') - - # Start child process with C locale so we can parse the output - env = os.environ.copy() - env['LANG'] = env['LANGUAGE'] = env['LC_ALL'] = env['LC_MESSAGES'] = 'C' - self._process = GLib.spawn_async(args, envp=['{}={}'.format(k,v) for k, v in env.items()], - flags=GLib.SPAWN_DO_NOT_REAP_CHILD, - standard_output=True, standard_error=True) - - # Wrap remaining contructor in try..except to avoid that the child - # process is not closed properly. - try: - # Handle child input - # The buffer is encapsulated in a class so we - # can pass an instance to the child callback. - class InputBuffer(object): - buf = '' - - self._input_buffer = InputBuffer() - self._error_buffer = InputBuffer() - self._errors = '' - - # Set non blocking - fcntl.fcntl(self._process[2], fcntl.F_SETFL, - fcntl.fcntl(self._process[2], fcntl.F_GETFL) | os.O_NONBLOCK) - - # Add watch on child process - GLib.child_watch_add(GLib.PRIORITY_DEFAULT, self._process[0], self._child_cb) - GLib.io_add_watch(self._process[2], GLib.PRIORITY_DEFAULT, GLib.IO_IN, - self._child_data_cb, (True, self._input_buffer)) - GLib.io_add_watch(self._process[3], GLib.PRIORITY_DEFAULT, GLib.IO_IN, - self._child_data_cb, (False, self._error_buffer)) - - # Signal handler to relay USR1 signal to redshift process - def relay_signal_handler(signal): - os.kill(self._process[0], signal) - return True - - GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGUSR1, - relay_signal_handler, signal.SIGUSR1) - except: - self.termwait() - raise - - @property - def inhibited(self): - '''Current inhibition state''' - return self._inhibited - - @property - def temperature(self): - '''Current screen temperature''' - return self._temperature - - @property - def period(self): - '''Current period of day''' - return self._period - - @property - def location(self): - '''Current location''' - return self._location - - def set_inhibit(self, inhibit): - '''Set inhibition state''' - if inhibit != self._inhibited: - self._child_toggle_inhibit() - - def _child_signal(self, sg): - """Send signal to child process.""" - os.kill(self._process[0], sg) - - def _child_toggle_inhibit(self): - '''Sends a request to the child process to toggle state''' - self._child_signal(signal.SIGUSR1) - - def _child_cb(self, pid, status, data=None): - '''Called when the child process exists''' - - # Empty stdout and stderr - for f in (self._process[2], self._process[3]): - while True: - buf = os.read(f, 256).decode('utf-8') - if buf == '': - break - if f == self._process[3]: # stderr - self._errors += buf - - # Check exit status of child - report_errors = False - try: - GLib.spawn_check_exit_status(status) - except GLib.GError: - self.emit('error-occured', self._errors) - - GLib.spawn_close_pid(self._process[0]) - Gtk.main_quit() - - def _child_key_change_cb(self, key, value): - '''Called when the child process reports a change of internal state''' - - def parse_coord(s): - '''Parse coordinate like `42.0 N` or `91.5 W`''' - v, d = s.split(' ') - return float(v) * (1 if d in 'NE' else -1) - - if key == 'Status': - new_inhibited = value != 'Enabled' - if new_inhibited != self._inhibited: - self._inhibited = new_inhibited - self.emit('inhibit-changed', new_inhibited) - elif key == 'Color temperature': - new_temperature = int(value.rstrip('K'), 10) - if new_temperature != self._temperature: - self._temperature = new_temperature - self.emit('temperature-changed', new_temperature) - elif key == 'Period': - new_period = value - if new_period != self._period: - self._period = new_period - self.emit('period-changed', new_period) - elif key == 'Location': - new_location = tuple(parse_coord(x) for x in value.split(', ')) - if new_location != self._location: - self._location = new_location - self.emit('location-changed', *new_location) - - def _child_stdout_line_cb(self, line): - '''Called when the child process outputs a line to stdout''' - if line: - m = re.match(r'([\w ]+): (.+)', line) - if m: - key = m.group(1) - value = m.group(2) - self._child_key_change_cb(key, value) - - def _child_data_cb(self, f, cond, data): - '''Called when the child process has new data on stdout/stderr''' - - stdout, ib = data - ib.buf += os.read(f, 256).decode('utf-8') - - # Split input at line break - while True: - first, sep, last = ib.buf.partition('\n') - if sep == '': - break - ib.buf = last - if stdout: - self._child_stdout_line_cb(first) - else: - self._errors += first + '\n' - - return True - - def terminate_child(self): - """Send SIGINT to child process.""" - self._child_signal(signal.SIGINT) - - def kill_child(self): - """Send SIGKILL to child process.""" - self._child_signal(signal.SIGKILL) - - class RedshiftStatusIcon(object): - '''The status icon tracking the RedshiftController''' + """The status icon tracking the RedshiftController.""" def __init__(self, controller): - '''Creates a new instance of the status icon''' + """Creates a new instance of the status icon.""" self._controller = controller if appindicator: # Create indicator - self.indicator = appindicator.Indicator.new('redshift', - 'redshift-status-on', - appindicator.IndicatorCategory.APPLICATION_STATUS) + self.indicator = appindicator.Indicator.new( + 'redshift', + 'redshift-status-on', + appindicator.IndicatorCategory.APPLICATION_STATUS) self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE) else: # Create status icon @@ -280,16 +87,17 @@ self.status_menu.append(suspend_menu_item) # Add autostart option - autostart_item = Gtk.CheckMenuItem.new_with_label(_('Autostart')) - try: - autostart_item.set_active(utils.get_autostart()) - except IOError as strerror: - print(strerror) - autostart_item.set_property('sensitive', False) - else: - autostart_item.connect('toggled', self.autostart_cb) - finally: - self.status_menu.append(autostart_item) + if utils.supports_autostart(): + autostart_item = Gtk.CheckMenuItem.new_with_label(_('Autostart')) + try: + autostart_item.set_active(utils.get_autostart()) + except IOError as strerror: + print(strerror) + autostart_item.set_property('sensitive', False) + else: + autostart_item.connect('toggled', self.autostart_cb) + finally: + self.status_menu.append(autostart_item) # Add info action info_item = Gtk.MenuItem.new_with_label(_('Info')) @@ -302,44 +110,52 @@ self.status_menu.append(quit_item) # Create info dialog - self.info_dialog = Gtk.Dialog() - self.info_dialog.set_title(_('Info')) - self.info_dialog.add_button(_('Close'), Gtk.ButtonsType.CLOSE) + self.info_dialog = Gtk.Window(title=_('Info')) self.info_dialog.set_resizable(False) self.info_dialog.set_property('border-width', 6) + self.info_dialog.connect('delete-event', self.close_info_dialog_cb) + + content_area = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + self.info_dialog.add(content_area) + content_area.show() self.status_label = Gtk.Label() self.status_label.set_alignment(0.0, 0.5) self.status_label.set_padding(6, 6) - self.info_dialog.get_content_area().pack_start(self.status_label, True, True, 0) + content_area.pack_start(self.status_label, True, True, 0) self.status_label.show() self.location_label = Gtk.Label() self.location_label.set_alignment(0.0, 0.5) self.location_label.set_padding(6, 6) - self.info_dialog.get_content_area().pack_start(self.location_label, True, True, 0) + content_area.pack_start(self.location_label, True, True, 0) self.location_label.show() self.temperature_label = Gtk.Label() self.temperature_label.set_alignment(0.0, 0.5) self.temperature_label.set_padding(6, 6) - self.info_dialog.get_content_area().pack_start(self.temperature_label, True, True, 0) + content_area.pack_start(self.temperature_label, True, True, 0) self.temperature_label.show() self.period_label = Gtk.Label() self.period_label.set_alignment(0.0, 0.5) self.period_label.set_padding(6, 6) - self.info_dialog.get_content_area().pack_start(self.period_label, True, True, 0) + content_area.pack_start(self.period_label, True, True, 0) self.period_label.show() - self.info_dialog.connect('response', self.response_info_cb) + self.close_button = Gtk.Button(label=_('Close')) + content_area.pack_start(self.close_button, True, True, 0) + self.close_button.connect('clicked', self.close_info_dialog_cb) + self.close_button.show() # Setup signals to property changes self._controller.connect('inhibit-changed', self.inhibit_change_cb) self._controller.connect('period-changed', self.period_change_cb) - self._controller.connect('temperature-changed', self.temperature_change_cb) + self._controller.connect( + 'temperature-changed', self.temperature_change_cb) self._controller.connect('location-changed', self.location_change_cb) self._controller.connect('error-occured', self.error_occured_cb) + self._controller.connect('stopped', self.controller_stopped_cb) # Set info box text self.change_inhibited(self._controller.inhibited) @@ -362,18 +178,18 @@ self.suspend_timer = None def remove_suspend_timer(self): - '''Disable any previously set suspend timer''' + """Disable any previously set suspend timer.""" if self.suspend_timer is not None: GLib.source_remove(self.suspend_timer) self.suspend_timer = None def suspend_cb(self, item, minutes): - '''Callback that handles activation of a suspend timer - - The minutes parameter is the number of minutes to suspend. Even if redshift - is not disabled when called, it will still set a suspend timer and - reactive redshift when the timer is up.''' + """Callback that handles activation of a suspend timer. + The minutes parameter is the number of minutes to suspend. Even if + redshift is not disabled when called, it will still set a suspend timer + and reactive redshift when the timer is up. + """ # Inhibit self._controller.set_inhibit(True) @@ -382,29 +198,30 @@ self.remove_suspend_timer() # If redshift was already disabled we reenable it nonetheless. - self.suspend_timer = GLib.timeout_add_seconds(minutes * 60, self.reenable_cb) + self.suspend_timer = GLib.timeout_add_seconds( + minutes * 60, self.reenable_cb) def reenable_cb(self): - '''Callback to reenable redshift when a suspend timer expires''' + """Callback to reenable redshift when a suspend timer expires.""" self._controller.set_inhibit(False) def popup_menu_cb(self, widget, button, time, data=None): - '''Callback when the popup menu on the status icon has to open''' + """Callback when the popup menu on the status icon has to open.""" self.status_menu.show_all() self.status_menu.popup(None, None, Gtk.StatusIcon.position_menu, self.status_icon, button, time) def toggle_cb(self, widget, data=None): - '''Callback when a request to toggle redshift was made''' + """Callback when a request to toggle redshift was made.""" self.remove_suspend_timer() self._controller.set_inhibit(not self._controller.inhibited) def toggle_item_cb(self, widget, data=None): - '''Callback then a request to toggle redshift was made from a toggle item + """Callback when a request to toggle redshift was made. This ensures that the state of redshift is synchronised with - the toggle state of the widget (e.g. Gtk.CheckMenuItem).''' - + the toggle state of the widget (e.g. Gtk.CheckMenuItem). + """ active = not self._controller.inhibited if active != widget.get_active(): self.remove_suspend_timer() @@ -412,20 +229,24 @@ # Info dialog callbacks def show_info_cb(self, widget, data=None): - '''Callback when the info dialog should be presented''' + """Callback when the info dialog should be presented.""" self.info_dialog.show() def response_info_cb(self, widget, data=None): - '''Callback when a button in the info dialog was activated''' + """Callback when a button in the info dialog was activated.""" + self.info_dialog.hide() + + def close_info_dialog_cb(self, widget, data=None): + """Callback when the info dialog is closed.""" self.info_dialog.hide() + return True def update_status_icon(self): - '''Update the status icon according to the internally recorded state + """Update the status icon according to the internally recorded state. This should be called whenever the internally recorded state - might have changed.''' - - # Update status icon + might have changed. + """ if appindicator: if not self._controller.inhibited: self.indicator.set_icon('redshift-status-on') @@ -439,59 +260,79 @@ # State update functions def inhibit_change_cb(self, controller, inhibit): - '''Callback when controller changes inhibition status''' + """Callback when controller changes inhibition status.""" self.change_inhibited(inhibit) def period_change_cb(self, controller, period): - '''Callback when controller changes period''' + """Callback when controller changes period.""" self.change_period(period) def temperature_change_cb(self, controller, temperature): - '''Callback when controller changes temperature''' + """Callback when controller changes temperature.""" self.change_temperature(temperature) def location_change_cb(self, controller, lat, lon): - '''Callback when controlled changes location''' + """Callback when controlled changes location.""" self.change_location((lat, lon)) def error_occured_cb(self, controller, error): - '''Callback when an error occurs in the controller''' - error_dialog = Gtk.MessageDialog(None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, - Gtk.ButtonsType.CLOSE, '') - error_dialog.set_markup('Failed to run Redshift\n' + error + '') + """Callback when an error occurs in the controller.""" + error_dialog = Gtk.MessageDialog( + None, Gtk.DialogFlags.MODAL, Gtk.MessageType.ERROR, + Gtk.ButtonsType.CLOSE, '') + error_dialog.set_markup( + 'Failed to run Redshift\n' + error + '') error_dialog.run() # Quit when the model dialog is closed sys.exit(-1) + def controller_stopped_cb(self, controller): + """Callback when controlled is stopped successfully.""" + Gtk.main_quit() + # Update interface def change_inhibited(self, inhibited): - '''Change interface to new inhibition status''' + """Change interface to new inhibition status.""" self.update_status_icon() self.toggle_item.set_active(not inhibited) - self.status_label.set_markup(_('Status: {}').format(_('Disabled') if inhibited else _('Enabled'))) + self.status_label.set_markup( + _('Status: {}').format( + _('Disabled') if inhibited else _('Enabled'))) def change_temperature(self, temperature): - '''Change interface to new temperature''' - self.temperature_label.set_markup('{}: {}K'.format(_('Color temperature'), temperature)) + """Change interface to new temperature.""" + self.temperature_label.set_markup( + '{}: {}K'.format(_('Color temperature'), temperature)) + self.update_tooltip_text() def change_period(self, period): - '''Change interface to new period''' - self.period_label.set_markup('{}: {}'.format(_('Period'), period)) + """Change interface to new period.""" + self.period_label.set_markup( + '{}: {}'.format(_('Period'), period)) + self.update_tooltip_text() def change_location(self, location): - '''Change interface to new location''' - self.location_label.set_markup('{}: {}, {}'.format(_('Location'), *location)) + """Change interface to new location.""" + self.location_label.set_markup( + '{}: {}, {}'.format(_('Location'), *location)) + def update_tooltip_text(self): + """Update text of tooltip status icon.""" + if not appindicator: + self.status_icon.set_tooltip_text('{}: {}K, {}: {}'.format( + _('Color temperature'), self._controller.temperature, + _('Period'), self._controller.period)) def autostart_cb(self, widget, data=None): - '''Callback when a request to toggle autostart is made''' + """Callback when a request to toggle autostart is made.""" utils.set_autostart(widget.get_active()) def destroy_cb(self, widget, data=None): - '''Callback when a request to quit the application is made''' + """Callback when a request to quit the application is made.""" if not appindicator: self.status_icon.set_visible(False) + self.info_dialog.destroy() self._controller.terminate_child() return False @@ -503,6 +344,11 @@ gettext.bindtextdomain('redshift', defs.LOCALEDIR) gettext.textdomain('redshift') + for help_arg in ('-h', '--help'): + if help_arg in sys.argv: + print(_('Please run `redshift -h` for help output.')) + sys.exit(-1) + # Create redshift child process controller c = RedshiftController(sys.argv[1:]) @@ -518,7 +364,7 @@ try: # Create status icon - s = RedshiftStatusIcon(c) + RedshiftStatusIcon(c) # Run main loop Gtk.main() diff -Nru redshift-1.11/src/redshift-gtk/utils.py redshift-1.12/src/redshift-gtk/utils.py --- redshift-1.11/src/redshift-gtk/utils.py 2014-05-07 21:14:33.000000000 +0000 +++ redshift-1.12/src/redshift-gtk/utils.py 2017-10-19 02:36:21.000000000 +0000 @@ -20,8 +20,14 @@ import ctypes import os import sys -from xdg import BaseDirectory as base -from xdg import DesktopEntry as desktop + +try: + from xdg import BaseDirectory + from xdg import DesktopEntry + has_xdg = True +except ImportError: + has_xdg = False + REDSHIFT_DESKTOP = 'redshift-gtk.desktop' @@ -32,12 +38,13 @@ def open_autostart_file(): - autostart_dir = base.save_config_path("autostart") + autostart_dir = BaseDirectory.save_config_path("autostart") autostart_file = os.path.join(autostart_dir, REDSHIFT_DESKTOP) if not os.path.exists(autostart_file): - desktop_files = list(base.load_data_paths("applications", - REDSHIFT_DESKTOP)) + desktop_files = list( + BaseDirectory.load_data_paths( + "applications", REDSHIFT_DESKTOP)) if not desktop_files: raise IOError("Installed redshift desktop file not found!") @@ -45,21 +52,33 @@ desktop_file_path = desktop_files[0] # Read installed file - dfile = desktop.DesktopEntry(desktop_file_path) + dfile = DesktopEntry.DesktopEntry(desktop_file_path) for key, values in AUTOSTART_KEYS: dfile.set(key, values[False]) dfile.write(filename=autostart_file) else: - dfile = desktop.DesktopEntry(autostart_file) + dfile = DesktopEntry.DesktopEntry(autostart_file) return dfile, autostart_file + +def supports_autostart(): + return has_xdg + + def get_autostart(): + if not has_xdg: + return False + dfile, path = open_autostart_file() check_key, check_values = AUTOSTART_KEYS[0] return dfile.get(check_key) == check_values[True] + def set_autostart(active): + if not has_xdg: + return + dfile, path = open_autostart_file() for key, values in AUTOSTART_KEYS: dfile.set(key, values[active]) @@ -67,6 +86,7 @@ def setproctitle(title): + """Set process title.""" title_bytes = title.encode(sys.getdefaultencoding(), 'replace') buf = ctypes.create_string_buffer(title_bytes) if 'linux' in sys.platform: diff -Nru redshift-1.11/src/redshift.h redshift-1.12/src/redshift.h --- redshift-1.11/src/redshift.h 2016-01-02 19:01:16.000000000 +0000 +++ redshift-1.12/src/redshift.h 2017-11-02 02:34:45.000000000 +0000 @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with Redshift. If not, see . - Copyright (c) 2013-2014 Jon Lund Steffensen + Copyright (c) 2013-2017 Jon Lund Steffensen */ #ifndef REDSHIFT_REDSHIFT_H @@ -23,6 +23,9 @@ #include #include +/* The color temperature when no adjustment is applied. */ +#define NEUTRAL_TEMP 6500 + /* Location */ typedef struct { @@ -45,17 +48,48 @@ float brightness; } color_setting_t; +/* Program modes. */ +typedef enum { + PROGRAM_MODE_CONTINUAL, + PROGRAM_MODE_ONE_SHOT, + PROGRAM_MODE_PRINT, + PROGRAM_MODE_RESET, + PROGRAM_MODE_MANUAL +} program_mode_t; + +/* Time range. + Fields are offsets from midnight in seconds. */ +typedef struct { + int start; + int end; +} time_range_t; + +/* Transition scheme. + The solar elevations at which the transition begins/ends, + and the association color settings. */ +typedef struct { + double high; + double low; + int use_time; /* When enabled, ignore elevation and use time ranges. */ + time_range_t dawn; + time_range_t dusk; + color_setting_t day; + color_setting_t night; +} transition_scheme_t; + /* Gamma adjustment method */ -typedef int gamma_method_init_func(void *state); -typedef int gamma_method_start_func(void *state); -typedef void gamma_method_free_func(void *state); +typedef struct gamma_state gamma_state_t; + +typedef int gamma_method_init_func(gamma_state_t **state); +typedef int gamma_method_start_func(gamma_state_t *state); +typedef void gamma_method_free_func(gamma_state_t *state); typedef void gamma_method_print_help_func(FILE *f); -typedef int gamma_method_set_option_func(void *state, const char *key, +typedef int gamma_method_set_option_func(gamma_state_t *state, const char *key, const char *value); -typedef void gamma_method_restore_func(void *state); -typedef int gamma_method_set_temperature_func(void *state, - const color_setting_t *setting); +typedef void gamma_method_restore_func(gamma_state_t *state); +typedef int gamma_method_set_temperature_func( + gamma_state_t *state, const color_setting_t *setting, int preserve); typedef struct { char *name; @@ -83,13 +117,17 @@ /* Location provider */ -typedef int location_provider_init_func(void *state); -typedef int location_provider_start_func(void *state); -typedef void location_provider_free_func(void *state); +typedef struct location_state location_state_t; + +typedef int location_provider_init_func(location_state_t **state); +typedef int location_provider_start_func(location_state_t *state); +typedef void location_provider_free_func(location_state_t *state); typedef void location_provider_print_help_func(FILE *f); -typedef int location_provider_set_option_func(void *state, const char *key, - const char *value); -typedef int location_provider_get_location_func(void *state, location_t *loc); +typedef int location_provider_set_option_func( + location_state_t *state, const char *key, const char *value); +typedef int location_provider_get_fd_func(location_state_t *state); +typedef int location_provider_handle_func( + location_state_t *state, location_t *location, int *available); typedef struct { char *name; @@ -106,8 +144,9 @@ /* Set an option key, value-pair. */ location_provider_set_option_func *set_option; - /* Get current location. */ - location_provider_get_location_func *get_location; + /* Listen and handle location updates. */ + location_provider_get_fd_func *get_fd; + location_provider_handle_func *handle; } location_provider_t; diff -Nru redshift-1.11/src/signals.c redshift-1.12/src/signals.c --- redshift-1.11/src/signals.c 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/signals.c 2017-10-11 04:43:42.000000000 +0000 @@ -50,6 +50,11 @@ disable = 1; } +#else /* ! HAVE_SIGNAL_H || __WIN32__ */ + +int disable = 0; +int exiting = 0; + #endif /* ! HAVE_SIGNAL_H || __WIN32__ */ diff -Nru redshift-1.11/src/signals.h redshift-1.12/src/signals.h --- redshift-1.11/src/signals.h 2016-01-02 21:48:48.000000000 +0000 +++ redshift-1.12/src/signals.h 2017-10-11 04:43:42.000000000 +0000 @@ -27,8 +27,8 @@ extern volatile sig_atomic_t disable; #else /* ! HAVE_SIGNAL_H || __WIN32__ */ -# define exiting 0 -# define disable 0 +extern int exiting; +extern int disable; #endif /* ! HAVE_SIGNAL_H || __WIN32__ */ diff -Nru redshift-1.11/src/windows/appicon.rc redshift-1.12/src/windows/appicon.rc --- redshift-1.11/src/windows/appicon.rc 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/src/windows/appicon.rc 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1 @@ +AppIcon ICON redshift.ico Binary files /tmp/tmpmB3Z_n/Lb8gEVatgy/redshift-1.11/src/windows/redshift.ico and /tmp/tmpmB3Z_n/LvmyFd40vR/redshift-1.12/src/windows/redshift.ico differ diff -Nru redshift-1.11/src/windows/versioninfo.rc redshift-1.12/src/windows/versioninfo.rc --- redshift-1.11/src/windows/versioninfo.rc 1970-01-01 00:00:00.000000000 +0000 +++ redshift-1.12/src/windows/versioninfo.rc 2017-10-19 02:36:21.000000000 +0000 @@ -0,0 +1,20 @@ +#include "config.h" + +1 VERSIONINFO +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "CompanyName", "Redshift Open Source Project" + VALUE "FileDescription", "Redshift" + VALUE "OriginalFilename", "redshift.exe" + VALUE "ProductName", "Redshift" + VALUE "ProductVersion", PACKAGE_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END