diff -Nru epiphany-browser-3.16.3/aclocal.m4 epiphany-browser-3.18.0/aclocal.m4 --- epiphany-browser-3.16.3/aclocal.m4 2015-07-09 13:29:05.000000000 +0000 +++ epiphany-browser-3.18.0/aclocal.m4 2015-09-22 07:50:38.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,703 +20,7 @@ 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'.])]) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) - - -dnl GNOME_CODE_COVERAGE -dnl -dnl Defines CODE_COVERAGE_CFLAGS and CODE_COVERAGE_LDFLAGS which should be -dnl included in the CFLAGS and LIBS/LDFLAGS variables of every build target -dnl (program or library) which should be built with code coverage support. -dnl Also defines GNOME_CODE_COVERAGE_RULES which should be substituted in your -dnl Makefile; and $enable_code_coverage which can be used in subsequent -dnl configure output. -dnl -dnl Note that all optimisation flags in CFLAGS must be disabled when code -dnl coverage is enabled. -dnl -dnl Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+. -dnl This file is licenced under LGPLv2.1+. -dnl -dnl Usage example: -dnl configure.ac: -dnl GNOME_CODE_COVERAGE -dnl -dnl Makefile.am: -dnl @GNOME_CODE_COVERAGE_RULES@ -dnl my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) … -dnl my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) … -dnl -dnl This results in a “check-code-coverage” rule being added to any Makefile.am -dnl which includes “@GNOME_CODE_COVERAGE_RULES@” (assuming the module has been -dnl configured with --enable-code-coverage). Running `make check-code-coverage` -dnl in that directory will run the module’s test suite (`make check`) and build -dnl a code coverage report detailing the code which was touched, then print the -dnl URI for the report. - -AU_DEFUN([GNOME_CODE_COVERAGE],[ - AX_CODE_COVERAGE - GNOME_CODE_COVERAGE_RULES=$CODE_COVERAGE_RULES - - AC_SUBST([GNOME_CODE_COVERAGE_RULES]) - m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([GNOME_CODE_COVERAGE_RULES])]) -], -[[$0: This macro is deprecated. You should use AX_CODE_COVERAGE instead and -replace uses of GNOME_CODE_COVERAGE_RULES with CODE_COVERAGE_RULES. -See: http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html#ax_code_coverage]]) - -# gnome-common.m4 -# -# serial 3 -# - -AU_DEFUN([GNOME_DEBUG_CHECK], -[ - AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG]) -], -[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and -replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG. -See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_check_enable_debug]]) - -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) - - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi - - AC_SUBST(DISABLE_DEPRECATED) -], -[[$0: This macro is deprecated. All of the modules it disables deprecations for -are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]]) - -# gnome-compiler-flags.m4 -# -# serial 4 -# - -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings and substitute the result into -dnl WARN_CFLAGS -dnl For now, only works on GCC -dnl Pass the default value of the --enable-compile-warnings configure option as -dnl the first argument to the macro, defaulting to 'yes'. -dnl Additional warning/error flags can be passed as an optional second argument. -dnl -dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AU_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - - warning_flags= - realsave_CFLAGS="$CFLAGS" - - dnl These are warning flags that aren't marked as fatal. Can be - dnl overridden on a per-project basis with -Wno-foo. - base_warn_flags=" \ - -Wall \ - -Wstrict-prototypes \ - -Wnested-externs \ - " - - dnl These compiler flags typically indicate very broken or suspicious - dnl code. Some of them such as implicit-function-declaration are - dnl just not default because gcc compiles a lot of legacy code. - dnl We choose to make this set into explicit errors. - base_error_flags=" \ - -Werror=missing-prototypes \ - -Werror=implicit-function-declaration \ - -Werror=pointer-arith \ - -Werror=init-self \ - -Werror=format-security \ - -Werror=format=2 \ - -Werror=missing-include-dirs \ - -Werror=return-type \ - " - - dnl Additional warning or error flags provided by the module author to - dnl allow stricter standards to be imposed on a per-module basis. - dnl The author can pass -W or -Werror flags here as they see fit. - additional_flags="m4_default([$2],[])" - - case "$enable_compile_warnings" in - no) - warning_flags="-w" - ;; - minimum) - warning_flags="-Wall" - ;; - yes|maximum|error) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - - dnl Check whether GCC supports the warning options - for option in $warning_flags; do - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$save_CFLAGS" - AC_MSG_RESULT([$has_option]) - if test $has_option = yes; then - tested_warning_flags="$tested_warning_flags $option" - fi - unset has_option - unset save_CFLAGS - done - unset option - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($tested_warning_flags) - - AC_ARG_ENABLE(iso-c, - AS_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$tested_warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-c. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) - -dnl For C++, do basically the same thing. - -AU_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AS_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) - - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac - - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AS_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac - - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -], -[[$0: This macro is deprecated. You should use AX_COMPILER_FLAGS instead and -eliminate use of --enable-iso-cxx. -See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) - -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -728,10 +32,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], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -747,14 +51,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])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-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -806,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -837,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1028,7 +332,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1104,7 +408,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1194,8 +498,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 @@ -1269,6 +573,9 @@ AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) 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 @@ -1298,7 +605,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-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1309,7 +616,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'" ;; @@ -1319,7 +626,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1341,7 +648,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1376,7 +683,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1426,7 +733,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1465,7 +772,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1494,7 +801,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-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1541,7 +848,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1560,7 +867,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1641,7 +948,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1701,7 +1008,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1729,7 +1036,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1748,7 +1055,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1879,8 +1186,18 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/appstream-xml.m4]) +m4_include([m4/ax_append_compile_flags.m4]) +m4_include([m4/ax_append_flag.m4]) +m4_include([m4/ax_check_compile_flag.m4]) m4_include([m4/ax_check_enable_debug.m4]) m4_include([m4/ax_code_coverage.m4]) +m4_include([m4/ax_compiler_flags.m4]) +m4_include([m4/ax_compiler_flags_cflags.m4]) +m4_include([m4/ax_compiler_flags_gir.m4]) +m4_include([m4/ax_compiler_flags_ldflags.m4]) +m4_include([m4/ax_is_release.m4]) +m4_include([m4/ax_require_defined.m4]) m4_include([m4/gsettings.m4]) m4_include([m4/intltool.m4]) m4_include([m4/libtool.m4]) diff -Nru epiphany-browser-3.16.3/autogen.sh epiphany-browser-3.18.0/autogen.sh --- epiphany-browser-3.16.3/autogen.sh 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/autogen.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="epiphany" - -(test -f $srcdir/src/ephy-window.c) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level $PKG_NAME directory" - exit 1 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common from GNOME git and make" - echo "sure the gnome-autogen.sh script is in your \$PATH." - exit 1 -} - -REQUIRED_AUTOMAKE_VERSION=1.11 -REQUIRED_LIBTOOL_VERSION=2.2 -REQUIRED_INTLTOOL_VERSION=0.40.4 -. gnome-autogen.sh diff -Nru epiphany-browser-3.16.3/build-aux/compile epiphany-browser-3.18.0/build-aux/compile --- epiphany-browser-3.16.3/build-aux/compile 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/build-aux/compile 2015-09-22 07:44:11.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru epiphany-browser-3.16.3/build-aux/config.guess epiphany-browser-3.18.0/build-aux/config.guess --- epiphany-browser-3.16.3/build-aux/config.guess 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/build-aux/config.guess 2015-09-22 07:44:11.000000000 +0000 @@ -0,0 +1,1441 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright 1992-2015 Free Software Foundation, Inc. + +timestamp='2015-08-20' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). +# +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. +# +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches to . + + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright 1992-2015 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi + +trap 'exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + ;; +esac + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # + # 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=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_ARCH}" in + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval $set_cc_for_build + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ELF__ + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + 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 + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + 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}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + 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" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + 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'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm*:riscos:*:*|arm*:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + 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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + 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 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[4567]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/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 + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + 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_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + 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/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + *:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + else + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi + fi + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-${LIBC} + exit ;; + 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 ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + mips:Linux:*:* | mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=${UNAME_MACHINE}el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=${UNAME_MACHINE} + #else + CPU= + #endif + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + ;; + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-${LIBC} + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; + esac + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-${LIBC} + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-${LIBC} + exit ;; + x86_64:Linux:*:*) + echo ${UNAME_MACHINE}-pc-linux-${LIBC} + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "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 + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; +esac + +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF + +exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -Nru epiphany-browser-3.16.3/build-aux/config.sub epiphany-browser-3.18.0/build-aux/config.sub --- epiphany-browser-3.16.3/build-aux/config.sub 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/build-aux/config.sub 2015-09-22 07:44:11.000000000 +0000 @@ -0,0 +1,1813 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2015 Free Software Foundation, Inc. + +timestamp='2015-08-20' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see . +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to . +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# 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 + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2015 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | 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 \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pdp11 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | 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 \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | we32k \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | 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-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | 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*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + 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 + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little | ppc64-le | powerpc64-little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-haiku) + os=-haiku + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os +exit + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff -Nru epiphany-browser-3.16.3/build-aux/depcomp epiphany-browser-3.18.0/build-aux/depcomp --- epiphany-browser-3.16.3/build-aux/depcomp 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/build-aux/depcomp 2015-09-22 07:44:12.000000000 +0000 @@ -0,0 +1,791 @@ +#! /bin/sh +# depcomp - compile a program generating dependencies as side-effects + +scriptversion=2013-05-30.07; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Originally written by Alexandre Oliva . + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: depcomp [--help] [--version] PROGRAM [ARGS] + +Run PROGRAMS ARGS to compile a file, generating dependencies +as side-effects. + +Environment variables: + depmode Dependency tracking mode. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. + DEPDIR directory where to store dependencies. + depfile Dependency file to output. + tmpdepfile Temporary file to use when outputting dependencies. + libtool Whether libtool is used (yes/no). + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "depcomp $scriptversion" + exit $? + ;; +esac + +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + +if test -z "$depmode" || test -z "$source" || test -z "$object"; then + echo "depcomp: Variables source, object and depmode must be set" 1>&2 + exit 1 +fi + +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. +depfile=${depfile-`echo "$object" | + sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + +rm -f "$tmpdepfile" + +# Avoid interferences from the environment. +gccflag= dashmflag= + +# Some modes work just like other modes, but use different flags. We +# parameterize here, but still list the modes in the big case below, +# to make depend.m4 easier to write. Note that we *cannot* use a case +# here, because this file can only contain one case statement. +if test "$depmode" = hp; then + # HP compiler uses -M and no extra arg. + gccflag=-M + depmode=gcc +fi + +if test "$depmode" = dashXmstdout; then + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout +fi + +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc +fi + +case "$depmode" in +gcc3) +## gcc 3 implements dependency tracking that does exactly what +## we want. Yay! Note: for some reason libtool 1.4 doesn't like +## it if -MD -MP comes after the -MF stuff. Hmm. +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + mv "$tmpdepfile" "$depfile" + ;; + +gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). +## There are various ways to get dependency output from gcc. Here's +## why we pick this rather obscure method: +## - Don't want to use -MD because we'd like the dependencies to end +## up in a subdir. Having to rename by hand is ugly. +## (We might end up doing this anyway to support other compilers.) +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. +## - Using -M directly means running the compiler twice (even worse +## than renaming). + if test -z "$gccflag"; then + gccflag=-MD, + fi + "$@" -Wp,"$gccflag$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The second -e expression handles DOS-style file names with drive + # letters. + sed -e 's/^[^:]*: / /' \ + -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" +## This next piece of magic avoids the "deleted header file" problem. +## The problem is that when a header file which appears in a .P file +## is deleted, the dependency causes make to die (because there is +## typically no way to rebuild the header). We avoid this by adding +## dummy dependencies for each header file. Too bad gcc doesn't do +## this for us directly. +## Some versions of gcc put a space before the ':'. On the theory +## that the space means something, we add a space to the output as +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. +## Some versions of the HPUX 10.20 sed can't process this invocation +## correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like '#:fec' to the end of the + # dependency line. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" + echo >> "$depfile" + # The second pass generates a dummy entry for each header file. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" + ;; + +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +aix) + # The C for AIX Compiler uses -M and outputs the dependencies + # in a .u file. In older versions, this file always lives in the + # current directory. Also, the AIX compiler puts '$object:' at the + # start of each line; $object doesn't have directory information. + # Version 6 uses the directory in both cases. + set_dir_from "$object" + set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u + "$@" -Wc,-M + else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u + "$@" -M + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" + rm -f "$tmpdepfile" + ;; + +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using '\' : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. + # Do two passes, one to just change these to + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + set_dir_from "$object" + set_base_from "$object" + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + +tru64) + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +#nosideeffect) + # This comment above is used by automake to tell side-effect + # dependency tracking mechanisms from slower ones. + +dashmstdout) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout, regardless of -o. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove '-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + test -z "$dashmflag" && dashmflag=-M + # Require at least two characters before searching for ':' + # in the target name. This is to cope with DOS-style filenames: + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. + "$@" $dashmflag | + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +dashXmstdout) + # This case only exists to satisfy depend.m4. It is never actually + # run, as this mode is specially recognized in the preamble. + exit 1 + ;; + +makedepend) + "$@" || exit $? + # Remove any Libtool call + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + # X makedepend + shift + cleared=no eat=no + for arg + do + case $cleared in + no) + set ""; shift + cleared=yes ;; + esac + if test $eat = yes; then + eat=no + continue + fi + case "$arg" in + -D*|-I*) + set fnord "$@" "$arg"; shift ;; + # Strip any option that makedepend may not understand. Remove + # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; + -*|$object) + ;; + *) + set fnord "$@" "$arg"; shift ;; + esac + done + obj_suffix=`echo "$object" | sed 's/^.*\././'` + touch "$tmpdepfile" + ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" "$tmpdepfile".bak + ;; + +cpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + # Remove '-o $object'. + IFS=" " + for arg + do + case $arg in + -o) + shift + ;; + $object) + shift + ;; + *) + set fnord "$@" "$arg" + shift # fnord + shift # $arg + ;; + esac + done + + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" + sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvisualcpp) + # Important note: in order to support this mode, a compiler *must* + # always write the preprocessed file to stdout. + "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + + IFS=" " + for arg + do + case "$arg" in + -o) + shift + ;; + $object) + shift + ;; + "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") + set fnord "$@" + shift + shift + ;; + *) + set fnord "$@" "$arg" + shift + shift + ;; + esac + done + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + +none) + exec "$@" + ;; + +*) + echo "Unknown depmode $depmode" 1>&2 + exit 1 + ;; +esac + +exit 0 + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru epiphany-browser-3.16.3/build-aux/install-sh epiphany-browser-3.18.0/build-aux/install-sh --- epiphany-browser-3.16.3/build-aux/install-sh 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/build-aux/install-sh 2015-09-22 07:44:11.000000000 +0000 @@ -0,0 +1,508 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2014-09-12.12; # UTC + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# 'make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +tab=' ' +nl=' +' +IFS=" $tab$nl" + +# Set DOITPROG to "echo" to test this script. + +doit=${DOITPROG-} +doit_exec=${doit:-exec} + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chgrpcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog +rmcmd="$rmprog -f" +stripcmd= + +src= +dst= +dir_arg= +dst_arg= + +copy_on_change=false +is_target_a_directory=possibly + +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) ;; + + -C) copy_on_change=true;; + + -d) dir_arg=true;; + + -g) chgrpcmd="$chgrpprog $2" + shift;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; + + -o) chowncmd="$chownprog $2" + shift;; + + -s) stripcmd=$stripprog;; + + -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) is_target_a_directory=never;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) 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. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call 'install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + 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 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names problematic for 'test' and other utilities. + case $src in + -* | [=\(\)!]) src=./$src;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dst_arg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + dst=$dst_arg + + # 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 "$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 + dstdir=`dirname "$dst"` + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + 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. + ;; + *) + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 + + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/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. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; + esac + + oIFS=$IFS + IFS=/ + set -f + set fnord $dstdir + shift + set +f + IFS=$oIFS + + prefixes= + + for d + do + 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/ + 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 + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # 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` && + set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + set +f && + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # 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 rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru epiphany-browser-3.16.3/build-aux/ltmain.sh epiphany-browser-3.18.0/build-aux/ltmain.sh --- epiphany-browser-3.16.3/build-aux/ltmain.sh 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/build-aux/ltmain.sh 2015-09-22 07:44:04.000000000 +0000 @@ -0,0 +1,9661 @@ + +# libtool (GNU libtool) 2.4.2 +# 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. +# 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 the License, or +# (at your option) any later version. +# +# As a special exception to the GNU General Public License, +# if you distribute this file as part of a program or library that +# is built using GNU Libtool, you may include this file under the +# same distribution terms that you use for the rest of that program. +# +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Libtool; see the file COPYING. If not, a copy +# can be downloaded from http://www.gnu.org/licenses/gpl.html, +# or obtained by writing to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +# 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 Debian-2.4.2-1.11 +# 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 Debian-2.4.2-1.11" +TIMESTAMP="" +package_revision=1.3337 + +# Be Bourne compatible +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 + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac +fi +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 +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\" + fi" +done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL + +$lt_unset CDPATH + + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + + + +: ${CP="cp -f"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${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 + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + +# func_dirname_and_basename file append nondir_replacement +# perform func_basename and func_dirname in a single function +# call: +# 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 + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result +} + +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi + + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} + +# The name of this program: +func_dirname_and_basename "$progpath" +progname=$func_basename_result + +# Make sure we have an absolute path for reexecution: +case $progpath in + [\\/]*|[A-Za-z]:\\*) ;; + *[\\/]*) + progdir=$func_dirname_result + progdir=`cd "$progdir" && pwd` + progpath="$progdir/$progname" + ;; + *) + save_IFS="$IFS" + IFS=${PATH_SEPARATOR-:} + for progdir in $PATH; do + IFS="$save_IFS" + test -x "$progdir/$progname" && break + done + IFS="$save_IFS" + test -n "$progdir" || progdir=`pwd` + 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: +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+"$@"} + + # 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_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 +} + +# 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 + + # 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_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 + + +# func_grep expression filename +# Check whether EXPRESSION matches any line of FILENAME, without output. +func_grep () +{ + $GREP "$1" "$2" >/dev/null 2>&1 +} + + +# 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= + + if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + + # Protect directory names starting with `-' + case $my_directory_path in + -*) my_directory_path="./$my_directory_path" ;; + esac + + # While some portion of DIR does not yet exist... + while test ! -d "$my_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" + + # If the last portion added has no slash in it, the list is done + case $my_directory_path in */*) ;; *) break ;; esac + + # ...otherwise throw away the child directory and loop + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + done + my_dir_list=`$ECHO "$my_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 + # try to create one of the directories concurrently. Don't + # stop in that case! + $MKDIR "$my_dir" 2>/dev/null || : + done + IFS="$save_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'" + fi +} + + +# func_mktempdir [string] +# 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. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$opt_dry_run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # 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 + + $ECHO "$my_tmpdir" +} + + +# 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 () +{ + case $1 in + *[\\\`\"\$]*) + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; + *) + func_quote_for_eval_unquoted_result="$1" ;; + esac + + 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 +} + + +# 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 () +{ + case $1 in + *[\\\`\"]*) + my_arg=`$ECHO "$1" | $SED \ + -e "$double_quote_subst" -e "$sed_double_backslash"` ;; + *) + my_arg="$1" ;; + esac + + 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_quote_for_expand_result="$my_arg" +} + + +# 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-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + 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 +} + + +# 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 () +{ + my_cmd="$1" + my_fail_exp="${2-:}" + + ${opt_silent-false} || { + func_quote_for_expand "$my_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + 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_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_version +# Echo version message to standard output and exit. +func_version () +{ + $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 $? +} + +# func_usage +# Echo short help message to standard output and exit. +func_usage () +{ + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { + s/^# // + s/^# *$// + s/\$progname/'$progname'/ + p + }' < "$progpath" + echo + $ECHO "run \`$progname --help | more' for full usage" + exit $? +} + +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. +func_help () +{ + $opt_debug + + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print + s/^# // + s/^# *$// + s*\$progname*'$progname'* + 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_missing_arg argname +# Echo program name prefixed message to standard error and set global +# exit_cmd. +func_missing_arg () +{ + $opt_debug + + func_error "missing argument for $1." + exit_cmd=exit +} + + +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation + +exit_cmd=: + + + + + +magic="%%%MAGIC variable%%%" +magic_exe="%%%MAGIC EXE variable%%%" + +# Global variables. +nonopt= +preserve_args= +lo2o="s/\\.lo\$/.${objext}/" +o2lo="s/\\.${objext}\$/.lo/" +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= + +# func_append var value +# Append VALUE to the end of shell variable VAR. +func_append () +{ + eval "${1}=\$${1}\${2}" +} # func_append may be replaced by extended shell implementation + +# 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 + + +# func_arith arithmetic-term... +func_arith () +{ + func_arith_result=`expr "${@}"` +} # func_arith may be replaced by extended shell implementation + + +# 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 + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + +# func_fatal_configuration arg... +# Echo program name prefixed message to standard error, followed by +# a configuration failure hint, and exit. +func_fatal_configuration () +{ + func_error ${1+"$@"} + func_error "See the $PACKAGE documentation for more information." + func_fatal_error "Fatal configuration error." +} + + +# func_config +# Display the configuration for all the tags in this script. +func_config () +{ + re_begincf='^# ### BEGIN LIBTOOL' + re_endcf='^# ### END LIBTOOL' + + # Default configuration. + $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" + + # Now print the configurations for the tags. + for tagname in $taglist; do + $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" + done + + exit $? +} + +# func_features +# Display the features supported by this script. +func_features () +{ + echo "host: $host" + if test "$build_libtool_libs" = yes; then + echo "enable shared libraries" + else + echo "disable shared libraries" + fi + if test "$build_old_libs" = yes; then + echo "enable static libraries" + else + echo "disable static libraries" + fi + + exit $? +} + +# 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" + + 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) ;; + *) + 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 +} + +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () +{ + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac + + + +# 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 + + +# 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: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" + + case $host in + *cygwin* | *mingw* | *pw32* | *cegcc*) + # 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 + + 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 + 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 +} + + + + +## ----------- ## +## Main. ## +## ----------- ## + +# func_lalib_p 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 +} + +# func_lalib_unsafe_p 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. +func_lalib_unsafe_p () +{ + lalib_p=no + if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then + for lalib_p_l in 1 2 3 4 + do + read lalib_p_line + case "$lalib_p_line" in + \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; + esac + done + exec 0<&5 5<&- + fi + test "$lalib_p" = yes +} + +# func_ltwrapper_script_p file +# True iff FILE is a libtool wrapper script +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_script_p () +{ + func_lalib_p "$1" +} + +# func_ltwrapper_executable_p file +# True iff FILE is a libtool wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_executable_p () +{ + func_ltwrapper_exec_suffix= + case $1 in + *.exe) ;; + *) func_ltwrapper_exec_suffix=.exe ;; + esac + $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 +} + +# func_ltwrapper_scriptname file +# Assumes file is an ltwrapper_executable +# uses $file to determine the appropriate filename for a +# temporary ltwrapper_script. +func_ltwrapper_scriptname () +{ + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" +} + +# func_ltwrapper_p file +# True iff FILE is a libtool wrapper script or wrapper executable +# This function is only a basic sanity check; it will hardly flush out +# determined imposters. +func_ltwrapper_p () +{ + func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" +} + + +# func_execute_cmds commands fail_cmd +# Execute tilde-delimited COMMANDS. +# If FAIL_CMD is given, eval that upon failure. +# FAIL_CMD may read-access the current command in variable CMD! +func_execute_cmds () +{ + $opt_debug + save_ifs=$IFS; IFS='~' + for cmd in $1; do + IFS=$save_ifs + eval cmd=\"$cmd\" + func_show_eval "$cmd" "${2-:}" + done + IFS=$save_ifs +} + + +# func_source file +# Source FILE, adding directory component if necessary. +# 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. +func_source () +{ + $opt_debug + case $1 in + */* | *\\*) . "$1" ;; + *) . "./$1" ;; + esac +} + + +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () +{ + $opt_debug + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + 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`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + func_append_quoted CC_quoted "$arg" + done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` + case "$@ " in + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # 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'" +# else +# func_verbose "using $tagname tagged configuration" + fi + ;; + esac + fi +} + + + +# func_write_libtool_object output_name pic_name nonpic_name +# Create a libtool object file (analogous to a ".la" file), +# 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}\' + else + write_lobj=none + fi + + if test "$build_old_libs" = yes; then + write_oldobj=\'${3}\' + else + write_oldobj=none + fi + + $opt_dry_run || { + cat >${write_libobj}T </dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + +# func_mode_compile arg... +func_mode_compile () +{ + $opt_debug + # Get the compilation command and the source file. + base_compile= + srcfile="$nonopt" # always keep a non-empty value in "srcfile" + suppress_opt=yes + suppress_output= + arg_mode=normal + libobj= + later= + pie_flag= + + for arg + do + case $arg_mode in + arg ) + # do not "continue". Instead, add this to base_compile + lastarg="$arg" + arg_mode=normal + ;; + + target ) + libobj="$arg" + arg_mode=normal + continue + ;; + + normal ) + # Accept any command-line options. + case $arg in + -o) + test -n "$libobj" && \ + func_fatal_error "you cannot specify \`-o' more than once" + arg_mode=target + continue + ;; + + -pie | -fpie | -fPIE) + func_append pie_flag " $arg" + continue + ;; + + -shared | -static | -prefer-pic | -prefer-non-pic) + func_append later " $arg" + continue + ;; + + -no-suppress) + suppress_opt=no + continue + ;; + + -Xcompiler) + arg_mode=arg # the next one goes into the "base_compile" arg list + continue # The current "srcfile" will either be retained or + ;; # replaced later. I would guess that would be a bug. + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + lastarg= + save_ifs="$IFS"; IFS=',' + for arg in $args; do + IFS="$save_ifs" + func_append_quoted lastarg "$arg" + done + IFS="$save_ifs" + func_stripname ' ' '' "$lastarg" + lastarg=$func_stripname_result + + # Add the arguments to base_compile. + func_append base_compile " $lastarg" + continue + ;; + + *) + # Accept the current argument as the source file. + # The previous "srcfile" becomes the current argument. + # + lastarg="$srcfile" + srcfile="$arg" + ;; + esac # case $arg + ;; + esac # case $arg_mode + + # Aesthetically quote the previous argument. + func_append_quoted base_compile "$lastarg" + done # for arg + + case $arg_mode in + arg) + func_fatal_error "you must specify an argument for -Xcompile" + ;; + target) + 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" + } + ;; + esac + + # Recognize several different file suffixes. + # If the user specifies -o file.o, it is replaced with file.lo + case $libobj in + *.[cCFSifmso] | \ + *.ada | *.adb | *.ads | *.asm | \ + *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) + func_xform "$libobj" + libobj=$func_xform_result + ;; + esac + + case $libobj in + *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; + *) + func_fatal_error "cannot determine name of library object from \`$libobj'" + ;; + esac + + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not build a shared library" + build_old_libs=no + continue + ;; + + -static) + build_libtool_libs=no + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue + ;; + esac + done + + 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_dirname_and_basename "$obj" "/" "" + 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 + removelist="$obj $lobj $libobj ${libobj}T" + else + removelist="$lobj $libobj ${libobj}T" + fi + + # On Cygwin there's no "real" PIC flag so we must build both object types + case $host_os in + cygwin* | mingw* | pw32* | os2* | cegcc*) + pic_mode=default + ;; + esac + if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; 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" + else + output_obj= + need_locks=no + lockfile= + fi + + # 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 + 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 + if test -f "$lockfile"; then + $ECHO "\ +*** ERROR, $lockfile exists and contains: +`cat $lockfile 2>/dev/null` + +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 +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." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + func_append removelist " $output_obj" + $ECHO "$srcfile" > "$lockfile" + fi + + $opt_dry_run || $RM $removelist + func_append removelist " $lockfile" + trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 + + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result + func_quote_for_eval "$srcfile" + qsrcfile=$func_quote_for_eval_result + + # Only build a PIC object if we are building libtool libraries. + if test "$build_libtool_libs" = yes; then + # Without this assignment, base_compile gets emptied. + fbsd_hideous_sh_bug=$base_compile + + if test "$pic_mode" != no; then + command="$base_compile $qsrcfile $pic_flag" + else + # Don't build PIC code + command="$base_compile $qsrcfile" + fi + + func_mkdir_p "$xdir$objdir" + + if test -z "$output_obj"; then + # Place PIC objects in $objdir + func_append command " -o $lobj" + fi + + func_show_eval_locale "$command" \ + 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +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 +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." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed, then go on to compile the next one + if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then + func_show_eval '$MV "$output_obj" "$lobj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + + # Allow error messages only from the first compilation. + if test "$suppress_opt" = yes; 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 + # 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 + func_append command " -o $obj" + fi + + # Suppress compiler output if we already did a PIC compilation. + func_append command "$suppress_output" + func_show_eval_locale "$command" \ + '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' + + if test "$need_locks" = warn && + test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then + $ECHO "\ +*** ERROR, $lockfile contains: +`cat $lockfile 2>/dev/null` + +but it should contain: +$srcfile + +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 +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." + + $opt_dry_run || $RM $removelist + exit $EXIT_FAILURE + fi + + # Just move the object if needed + if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then + func_show_eval '$MV "$output_obj" "$obj"' \ + 'error=$?; $opt_dry_run || $RM $removelist; exit $error' + fi + fi + + $opt_dry_run || { + func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" + + # Unlock the critical section if it was locked + if test "$need_locks" != no; then + removelist=$lockfile + $RM "$lockfile" + fi + } + + exit $EXIT_SUCCESS +} + +$opt_help || { + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} +} + +func_mode_help () +{ + # We need to display help for each of the modes. + case $opt_mode in + "") + # Generic help is extracted from the usage comments + # at the start of this file. + func_help + ;; + + clean) + $ECHO \ +"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... + +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 +to RM. + +If FILE is a libtool library, object or program, all the files associated +with it are deleted. Otherwise, only FILE itself is deleted using RM." + ;; + + compile) + $ECHO \ +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE + +Compile a source file into a libtool library object. + +This mode accepts the following additional options: + + -o OUTPUT-FILE set the output file name to OUTPUT-FILE + -no-suppress do not suppress compiler output for multiple passes + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only + -shared do not build a \`.o' file suitable for static linking + -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler + +COMPILE-COMMAND is a command to be used in creating a \`standard' object file +from the given SOURCEFILE. + +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'." + ;; + + execute) + $ECHO \ +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... + +Automatically set library path, then run a program. + +This mode accepts the following additional options: + + -dlopen FILE add the directory containing FILE to the library path + +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 +into their corresponding uninstalled binary, and any of their required library +directories are added to the library path. + +Then, COMMAND is executed, with ARGS as arguments." + ;; + + finish) + $ECHO \ +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... + +Complete the installation of libtool libraries. + +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." + ;; + + install) + $ECHO \ +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... + +Install executables or libraries. + +INSTALL-COMMAND is the installation command. The first component should be +either the \`install' or \`cp' program. + +The following components of INSTALL-COMMAND are treated specially: + + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation + +The rest of the components are interpreted as arguments to that command (only +BSD-compatible install options are recognized)." + ;; + + link) + $ECHO \ +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... + +Link object files or libraries together to form another library, or to +create an executable program. + +LINK-COMMAND is a command using the C compiler that you would use to create +a program from several object files. + +The following components of LINK-COMMAND are treated specially: + + -all-static do not do any dynamic linking at all + -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) + -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime + -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols + -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) + -export-symbols SYMFILE + try to export only the symbols listed in SYMFILE + -export-symbols-regex REGEX + try to export only the symbols matching REGEX + -LLIBDIR search LIBDIR for required installed libraries + -lNAME OUTPUT-FILE requires the installed library libNAME + -module build a library that can dlopened + -no-fast-install disable the fast-install mode + -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 + -precious-files-regex REGEX + don't remove output files matching REGEX + -release RELEASE specify package release information + -rpath LIBDIR the created library will eventually be installed in LIBDIR + -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries + -shared only do dynamic linking of libtool libraries + -shrext SUFFIX override the standard shared library file extension + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries + -version-info CURRENT[:REVISION[:AGE]] + specify library version info [each variable defaults to 0] + -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) + +All other options (arguments beginning with \`-') are ignored. + +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 +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 \`.lo' or \`.${objext}', then a reloadable object file +is created, otherwise an executable program is created." + ;; + + uninstall) + $ECHO \ +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... + +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 +to RM. + +If FILE is a libtool library, all the files associated with it are deleted. +Otherwise, only FILE itself is deleted using RM." + ;; + + *) + func_fatal_help "invalid operation mode \`$opt_mode'" + ;; + esac + + echo + $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 + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi + + +# func_mode_execute arg... +func_mode_execute () +{ + $opt_debug + # The first argument is the command name. + 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" + + dir= + case $file in + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$lib' is not a valid libtool archive" + + # Read the libtool library. + dlname= + library_names= + func_source "$file" + + # Skip this library if it cannot be dlopened. + 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'" + continue + fi + + func_dirname "$file" "" "." + 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'" + fi + fi + ;; + + *.lo) + # Just add the directory containing the .lo file. + func_dirname "$file" "" "." + dir="$func_dirname_result" + ;; + + *) + 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" + + # Now add the directory to shlibpath_var. + if eval "test -z \"\$$shlibpath_var\""; then + eval "$shlibpath_var=\"\$dir\"" + else + eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" + fi + done + + # This variable tells wrapper scripts just to set shlibpath_var + # rather than running their programs. + libtool_execute_magic="$magic" + + # Check if any of the arguments is a wrapper script. + args= + for file + do + case $file in + -* | *.la | *.lo ) ;; + *) + # Do a test to see if this is really a libtool program. + if func_ltwrapper_script_p "$file"; then + func_source "$file" + # Transform arg to wrapped name. + 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" + fi + ;; + esac + # Quote arguments (to preserve shell metacharacters). + func_append_quoted args "$file" + done + + if test "X$opt_dry_run" = Xfalse; then + if test -n "$shlibpath_var"; then + # Export the shlibpath_var. + eval "export $shlibpath_var" + fi + + # Restore saved environment variables + for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + else + $lt_unset $lt_var + fi" + 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 + fi +} + +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libs= + libdirs= + admincmds= + + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi + + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + for libdir in $libdirs; do + if test -n "$finish_cmds"; then + # Do each command in the finish commands. + func_execute_cmds "$finish_cmds" 'admincmds="$admincmds +'"$cmd"'"' + fi + if test -n "$finish_eval"; then + # Do the single finish_eval. + eval cmds=\"$finish_eval\" + $opt_dry_run || eval "$cmds" || func_append admincmds " + $cmds" + fi + done + fi + + # Exit here if they wanted silent mode. + $opt_silent && exit $EXIT_SUCCESS + + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" + + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo + + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi + exit $EXIT_SUCCESS +} + +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} + + +# func_mode_install arg... +func_mode_install () +{ + $opt_debug + # 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 || + # Allow the use of GNU shtool's install command. + case $nonopt in *shtool*) :;; *) false;; esac; then + # Aesthetically quote it. + func_quote_for_eval "$nonopt" + install_prog="$func_quote_for_eval_result " + arg=$1 + shift + else + install_prog= + arg=$nonopt + fi + + # The real first argument should be the name of the installation program. + # Aesthetically quote it. + func_quote_for_eval "$arg" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac + + # We need to accept at least all the BSD install flags. + dest= + files= + opts= + prev= + install_type= + isdir=no + stripme= + no_mode=: + for arg + do + arg2= + if test -n "$dest"; then + func_append files " $dest" + dest=$arg + continue + fi + + case $arg in + -d) isdir=yes ;; + -f) + if $install_cp; then :; else + prev=$arg + fi + ;; + -g | -m | -o) + prev=$arg + ;; + -s) + stripme=" -s" + continue + ;; + -*) + ;; + *) + # If the previous option needed an argument, then skip it. + if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi + prev= + else + dest=$arg + continue + fi + ;; + esac + + # Aesthetically quote the argument. + func_quote_for_eval "$arg" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" + done + + test -z "$install_prog" && \ + func_fatal_help "you must specify an install program" + + test -n "$prev" && \ + func_fatal_help "the \`$prev' option requires an argument" + + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + + if test -z "$files"; then + if test -z "$dest"; then + func_fatal_help "no file or destination specified" + else + func_fatal_help "you must specify a destination" + fi + fi + + # Strip any trailing slash from the destination. + func_stripname '' '/' "$dest" + 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" + destname= + else + func_dirname_and_basename "$dest" "" "." + 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" + fi + case $destdir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + for file in $files; do + case $file in + *.lo) ;; + *) + func_fatal_help "\`$destdir' must be an absolute directory name" + ;; + esac + done + ;; + esac + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + staticlibs= + future_libdirs= + current_libdirs= + for file in $files; do + + # Do each installation. + case $file in + *.$libext) + # Do the static libraries later. + func_append staticlibs " $file" + ;; + + *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + + # Check to see that this really is a libtool archive. + func_lalib_unsafe_p "$file" \ + || func_fatal_help "\`$file' is not a valid libtool archive" + + library_names= + old_library= + relink_command= + func_source "$file" + + # Add the libdir to current_libdirs if it is the destination. + if test "X$destdir" = "X$libdir"; then + case "$current_libdirs " in + *" $libdir "*) ;; + *) func_append current_libdirs " $libdir" ;; + esac + else + # Note the libdir as a future libdir. + case "$future_libdirs " in + *" $libdir "*) ;; + *) func_append future_libdirs " $libdir" ;; + esac + fi + + func_dirname "$file" "/" "" + dir="$func_dirname_result" + func_append dir "$objdir" + + if test -n "$relink_command"; then + # Determine the prefix the user has applied to our future dir. + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` + + # Don't allow the user to place us outside of our expected + # location b/c this prevents finding dependent libraries that + # are installed to the same prefix. + # At present, this check doesn't affect windows .dll's that + # 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" + + if test -n "$inst_prefix_dir"; then + # Stick the inst_prefix_dir data into the link command. + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + else + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + fi + + func_warning "relinking \`$file'" + func_show_eval "$relink_command" \ + '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" + shift + + 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" + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + case $realname in + *.dll.a) + tstripme="" + ;; + esac + ;; + esac + if test -n "$tstripme" && test -n "$striplib"; then + func_show_eval "$striplib $destdir/$realname" 'exit $?' + fi + + if test "$#" -gt 0; then + # Delete the old symlinks, and create new ones. + # 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 + do + test "$linkname" != "$realname" \ + && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" + done + fi + + # Do each command in the postinstall commands. + 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 + func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' + + # Maybe install the static library, too. + test -n "$old_library" && func_append staticlibs " $dir/$old_library" + ;; + + *.lo) + # Install (i.e. copy) a libtool object. + + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + destfile="$func_basename_result" + destfile="$destdir/$destfile" + fi + + # Deduce the name of the destination old-style object file. + case $destfile in + *.lo) + func_lo2o "$destfile" + staticdest=$func_lo2o_result + ;; + *.$objext) + staticdest="$destfile" + destfile= + ;; + *) + func_fatal_help "cannot copy a libtool object to \`$destfile'" + ;; + esac + + # Install the libtool object if requested. + test -n "$destfile" && \ + func_show_eval "$install_prog $file $destfile" 'exit $?' + + # Install the old object if enabled. + if test "$build_old_libs" = yes; then + # Deduce the name of the old-style object file. + func_lo2o "$file" + staticobj=$func_lo2o_result + func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' + fi + exit $EXIT_SUCCESS + ;; + + *) + # Figure out destination file name, if it wasn't already specified. + if test -n "$destname"; then + destfile="$destdir/$destname" + else + func_basename "$file" + 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="" + case $file in + *.exe) + if test ! -f "$file"; then + func_stripname '' '.exe' "$file" + file=$func_stripname_result + stripped_ext=".exe" + fi + ;; + esac + + # Do a test to see if this is really a libtool program. + case $host in + *cygwin* | *mingw*) + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + wrapper=$func_ltwrapper_scriptname_result + else + func_stripname '' '.exe' "$file" + wrapper=$func_stripname_result + fi + ;; + *) + wrapper=$file + ;; + esac + if func_ltwrapper_script_p "$wrapper"; then + notinst_deplibs= + relink_command= + + func_source "$wrapper" + + # Check the variables that should have been set. + test -z "$generated_by_libtool_version" && \ + func_fatal_error "invalid libtool wrapper script \`$wrapper'" + + finalize=yes + 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 + if test -n "$libdir" && test ! -f "$libfile"; then + func_warning "\`$lib' has not been installed in \`$libdir'" + finalize=no + fi + done + + relink_command= + func_source "$wrapper" + + outputname= + if test "$fast_install" = no && test -n "$relink_command"; then + $opt_dry_run || { + if test "$finalize" = yes; then + tmpdir=`func_mktempdir` + func_basename "$file$stripped_ext" + file="$func_basename_result" + outputname="$tmpdir/$file" + # Replace the output file specification. + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` + + $opt_silent || { + 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" + $opt_dry_run || ${RM}r "$tmpdir" + continue + fi + file="$outputname" + else + func_warning "cannot relink \`$file'" + fi + } + else + # Install the binary that we compiled earlier. + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` + fi + fi + + # remove .exe since cygwin /usr/bin/install will append another + # one anyway + case $install_prog,$host in + */usr/bin/install*,*cygwin*) + case $file:$destfile in + *.exe:*.exe) + # this is ok + ;; + *.exe:*) + destfile=$destfile.exe + ;; + *:*.exe) + func_stripname '' '.exe' "$destfile" + destfile=$func_stripname_result + ;; + esac + ;; + esac + func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' + $opt_dry_run || if test -n "$outputname"; then + ${RM}r "$tmpdir" + fi + ;; + esac + done + + for file in $staticlibs; do + func_basename "$file" + name="$func_basename_result" + + # Set up the ranlib parameters. + oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + + func_show_eval "$install_prog \$file \$oldlib" 'exit $?' + + if test -n "$stripme" && test -n "$old_striplib"; then + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' + fi + + # Do each command in the postinstall commands. + func_execute_cmds "$old_postinstall_cmds" 'exit $?' + done + + test -n "$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' + else + exit $EXIT_SUCCESS + fi +} + +test "$opt_mode" = install && func_mode_install ${1+"$@"} + + +# func_generate_dlsyms outputname originator pic_p +# Extract symbols from dlprefiles and create ${outputname}S.o with +# 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'` + my_dlsyms= + + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$NM" && test -n "$global_symbol_pipe"; then + my_dlsyms="${my_outputname}S.c" + else + func_error "not configured to extract global symbols from dlpreopened files" + fi + fi + + if test -n "$my_dlsyms"; then + case $my_dlsyms in + "") ;; + *.c) + # Discover the nlist of each of the dlfiles. + nlist="$output_objdir/${my_outputname}.nm" + + func_show_eval "$RM $nlist ${nlist}S ${nlist}T" + + # Parse the name list into a source file. + 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 */ + +#ifdef __cplusplus +extern \"C\" { +#endif + +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + +/* External symbol declarations for the compiler. */\ +" + + if test "$dlself" = yes; then + func_verbose "generating symbol list for \`$output'" + + $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" + + # Add our own program objects to the symbol list. + 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'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" + done + + if test -n "$exclude_expsyms"; then + $opt_dry_run || { + eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + if test -n "$export_symbols_regex"; then + $opt_dry_run || { + eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' + eval '$MV "$nlist"T "$nlist"' + } + fi + + # Prepare the list of exported symbols + if test -z "$export_symbols"; then + 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"' + case $host in + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' + ;; + esac + } + else + $opt_dry_run || { + 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 + *cygwin* | *mingw* | *cegcc* ) + eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' + eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' + ;; + esac + } + fi + fi + + for dlprefile in $dlprefiles; do + func_verbose "extracting global C symbols from \`$dlprefile'" + func_basename "$dlprefile" + 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="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac + done + + $opt_dry_run || { + # Make sure we have at least an empty file. + test -f "$nlist" || : > "$nlist" + + if test -n "$exclude_expsyms"; then + $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T + $MV "$nlist"T "$nlist" + fi + + # Try sorting and uniquifying the output. + if $GREP -v "^: " < "$nlist" | + if sort -k 3 /dev/null 2>&1; then + sort -k 3 + else + sort +2 + fi | + uniq > "$nlist"S; then + : + else + $GREP -v "^: " < "$nlist" > "$nlist"S + fi + + if test -f "$nlist"S; then + eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' + else + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" + fi + + echo >> "$output_objdir/$my_dlsyms" "\ + +/* The mapping between symbol names and symbols. */ +typedef struct { + const char *name; + void *address; +} lt_dlsymlist; +extern LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[]; +LT_DLSYM_CONST lt_dlsymlist +lt_${my_prefix}_LTX_preloaded_symbols[] = +{\ + { \"$my_originator\", (void *) 0 }," + + case $need_lib_prefix in + no) + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + *) + eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" + ;; + esac + echo >> "$output_objdir/$my_dlsyms" "\ + {0, (void *) 0} +}; + +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt_${my_prefix}_LTX_preloaded_symbols; +} +#endif + +#ifdef __cplusplus +} +#endif\ +" + } # !$opt_dry_run + + pic_flag_for_symtable= + case "$compile_command " in + *" -static "*) ;; + *) + case $host in + # compiling the symbol table file with pic_flag works around + # a FreeBSD bug that causes programs to crash when -lm is + # linked before any other PIC object. But we must not use + # pic_flag when linking with -static. The problem exists in + # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; + *-*-hpux*) + pic_flag_for_symtable=" $pic_flag" ;; + *) + if test "X$my_pic_p" != Xno; then + pic_flag_for_symtable=" $pic_flag" + fi + ;; + esac + ;; + esac + symtab_cflags= + for arg in $LTCFLAGS; do + case $arg in + -pie | -fpie | -fPIE) ;; + *) func_append symtab_cflags " $arg" ;; + esac + done + + # Now compile the dynamic symbol file. + 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"' + + # Transform the symbol file into the correct name. + symfileobj="$output_objdir/${my_outputname}S.$objext" + case $host in + *cygwin* | *mingw* | *cegcc* ) + if test -f "$output_objdir/$my_outputname.def"; then + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + else + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + fi + ;; + *) + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` + ;; + esac + ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; + esac + else + # We keep going just in case the user didn't refer to + # lt_preloaded_symbols. The linker will fail if global_symbol_pipe + # really was required. + + # Nullify the symbol file. + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` + fi +} + +# func_win32_libid arg +# return the library type of file 'arg' +# +# Need a lot of goo to handle *both* DLLs and import libs +# Has to be a shell function in order to 'eat' the argument +# that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. +func_win32_libid () +{ + $opt_debug + win32_libid_type="unknown" + win32_fileres=`file -L $1 2>/dev/null` + case $win32_fileres in + *ar\ archive\ import\ library*) # definitely import + win32_libid_type="x86 archive import" + ;; + *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. + if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' + 1,100{ + / I /{ + s,.*,import, + p + q + } + }'` + case $win32_nmres in + import*) win32_libid_type="x86 archive import";; + *) win32_libid_type="x86 archive static";; + esac + fi + ;; + *DLL*) + win32_libid_type="x86 DLL" + ;; + *executable*) # but shell scripts are "executable" too... + case $win32_fileres in + *MS\ Windows\ PE\ Intel*) + win32_libid_type="x86 DLL" + ;; + esac + ;; + esac + $ECHO "$win32_libid_type" +} + +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} + + +# func_extract_an_archive dir oldlib +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 + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" + fi +} + + +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + $opt_debug + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + 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" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + func_basename "$my_xlib" + my_xlib="$func_basename_result" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + func_arith $extracted_serial + 1 + extracted_serial=$func_arith_result + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" + + func_mkdir_p "$my_xdir" + + case $host in + *-darwin*) + func_verbose "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + $opt_dry_run || { + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`basename "$darwin_archive"` + 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}" + cd "$darwin_curdir" + $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_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` + $LIPO -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + $RM -rf unfat-$$ + cd "$darwin_orig_dir" + else + cd $darwin_orig_dir + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + } # !$opt_dry_run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` + done + + func_extract_archives_result="$my_oldobjs" +} + + +# func_emit_wrapper [arg=no] +# +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} + + $ECHO "\ +#! $SHELL + +# $output - temporary wrapper script for $objdir/$outputname +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# The $output program cannot be directly executed until all the libtool +# libraries that it depends on are installed. +# +# This wrapper script should never be moved out of the build directory. +# If it is, it will not operate correctly. + +# Sed substitution that helps us do robust quoting. It backslashifies +# metacharacters that are still active within double-quoted strings. +sed_quote_subst='$sed_quote_subst' + +# Be Bourne compatible +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 + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + +# The HP-UX ksh and POSIX shell print the target directory to stdout +# if CDPATH is set. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +relink_command=\"$relink_command\" + +# This environment variable determines our operation mode. +if test \"\$libtool_install_magic\" = \"$magic\"; then + # install mode needs the following variables: + generated_by_libtool_version='$macro_version' + notinst_deplibs='$notinst_deplibs' +else + # When we are sourced in execute mode, \$file and \$ECHO are already set. + if test \"\$libtool_execute_magic\" != \"$magic\"; then + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ +" + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} + + # Find the directory that this script lives in. + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` + test \"x\$thisdir\" = \"x\$file\" && thisdir=. + + # Follow symbolic links until we get to the real thisdir. + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` + while test -n \"\$file\"; do + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` + + # If there was a directory component, then change thisdir. + if test \"x\$destdir\" != \"x\$file\"; then + case \"\$destdir\" in + [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; + *) thisdir=\"\$thisdir/\$destdir\" ;; + esac + fi + + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` + done + + # Usually 'no', except on cygwin/mingw when embedded into + # the cwrapper. + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 + if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then + # special case for '.' + if test \"\$thisdir\" = \".\"; then + thisdir=\`pwd\` + fi + # remove .libs from thisdir + case \"\$thisdir\" in + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; + $objdir ) thisdir=. ;; + esac + fi + + # Try to get the absolute directory name. + absdir=\`cd \"\$thisdir\" && pwd\` + test -n \"\$absdir\" && thisdir=\"\$absdir\" +" + + if test "$fast_install" = yes; 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\`; \\ + test \"X\$file\" != \"X\$progdir/\$program\"; }; then + + file=\"\$\$-\$program\" + + if test ! -d \"\$progdir\"; then + $MKDIR \"\$progdir\" + else + $RM \"\$progdir/\$file\" + fi" + + $ECHO "\ + + # relink executable if necessary + if test -n \"\$relink_command\"; then + if relink_command_output=\`eval \$relink_command 2>&1\`; then : + else + $ECHO \"\$relink_command_output\" >&2 + $RM \"\$progdir/\$file\" + exit 1 + fi + fi + + $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || + { $RM \"\$progdir/\$program\"; + $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } + $RM \"\$progdir/\$file\" + fi" + else + $ECHO "\ + program='$outputname' + progdir=\"\$thisdir/$objdir\" +" + fi + + $ECHO "\ + + if test -f \"\$progdir/\$program\"; then" + + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + + # Export our shlibpath_var if we have one. + if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + $ECHO "\ + # Add our own library path to $shlibpath_var + $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" + + # Some systems cannot cope with colon-terminated $shlibpath_var + # The second colon is a workaround for a bug in BeOS R4 sed + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` + + export $shlibpath_var +" + fi + + $ECHO "\ + if test \"\$libtool_execute_magic\" != \"$magic\"; then + # Run the actual program with our arguments. + func_exec_program \${1+\"\$@\"} + fi + else + # The program doesn't exist. + \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 + fi +fi\ +" +} + + +# func_emit_cwrapperexe_src +# emit the source code for a wrapper executable on stdout +# Must ONLY be called from within func_mode_link because +# it depends on a number of variable set therein. +func_emit_cwrapperexe_src () +{ + cat < +#include +#ifdef _MSC_VER +# include +# include +# include +#else +# include +# include +# ifdef __CYGWIN__ +# include +# endif +#endif +#include +#include +#include +#include +#include +#include +#include +#include + +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + +#if defined(PATH_MAX) +# define LT_PATHMAX PATH_MAX +#elif defined(MAXPATHLEN) +# define LT_PATHMAX MAXPATHLEN +#else +# define LT_PATHMAX 1024 +#endif + +#ifndef S_IXOTH +# define S_IXOTH 0 +#endif +#ifndef S_IXGRP +# define S_IXGRP 0 +#endif + +/* path handling portability macros */ +#ifndef DIR_SEPARATOR +# define DIR_SEPARATOR '/' +# define PATH_SEPARATOR ':' +#endif + +#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ + defined (__OS2__) +# define HAVE_DOS_BASED_FILE_SYSTEM +# define FOPEN_WB "wb" +# ifndef DIR_SEPARATOR_2 +# define DIR_SEPARATOR_2 '\\' +# endif +# ifndef PATH_SEPARATOR_2 +# define PATH_SEPARATOR_2 ';' +# endif +#endif + +#ifndef DIR_SEPARATOR_2 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) +#else /* DIR_SEPARATOR_2 */ +# define IS_DIR_SEPARATOR(ch) \ + (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) +#endif /* DIR_SEPARATOR_2 */ + +#ifndef PATH_SEPARATOR_2 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) +#else /* PATH_SEPARATOR_2 */ +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) +#endif /* PATH_SEPARATOR_2 */ + +#ifndef FOPEN_WB +# define FOPEN_WB "w" +#endif +#ifndef _O_BINARY +# define _O_BINARY 0 +#endif + +#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) +#define XFREE(stale) do { \ + if (stale) { free ((void *) stale); stale = 0; } \ +} while (0) + +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; +#else +static int lt_debug = 0; +#endif + +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ + +void *xmalloc (size_t num); +char *xstrdup (const char *string); +const char *base_name (const char *name); +char *find_executable (const char *wrapper); +char *chase_symlinks (const char *pathspec); +int make_executable (const char *path); +int check_executable (const char *path); +char *strendzap (char *str, const char *pat); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); +void lt_setenv (const char *name, const char *value); +char *lt_extend_str (const char *orig_value, const char *add, int to_end); +void lt_update_exe_path (const char *name, const char *value); +void lt_update_lib_path (const char *name, const char *value); +char **prepare_spawn (char **argv); +void lt_dump_script (FILE *f); +EOF + + cat <= 0) + && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) + return 1; + else + return 0; +} + +int +make_executable (const char *path) +{ + int rval = 0; + struct stat st; + + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); + if ((!path) || (!*path)) + return 0; + + if (stat (path, &st) >= 0) + { + rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); + } + return rval; +} + +/* Searches for the full path of the wrapper. Returns + newly allocated full path name if found, NULL otherwise + Does not chase symlinks, even on platforms that support them. +*/ +char * +find_executable (const char *wrapper) +{ + int has_slash = 0; + const char *p; + const char *p_next; + /* static buffer for getcwd */ + char tmp[LT_PATHMAX + 1]; + int tmp_len; + char *concat_name; + + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); + + if ((wrapper == NULL) || (*wrapper == '\0')) + return NULL; + + /* Absolute path? */ +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + else + { +#endif + if (IS_DIR_SEPARATOR (wrapper[0])) + { + concat_name = xstrdup (wrapper); + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } +#if defined (HAVE_DOS_BASED_FILE_SYSTEM) + } +#endif + + for (p = wrapper; *p; p++) + if (*p == '/') + { + has_slash = 1; + break; + } + if (!has_slash) + { + /* no slashes; search PATH */ + const char *path = getenv ("PATH"); + if (path != NULL) + { + for (p = path; *p; p = p_next) + { + const char *q; + size_t p_len; + for (q = p; *q; q++) + if (IS_PATH_SEPARATOR (*q)) + break; + p_len = q - p; + p_next = (*q == '\0' ? q : q + 1); + if (p_len == 0) + { + /* empty path: current directory */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = + XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + } + else + { + concat_name = + XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, p, p_len); + concat_name[p_len] = '/'; + strcpy (concat_name + p_len + 1, wrapper); + } + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + } + } + /* not found in PATH; assume curdir */ + } + /* Relative path | not found in path: prepend cwd */ + if (getcwd (tmp, LT_PATHMAX) == NULL) + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); + tmp_len = strlen (tmp); + concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); + memcpy (concat_name, tmp, tmp_len); + concat_name[tmp_len] = '/'; + strcpy (concat_name + tmp_len + 1, wrapper); + + if (check_executable (concat_name)) + return concat_name; + XFREE (concat_name); + return NULL; +} + +char * +chase_symlinks (const char *pathspec) +{ +#ifndef S_ISLNK + return xstrdup (pathspec); +#else + char buf[LT_PATHMAX]; + struct stat s; + char *tmp_pathspec = xstrdup (pathspec); + char *p; + int has_symlinks = 0; + while (strlen (tmp_pathspec) && !has_symlinks) + { + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); + if (lstat (tmp_pathspec, &s) == 0) + { + if (S_ISLNK (s.st_mode) != 0) + { + has_symlinks = 1; + break; + } + + /* search backwards for last DIR_SEPARATOR */ + p = tmp_pathspec + strlen (tmp_pathspec) - 1; + while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + p--; + if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) + { + /* no more DIR_SEPARATORS left */ + break; + } + *p = '\0'; + } + else + { + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); + } + } + XFREE (tmp_pathspec); + + if (!has_symlinks) + { + return xstrdup (pathspec); + } + + tmp_pathspec = realpath (pathspec, buf); + if (tmp_pathspec == 0) + { + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); + } + return xstrdup (tmp_pathspec); +#endif +} + +char * +strendzap (char *str, const char *pat) +{ + size_t len, patlen; + + assert (str != NULL); + assert (pat != NULL); + + len = strlen (str); + patlen = strlen (pat); + + if (patlen <= len) + { + str += len - patlen; + if (strcmp (str, pat) == 0) + *str = '\0'; + } + return str; +} + +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + +static void +lt_error_core (int exit_status, const char *file, + int line, const char *mode, + const char *message, va_list ap) +{ + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); + vfprintf (stderr, message, ap); + fprintf (stderr, ".\n"); + + if (exit_status >= 0) + exit (exit_status); +} + +void +lt_fatal (const char *file, int line, const char *message, ...) +{ + va_list ap; + va_start (ap, message); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); + va_end (ap); +} + +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + +void +lt_setenv (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); + { +#ifdef HAVE_SETENV + /* always make a copy, for consistency with !HAVE_SETENV */ + char *str = xstrdup (value); + setenv (name, str, 1); +#else + int len = strlen (name) + 1 + strlen (value) + 1; + char *str = XMALLOC (char, len); + sprintf (str, "%s=%s", name, value); + if (putenv (str) != EXIT_SUCCESS) + { + XFREE (str); + } +#endif + } +} + +char * +lt_extend_str (const char *orig_value, const char *add, int to_end) +{ + char *new_value; + if (orig_value && *orig_value) + { + int orig_value_len = strlen (orig_value); + int add_len = strlen (add); + new_value = XMALLOC (char, add_len + orig_value_len + 1); + if (to_end) + { + strcpy (new_value, orig_value); + strcpy (new_value + orig_value_len, add); + } + else + { + strcpy (new_value, add); + strcpy (new_value + add_len, orig_value); + } + } + else + { + new_value = xstrdup (add); + } + return new_value; +} + +void +lt_update_exe_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + /* some systems can't cope with a ':'-terminated path #' */ + int len = strlen (new_value); + while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) + { + new_value[len-1] = '\0'; + } + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +void +lt_update_lib_path (const char *name, const char *value) +{ + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); + + if (name && *name && value && *value) + { + char *new_value = lt_extend_str (getenv (name), value, 0); + lt_setenv (name, new_value); + XFREE (new_value); + } +} + +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' + cat <<"EOF" +} +EOF +} +# end: func_emit_cwrapperexe_src + +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + +# func_mode_link arg... +func_mode_link () +{ + $opt_debug + 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 + # 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 + # 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. + allow_undefined=yes + ;; + *) + allow_undefined=yes + ;; + esac + libtool_args=$nonopt + base_compile="$nonopt $@" + compile_command=$nonopt + finalize_command=$nonopt + + compile_rpath= + finalize_rpath= + compile_shlibpath= + finalize_shlibpath= + convenience= + old_convenience= + deplibs= + old_deplibs= + compiler_flags= + linker_flags= + dllsearchpath= + lib_search_path=`pwd` + inst_prefix_dir= + new_inherited_linker_flags= + + avoid_version=no + bindir= + dlfiles= + dlprefiles= + dlself=no + export_dynamic=no + export_symbols= + export_symbols_regex= + generated= + libobjs= + ltlibs= + module=no + no_install=no + objs= + non_pic_objects= + precious_files_regex= + prefer_static_libs=no + preload=no + prev= + prevarg= + release= + rpath= + xrpath= + perm_rpath= + temp_rpath= + thread_safe=no + vinfo= + vinfo_number=no + weak_libs= + single_module="${wl}-single_module" + func_infer_tag $base_compile + + # We need to know -static, to get the right output filenames. + for arg + do + case $arg in + -shared) + test "$build_libtool_libs" != yes && \ + func_fatal_configuration "can not 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 + func_warning "complete static linking is impossible in this configuration" + fi + if test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + -static) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=built + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac + build_libtool_libs=no + build_old_libs=yes + break + ;; + esac + done + + # See if our shared archives depend on static archives. + test -n "$old_archive_from_new_cmds" && build_old_libs=yes + + # Go through the arguments, transforming them on the way. + while test "$#" -gt 0; do + arg="$1" + shift + func_quote_for_eval "$arg" + qarg=$func_quote_for_eval_unquoted_result + func_append libtool_args " $func_quote_for_eval_result" + + # If the previous option needs an argument, assign it. + if test -n "$prev"; then + case $prev in + output) + func_append compile_command " @OUTPUT@" + func_append finalize_command " @OUTPUT@" + ;; + esac + + case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; + dlfiles|dlprefiles) + if test "$preload" = no; then + # Add the symbol object into the linking commands. + func_append compile_command " @SYMFILE@" + func_append finalize_command " @SYMFILE@" + preload=yes + fi + case $arg in + *.la | *.lo) ;; # We handle these cases below. + force) + if test "$dlself" = no; then + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + self) + if test "$prev" = dlprefiles; then + dlself=yes + elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + dlself=yes + else + dlself=needless + export_dynamic=yes + fi + prev= + continue + ;; + *) + if test "$prev" = dlfiles; then + func_append dlfiles " $arg" + else + func_append dlprefiles " $arg" + fi + prev= + continue + ;; + esac + ;; + expsyms) + export_symbols="$arg" + test -f "$arg" \ + || func_fatal_error "symbol file \`$arg' does not exist" + prev= + continue + ;; + expsyms_regex) + export_symbols_regex="$arg" + prev= + continue + ;; + framework) + case $host in + *-*-darwin*) + case "$deplibs " in + *" $qarg.ltframework "*) ;; + *) func_append deplibs " $qarg.ltframework" # this is fixed later + ;; + esac + ;; + esac + prev= + continue + ;; + inst_prefix) + inst_prefix_dir="$arg" + prev= + continue + ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg + moreargs= + for fil in `cat "$save_arg"` + do +# func_append moreargs " $fil" + arg=$fil + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + 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'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + 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" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + done + else + func_fatal_error "link input file \`$arg' does not exist" + fi + arg=$save_arg + prev= + continue + ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; + release) + release="-$arg" + prev= + continue + ;; + rpath | xrpath) + # We need an absolute path. + case $arg in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + if test "$prev" = rpath; then + case "$rpath " in + *" $arg "*) ;; + *) func_append rpath " $arg" ;; + esac + else + case "$xrpath " in + *" $arg "*) ;; + *) func_append xrpath " $arg" ;; + esac + fi + prev= + continue + ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; + weak) + func_append weak_libs " $arg" + prev= + continue + ;; + xcclinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xcompiler) + func_append compiler_flags " $qarg" + prev= + func_append compile_command " $qarg" + func_append finalize_command " $qarg" + continue + ;; + xlinker) + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" + prev= + func_append compile_command " $wl$qarg" + func_append finalize_command " $wl$qarg" + continue + ;; + *) + eval "$prev=\"\$arg\"" + prev= + continue + ;; + esac + fi # test -n "$prev" + + prevarg="$arg" + + case $arg in + -all-static) + if test -n "$link_static_flag"; then + # See comment for -static flag below, for more details. + func_append compile_command " $link_static_flag" + func_append finalize_command " $link_static_flag" + fi + continue + ;; + + -allow-undefined) + # FIXME: remove this flag sometime in the future. + func_fatal_error "\`-allow-undefined' must not be used because it is the default" + ;; + + -avoid-version) + avoid_version=yes + continue + ;; + + -bindir) + prev=bindir + continue + ;; + + -dlopen) + prev=dlfiles + continue + ;; + + -dlpreopen) + prev=dlprefiles + continue + ;; + + -export-dynamic) + export_dynamic=yes + continue + ;; + + -export-symbols | -export-symbols-regex) + 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 + prev=expsyms + else + prev=expsyms_regex + fi + continue + ;; + + -framework) + prev=framework + continue + ;; + + -inst-prefix-dir) + prev=inst_prefix + continue + ;; + + # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* + # so, if we see these flags be careful not to treat them like -L + -L[A-Z][A-Z]*:*) + case $with_gcc/$host in + no/*-*-irix* | /*-*-irix*) + func_append compile_command " $arg" + func_append finalize_command " $arg" + ;; + esac + continue + ;; + + -L*) + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then + if test "$#" -gt 0; then + func_fatal_error "require no space between \`-L' and \`$1'" + else + func_fatal_error "need path for \`-L' option" + fi + fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + *) + absdir=`cd "$dir" && pwd` + test -z "$absdir" && \ + func_fatal_error "cannot determine absolute directory name of \`$dir'" + dir="$absdir" + ;; + esac + case "$deplibs " in + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; + *) + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" + ;; + esac + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$dir:"*) ;; + ::) dllsearchpath=$dir;; + *) func_append dllsearchpath ":$dir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + continue + ;; + + -l*) + if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) + # These systems don't actually have a C or math library (as such) + continue + ;; + *-*-os2*) + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C and math libraries are in the System framework + func_append deplibs " System.ltframework" + continue + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + test "X$arg" = "X-lc" && continue + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; + esac + fi + func_append deplibs " $arg" + continue + ;; + + -module) + module=yes + continue + ;; + + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + # Darwin uses the -arch flag to determine output architecture. + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + prev=xcompiler + continue + ;; + + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) + func_append compiler_flags " $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + continue + ;; + + -multi_module) + single_module="${wl}-multi_module" + continue + ;; + + -no-fast-install) + fast_install=no + continue + ;; + + -no-install) + case $host in + *-*-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" + fast_install=no + ;; + *) no_install=yes ;; + esac + continue + ;; + + -no-undefined) + allow_undefined=no + continue + ;; + + -objectlist) + prev=objectlist + continue + ;; + + -o) prev=output ;; + + -precious-files-regex) + prev=precious_regex + continue + ;; + + -release) + prev=release + continue + ;; + + -rpath) + prev=rpath + continue + ;; + + -R) + prev=xrpath + continue + ;; + + -R*) + func_stripname '-R' '' "$arg" + dir=$func_stripname_result + # We need an absolute path. + case $dir in + [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; + *) + func_fatal_error "only absolute run-paths are allowed" + ;; + esac + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + continue + ;; + + -shared) + # The effects of -shared are defined in a previous loop. + continue + ;; + + -shrext) + prev=shrext + continue + ;; + + -static | -static-libtool-libs) + # The effects of -static are defined in a previous loop. + # We used to do the same as -all-static on platforms that + # didn't have a PIC flag, but the assumption that the effects + # would be equivalent was wrong. It would break on at least + # Digital Unix and AIX. + continue + ;; + + -thread-safe) + thread_safe=yes + continue + ;; + + -version-info) + prev=vinfo + continue + ;; + + -version-number) + prev=vinfo + vinfo_number=yes + continue + ;; + + -weak) + prev=weak + continue + ;; + + -Wc,*) + func_stripname '-Wc,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + 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" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result + arg= + save_ifs="$IFS"; IFS=',' + for flag in $args; do + 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" + func_stripname ' ' '' "$arg" + arg=$func_stripname_result + ;; + + -Xcompiler) + prev=xcompiler + continue + ;; + + -Xlinker) + prev=xlinker + continue + ;; + + -XCClinker) + prev=xcclinker + continue + ;; + + # -msg_* for osf cc + -msg_*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" + func_append finalize_command " $arg" + func_append compiler_flags " $arg" + continue + ;; + + # Some other compiler flag. + -* | +*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + ;; + + *.$objext) + # A standard object. + func_append objs " $arg" + ;; + + *.lo) + # A libtool-controlled object. + + # Check to see that this really is a libtool object. + if func_lalib_unsafe_p "$arg"; then + pic_object= + non_pic_object= + + # Read the .lo file + func_source "$arg" + + 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'" + fi + + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + if test "$pic_object" != none; then + # Prepend the subdirectory the object is found in. + pic_object="$xdir$pic_object" + + if test "$prev" = dlfiles; then + if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + func_append dlfiles " $pic_object" + prev= + continue + else + # If libtool objects are unsupported, then we need to preload. + prev=dlprefiles + fi + fi + + # CHECK ME: I think I busted this. -Ossama + if test "$prev" = dlprefiles; then + # Preload the old-style object. + func_append dlprefiles " $pic_object" + prev= + fi + + # A PIC object. + func_append libobjs " $pic_object" + arg="$pic_object" + fi + + # Non-PIC object. + if test "$non_pic_object" != none; then + # Prepend the subdirectory the object is found in. + 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" + fi + else + # If the PIC object exists, use it instead. + # $xdir was prepended to $pic_object above. + non_pic_object="$pic_object" + func_append non_pic_objects " $non_pic_object" + fi + else + # Only an error if not doing a dry-run. + if $opt_dry_run; then + # Extract subdirectory from the argument. + func_dirname "$arg" "/" "" + xdir="$func_dirname_result" + + func_lo2o "$arg" + pic_object=$xdir$objdir/$func_lo2o_result + non_pic_object=$xdir$func_lo2o_result + func_append libobjs " $pic_object" + func_append non_pic_objects " $non_pic_object" + else + func_fatal_error "\`$arg' is not a valid libtool object" + fi + fi + ;; + + *.$libext) + # An archive. + func_append deplibs " $arg" + func_append old_deplibs " $arg" + continue + ;; + + *.la) + # A libtool-controlled library. + + func_resolve_sysroot "$arg" + if test "$prev" = dlfiles; then + # This library was specified with -dlopen. + func_append dlfiles " $func_resolve_sysroot_result" + prev= + elif test "$prev" = dlprefiles; then + # The library was specified with -dlpreopen. + func_append dlprefiles " $func_resolve_sysroot_result" + prev= + else + func_append deplibs " $func_resolve_sysroot_result" + fi + continue + ;; + + # Some other compiler argument. + *) + # 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" + ;; + esac # arg + + # Now actually substitute the argument into the commands. + if test -n "$arg"; then + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + done # argument parsing loop + + test -n "$prev" && \ + func_fatal_help "the \`$prevarg' option requires an argument" + + if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + eval arg=\"$export_dynamic_flag_spec\" + func_append compile_command " $arg" + func_append finalize_command " $arg" + fi + + oldlibs= + # calculate the name of the file, without its directory + func_basename "$output" + 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\'\` + 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\" + + func_dirname "$output" "/" "" + output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result + # Create the object directory. + func_mkdir_p "$output_objdir" + + # Determine the type of output + case $output in + "") + func_fatal_help "you must specify an output file" + ;; + *.$libext) linkmode=oldlib ;; + *.lo | *.$objext) linkmode=obj ;; + *.la) linkmode=lib ;; + *) linkmode=prog ;; # Anything else should be a program. + esac + + specialdeplibs= + + libs= + # 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 + case "$libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append libs " $deplib" + done + + if test "$linkmode" = lib; then + libs="$predeps $libs $compiler_lib_search_path $postdeps" + + # Compute libraries that are listed more than once in $predeps + # $postdeps and mark them as special (i.e., whose duplicates are + # not to be eliminated). + pre_post_deps= + if $opt_duplicate_compiler_generated_deps; then + for pre_post_dep in $predeps $postdeps; do + case "$pre_post_deps " in + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; + esac + func_append pre_post_deps " $pre_post_dep" + done + fi + pre_post_deps= + fi + + deplibs= + newdependency_libs= + newlib_search_path= + need_relink=no # whether we're linking any uninstalled libtool libraries + notinst_deplibs= # not-installed libtool libraries + notinst_path= # paths that contain not-installed libtool libraries + + case $linkmode in + lib) + passes="conv dlpreopen link" + for file in $dlfiles $dlprefiles; do + case $file in + *.la) ;; + *) + func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + ;; + esac + done + ;; + prog) + compile_deplibs= + finalize_deplibs= + alldeplibs=no + newdlfiles= + newdlprefiles= + passes="conv scan dlopen dlpreopen link" + ;; + *) passes="conv" + ;; + esac + + 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 + ## 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" + fi + + if test "$linkmode,$pass" = "lib,link" || + test "$linkmode,$pass" = "prog,scan"; then + libs="$deplibs" + deplibs= + fi + if test "$linkmode" = prog; then + case $pass in + dlopen) libs="$dlfiles" ;; + dlpreopen) libs="$dlprefiles" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; + esac + fi + if test "$linkmode,$pass" = "lib,dlpreopen"; then + # Collect and forward deplibs of preopened libtool libs + for lib in $dlprefiles; do + # Ignore non-libtool-libs + dependency_libs= + func_resolve_sysroot "$lib" + case $lib in + *.la) func_source "$func_resolve_sysroot_result" ;; + esac + + # Collect preopened libtool deplibs, except any this library + # has declared as weak libs + for deplib in $dependency_libs; do + func_basename "$deplib" + deplib_base=$func_basename_result + case " $weak_libs " in + *" $deplib_base "*) ;; + *) func_append deplibs " $deplib" ;; + esac + done + done + libs="$dlprefiles" + fi + if test "$pass" = dlopen; then + # Collect dlpreopened libraries + save_deplibs="$deplibs" + deplibs= + fi + + for deplib in $libs; do + lib= + found=no + 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 + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append compiler_flags " $deplib" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -l*) + if test "$linkmode" != lib && test "$linkmode" != prog; then + func_warning "\`-l' is ignored for archives/objects" + continue + fi + func_stripname '-l' '' "$deplib" + name=$func_stripname_result + if test "$linkmode" = lib; 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" + fi + 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}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + 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 $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 + case " $predeps $postdeps " in + *" $deplib "*) + if func_lalib_p "$lib"; then + library_names= + old_library= + func_source "$lib" + for l in $old_library $library_names; do + ll="$l" + done + if test "X$ll" = "X$old_library" ; then # only static version available + found=no + func_dirname "$lib" "" "." + ladir="$func_dirname_result" + lib=$ladir/$old_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 + fi + fi + ;; + *) ;; + esac + fi + fi + ;; # -l + *.ltframework) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + if test "$linkmode" = lib ; then + case "$new_inherited_linker_flags " in + *" $deplib "*) ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; + esac + fi + fi + continue + ;; + -L*) + case $linkmode in + lib) + deplibs="$deplib $deplibs" + test "$pass" = conv && 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 + deplibs="$deplib $deplibs" + continue + fi + if test "$pass" = scan; then + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + *) + func_warning "\`-L' is ignored for archives/objects" + ;; + esac # linkmode + continue + ;; # -L + -R*) + if test "$pass" = link; then + func_stripname '-R' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result + # Make sure the xrpath contains only unique directories. + case "$xrpath " in + *" $dir "*) ;; + *) func_append xrpath " $dir" ;; + esac + fi + deplibs="$deplib $deplibs" + continue + ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; + *.$libext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + continue + fi + case $linkmode in + lib) + # Linking convenience modules into shared libraries is allowed, + # but linking other static libraries is non-portable. + case " $dlpreconveniencelibs " in + *" $deplib "*) ;; + *) + valid_a_lib=no + 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 + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then + echo + $ECHO "*** Warning: Trying to link with static lib archive $deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." + 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 + deplibs="$deplib $deplibs" + else + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + fi + continue + ;; + esac # linkmode + ;; # *.$libext + *.lo | *.$objext) + if test "$pass" = conv; then + deplibs="$deplib $deplibs" + elif test "$linkmode" = prog; then + if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + # If there is no dlopen support or we're linking statically, + # we need to preload. + func_append newdlprefiles " $deplib" + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + func_append newdlfiles " $deplib" + fi + fi + continue + ;; + %DEPLIBS%) + alldeplibs=yes + 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 + + # 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_dirname "$lib" "" "." + ladir="$func_dirname_result" + + dlname= + dlopen= + dlpreopen= + libdir= + library_names= + old_library= + inherited_linker_flags= + # If the library was installed with an old release of libtool, + # it will not redefine variables installed, or shouldnotlink + installed=yes + shouldnotlink=no + avoidtemprpath= + + + # Read the .la file + func_source "$lib" + + # Convert "-framework foo" to "foo.ltframework" + if test -n "$inherited_linker_flags"; then + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` + for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do + case " $new_inherited_linker_flags " in + *" $tmp_inherited_linker_flag "*) ;; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; + esac + 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 + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" + fi + + if test "$pass" = conv; 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'" + 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" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done + elif test "$linkmode" != prog && test "$linkmode" != lib; then + func_fatal_error "\`$lib' is not a convenience library" + fi + continue + fi # $pass = conv + + + # 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 + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi + if test -z "$linklib"; then + func_fatal_error "cannot find name of link library for \`$lib'" + fi + + # 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 -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; 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 + # bomb out in the load deplibs phase. + func_append dlprefiles " $lib $dependency_libs" + else + func_append newdlfiles " $lib" + fi + continue + fi # $pass = dlopen + + # We need an absolute path. + case $ladir in + [\\/]* | [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 "passing it literally to the linker, although it might fail" + abs_ladir="$ladir" + fi + ;; + esac + func_basename "$lib" + laname="$func_basename_result" + + # Find the relevant object directory and library name. + if test "X$installed" = Xyes; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + func_warning "library \`$lib' was moved." + dir="$ladir" + absdir="$abs_ladir" + libdir="$abs_ladir" + else + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" + fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + else + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + func_append notinst_path " $abs_ladir" + fi + fi # $installed = yes + func_stripname 'lib' '.la' "$laname" + 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'" + fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac + fi # $pass = dlpreopen + + if test -z "$libdir"; then + # Link the convenience library + if test "$linkmode" = lib; then + deplibs="$dir/$old_library $deplibs" + elif test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$dir/$old_library $compile_deplibs" + finalize_deplibs="$dir/$old_library $finalize_deplibs" + else + deplibs="$lib $deplibs" # used for prog,scan pass + fi + continue + fi + + + if test "$linkmode" = prog && test "$pass" != link; 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 + fi + + tmp_libs= + for deplib in $dependency_libs; do + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" + ;; + esac + # Need to link against all dependency_libs? + if test "$linkalldeplibs" = yes; 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 + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done # for deplib + continue + fi # $linkmode = prog... + + if test "$linkmode,$pass" = "prog,link"; then + if test -n "$library_names" && + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then + # We need to hardcode the library path + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + # Make sure the rpath contains only unique directories. + case "$temp_rpath:" in + *"$absdir:"*) ;; + *) func_append temp_rpath "$absdir:" ;; + esac + fi + + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && + { test "$deplibs_check_method" = pass_all || + { test "$build_libtool_libs" = yes && + test -n "$library_names"; }; }; then + # We only need to search for static libraries + continue + fi + fi + + 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 + use_static_libs=no + fi + if test -n "$library_names" && + { test "$use_static_libs" = no || test -z "$old_library"; }; then + case $host in + *cygwin* | *mingw* | *cegcc*) + # No point in relinking DLLs because paths are not encoded + func_append notinst_deplibs " $lib" + need_relink=no + ;; + *) + if test "$installed" = no; then + func_append notinst_deplibs " $lib" + need_relink=yes + fi + ;; + esac + # This is a shared library + + # Warn about portability, can't link against -module's on some + # systems (darwin). Don't bleat about dlopened modules though! + dlopenmodule="" + for dlpremoduletest in $dlprefiles; do + if test "X$dlpremoduletest" = "X$lib"; then + dlopenmodule="$dlpremoduletest" + break + fi + done + if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + echo + if test "$linkmode" = prog; 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 + # Hardcode the library path. + # Skip directories that are in the system default run-time + # search path. + case " $sys_lib_dlsearch_path " in + *" $absdir "*) ;; + *) + case "$compile_rpath " in + *" $absdir "*) ;; + *) func_append compile_rpath " $absdir" ;; + esac + ;; + esac + case " $sys_lib_dlsearch_path " in + *" $libdir "*) ;; + *) + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + ;; + esac + fi + + if test -n "$old_archive_from_expsyms_cmds"; then + # figure out the soname + set dummy $library_names + shift + 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" + elif test -n "$soname_spec"; then + # bleh windows + case $host in + *cygwin* | mingw* | *cegcc*) + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + esac + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + + # Make a new name for the extract_expsyms_cmds to use + soroot="$soname" + func_basename "$soroot" + 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_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_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' + fi + # make sure the library variables are pointing to the new library + dir=$output_objdir + linklib=$newlib + fi # test -n "$old_archive_from_expsyms_cmds" + + if test "$linkmode" = prog || test "$opt_mode" != relink; then + add_shlibpath= + add_dir= + add= + lib_linked=yes + case $hardcode_action in + immediate | unsupported) + if test "$hardcode_direct" = no; then + add="$dir/$linklib" + case $host in + *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; + *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ + *-*-unixware7*) add_dir="-L$dir" ;; + *-*-darwin* ) + # if the lib is a (non-dlopened) module then we can not + # link against it, someone is ignoring the earlier warnings + if /usr/bin/file -L $add 2> /dev/null | + $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 + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" + else + add="$dir/$old_library" + fi + elif test -n "$old_library"; then + add="$dir/$old_library" + fi + fi + esac + elif test "$hardcode_minus_L" = no; then + case $host in + *-*-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" + 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" + # Try looking first in the location we're being installed to. + if test -n "$inst_prefix_dir"; then + case $libdir in + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + elif test "$hardcode_shlibpath_var" = yes; then + add_shlibpath="$dir" + add="-l$name" + else + lib_linked=no + fi + ;; + *) lib_linked=no ;; + esac + + if test "$lib_linked" != yes; then + func_fatal_configuration "unsupported hardcode properties" + fi + + if test -n "$add_shlibpath"; then + case :$compile_shlibpath: in + *":$add_shlibpath:"*) ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; + esac + fi + if test "$linkmode" = prog; 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 + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + fi + fi + fi + + if test "$linkmode" = prog || test "$opt_mode" = relink; 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 + case :$finalize_shlibpath: in + *":$libdir:"*) ;; + *) func_append finalize_shlibpath "$libdir:" ;; + esac + add="-l$name" + elif test "$hardcode_automatic" = yes; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then + add="$inst_prefix_dir$libdir/$linklib" + else + add="$libdir/$linklib" + fi + else + # We cannot seem to hardcode it, guess we'll fake it. + 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 + [\\/]*) + func_append add_dir " -L$inst_prefix_dir$libdir" + ;; + esac + fi + add="-l$name" + fi + + if test "$linkmode" = prog; then + test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" + test -n "$add" && finalize_deplibs="$add $finalize_deplibs" + else + test -n "$add_dir" && deplibs="$add_dir $deplibs" + test -n "$add" && deplibs="$add $deplibs" + fi + fi + elif test "$linkmode" = prog; 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" + 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 + # Not a shared library + if test "$deplibs_check_method" != pass_all; 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 "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." + if test "$module" = yes; then + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + else + deplibs="$dir/$old_library $deplibs" + link_static=yes + fi + fi # link shared/static library? + + if test "$linkmode" = lib; then + if test -n "$dependency_libs" && + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || + test "$link_static" = yes; }; then + # Extract -R from dependency_libs + temp_deplibs= + for libdir in $dependency_libs; do + case $libdir in + -R*) func_stripname '-R' '' "$libdir" + temp_xrpath=$func_stripname_result + case " $xrpath " in + *" $temp_xrpath "*) ;; + *) func_append xrpath " $temp_xrpath";; + esac;; + *) func_append temp_deplibs " $libdir";; + esac + done + 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" + # ... and its dependency_libs + tmp_libs= + for deplib in $dependency_libs; do + newdependency_libs="$deplib $newdependency_libs" + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then + case "$tmp_libs " in + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; + esac + fi + func_append tmp_libs " $func_resolve_sysroot_result" + done + + if test "$link_all_deplibs" != no; then + # Add the search paths of all dependency libraries + for deplib in $dependency_libs; do + path= + case $deplib in + -L*) path="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result + func_dirname "$deplib" "" "." + dir=$func_dirname_result + # We need an absolute path. + case $dir in + [\\/]* | [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" + fi + ;; + esac + if $GREP "^installed=no" $deplib > /dev/null; then + 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 + 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 -z "$darwin_install_name"; then + 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}" + path= + fi + fi + ;; + *) + path="-L$absdir/$objdir" + ;; + esac + else + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + test -z "$libdir" && \ + func_fatal_error "\`$deplib' is not a valid libtool archive" + test "$absdir" != "$libdir" && \ + func_warning "\`$deplib' seems to be moved" + + path="-L$absdir" + fi + ;; + esac + case " $deplibs " in + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; + esac + done + fi # link_all_deplibs != no + fi # linkmode = lib + done # for deplib in $libs + if test "$pass" = link; then + if test "$linkmode" = "prog"; 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 + # 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 + # Make sure lib_search_path contains only unique directories. + lib_search_path= + for dir in $newlib_search_path; do + case "$lib_search_path " in + *" $dir "*) ;; + *) func_append lib_search_path " $dir" ;; + esac + done + newlib_search_path= + fi + + if test "$linkmode,$pass" != "prog,link"; then + vars="deplibs" + else + vars="compile_deplibs finalize_deplibs" + fi + for var in $vars dependency_libs; do + # Add libraries to $var in reverse order + eval tmp_libs=\"\$$var\" + new_libs= + for deplib in $tmp_libs; do + # FIXME: Pedantically, this is the right thing to do, so + # that some nasty dependency loop isn't accidentally + # broken: + #new_libs="$deplib $new_libs" + # Pragmatically, this seems to cause very few problems in + # practice: + case $deplib in + -L*) new_libs="$deplib $new_libs" ;; + -R*) ;; + *) + # And here is the reason: when a library appears more + # than once as an explicit dependence of a library, or + # is implicitly linked in more than once by the + # compiler, it is considered special, and multiple + # occurrences thereof are not removed. Compare this + # with having the same library being listed as a + # dependency of multiple other libraries: in this case, + # we know (pedantically, we assume) the library does not + # need to be listed more than once, so we keep only the + # last copy. This is not always right, but it is rare + # enough that we require users that really mean to play + # such unportable linking tricks to link the library + # using -Wl,-lname, so that libtool does not consider it + # for duplicate removal. + case " $specialdeplibs " in + *" $deplib "*) new_libs="$deplib $new_libs" ;; + *) + case " $new_libs " in + *" $deplib "*) ;; + *) new_libs="$deplib $new_libs" ;; + esac + ;; + esac + ;; + esac + done + tmp_libs= + for deplib in $new_libs; do + case $deplib in + -L*) + case " $tmp_libs " in + *" $deplib "*) ;; + *) func_append tmp_libs " $deplib" ;; + esac + ;; + *) func_append tmp_libs " $deplib" ;; + esac + done + eval $var=\"$tmp_libs\" + done # for var + fi + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) + tmp_libs= + for i in $dependency_libs ; do + case " $predeps $postdeps $compiler_lib_search_path " in + *" $i "*) + i="" + ;; + esac + 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" + fi + if test "$linkmode" = prog || test "$linkmode" = lib; then + dlprefiles="$newdlprefiles" + fi + + case $linkmode in + oldlib) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for archives" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for archives" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for archives" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for archives" + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for archives" + + test -n "$release" && \ + func_warning "\`-release' is ignored for archives" + + test -n "$export_symbols$export_symbols_regex" && \ + func_warning "\`-export-symbols' is ignored for archives" + + # Now set the variables for building old libraries. + build_libtool_libs=no + oldlibs="$output" + func_append objs "$old_deplibs" + ;; + + lib) + # Make sure we only generate libraries of the form `libNAME.la'. + case $outputname in + lib*) + func_stripname 'lib' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + ;; + *) + test "$module" = no && \ + func_fatal_help "libtool library \`$output' must begin with \`lib'" + + if test "$need_lib_prefix" != no; then + # Add the "lib" prefix for modules if required + func_stripname '' '.la' "$outputname" + name=$func_stripname_result + eval shared_ext=\"$shrext_cmds\" + eval libname=\"$libname_spec\" + else + func_stripname '' '.la' "$outputname" + libname=$func_stripname_result + fi + ;; + 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" + else + echo + $ECHO "*** Warning: Linking the shared library $output against the non-libtool" + $ECHO "*** objects $objs is not portable!" + func_append libobjs " $objs" + fi + fi + + test "$dlself" != no && \ + 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" + + install_libdir="$1" + + oldlibs= + if test -z "$rpath"; then + if test "$build_libtool_libs" = yes; then + # Building a libtool convenience library. + # 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" + build_libtool_libs=convenience + build_old_libs=yes + fi + + test -n "$vinfo" && \ + func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + + test -n "$release" && \ + func_warning "\`-release' is ignored for convenience libraries" + else + + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 + shift + IFS="$save_ifs" + + test -n "$7" && \ + func_fatal_help "too many parameters to \`-version-info'" + + # convert absolute version numbers to libtool ages + # this retains compatibility with .la files and attempts + # to make the code below a bit more comprehensible + + case $vinfo_number in + yes) + 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 + # + case $version_type in + # correct linux to gnu/linux during the next big refactor + darwin|linux|osf|windows|none) + func_arith $number_major + $number_minor + current=$func_arith_result + age="$number_minor" + revision="$number_revision" + ;; + freebsd-aout|freebsd-elf|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" + lt_irix_increment=no + ;; + *) + func_fatal_configuration "$modename: unknown library version type \`$version_type'" + ;; + esac + ;; + no) + current="$1" + revision="$2" + age="$3" + ;; + esac + + # Check that each of the things are valid numbers. + 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" + ;; + 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" + ;; + 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" + ;; + 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" + fi + + # Calculate the version variables. + major= + versuffix= + verstring= + case $version_type in + none) ;; + + darwin) + # Like Linux, but with the current version available in + # verstring for coding it into the library header + func_arith $current - $age + major=.$func_arith_result + 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" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + + freebsd-aout) + major=".$current" + versuffix=".$current.$revision"; + ;; + + freebsd-elf) + major=".$current" + versuffix=".$current" + ;; + + irix | nonstopux) + if test "X$lt_irix_increment" = "Xno"; then + func_arith $current - $age + else + func_arith $current - $age + 1 + fi + major=$func_arith_result + + case $version_type in + nonstopux) verstring_prefix=nonstopux ;; + *) verstring_prefix=sgi ;; + esac + verstring="$verstring_prefix$major.$revision" + + # Add in all the interfaces that we are compatible with. + loop=$revision + while test "$loop" -ne 0; do + func_arith $revision - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring_prefix$major.$iface:$verstring" + done + + # Before this point, $major must not contain `.'. + major=.$major + 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" + ;; + + osf) + func_arith $current - $age + major=.$func_arith_result + 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 + func_arith $current - $loop + iface=$func_arith_result + func_arith $loop - 1 + loop=$func_arith_result + verstring="$verstring:${iface}.0" + done + + # Make executables depend on our current version. + func_append verstring ":${current}.0" + ;; + + qnx) + major=".$current" + versuffix=".$current" + ;; + + sunos) + major=".$current" + versuffix=".$current.$revision" + ;; + + windows) + # Use '-' rather than '.', since we only want one + # extension on DOS 8.3 filesystems. + func_arith $current - $age + major=$func_arith_result + versuffix="-$major" + ;; + + *) + func_fatal_configuration "unknown library version type \`$version_type'" + ;; + esac + + # Clear the version info if we defaulted, and they specified a release. + if test -z "$vinfo" && test -n "$release"; then + major= + case $version_type in + darwin) + # we can't check for "0.0" in archive_cmds due to quoting + # problems, so we reset it completely + verstring= + ;; + *) + verstring="0.0" + ;; + esac + if test "$need_version" = no; then + versuffix= + else + 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 + major= + versuffix= + 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 + fi + else + # Don't allow undefined symbols. + allow_undefined_flag="$no_undefined_flag" + fi + + fi + + func_generate_dlsyms "$libname" "$libname" "yes" + func_append libobjs " $symfileobj" + test "X$libobjs" = "X " && libobjs= + + if test "$opt_mode" != relink; then + # Remove our outputs, but don't remove object files since they + # may have been created when compiling PIC objects. + removelist= + tempremovelist=`$ECHO "$output_objdir/*"` + for p in $tempremovelist; do + case $p in + *.$objext | *.gcno) + ;; + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi + func_append removelist " $p" + ;; + *) ;; + esac + done + test -n "$removelist" && \ + func_show_eval "${RM}r \$removelist" + fi + + # Now set the variables for building old libraries. + if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + func_append oldlibs " $output_objdir/$libname.$libext" + + # Transform .lo files to .o files. + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + fi + + # Eliminate all temporary directories. + #for path in $notinst_path; do + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` + #done + + if test -n "$xrpath"; then + # If the user specified any rpath flags, then add them. + temp_xrpath= + for libdir in $xrpath; do + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + dependency_libs="$temp_xrpath $dependency_libs" + fi + fi + + # Make sure dlfiles contains only unique files that won't be dlpreopened + old_dlfiles="$dlfiles" + dlfiles= + for lib in $old_dlfiles; do + case " $dlprefiles $dlfiles " in + *" $lib "*) ;; + *) func_append dlfiles " $lib" ;; + esac + done + + # Make sure dlprefiles contains only unique files + old_dlprefiles="$dlprefiles" + dlprefiles= + for lib in $old_dlprefiles; do + case "$dlprefiles " in + *" $lib "*) ;; + *) func_append dlprefiles " $lib" ;; + esac + done + + if test "$build_libtool_libs" = yes; then + if test -n "$rpath"; then + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) + # these systems don't actually have a c library (as such)! + ;; + *-*-rhapsody* | *-*-darwin1.[012]) + # Rhapsody C library is in the System framework + func_append deplibs " System.ltframework" + ;; + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + # Do not include libc due to us having libc/libc_r. + ;; + *-*-sco3.2v5* | *-*-sco5v6*) + # Causes problems with __ctype + ;; + *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) + # Compiler inserts libc in the correct place for threads to work + ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test "$build_libtool_need_lc" = "yes"; then + func_append deplibs " -lc" + fi + ;; + esac + fi + + # Transform deplibs into only deplibs that can be linked in shared. + name_save=$name + libname_save=$libname + release_save=$release + versuffix_save=$versuffix + major_save=$major + # 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="" + newdeplibs= + droppeddeps=no + case $deplibs_check_method in + pass_all) + # Don't check for shared/static. Everything works. + # This might be a little naive. We might want to check + # whether the library exists or not. But this is on + # osf3 & osf4 and I'm not really sure... Just + # implementing what was already the behavior. + newdeplibs=$deplibs + ;; + test_compile) + # This code stresses the "libraries are programs" paradigm to its + # limits. Maybe even breaks it. We compile a program, linking it + # against the deplibs as a proxy for the library. Then we can check + # whether they linked in statically or dynamically with ldd. + $opt_dry_run || $RM conftest.c + cat > conftest.c </dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi + for potent_lib in $potential_libs; do + # Follow soft links. + if ls -lLd "$potent_lib" 2>/dev/null | + $GREP " -> " >/dev/null; then + continue + fi + # The statement above tries to avoid entering an + # endless loop below, in case of cyclic links. + # We might still enter an endless loop, since a link + # loop can be closed while we follow links, + # but so what? + potlib="$potent_lib" + while test -h "$potlib" 2>/dev/null; do + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + case $potliblink in + [\\/]* | [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="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + 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" + $ECHO "*** using a file magic. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + match_pattern*) + set dummy $deplibs_check_method; shift + match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` + for a_deplib in $deplibs; do + case $a_deplib in + -l*) + func_stripname -l '' "$a_deplib" + name=$func_stripname_result + if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + case " $predeps $postdeps " in + *" $a_deplib "*) + func_append newdeplibs " $a_deplib" + a_deplib="" + ;; + esac + fi + 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 + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ + $EGREP "$match_pattern_regex" > /dev/null; then + func_append newdeplibs " $a_deplib" + a_deplib="" + break 2 + fi + done + done + fi + if test -n "$a_deplib" ; then + droppeddeps=yes + echo + $ECHO "*** Warning: linker path does not have real file for library $a_deplib." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" + 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" + $ECHO "*** using a regex pattern. Last file checked: $potlib" + fi + fi + ;; + *) + # Add a -L argument. + func_append newdeplibs " $a_deplib" + ;; + esac + done # Gone through all deplibs. + ;; + none | unknown | *) + 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 + # can't use Xsed below, because $i might contain '/' + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` + done + fi + case $tmp_deplibs in + *[!\ \ ]*) + echo + if test "X$deplibs_check_method" = "Xnone"; then + echo "*** Warning: inter-library dependencies are not supported in this platform." + else + echo "*** Warning: inter-library dependencies are not known to be supported." + fi + echo "*** All declared inter-library dependencies are being dropped." + droppeddeps=yes + ;; + esac + ;; + esac + versuffix=$versuffix_save + major=$major_save + release=$release_save + libname=$libname_save + name=$name_save + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library with the System framework + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + if test "$droppeddeps" = yes; then + if test "$module" = yes; then + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" + $ECHO "*** dependencies of module $libname. Therefore, libtool will create" + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." + if test -z "$global_symbol_pipe"; then + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." + fi + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + else + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." + + if test "$allow_undefined" = no; then + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." + if test "$build_old_libs" = no; then + oldlibs="$output_objdir/$libname.$libext" + build_libtool_libs=module + build_old_libs=yes + else + build_libtool_libs=no + fi + fi + fi + fi + # Done checking deplibs! + deplibs=$newdeplibs + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + case $host in + *-*-darwin*) + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + deplibs="$new_libs" + + # All the library-specific variables (install_libdir is set above). + library_names= + old_library= + 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. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac + if test "$hardcode_into_libs" = yes; then + # Hardcode the library paths + hardcode_libdirs= + dep_rpath= + rpath="$finalize_rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + for libdir in $rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append dep_rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" + fi + if test -n "$runpath_var" && test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" + fi + test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" + fi + + shlibpath="$finalize_shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + if test -n "$shlibpath"; then + eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" + fi + + # Get the real and link names of the library. + eval shared_ext=\"$shrext_cmds\" + eval library_names=\"$library_names_spec\" + set dummy $library_names + shift + realname="$1" + shift + + if test -n "$soname_spec"; then + eval soname=\"$soname_spec\" + else + soname="$realname" + fi + if test -z "$dlname"; then + dlname=$soname + fi + + lib="$output_objdir/$realname" + linknames= + for link + do + func_append linknames " $link" + done + + # Use standard objects if they are pic + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` + test "X$libobjs" = "X " && libobjs= + + delfiles= + if test -n "$export_symbols" && test -n "$include_expsyms"; then + $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" + export_symbols="$output_objdir/$libname.uexp" + func_append delfiles " $export_symbols" + fi + + orig_export_symbols= + case $host_os in + 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 + # 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" + 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" + $opt_dry_run || $RM $export_symbols + cmds=$export_symbols_cmds + save_ifs="$IFS"; IFS='~' + for cmd1 in $cmds; do + 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 + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" + func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs + skipped_export=false + else + # The command line is too long to execute in one step. + func_verbose "using reloadable object file for export list..." + skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break + fi + done + IFS="$save_ifs" + if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + 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" + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' + fi + + if test "X$skipped_export" != "X:" && 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" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # '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. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + + tmp_deplibs= + for test_deplib in $deplibs; do + case " $convenience " in + *" $test_deplib "*) ;; + *) + func_append tmp_deplibs " $test_deplib" + ;; + esac + done + deplibs="$tmp_deplibs" + + if test -n "$convenience"; then + if test -n "$whole_archive_flag_spec" && + test "$compiler_needs_object" = yes && + test -z "$libobjs"; then + # extract the archives, so we have objects to list. + # TODO: could optimize this to just extract one archive. + whole_archive_flag_spec= + fi + if test -n "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + else + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + fi + + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + eval flag=\"$thread_safe_flag_spec\" + func_append linker_flags " $flag" + fi + + # Make a backup of the uninstalled library when relinking + if test "$opt_mode" = relink; 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 -n "$export_symbols" && test -n "$module_expsym_cmds"; then + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds + else + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds + else + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds + fi + fi + + if test "X$skipped_export" != "X:" && + func_len " $test_cmds" && + len=$func_len_result && + test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + : + else + # The command line is too long to link in one step, link piecewise + # or, if using GNU ld and skipped_export is not :, use a linker + # script. + + # Save the value of $output and $libobjs because we want to + # use them later. If we have whole_archive_flag_spec, we + # want to use save_libobjs as it was before + # whole_archive_flag_spec was expanded, because we can't + # assume the linker understands whole_archive_flag_spec. + # This may have to be revisited, in case too many + # convenience libraries get linked in and end up exceeding + # the spec. + if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then + save_libobjs=$libobjs + fi + save_output=$output + func_basename "$output" + output_la=$func_basename_result + + # Clear the reloadable object creation command queue and + # initialize k to one. + test_cmds= + concat_cmds= + objlist= + 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 + func_verbose "creating GNU ld script: $output" + echo 'INPUT (' > $output + for obj in $save_libobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result + elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then + output=${output_objdir}/${output_la}.lnk + func_verbose "creating linker input file list: $output" + : > $output + set x $save_libobjs + shift + firstobj= + if test "$compiler_needs_object" = yes; then + firstobj="$1 " + shift + fi + for obj + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output + done + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" + else + if test -n "$save_libobjs"; then + func_verbose "creating reloadable object files..." + output=$output_objdir/$output_la-${k}.$objext + eval test_cmds=\"$reload_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + + # Loop over the list of objects to be linked. + for obj in $save_libobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + if test "X$objlist" = X || + 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 + # The first file doesn't have a previous command to add. + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" + else + # All subsequent reloadable object files will link in + # the last one created. + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" + fi + last_robj=$output_objdir/$output_la-${k}.$objext + func_arith $k + 1 + k=$func_arith_result + output=$output_objdir/$output_la-${k}.$objext + objlist=" $obj" + func_len " $last_robj" + func_arith $len0 + $func_len_result + len=$func_arith_result + fi + done + # Handle the remaining objects by creating one last + # reloadable object file. All subsequent reloadable object + # 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\" + if test -n "$last_robj"; then + eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + fi + func_append delfiles " $output" + + else + output= + fi + + if ${skipped_export-false}; then + 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. + test -z "$concat_cmds" || concat_cmds=$concat_cmds~ + eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" + 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='~' + for cmd in $concat_cmds; do + IFS="$save_ifs" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + 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"' + func_show_eval '$MV "${export_symbols}T" "$export_symbols"' + fi + fi + + if ${skipped_export-false}; then + if test -n "$export_symbols" && test -n "$include_expsyms"; then + tmp_export_symbols="$export_symbols" + test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" + $opt_dry_run || eval '$ECHO "$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" + # FIXME: $output_objdir/$libname.filter potentially contains lots of + # '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. + $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter + func_append delfiles " $export_symbols $output_objdir/$libname.filter" + export_symbols=$output_objdir/$libname.def + $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols + fi + fi + + libobjs=$output + # Restore the value of output. + output=$save_output + + if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then + eval libobjs=\"\$libobjs $whole_archive_flag_spec\" + test "X$libobjs" = "X " && libobjs= + fi + # Expand the library linking commands again to reset the + # value of $libobjs for piecewise linking. + + # Do each of the archive commands. + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi + else + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi + fi + fi + + if test -n "$delfiles"; then + # Append the command to remove temporary files to $cmds. + eval cmds=\"\$cmds~\$RM $delfiles\" + fi + + # Add any objects from preloaded convenience libraries + if test -n "$dlprefiles"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append libobjs " $func_extract_archives_result" + test "X$libobjs" = "X " && libobjs= + fi + + save_ifs="$IFS"; IFS='~' + for cmd in $cmds; do + IFS="$save_ifs" + eval cmd=\"$cmd\" + $opt_silent || { + func_quote_for_expand "$cmd" + eval "func_echo $func_quote_for_expand_result" + } + $opt_dry_run || eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + ( cd "$output_objdir" && \ + $RM "${realname}T" && \ + $MV "${realname}U" "$realname" ) + fi + + exit $lt_exit + } + done + IFS="$save_ifs" + + # Restore the uninstalled library and exit + if test "$opt_mode" = relink; then + $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + func_show_eval '${RM}r "$gentop"' + fi + fi + + exit $EXIT_SUCCESS + fi + + # Create links to the real library. + for linkname in $linknames; do + if test "$realname" != "$linkname"; then + func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' + fi + done + + # If -module or -export-dynamic was specified, set the dlname. + if test "$module" = yes || test "$export_dynamic" = yes; then + # On all known operating systems, these are identical. + dlname="$soname" + fi + fi + ;; + + obj) + if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + func_warning "\`-dlopen' is ignored for objects" + fi + + case " $deplibs" in + *\ -l* | *\ -L*) + func_warning "\`-l' and \`-L' are ignored for objects" ;; + esac + + test -n "$rpath" && \ + func_warning "\`-rpath' is ignored for objects" + + test -n "$xrpath" && \ + func_warning "\`-R' is ignored for objects" + + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for objects" + + test -n "$release" && \ + 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" + + libobj=$output + func_lo2o "$libobj" + obj=$func_lo2o_result + ;; + *) + libobj= + obj="$output" + ;; + esac + + # Delete the old objects. + $opt_dry_run || $RM $obj $libobj + + # Objects from convenience libraries. This assumes + # single-version convenience libraries. Whenever we create + # different ones for PIC/non-PIC, this we'll have to duplicate + # 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 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'` + else + gentop="$output_objdir/${obj}x" + func_append generated " $gentop" + + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" + fi + fi + + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + + # Create the old-style object. + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + + output="$obj" + func_execute_cmds "$reload_cmds" 'exit $?' + + # Exit if we aren't doing a library object file. + if test -z "$libobj"; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + fi + + if test "$build_libtool_libs" != yes; then + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + # Create an invalid libtool object if no PIC, so that we don't + # accidentally link it into a program. + # $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 + # Only do commands if we really have different PIC objects. + reload_objs="$libobjs $reload_conv_objs" + output="$libobj" + func_execute_cmds "$reload_cmds" 'exit $?' + fi + + if test -n "$gentop"; then + func_show_eval '${RM}r "$gentop"' + fi + + exit $EXIT_SUCCESS + ;; + + prog) + case $host in + *cygwin*) func_stripname '' '.exe' "$output" + output=$func_stripname_result.exe;; + esac + test -n "$vinfo" && \ + func_warning "\`-version-info' is ignored for programs" + + test -n "$release" && \ + 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." + + case $host in + *-*-rhapsody* | *-*-darwin1.[012]) + # On Rhapsody replace the C library is the System framework + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` + ;; + esac + + case $host in + *-*-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 + 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" + ;; + esac + fi + # Time to change all our "foo.ltframework" stuff back to "-framework foo" + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + ;; + esac + + + # move library search paths that coincide with paths to not yet + # installed libraries to the beginning of the library search list + new_libs= + for path in $notinst_path; do + case " $new_libs " in + *" -L$path/$objdir "*) ;; + *) + case " $compile_deplibs " in + *" -L$path/$objdir "*) + func_append new_libs " -L$path/$objdir" ;; + esac + ;; + esac + done + for deplib in $compile_deplibs; do + case $deplib in + -L*) + case " $new_libs " in + *" $deplib "*) ;; + *) func_append new_libs " $deplib" ;; + esac + ;; + *) func_append new_libs " $deplib" ;; + esac + done + compile_deplibs="$new_libs" + + + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" + + if test -n "$rpath$xrpath"; then + # If the user specified any rpath flags, then add them. + for libdir in $rpath $xrpath; do + # This is the magic to use -rpath. + case "$finalize_rpath " in + *" $libdir "*) ;; + *) func_append finalize_rpath " $libdir" ;; + esac + done + fi + + # Now hardcode the library paths + rpath= + hardcode_libdirs= + for libdir in $compile_rpath $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$perm_rpath " in + *" $libdir "*) ;; + *) func_append perm_rpath " $libdir" ;; + esac + fi + case $host in + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) + testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + case :$dllsearchpath: in + *":$libdir:"*) ;; + ::) dllsearchpath=$libdir;; + *) func_append dllsearchpath ":$libdir";; + esac + case :$dllsearchpath: in + *":$testbindir:"*) ;; + ::) dllsearchpath=$testbindir;; + *) func_append dllsearchpath ":$testbindir";; + esac + ;; + esac + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + compile_rpath="$rpath" + + rpath= + hardcode_libdirs= + for libdir in $finalize_rpath; do + if test -n "$hardcode_libdir_flag_spec"; then + if test -n "$hardcode_libdir_separator"; then + if test -z "$hardcode_libdirs"; then + hardcode_libdirs="$libdir" + else + # Just accumulate the unique libdirs. + case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in + *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) + ;; + *) + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" + ;; + esac + fi + else + eval flag=\"$hardcode_libdir_flag_spec\" + func_append rpath " $flag" + fi + elif test -n "$runpath_var"; then + case "$finalize_perm_rpath " in + *" $libdir "*) ;; + *) func_append finalize_perm_rpath " $libdir" ;; + esac + fi + done + # Substitute the hardcoded libdirs into the rpath. + if test -n "$hardcode_libdir_separator" && + test -n "$hardcode_libdirs"; then + libdir="$hardcode_libdirs" + eval rpath=\" $hardcode_libdir_flag_spec\" + fi + finalize_rpath="$rpath" + + if test -n "$libobjs" && test "$build_old_libs" = yes; 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" + + # template prelinking step + if test -n "$prelink_cmds"; then + func_execute_cmds "$prelink_cmds" 'exit $?' + fi + + wrappers_required=yes + case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; + *cygwin* | *mingw* ) + if test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + *) + if test "$need_relink" = no || test "$build_libtool_libs" != yes; then + wrappers_required=no + fi + ;; + esac + if test "$wrappers_required" = no; then + # Replace the output file specification. + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + link_command="$compile_command$compile_rpath" + + # We have no uninstalled library dependencies, so finalize right now. + exit_status=0 + func_show_eval "$link_command" 'exit_status=$?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Delete the generated files. + if test -f "$output_objdir/${outputname}S.${objext}"; then + func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + 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" + fi + if test -n "$finalize_shlibpath"; then + finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" + fi + + compile_var= + finalize_var= + if test -n "$runpath_var"; then + if test -n "$perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $perm_rpath; do + func_append rpath "$dir:" + done + compile_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + if test -n "$finalize_perm_rpath"; then + # We should set the runpath_var. + rpath= + for dir in $finalize_perm_rpath; do + func_append rpath "$dir:" + done + finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " + fi + fi + + if test "$no_install" = yes; then + # We don't need to create a wrapper script. + link_command="$compile_var$compile_command$compile_rpath" + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` + # Delete the old output file. + $opt_dry_run || $RM $output + # Link the executable and exit + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + exit $EXIT_SUCCESS + fi + + 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 + + # Replace the output file specification. + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + + # Delete the old output files. + $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname + + func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + + # Now create the wrapper script. + func_verbose "creating $output" + + # Quote the relink command for shipping. + if test -n "$relink_command"; then + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + fi + done + relink_command="(cd `pwd`; $relink_command)" + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + fi + + # Only actually do things if not in dry run mode. + $opt_dry_run || { + # win32 will think the script is a binary if it has + # a .exe suffix, so we strip it off here. + case $output in + *.exe) func_stripname '' '.exe' "$output" + output=$func_stripname_result ;; + esac + # test for cygwin because mv fails w/o .exe extensions + case $host in + *cygwin*) + exeext=.exe + func_stripname '' '.exe' "$outputname" + outputname=$func_stripname_result ;; + *) exeext= ;; + esac + case $host in + *cygwin* | *mingw* ) + 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" + $RM $cwrappersource $cwrapper + trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 + + func_emit_cwrapperexe_src > $cwrappersource + + # The wrapper executable is built using the $host compiler, + # because it contains $host paths and files. If cross- + # compiling, it, like the target executable, must be + # executed on the $host or under an emulation environment. + $opt_dry_run || { + $LTCC $LTCFLAGS -o $cwrapper $cwrappersource + $STRIP $cwrapper + } + + # Now, create the wrapper script for func_source use: + func_ltwrapper_scriptname $cwrapper + $RM $func_ltwrapper_scriptname_result + 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 + $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result + else + func_emit_wrapper no > $func_ltwrapper_scriptname_result + fi + } + ;; + * ) + $RM $output + trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 + + func_emit_wrapper no > $output + chmod +x $output + ;; + esac + } + exit $EXIT_SUCCESS + ;; + esac + + # 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" + build_libtool_libs=no + else + oldobjs="$old_deplibs $non_pic_objects" + if test "$preload" = yes && test -f "$symfileobj"; then + func_append oldobjs " $symfileobj" + fi + fi + addlibs="$old_convenience" + fi + + if test -n "$addlibs"; then + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + + func_extract_archives $gentop $addlibs + func_append oldobjs " $func_extract_archives_result" + fi + + # Do each command in the archive commands. + if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; 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" + func_append generated " $gentop" + + func_extract_archives $gentop $dlprefiles + func_append oldobjs " $func_extract_archives_result" + fi + + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + func_basename "$obj" + $ECHO "$func_basename_result" + done | sort | sort -uc >/dev/null 2>&1); then + : + else + echo "copying selected object files to avoid basename conflicts..." + gentop="$output_objdir/${outputname}x" + func_append generated " $gentop" + func_mkdir_p "$gentop" + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + func_basename "$obj" + objbase="$func_basename_result" + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + func_arith $counter + 1 + counter=$func_arith_result + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" + ;; + *) func_append oldobjs " $obj" ;; + esac + done + fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result + eval cmds=\"$old_archive_cmds\" + + func_len " $cmds" + len=$func_len_result + if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds + else + # the command line is too long to link in one step, link in parts + func_verbose "using piecewise archive linking..." + save_RANLIB=$RANLIB + RANLIB=: + objlist= + concat_cmds= + save_oldobjs=$oldobjs + oldobjs= + # Is there a better way of finding the last object in the list? + for obj in $save_oldobjs + do + last_oldobj=$obj + done + eval test_cmds=\"$old_archive_cmds\" + func_len " $test_cmds" + len0=$func_len_result + len=$len0 + for obj in $save_oldobjs + do + func_len " $obj" + func_arith $len + $func_len_result + len=$func_arith_result + func_append objlist " $obj" + if test "$len" -lt "$max_cmd_len"; then + : + else + # the above command should be used before it gets too long + oldobjs=$objlist + 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\" + objlist= + len=$len0 + fi + done + RANLIB=$save_RANLIB + oldobjs=$objlist + if test "X$oldobjs" = "X" ; then + eval cmds=\"\$concat_cmds\" + else + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" + fi + fi + fi + func_execute_cmds "$cmds" 'exit $?' + done + + test -n "$generated" && \ + func_show_eval "${RM}r$generated" + + # Now create the libtool archive. + case $output in + *.la) + old_library= + test "$build_old_libs" = yes && old_library="$libname.$libext" + func_verbose "creating $output" + + # Preserve any variables that may affect compiler behavior + for var in $variables_saved_for_relink; do + if eval test -z \"\${$var+set}\"; then + relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" + elif eval var_value=\$$var; test -z "$var_value"; then + relink_command="$var=; export $var; $relink_command" + else + func_quote_for_eval "$var_value" + relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + 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=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; 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 -z "$install_libdir"; then + break + fi + 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" + func_resolve_sysroot "$deplib" + 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_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" + ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; + esac + done + dependency_libs="$newdependency_libs" + 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` + test -z "$libdir" && \ + 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" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + *.la) + # Only pass preopened files to the pseudo-archive (for + # eventual linking with the app. that links it) if we + # 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` + test -z "$libdir" && \ + func_fatal_error "\`$lib' is not a valid libtool archive" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" + ;; + esac + done + dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlfiles " $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + func_append newdlprefiles " $abs" + done + dlprefiles="$newdlprefiles" + fi + $RM $output + # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. + tdlname=$dlname + case $host,$output,$installed,$module,$dlname in + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; + esac + $ECHO > $output "\ +# $outputname - a libtool library file +# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='$tdlname' + +# Names of this library. +library_names='$library_names' + +# The name of the static archive. +old_library='$old_library' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='$new_inherited_linker_flags' + +# Libraries that this one depends upon. +dependency_libs='$dependency_libs' + +# Names of additional weak libraries provided by this library +weak_library_names='$weak_libs' + +# Version information for $libname. +current=$current +age=$age +revision=$revision + +# Is this an already installed library? +installed=$installed + +# Should we warn about portability when linking against -modules? +shouldnotlink=$module + +# Files to dlopen/dlpreopen +dlopen='$dlfiles' +dlpreopen='$dlprefiles' + +# Directory that this library needs to be installed in: +libdir='$install_libdir'" + if test "$installed" = no && test "$need_relink" = yes; then + $ECHO >> $output "\ +relink_command=\"$relink_command\"" + fi + done + } + + # Do a symbolic link so that the libtool archive can be found in + # LD_LIBRARY_PATH before the program is installed. + func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' + ;; + esac + exit $EXIT_SUCCESS +} + +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && + func_mode_link ${1+"$@"} + + +# func_mode_uninstall arg... +func_mode_uninstall () +{ + $opt_debug + RM="$nonopt" + files= + rmforce= + exit_status=0 + + # This variable tells wrapper scripts just to set variables rather + # than running their programs. + libtool_install_magic="$magic" + + for arg + do + case $arg in + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; + esac + done + + test -z "$RM" && \ + func_fatal_help "you must specify an RM program" + + rmdirs= + + for file in $files; do + func_dirname "$file" "" "." + dir="$func_dirname_result" + if test "X$dir" = X.; then + odir="$objdir" + else + odir="$dir/$objdir" + fi + func_basename "$file" + name="$func_basename_result" + test "$opt_mode" = uninstall && odir="$dir" + + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then + case " $rmdirs " in + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; + esac + fi + + # Don't error if the file doesn't exist and rm -f was used. + if { test -L "$file"; } >/dev/null 2>&1 || + { test -h "$file"; } >/dev/null 2>&1 || + test -f "$file"; then + : + elif test -d "$file"; then + exit_status=1 + continue + elif test "$rmforce" = yes; then + continue + fi + + rmfiles="$file" + + case $name in + *.la) + # Possibly a libtool archive, so verify it. + if func_lalib_p "$file"; then + func_source $dir/$name + + # Delete the libtool libraries and symlinks. + for n in $library_names; do + func_append rmfiles " $odir/$n" + done + test -n "$old_library" && func_append rmfiles " $odir/$old_library" + + case "$opt_mode" in + clean) + case " $library_names " in + *" $dlname "*) ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; + esac + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" + ;; + 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' + 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' + fi + # FIXME: should reinstall the best remaining shared library. + ;; + esac + fi + ;; + + *.lo) + # Possibly a libtool object, so verify it. + if func_lalib_p "$file"; then + + # Read the .lo file + func_source $dir/$name + + # Add PIC object to the list of files to remove. + if test -n "$pic_object" && + test "$pic_object" != none; 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 + func_append rmfiles " $dir/$non_pic_object" + fi + fi + ;; + + *) + if test "$opt_mode" = clean ; then + noexename=$name + case $file in + *.exe) + func_stripname '' '.exe' "$file" + file=$func_stripname_result + func_stripname '' '.exe' "$name" + noexename=$func_stripname_result + # $file with .exe has already been added to rmfiles, + # add $file without .exe + func_append rmfiles " $file" + ;; + esac + # Do a test to see if this is a libtool program. + if func_ltwrapper_p "$file"; then + if func_ltwrapper_executable_p "$file"; then + func_ltwrapper_scriptname "$file" + relink_command= + func_source $func_ltwrapper_scriptname_result + func_append rmfiles " $func_ltwrapper_scriptname_result" + else + relink_command= + func_source $dir/$noexename + fi + + # 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/lt-$name" + fi + if test "X$noexename" != "X$name" ; then + func_append rmfiles " $odir/lt-${noexename}.c" + fi + fi + fi + ;; + esac + func_show_eval "$RM $rmfiles" 'exit_status=1' + done + + # 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" + fi + done + + exit $exit_status +} + +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && + func_mode_uninstall ${1+"$@"} + +test -z "$opt_mode" && { + help="$generic_help" + func_fatal_help "you must specify a MODE" +} + +test -z "$exec_cmd" && \ + func_fatal_help "invalid operation mode \`$opt_mode'" + +if test -n "$exec_cmd"; then + eval exec "$exec_cmd" + exit $EXIT_FAILURE +fi + +exit $exit_status + + +# The TAGs below are defined such that we never get into a situation +# in which 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 +# them. This is particularly important on AIX, because we don't +# support having both static and shared libraries enabled at the same +# time on that platform, so we default to a shared-only configuration. +# If a disable-shared tag is given, we'll fallback to a static-only +# configuration. But we'll never go from static-only to shared-only. + +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared +build_libtool_libs=no +build_old_libs=yes +# ### END LIBTOOL TAG CONFIG: disable-shared + +# ### BEGIN LIBTOOL TAG CONFIG: disable-static +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` +# ### END LIBTOOL TAG CONFIG: disable-static + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: +# vi:sw=2 + diff -Nru epiphany-browser-3.16.3/build-aux/missing epiphany-browser-3.18.0/build-aux/missing --- epiphany-browser-3.16.3/build-aux/missing 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/build-aux/missing 2015-09-22 07:44:11.000000000 +0000 @@ -0,0 +1,215 @@ +#! /bin/sh +# Common wrapper for a few potentially missing GNU programs. + +scriptversion=2013-10-28.13; # UTC + +# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try '$0 --help' for more information" + exit 1 +fi + +case $1 in + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + +Supported PROGRAM values: + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man + +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" + exit 1 + ;; + +esac + +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru epiphany-browser-3.16.3/ChangeLog epiphany-browser-3.18.0/ChangeLog --- epiphany-browser-3.16.3/ChangeLog 2015-07-09 13:37:56.000000000 +0000 +++ epiphany-browser-3.18.0/ChangeLog 2015-09-22 07:54:28.000000000 +0000 @@ -1,58 +1,1683 @@ -commit c9c721640a07f891456f9b03cb8a4c0997fe8335 +commit 39efde6540a6b24d804f9676e2f330a26d9f1baf Author: Claudio Saavedra -Date: Thu Jul 9 16:37:00 2015 +0300 +Date: Tue Sep 22 10:53:26 2015 +0300 - [release] 3.16.3 + [release] 3.18.0 - NEWS | 8 ++++++++ + NEWS | 12 ++++++++++++ + configure.ac | 4 ++-- + 2 files changed, 14 insertions(+), 2 deletions(-) + +commit 68fe7cd0ae0cc965c122fc7b1ef0e2f6089c49d2 +Author: Claudio Saavedra +Date: Mon Sep 21 18:50:42 2015 +0300 + + ephy-completion-model: Make it possible not to use formatting markup + + Since the completion model is used in the search provider as well, + which doesn't need the markup and also doesn't initialize GTK+, + we need to ensure that the completion model can still be used + without it. + + Definitely not the best approach but safe enough for .0 release. + + https://bugzilla.gnome.org/show_bug.cgi?id=755341 + + src/ephy-completion-model.c | 33 +++++++++++++++++++++++++++------ + src/ephy-completion-model.h | 3 ++- + src/ephy-location-controller.c | 2 +- + src/ephy-search-provider.c | 2 +- + tests/ephy-completion-model-test.c | 4 ++-- + 5 files changed, 33 insertions(+), 11 deletions(-) + +commit 1500958d19f231ec639fc4e0a25fdad0aeae4ede +Author: Reinout van Schouwen +Date: Mon Sep 21 23:41:09 2015 +0200 + + Updated Dutch translation by Nathan Follens + + po/nl.po | 1868 +++++++++++++++----------------------------------------------- + 1 file changed, 444 insertions(+), 1424 deletions(-) + +commit 557eb8383557debf7420af54a1b49345ccc96088 +Author: Милош Поповић +Date: Mon Sep 21 21:43:55 2015 +0000 + + Updated Serbian Latin translation + + po/sr@latin.po | 494 +++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 267 insertions(+), 227 deletions(-) + +commit c68982c6b48d9024e9631971ab60ab290ac40757 +Author: Милош Поповић +Date: Mon Sep 21 21:43:13 2015 +0000 + + Updated Serbian translation + + po/sr.po | 494 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 267 insertions(+), 227 deletions(-) + +commit fdf19b543193dceca1585057e029bf899cf44300 +Author: Michael Catanzaro +Date: Fri Sep 18 11:54:17 2015 -0500 + + Fix clearing all passwords from the clear data dialog + + Epiphany saves passwords with EPHY_FORM_PASSWORD_SCHEMA. If we want to + delete the passwords we've saved, we have to pass that schema to + libsecret. Using the SECRET_SCHEMA_COMPAT_NETWORK guarantees we will + only delete passwords saved by other apps, and none of our own + passwords. + + Exception: WebKitGTK+ is saving HTTP auth passwords with + SECRET_SCHEMA_COMPAT_NETWORK. This change means those passwords will no + longer be deleted, which is non-ideal. + + https://bugzilla.gnome.org/show_bug.cgi?id=755190 + + src/clear-data-dialog.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +commit 5f0cac6c373b5f41bdb24b4762487bae93331c61 +Author: Michael Catanzaro +Date: Sat Sep 19 19:55:48 2015 -0500 + + Don't crash on escaped null characters + + Disallow escaped slashes as well. + + https://bugzilla.gnome.org/show_bug.cgi?id=755287 + + embed/ephy-web-view.c | 16 ++++++++++------ + lib/ephy-uri-helpers.c | 15 +++++++++++++++ + lib/ephy-uri-helpers.h | 1 + + lib/widgets/ephy-download-widget.c | 5 +++-- + src/bookmarks/ephy-bookmark-properties.c | 3 ++- + src/bookmarks/ephy-bookmarks-editor.c | 3 ++- + src/ephy-completion-model.c | 3 ++- + src/ephy-history-window.c | 3 ++- + 8 files changed, 37 insertions(+), 12 deletions(-) + +commit 508af286eb8a32a2fd63a77428607916c1bc40e1 +Author: Ask Hjorth Larsen +Date: Sun Sep 20 20:18:46 2015 +0200 + + Updated Danish translation + + po/da.po | 35 +++++++++++++++-------------------- + 1 file changed, 15 insertions(+), 20 deletions(-) + +commit 6b611d8a82f2135465d9106b9cffa1b82bb9936d +Author: Alain Lojewski +Date: Sat Sep 19 15:49:45 2015 +0000 + + Updated French translation + + help/fr/fr.po | 225 ++++++++++++++++++++++++++++++++++++++++++++-------------- + 1 file changed, 172 insertions(+), 53 deletions(-) + +commit ceed3ab250c3bb6add56aef7b2c954c344eb5d33 +Author: Ask Hjorth Larsen +Date: Sat Sep 19 15:07:11 2015 +0000 + + Updated Danish translation + + po/da.po | 358 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 197 insertions(+), 161 deletions(-) + +commit cdf3ece6a4c97a878e2d551c7441472f5e3b1bde +Author: František Zatloukal +Date: Sat Sep 19 11:32:50 2015 +0200 + + Updated Czech translation + + po/cs.po | 548 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 268 insertions(+), 280 deletions(-) + +commit be3db2cfc6de77948bcd7bc10480c4c8dbe0fb9a +Author: Stas Solovey +Date: Thu Sep 17 09:59:09 2015 +0000 + + Updated Russian translation + + po/ru.po | 342 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 191 insertions(+), 151 deletions(-) + +commit 567c98ff909095ee36e072afa255fdba54cc28e3 +Author: Muhammet Kara +Date: Wed Sep 16 18:42:04 2015 +0000 + + Updated Turkish translation + + po/tr.po | 299 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 165 insertions(+), 134 deletions(-) + +commit 28c9f5b307a5e8a3ab7105cc893ef6fbe37b8e6f +Author: Rūdolfs Mazurs +Date: Wed Sep 16 14:44:17 2015 +0300 + + Updated Latvian translation + + po/lv.po | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) + +commit 8bd37bc3d923e6d2028a84557de72c36c3d4626f +Author: Rūdolfs Mazurs +Date: Wed Sep 16 14:41:19 2015 +0300 + + Updated Latvian translation + + po/lv.po | 386 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 190 insertions(+), 196 deletions(-) + +commit 12e97406ea1413f87ab37983502697f3217ff7bd +Author: Khaled Hosny +Date: Mon Sep 14 21:19:51 2015 +0200 + + Update Arabic translation + + po/ar.po | 335 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 179 insertions(+), 156 deletions(-) + +commit 547923228ee30e03f13a621e719dd88dec790fe8 +Author: Bernd Homuth +Date: Mon Sep 14 18:23:15 2015 +0000 + + Updated German translation + + po/de.po | 304 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 166 insertions(+), 138 deletions(-) + +commit 9e4b18640e2b7c4e4b5d56d98eacbb96e69a2f8e +Author: Claude Paroz +Date: Sat Sep 12 11:37:13 2015 +0200 + + Updated French translation + + po/fr.po | 27 +++++++++++++++++---------- + 1 file changed, 17 insertions(+), 10 deletions(-) + +commit 561069f339380ef7f028b9412db824c7b67444d2 +Author: Jiri Grönroos +Date: Thu Sep 10 18:43:17 2015 +0300 + + Finnish translation update + + po/fi.po | 380 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 191 insertions(+), 189 deletions(-) + +commit fd5f935cc529be1d85dc1ed3658262baa5c0a41c +Author: Claudio Saavedra +Date: Wed Sep 9 10:34:14 2015 +0300 + + [release] 3.17.91 + + NEWS | 11 +++++++++++ + configure.ac | 2 +- + 2 files changed, 12 insertions(+), 1 deletion(-) + +commit de56275d0a6d08e34e10672c20cdf5c56940e58e +Author: Claudio Saavedra +Date: Wed Sep 9 11:18:59 2015 +0300 + + ephy-download-test: Register the application + + Otherwise the inhibition will fail. + + tests/ephy-download-test.c | 1 + + 1 file changed, 1 insertion(+) + +commit aa9fb6b9328ba24a0a6aed4b4a3d028816585ae5 +Author: Michael Catanzaro +Date: Mon Aug 31 09:42:42 2015 -0500 + + uri-tester: don't leak from the pattern table + + This code is difficult to understand, but it's clear that these elements + are not freed when they are removed. Fix it. + + https://bugzilla.gnome.org/show_bug.cgi?id=696484 + + embed/web-extension/uri-tester.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f324749c8c1cfce9e450a977856f1b703916fb42 +Author: Carlos Garcia Campos +Date: Mon Aug 31 09:12:22 2015 +0200 + + uri-tester: Create optslist HashTable with a free function fo the keys + + Keys are inserted with g_strdup, so they need to be freed. + + https://bugzilla.gnome.org/show_bug.cgi?id=696484 + + embed/web-extension/uri-tester.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 257ecd12ecdb887318b2f758ca43bf1620191e0b +Author: Michael Catanzaro +Date: Sat Jul 25 15:03:54 2015 -0500 + + Don't overwrite page titles in history + + When loading a page, we schedule two history updates: the first to reset + the page's title to the empty string (when the web view's title property + is unset after load started) and the second to set the page's title + properly. The first history update is obviously a mistake. It seems like + it should be harmless, so long as the page load is allowed to complete, + but avoiding it seems to solve the bug where pages appear in the history + dialog with URLs for the title, and it's clearly wrong, so let's stop + doing this. + + https://bugzilla.gnome.org/show_bug.cgi?id=741385 + + embed/ephy-web-view.c | 2 +- + lib/history/ephy-history-service.c | 2 ++ + 2 files changed, 3 insertions(+), 1 deletion(-) + +commit b518c6e900a05bfbc7d3f61ce2b9b71e5469bf2c +Author: Michael Catanzaro +Date: Sun Aug 30 12:40:37 2015 -0500 + + Link the web extension to libephymisc.la + + This avoids compiling many files multiple times. Also, move the + uri-tester into the web extension directory, since that's the only place + it's used. + + https://bugzilla.gnome.org/show_bug.cgi?id=747521 + + embed/uri-tester.c | 975 --------------------------------------- + embed/uri-tester.h | 99 ---- + embed/web-extension/Makefile.am | 20 +- + embed/web-extension/uri-tester.c | 975 +++++++++++++++++++++++++++++++++++++++ + embed/web-extension/uri-tester.h | 99 ++++ + 5 files changed, 1077 insertions(+), 1091 deletions(-) + +commit 67a0888c940ea384ee932c5dea90644d5e2e22b0 +Author: ChangSeok Oh +Date: Tue Sep 8 02:19:36 2015 +0900 + + Added Korean help translation + + help/Makefile.am | 2 +- + help/ko/ko.po | 1783 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1784 insertions(+), 1 deletion(-) + +commit 0930650ec17086f72bed52a49e96ca6dcbf209a0 +Author: Aurimas Černius +Date: Mon Sep 7 14:07:54 2015 +0300 + + Updated Lithuanian translation + + po/lt.po | 343 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 191 insertions(+), 152 deletions(-) + +commit 5414a20a7e049454c50b8a41ce24df1d3d8964fe +Author: ChangSeok Oh +Date: Sat Sep 5 17:55:05 2015 +0900 + + Updated Korean translation + + po/ko.po | 339 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 187 insertions(+), 152 deletions(-) + +commit 6740ac8046a64d7a120d7c1cb5e6f91cf95bd853 +Author: Baurzhan Muftakhidinov +Date: Fri Sep 4 17:37:26 2015 +0000 + + Updated Kazakh translation + + po/kk.po | 317 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 170 insertions(+), 147 deletions(-) + +commit 08d54ae133ac5f7bdd96c72d16287fdd2cb89bc0 +Author: Michael Catanzaro +Date: Thu Sep 3 18:16:54 2015 -0500 + + EphyProfileUtils: fix leak in ephy_profile_utils_do_migration + + The first parameter to g_environ_setenv is "transfer full" but so is the + return value, and it is used as the return value. + + Indirect leak of 5579 byte(s) in 82 object(s) allocated from: + #0 0x7f1d6e115a0a in malloc (/lib64/libasan.so.2+0x98a0a) + #1 0x7f1d582b33c4 in g_malloc + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmem.c:94 + #2 0x7f1d582cb1ac in g_strdup + /home/mcatanzaro/jhbuild/checkout/glib/glib/gstrfuncs.c:363 + #3 0x7f1d582cca45 in g_strdupv + /home/mcatanzaro/jhbuild/checkout/glib/glib/gstrfuncs.c:2491 + #4 0x7f1d582997e1 in g_get_environ + /home/mcatanzaro/jhbuild/checkout/glib/glib/genviron.c:413 + #5 0x4ee3cc in ephy_profile_utils_do_migration + /home/mcatanzaro/jhbuild/checkout/epiphany/lib/ephy-profile-utils.c:102 + #6 0x42437c in main + /home/mcatanzaro/jhbuild/checkout/epiphany/src/ephy-main.c:378 + #7 0x7f1d574196ff in __libc_start_main (/lib64/libc.so.6+0x206ff) + + lib/ephy-profile-utils.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 252cc3c15d30793f182eec94963867d15387d1ce +Author: Michael Catanzaro +Date: Sun Aug 30 10:44:36 2015 -0500 + + EphyEmbed: fix leak setting the title property + + Direct leak of 178 byte(s) in 3 object(s) allocated from: + #0 0x7fce2bc1ba0a in malloc (/lib64/libasan.so.2+0x98a0a) + #1 0x7fce1d271068 in g_malloc + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmem.c:94 + #2 0x7fce1d27134a in g_malloc_n + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmem.c:330 + #3 0x7fce1d28c077 in g_strdup + /home/mcatanzaro/jhbuild/checkout/glib/glib/gstrfuncs.c:363 + #4 0x7fce1d5b5186 in g_value_dup_string + /home/mcatanzaro/jhbuild/checkout/glib/gobject/gvaluetypes.c:1136 + #5 0x49020c in ephy_embed_set_property + /home/mcatanzaro/jhbuild/checkout/epiphany/embed/ephy-embed.c:444 + #6 0x7fce1d58ef42 in object_set_property + /home/mcatanzaro/jhbuild/checkout/glib/gobject/gobject.c:1421 + #7 0x7fce1d58fbd4 in g_object_new_internal + /home/mcatanzaro/jhbuild/checkout/glib/gobject/gobject.c:1814 + #8 0x7fce1d59071a in g_object_new_valist + /home/mcatanzaro/jhbuild/checkout/glib/gobject/gobject.c:2039 + #9 0x7fce1d58f6c5 in g_object_new + /home/mcatanzaro/jhbuild/checkout/glib/gobject/gobject.c:1623 + #10 0x427214 in ephy_shell_new_tab_full + /home/mcatanzaro/jhbuild/checkout/epiphany/src/ephy-shell.c:694 + #11 0x459433 in session_parse_embed + /home/mcatanzaro/jhbuild/checkout/epiphany/src/ephy-session.c:1067 + #12 0x4595c8 in session_start_element + /home/mcatanzaro/jhbuild/checkout/epiphany/src/ephy-session.c:1113 + #13 0x7fce1d26deb9 in emit_start_element + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmarkup.c:1049 + #14 0x7fce1d26ea4e in g_markup_parse_context_parse + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmarkup.c:1396 + #15 0x459e2c in load_stream_read_cb + /home/mcatanzaro/jhbuild/checkout/epiphany/src/ephy-session.c:1266 + #16 0x7fce1d83ac11 in async_ready_callback_wrapper + /home/mcatanzaro/jhbuild/checkout/glib/gio/ginputstream.c:529 + #17 0x7fce1d871911 in g_task_return_now + /home/mcatanzaro/jhbuild/checkout/glib/gio/gtask.c:1104 + #18 0x7fce1d87196e in complete_in_idle_cb + /home/mcatanzaro/jhbuild/checkout/glib/gio/gtask.c:1118 + #19 0x7fce1d26b430 in g_idle_dispatch + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmain.c:5441 + #20 0x7fce1d268a78 in g_main_dispatch + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmain.c:3153 + #21 0x7fce1d2698bc in g_main_context_dispatch + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmain.c:3769 + #22 0x7fce1d269aa0 in g_main_context_iterate + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmain.c:3840 + #23 0x7fce1d269b64 in g_main_context_iteration + /home/mcatanzaro/jhbuild/checkout/glib/glib/gmain.c:3901 + #24 0x7fce1d8a349d in g_application_run + /home/mcatanzaro/jhbuild/checkout/glib/gio/gapplication.c:2311 + #25 0x4247ca in main + /home/mcatanzaro/jhbuild/checkout/epiphany/src/ephy-main.c:484 + #26 0x7fce1c3ca6ff in __libc_start_main (/lib64/libc.so.6+0x206ff) + + embed/ephy-embed.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 25c3734d1ca24bc942f4c8e18b1e41057a65e77b +Author: Michael Catanzaro +Date: Wed Sep 2 11:10:23 2015 -0500 + + Fixup for the previous commit + + src/ephy-title-box.c | 1 - + 1 file changed, 1 deletion(-) + +commit 01014b88746925b3d5e17e09527e0fb48ebf50de +Author: Michael Catanzaro +Date: Tue Sep 1 22:25:01 2015 -0500 + + EphyTitleBox: Escape should not work when there's no title + + Be careful to not allow switching to title mode when the page has no + title. + + https://bugzilla.gnome.org/show_bug.cgi?id=754427 + + src/ephy-title-box.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +commit 9f230a24d42220b8343a1d5ff74c9d3bb969dae0 +Author: Gianvito Cavasoli +Date: Wed Sep 2 06:17:18 2015 +0000 + + Updated Italian translation + + po/it.po | 322 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 173 insertions(+), 149 deletions(-) + +commit af073916477c6300e18490b6be609a1dbfabe676 +Author: Andika Triwidada +Date: Tue Sep 1 08:57:30 2015 +0000 + + Updated Indonesian translation + + po/id.po | 317 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 168 insertions(+), 149 deletions(-) + +commit 75d293330d0d29db104f01c1e17684cf1e4bd903 +Author: Balázs Úr +Date: Mon Aug 31 15:46:39 2015 +0000 + + Updated Hungarian translation + + po/hu.po | 244 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 129 insertions(+), 115 deletions(-) + +commit 6863df9a1027cf506af09a1ce13b53b10f20c858 +Author: Michael Catanzaro +Date: Thu Feb 26 21:18:33 2015 -0600 + + ephy-embed: slightly delay delayed load requests + + If the user is rapidly switching through many tabs with delayed load + requests, we shouldn't load them all. Instead, wait until the user stops + briefly on a tab before loading it. + + https://bugzilla.gnome.org/show_bug.cgi?id=745260 + + embed/ephy-embed.c | 36 +++++++++++++++++++++++++++++++----- + 1 file changed, 31 insertions(+), 5 deletions(-) + +commit 4ca650b788b2ef34813722f73bb85e3491580a7a +Author: Michael Catanzaro +Date: Sat Mar 7 14:57:31 2015 -0600 + + Do not open an extra overview when starting the browser + + If there is no saved session and the user launches Epiphany by clicking + a URI in another application, then we should open only one tab with that + URI. Currently we may open the overview and then the URI in a second tab, + because we do not consider the page to be blank if it is still loading. + Replace this tricky code. If the page is still loading it's not safe to + assume the URI has been set to whatever page was last loaded in it, and we + can't risk losing tabs from a previous session. + + https://bugzilla.gnome.org/show_bug.cgi?id=745792 + + src/ephy-shell.c | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) + +commit 248cb650f2b192210e7d2eaf66b0e12cda929e3a +Author: Tom Tryfonidis +Date: Sun Aug 30 12:09:41 2015 +0300 + + Updated Greek translation + + po/el.po | 332 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 181 insertions(+), 151 deletions(-) + +commit 72819cb52ebfa118b20293e99943cc89cc61a03e +Author: Yosef Or Boczko +Date: Sun Aug 30 10:58:31 2015 +0300 + + Updated Hebrew translation + + po/he.po | 242 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 130 insertions(+), 112 deletions(-) + +commit 9ab0e18547aa71dbdd8ae4304d48d2fb80c76ae5 +Author: Piotr Drąg +Date: Sun Aug 30 01:20:21 2015 +0200 + + Updated Polish translation + + po/pl.po | 464 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 242 insertions(+), 222 deletions(-) + +commit ef4c8fd80e8863a8355f0e7c194970ccd9df0a48 +Author: Michael Catanzaro +Date: Sat Aug 29 09:20:59 2015 -0500 + + Enable adblock by default + + It's been a long time since we've seen complaints about non-ads being + blocked. + + https://bugzilla.gnome.org/show_bug.cgi?id=754273 + + data/org.gnome.epiphany.gschema.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 4ff8705155fda53460bc9dfdc1de6c14e83880a1 +Author: Michael Catanzaro +Date: Sat Aug 29 09:12:04 2015 -0500 + + Enable DNT headers by default + + Argument in favor: The do-not-track header should be sent by default. + Otherwise, setting the header makes it easier to track you (since fewer + users will change the setting than leave it unchanged). It's hard to + understate how silly this is. ;) + + data/org.gnome.epiphany.gschema.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 080a2a02aaec820883f11e66ab0eae8a7e5c185d +Author: Anders Jonsson +Date: Thu Aug 27 08:36:25 2015 +0000 + + Updated Swedish translation + + po/sv.po | 638 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 326 insertions(+), 312 deletions(-) + +commit f671076569683c3f369ca64030dfe7c30a0abc00 +Author: Fran Dieguez +Date: Tue Aug 25 16:28:02 2015 +0200 + + Updated Galician translations + + po/gl.po | 337 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 182 insertions(+), 155 deletions(-) + +commit 43c1c5eba6028807ce45d09829fa5a9f4c0b1dff +Author: Chao-Hsiung Liao +Date: Tue Aug 25 13:20:28 2015 +0000 + + Updated Chinese (Taiwan) translation + + po/zh_TW.po | 344 +++++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 188 insertions(+), 156 deletions(-) + +commit 51b329fb59433247204efaadaa394d3b0ea9a3ae +Author: Alexandre Franke +Date: Mon Aug 24 20:15:29 2015 +0000 + + Updated French translation + + po/fr.po | 335 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 185 insertions(+), 150 deletions(-) + +commit 8dcc5dcba04140bd2adca2ed51a3057e518b321c +Author: Dušan Kazik +Date: Mon Aug 24 15:54:20 2015 +0000 + + Updated Slovak translation + + po/sk.po | 783 +++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 514 insertions(+), 269 deletions(-) + +commit ddf6de69c5e815aaa5064432000a4f521f63144c +Author: Michael Catanzaro +Date: Sat Aug 22 10:37:56 2015 -0500 + + Update autogen.sh to latest example + + Adds support of out-of-tree builds. Also, set +-x have become too + unwieldy and are removed. + + autogen.sh | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +commit 7b56201a1676ceda24b8597ce9d3d444066a9d00 +Author: Daniel Mustieles +Date: Wed Aug 12 08:58:57 2015 +0200 + + Updated Spanish translation + + po/es.po | 247 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 130 insertions(+), 117 deletions(-) + +commit 39f4fea86b4349c6d859f1272d191ed1f7754ea3 +Author: Enrico Nicoletto +Date: Mon Aug 10 23:06:31 2015 +0000 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 807 ++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 512 insertions(+), 295 deletions(-) + +commit 592e5dff5b6aadeccf437c3ddbfb2e4b0134353e +Author: Carlos Garcia Campos +Date: Fri Aug 7 11:15:57 2015 +0200 + + ephy-location-entry: Get rid of the cell data func to set the text + + It seems that changing the model in the cell data func callback confuses + GtkTreeView that keeps validating the rows all the time while the popup + is hidden. The fact that GtkEntry recomputes the size of the popup on + every size_allocate even when the popup is hidden doesn't help either. + So, not changing the model inside the cell data func callback prevents + the rows from being validated indefinitely, but still the cell data func + is called too often in my opinion. And we are always setting the same + text for every row, so I think we should set the title in the model and + get rid of the cell data func. + This patch also ensures that the URL is not shown twice in the + completion menu when there's no title. + + https://bugzilla.gnome.org/show_bug.cgi?id=753321 + + lib/widgets/ephy-location-entry.c | 76 +-------------------------------------- + src/ephy-completion-model.c | 63 +++++++++++++++++++++++++++++--- + 2 files changed, 60 insertions(+), 79 deletions(-) + +commit de0b20af8832fe8ebf3c8a70f9b82c6fc76cb4c9 +Author: Carlos Garcia Campos +Date: Thu Aug 6 16:00:30 2015 +0200 + + ephy-completion-model: Do not add smart bookmarks to the completion model + + They are already added by EphyLocationController to the completion menu + as completion actions. Otherwise they appear twice in the completion + menu, and with a null address in the first case. + + https://bugzilla.gnome.org/show_bug.cgi?id=753321 + + src/ephy-completion-model.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +commit 4d3f2dc8763c2eee28479ee8e45962ec28924dd1 +Author: Kjartan Maraas +Date: Thu Aug 6 11:15:10 2015 +0200 + + Updated Norwegian bokmål translation. + + po/nb.po | 145 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 81 insertions(+), 64 deletions(-) + +commit b2a53b9c7b9b6cb57a03cc44b266d5dfd8555ed1 +Author: Pedro Albuquerque +Date: Tue Aug 4 10:25:59 2015 +0000 + + Updated Portuguese translation + + po/pt.po | 249 +++++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 129 insertions(+), 120 deletions(-) + +commit 597d7f9f8661e464e083ce75151690012bfca885 +Author: Carlos Garcia Campos +Date: Fri Jul 31 10:15:49 2015 +0200 + + Implement shared-secondary-process model as MULTIPLE_SECONDARY_PROCESSES with a process limit of 1 + + The main difference is that the networking is done in the + network process, instead of the web process. + + https://bugzilla.gnome.org/show_bug.cgi?id=753093 + + embed/ephy-embed-shell.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +commit 74e1ff0dd50afc3450eb494dc3c6f5ac0c00b2f5 +Author: Carlos Garcia Campos +Date: Fri Jul 31 09:55:19 2015 +0200 + + Add a setting to set the maximum number of web processes + + It allows to limit the amount of web processes created at the same time + by the one-secondary-process-per-web-view process model. + + https://bugzilla.gnome.org/show_bug.cgi?id=753092 + + configure.ac | 2 +- + data/org.gnome.epiphany.gschema.xml | 6 ++++++ + embed/ephy-embed-shell.c | 2 ++ + lib/ephy-prefs.h | 1 + + 4 files changed, 10 insertions(+), 1 deletion(-) + +commit f8b2b4e0e050fe8ff04a6ea1d6260a6527822033 +Author: Carlos Garcia Campos +Date: Fri Jul 31 12:10:57 2015 +0200 + + overview: Move the overview CSS to about.css and generate the HTML from the code + + This way we get rid of the overview.html template resource. All the + overview specific classes and ids have been renamed to overview-name, + since the CSS is now in the common abbout.css resource. This fixes the + problems of using a printf template and makes the generation fo the + overview consistent with all other about handlers. + + https://bugzilla.gnome.org/show_bug.cgi?id=751385 + + embed/ephy-about-handler.c | 66 +++++++---- + embed/web-extension/ephy-web-overview.c | 18 +-- + src/Makefile.am | 1 - + src/epiphany.gresource.xml | 1 - + src/resources/about.css | 134 +++++++++++++++++++++ + src/resources/overview.html | 204 -------------------------------- + 6 files changed, 188 insertions(+), 236 deletions(-) + +commit 75d044a556533ab58cd1f895c4aaba29ac5acc8e +Author: Michael Catanzaro +Date: Sun Aug 2 19:04:34 2015 -0500 + + Fix the desktop file + + AC_CONFIG_FILES cannot translate things... broken since + 0711c69b583af8a5a455e75458a96058f74317d0 + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 6e5d64aeac48493c201f7fec611840510168e8d1 +Author: Michael Catanzaro +Date: Thu Jul 30 09:57:02 2015 -0500 + + Reorder options in remember password prompt + + I messed this up replacing the close button with don't save: affirmative + is always on the right in GNOME. Just like it already is for + geolocation/notification requests. + + https://bugzilla.gnome.org/show_bug.cgi?id=753061 + + embed/ephy-web-view.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit db05593e2710ab6df0d45fcc9df1d069e66c2906 +Author: Kjartan Maraas +Date: Fri Jul 31 12:08:26 2015 +0200 + + Updated Norwegian bokmål translation. + + po/nb.po | 378 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 187 insertions(+), 191 deletions(-) + +commit 3c4525de2b3e7cfa8938709094aa9b9dd3a2b930 +Author: Michael Catanzaro +Date: Sat Jul 25 17:14:08 2015 -0500 + + EphyWindow: store a decoded address, not a percent-encoded address + + This means the location controller will get a user-friendly display URI. + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + src/ephy-lockdown.c | 2 +- + src/ephy-window.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 961074415b68792ac0282e72a0d93245c1ad5ea2 +Author: Michael Catanzaro +Date: Sat Jul 25 17:08:01 2015 -0500 + + Show decoded URI in the new web application dialog + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + src/window-commands.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit a3317ec824d80d99537918f168db0a1f70bd268e +Author: Michael Catanzaro +Date: Sat Jul 25 17:02:35 2015 -0500 + + EphyWebView: add get_display_address() + + This returns a decoded URI. It is the only URI that is appropriate for + display to the user. + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + embed/ephy-web-view.c | 29 +++++++++++++++++++++++++++-- + embed/ephy-web-view.h | 2 +- + 2 files changed, 28 insertions(+), 3 deletions(-) + +commit dbee788e39394de6c0536d95dbef95528dbc7e3a +Author: Michael Catanzaro +Date: Mon Jul 27 19:47:34 2015 -0500 + + Fixup for 'display decoded URIs in the history dialog' + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + src/ephy-history-window.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit 339e2903b2adab2cbac8a69cce254285a61c2b4b +Author: Michael Catanzaro +Date: Mon Jul 27 19:44:26 2015 -0500 + + Fixup for 'display decoded URIs in bookmarks editor' + + I pushed before addressing Carlos's review comments. Bad Michael! + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + src/bookmarks/ephy-bookmarks-editor.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +commit 71be3ea36f1f7287d232f5410882017abc551768 +Author: Michael Catanzaro +Date: Thu Dec 11 19:10:58 2014 +0100 + + Display decoded URIs in the history dialog + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + src/ephy-history-window.c | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +commit 7218cb46abc59561f026406d4c5141bc71ae8c67 +Author: Michael Catanzaro +Date: Thu Dec 11 18:53:06 2014 +0100 + + Display decoded URIs in the bookmarks editor + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + src/bookmarks/ephy-bookmarks-editor.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +commit 965244584bfdf414137224d3728a578c472d3335 +Author: Michael Catanzaro +Date: Thu Dec 11 18:40:03 2014 +0100 + + Add ephy_node_view_add_column_full + + Allow creating an EphyNodeView column that derives its values from a + property, but is modified by a function for display. + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + lib/widgets/ephy-node-view.c | 52 ++++++++++++++++++++++++++++++++++---------- + lib/widgets/ephy-node-view.h | 10 +++++++++ + 2 files changed, 51 insertions(+), 11 deletions(-) + +commit e9f28821db0fabe8c6c96e898bd3e0e7a09e8d50 +Author: Michael Catanzaro +Date: Thu Dec 11 18:29:18 2014 +0100 + + Add ephy_tree_model_node_add_column_full + + Allow creating a tree model column that derives its values from a + property, but is modified by a function for display. + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + lib/widgets/ephy-tree-model-node.c | 54 +++++++++++++++++++++++--------------- + lib/widgets/ephy-tree-model-node.h | 6 +++++ + 2 files changed, 39 insertions(+), 21 deletions(-) + +commit 072ccaceb6dabc0a7a3baef4950b47aa282f315b +Author: Michael Catanzaro +Date: Thu Dec 11 12:16:42 2014 +0100 + + Display decoded URIs in the bookmark properties dialog + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + src/bookmarks/ephy-bookmark-properties.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 17e4d34628fc425c08a5c6d9cc2419bf3926222f +Author: Michael Catanzaro +Date: Thu Dec 11 11:30:22 2014 +0100 + + Display decoded URIs in the location entry completion + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + lib/widgets/ephy-location-entry.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit b2f5f1af21a9204c2645e6f56749d8aa6492351b +Author: Michael Catanzaro +Date: Sat Jul 25 16:01:39 2015 -0500 + + EphyWebView: Decode URI before setting the loading or status message + + This ensures that the URI displayed in the floating bar is decoded. + + https://bugzilla.gnome.org/show_bug.cgi?id=710004 + + embed/ephy-web-view.c | 15 +++++++++++---- + embed/ephy-web-view.h | 2 +- + 2 files changed, 12 insertions(+), 5 deletions(-) + +commit 2e42c298bc656cbd2ab02dbec2f45327dbfbb34d +Author: Marek Černocký +Date: Sat Jul 25 03:35:01 2015 +0200 + + Updated Czech translation + + po/cs.po | 347 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 174 insertions(+), 173 deletions(-) + +commit f8739c4ba09171c63f88df017e6a6bc244c082c0 +Author: Michael Catanzaro +Date: Fri Jul 17 10:10:10 2015 -0500 + + Inhibit logout and suspend while downloading files + + https://bugzilla.gnome.org/show_bug.cgi?id=339809 + + embed/ephy-download.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 53 insertions(+) + +commit 4ffd3902c3316b0d2f65fd4abede852eb995108c +Author: Bastien Nocera +Date: Sat Oct 18 20:58:05 2014 +0200 + + ephy-dom-utils: Remember some more passwords + + Remember passwords for the French tax office: + https://cfspart.impots.gouv.fr/LoginMDP + + The identifier's entry type is set as "tel" so that only digits can + be input on browsers that support those hints. Make sure that Epiphany + knows that "telephone numbers" can be used as identifiers, in addition + to free-form text and emails. + + https://bugzilla.gnome.org/show_bug.cgi?id=750024 + + lib/ephy-web-dom-utils.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit d3ecd72dac981b15c098fb29c03500667d8ffd55 +Author: Claudio Saavedra +Date: Wed Jul 22 14:45:38 2015 +0300 + + [release] 3.17.2 + + NEWS | 12 ++++++++++++ + configure.ac | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +commit 46916be759f08f9f560acb4eadf76103fc808b4e +Author: Carlos Garcia Campos +Date: Mon Jun 22 09:44:08 2015 +0200 + + embed: Make sure private instances don't leave data outside their profile dir + + Create the WebKitWebContext with a WebKitWebsiteDataManager configured + for the current profile. + + configure.ac | 2 +- + embed/ephy-embed-shell.c | 38 +++++++++++++++++++++----------------- + 2 files changed, 22 insertions(+), 18 deletions(-) + +commit 18c227908098a715b7b1686ffab6d151dc2459ba +Author: Michael Catanzaro +Date: Mon Jul 20 13:16:14 2015 -0500 + + Set page title as a tooltip for tabs + + https://bugzilla.gnome.org/show_bug.cgi?id=752606 + + src/ephy-notebook.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit 51e844a9e0e7e9901cbe22c923debeaa45bed006 +Author: Balázs Úr +Date: Fri Jul 17 12:46:06 2015 +0000 + + Updated Hungarian translation + + po/hu.po | 127 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 69 insertions(+), 58 deletions(-) + +commit 290774f2d27df8ff365e97e1e6e2b1a92ddd2512 +Author: Yosef Or Boczko +Date: Thu Jul 16 14:27:37 2015 +0300 + + Updated Hebrew translation + + po/he.po | 278 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 140 insertions(+), 138 deletions(-) + +commit e28f16a9f5a248939b4c8c297445fb6a1651bb4c +Author: Daniel Mustieles +Date: Mon Jul 13 10:27:12 2015 +0200 + + Updated Spanish translation + + po/es.po | 134 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 72 insertions(+), 62 deletions(-) + +commit 9f00bb5991e48efb65e463c436179cb29aa87e0c +Author: Ting-Wei Lan +Date: Tue Jul 7 16:11:04 2015 +0800 + + build: Fix -Werror build for clang + + https://bugzilla.gnome.org/show_bug.cgi?id=752050 + + embed/ephy-embed-prefs.c | 4 ++-- + embed/ephy-find-toolbar.c | 3 +++ + embed/ephy-web-view.c | 2 +- + lib/ephy-langs.c | 2 +- + src/bookmarks/ephy-bookmarks-editor.c | 6 +++--- + src/bookmarks/ephy-bookmarks-export.c | 2 +- + 6 files changed, 11 insertions(+), 8 deletions(-) + +commit 89464813d02df5459fa3cceaa752d33252d9cb94 +Author: Michael Catanzaro +Date: Tue Sep 9 17:07:48 2014 -0500 + + ephy-location-entry: update padding for latest Adwaita + + Our code for aligning the URL of completions with the URL in the + location entry seems to be theme-dependent, and the alignment isn't + quite right with the latest Adwaita. + + https://bugzilla.gnome.org/show_bug.cgi?id=736363 + + lib/widgets/ephy-location-entry.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8eb582bc36e39c2cfc321fe80de9be694a1b5811 +Author: Pedro Albuquerque +Date: Sat Jul 4 06:21:19 2015 +0000 + + Updated Portuguese translation + + po/pt.po | 373 +++++++++++++++++++++++++++++---------------------------------- + 1 file changed, 173 insertions(+), 200 deletions(-) + +commit 86058f219c4cf81d88387a44e68a698083ddb8f3 +Author: Michael Catanzaro +Date: Fri Jul 3 10:26:03 2015 -0500 + + configure.ac: Use AX_REQUIRE_DEFINED + + Let's assume the user has an up-to-date copy of autoconf-archive + (otherwise, he probably does not even have AX_REQUIRE_DEFINED). If so, + we can ensure a better error message when a required external macro is + missing. + + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +commit 4615a1debb36d723bbbc47525e836b1afb281c0e +Author: Michael Catanzaro +Date: Thu Jul 2 14:04:27 2015 -0500 + + Be more careful with weak pointers + + As a follow-up to bug #747422, be careful to remove weak pointers to + objects when it appears that the lifetime of the object can outlive the + lifetime of the memory location of the pointer. + + https://bugzilla.gnome.org/show_bug.cgi?id=751858 + + embed/ephy-web-view.c | 6 ++++++ + embed/web-extension/ephy-web-extension.c | 2 ++ + 2 files changed, 8 insertions(+) + +commit 0f1f02930040ee14a373fef7a86e2976d599acf3 +Author: Michael Catanzaro +Date: Thu Jul 2 13:51:40 2015 -0500 + + Add a FIXME comment + + src/bookmarks/ephy-bookmarks-editor.c | 1 + + 1 file changed, 1 insertion(+) + +commit 3596b8e88b0b98a5133c609124458d6d0d968062 +Author: Carlos Garnacho +Date: Thu Jul 2 15:56:44 2015 +0200 + + ephy-web-view: Clean up after outliving web extension proxies + + If the EphyWebView is destroyed before the EphyWebExtensionProxy + it's attached to does, we'll leave a dangling weak pointer, which + will nullify random memory at the time the web extension proxy + is actually destroyed. + + So, prepare for undoing the effects of page_created_cb() in case + we ::dispose() when we still have a web extension attached. + + https://bugzilla.gnome.org/show_bug.cgi?id=747422 + + embed/ephy-web-view.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +commit b2a52f197cbd3f2db30154b3f9c2d38b25f77394 +Author: Michael Catanzaro +Date: Mon Jun 29 21:45:36 2015 -0500 + + Silence all the new warnings + + Let's fix these one-by-one, instead of dealing with a bajillion warnings + that prevent us from seeing the build progress and noticing any warnings + at all. + + Also, actually make use of AX_COMPILER_FLAGS to test the flags we pass, + instead of using them unconditionally. + + configure.ac | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 44845cacf5b4e6a1af0aef3552a40021f6a75312 +Author: Michael Catanzaro +Date: Mon Jun 29 21:34:22 2015 -0500 + + Silence a deprecation warning coming from egg + + Don't want to use the normal compiler warnings here, because I don't + want to fix compiler warnings from egg generally. So we'll just leave + this directory with only the default compiler warnings. But for some + reason, -Wdeprecated-declaration is enabled by default. Maybe we'll + rethink using the default warnings here in the future, but in the + meantime, might as well placate it. + + Not upstreamed since the upstream code supports ancient GTK+. + + Also note: this code seems to be crashy, but it was crashy BEFORE this + commit too. It seems to be a regression in GTK+ 3.17. + + lib/egg/eggtreemultidnd.c | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) + +commit 43d48f2196f09327a716a3f9d01b184067d9d41e +Author: Michael Catanzaro +Date: Mon Jun 29 20:08:01 2015 -0500 + + configure.ac: Add a comment about some warnings we can't fix yet + + configure.ac | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +commit ad7cb596703be3c4bc6b0f3b2d49c36a4b0b7c5b +Author: Michael Catanzaro +Date: Mon Jun 29 19:03:13 2015 -0500 + + Fix build of URI helpers test + + tests/Makefile.am:178: warning: variable 'test_ephy_uri_helpers_SOURCES' + is defined but no program or + tests/Makefile.am:178: library has 'test_ephy_uri_helpers' as canonical + name (possible typo) + + Glad that was legal. "Glad." + + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9d512444141203d7de5513b66ca9dd59dfd3816f +Author: Michael Catanzaro +Date: Mon Jun 29 18:39:14 2015 -0500 + + Clean data files in normal clean + + Let's reserve distclean for stuff generated by configure, and use clean + for everything generated by make and not distributed (the usual rule). + + data/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 0b0dd9c9212abda612b0ba92306f4288b6f36c19 +Author: Michael Catanzaro +Date: Mon Jun 29 18:33:09 2015 -0500 + + Don't list the same files in multiple clean targets + + Distclean also deletes files that would be deleted by normal clean, + maintainerclean also deletes files that would be deleted by distclean, + and clean also deletes files that are deleted by poor forgotten + mostlyclean. + + embed/Makefile.am | 2 -- + lib/Makefile.am | 2 -- + lib/history/Makefile.am | 2 -- + lib/widgets/Makefile.am | 2 -- + src/Makefile.am | 2 -- + src/bookmarks/Makefile.am | 2 -- + 6 files changed, 12 deletions(-) + +commit 4966c40e75acb125f1ceef353d0d5c68c02b6eb1 +Author: Michael Catanzaro +Date: Mon Jun 29 18:30:15 2015 -0500 + + Remove POTFILES.skip + + Two of these files no longer exist, and the appdata file is already + translated. + + po/POTFILES.skip | 3 --- + 1 file changed, 3 deletions(-) + +commit 0711c69b583af8a5a455e75458a96058f74317d0 +Author: Michael Catanzaro +Date: Mon Jun 29 18:29:13 2015 -0500 + + Remove Bug Buddy crap from desktop file and simplify generation + + No need for the .desktop.in.in with the Bug Buddy stuff removed. + + configure.ac | 2 +- + data/Makefile.am | 4 ++-- + data/epiphany.desktop.in | 18 ++++++++++++++++++ + data/epiphany.desktop.in.in | 23 ----------------------- + po/POTFILES.in | 2 +- + po/POTFILES.skip | 1 - + 6 files changed, 22 insertions(+), 28 deletions(-) + +commit b012b48574425c6e17dd692306500fff3da78659 +Author: Michael Catanzaro +Date: Mon Jun 29 18:23:28 2015 -0500 + + Improve the appdata file + + Let's not show our codename in GNOME Software. Also, add a bit more + description; I think we need two paragraphs to pass appstream-util + validate. + + data/epiphany.appdata.xml.in | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +commit 72c138d4196238316c17ee666784f38e273d43c2 +Author: Michael Catanzaro +Date: Mon Jun 29 18:17:36 2015 -0500 + + Do not distribute org.gnome.Epiphany.service + + This is necessarily generated at make time. + + data/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6c3483ec695427bba018024fac1d035a8346ad8f +Author: Michael Catanzaro +Date: Mon Jun 29 18:08:28 2015 -0500 + + Modernize appdata generation and validate it during distcheck + + Using the standard appstream macros that replaced the appdata macros + that replaced the do-it-manually method we have here. + + configure.ac | 1 + + data/Makefile.am | 11 +++++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +commit 084f096535b08f17ddcb47b4d23ebd881c6e196e +Author: Michael Catanzaro +Date: Mon Jun 29 17:50:39 2015 -0500 + + configure.ac: Remove inexplicable blank line in output + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit a5bb7498b9272a3768c1f0549b087116a93ce848 +Author: Michael Catanzaro +Date: Mon Jun 29 17:46:50 2015 -0500 + + Remove git branches from ChangeLog + + These aren't meaningful in the changelog, and cause the resultant + changelog to differ based on the user's git configuration. + + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit e515d5769ed287fa4ca77259e8d0039348679672 +Author: Michael Catanzaro +Date: Mon Jun 29 17:43:53 2015 -0500 + + Put build goo under build-aux directory + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit ff29f6f24ac3e8949d135eb08db18fce272b96e0 +Author: Michael Catanzaro +Date: Mon Jun 29 17:37:25 2015 -0500 + + EXTRA_DIST fewer things + + autogen.sh is for git builds. It has no place in our tarball. + + HACKING is for developers, who should be using git. + + ChangeLog is already distributed by default. + + Makefile.am | 8 -------- + 1 file changed, 8 deletions(-) + +commit 03bfed408e51e032866f5c49a28704811080c7f4 +Author: Michael Catanzaro +Date: Mon Jun 29 17:33:35 2015 -0500 + + Remove MAINTAINERS + + It's obsoleted by the doap file, and hasn't been kept in sync. + + ChangeLog.README | 2 +- + HACKING | 2 +- + MAINTAINERS | 3 --- + Makefile.am | 1 - + 4 files changed, 2 insertions(+), 6 deletions(-) + +commit 81c0572868febb8073f7d52aa65b53d8a703fc6c +Author: Michael Catanzaro +Date: Mon Jun 29 17:31:20 2015 -0500 + + Remove COPYING.README + + WebKit is a thing now. If we switch back to Mozilla in the future, then + we can always resurrect this. I won't hold my breath. + + COPYING.README | 8 -------- + Makefile.am | 1 - + 2 files changed, 9 deletions(-) + +commit 16b1dd64cc7a6f5bc4b6b712a19e700eff51f908 +Author: Michael Catanzaro +Date: Mon Jun 29 17:29:43 2015 -0500 + + configure.ac: Add a few missing quotes + + More for style than safety + + configure.ac | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +commit 41b34cb38e174811fd226da1e3712b9682eb1542 +Author: Michael Catanzaro +Date: Mon Jun 29 17:27:26 2015 -0500 + + configure.ac: Rearrange + + This fixes a bajillion warnings about AX_CHECK_ENABLE_DEBUG being used + before AC_PROG_CC, which we have had ever since GNOME_DEBUG_CHECK + started using AX_CHECK_ENABLE_DEBUG internally. + + I rearrange a bit more to make it look nicer to me. :) + + configure.ac | 29 ++++++++++++----------------- + 1 file changed, 12 insertions(+), 17 deletions(-) + +commit 6fb87c2b8b1c71730cade3d02b2a00871e30ac2c +Author: Michael Catanzaro +Date: Mon Jun 29 17:21:26 2015 -0500 + + configure.ac: Remove EPHY_CHECK_VERSION cruft + + This no longer exists. If we add it in the future, we can bring it back, + but that doesn't seem like a particularly-likely future to me. + + configure.ac | 5 ----- + 1 file changed, 5 deletions(-) + +commit 7573f26fb584acf179ddcbc084b2b8aebfed53df +Author: Michael Catanzaro +Date: Mon Jun 29 17:15:27 2015 -0500 + + Reenable -Wmissing-prototype + + -Wmissing-prototype is good. Suppressing it for the entire project was a + bad idea. + + We'll need to keep -Wno-deprecated-declarations until we can manage to + move away from GtkUIManager, GtkAction, and friends. + + I kind of want to remove -Wdeclaration-after-statement as well, because + it is 2015 and it's good to minimize the scope of your variable + declarations by declaring them at point of first use, but this one is + worth discussing before changing. + + configure.ac | 2 +- + embed/web-extension/ephy-web-extension-main.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +commit d9a7d8e542357a321a49de4ce2b69855413bfd11 +Author: Michael Catanzaro +Date: Mon Jun 29 16:58:55 2015 -0500 + + Use AX_COMPILER_FLAGS instead of GNOME_COMPILE_WARNINGS + + GNOME_COMPILE_WARNINGS has been deprecated for AX_COMPILER_FLAGS. + + Behavior change: -Werror is not enabled by default for builds from git. + Disable by configuring with --disable-Werror. jhbuild and GNOME + Continuous will pass this by default. Werror will not be used for + tarball builds. This was the product of negotiation, intended to + encourage GNOME developers to fix warnings without causing needless + breakage for jhbuilders or for downstreams (since -Werror will not be + used for tarball builds). + + Behavior change #2: We have a ton of new warnings to fix now. + + https://wiki.gnome.org/Projects/GnomeCommon/Migration + + configure.ac | 3 +-- + embed/Makefile.am | 1 + + embed/web-extension/Makefile.am | 1 + + lib/Makefile.am | 1 + + lib/history/Makefile.am | 1 + + lib/widgets/Makefile.am | 1 + + src/Makefile.am | 5 ++++- + src/bookmarks/Makefile.am | 1 + + tests/Makefile.am | 2 ++ + 9 files changed, 13 insertions(+), 3 deletions(-) + +commit 480536d5026e68d0d0211849cc5fde759a7797b6 +Author: Michael Catanzaro +Date: Mon Jun 29 16:55:12 2015 -0500 + + Enable compiler warnings in some places they were missing + + lib/Makefile.am | 2 ++ + lib/history/Makefile.am | 2 ++ + tests/Makefile.am | 3 ++- + 3 files changed, 6 insertions(+), 1 deletion(-) + +commit c10488db3416e9afed2564b1a61f240b0414b6f5 +Author: Michael Catanzaro +Date: Mon Jun 29 16:42:38 2015 -0500 + + Use AX_CHECK_ENABLE_DEBUG instead of GNOME_DEBUG_CHECK + + Behavior change: debug mode is now enabled by default for builds from + git (but not for tarball builds). Now I don't need to pass --enable-debug + in my module_autogenargs in jhbuildrc anymore, yay! + + https://wiki.gnome.org/Projects/GnomeCommon/Migration + + configure.ac | 2 +- + lib/ephy-debug.c | 2 +- + lib/ephy-debug.h | 2 +- + lib/ephy-file-helpers.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit d05fcf358fd35f4448687de8444797ed4d1fed19 +Author: Michael Catanzaro +Date: Mon Jun 29 16:38:35 2015 -0500 + + configure.ac: Do not use GNOME_MAINTAINER_MODE_DEFINES + + I think this doesn't do anything anymore. + + https://wiki.gnome.org/Projects/GnomeCommon/Migration + + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +commit 16116312f12cd62c056ad2d7c95f31bc4405d314 +Author: Michael Catanzaro +Date: Mon Jun 29 16:35:25 2015 -0500 + + configure.ac: Use AX_IS_RELEASE + + This affects AX_CHECK_ENABLE_DEBUG and AX_COMPILER_FLAGS. + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit f0478f98c1ba131088c6dcf50ff4bac465252b7c +Author: Michael Catanzaro +Date: Mon Jun 29 16:28:00 2015 -0500 + + Use AX_CODE_COVERAGE instead of GNOME_CODE_COVERAGE + + GNOME_CODE_COVERAGE has moved upstream. + + Note: This means we now depend on autoconf-archive for builds from git, + which is now a mandatory dependency for GNOME (when building from git). + All macros will be copied into the tarball and distributed + automatically, so there are no new dependencies in our release. + + https://wiki.gnome.org/Projects/GnomeCommon/Migration + + Makefile.am | 2 +- configure.ac | 2 +- - 2 files changed, 9 insertions(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 2 deletions(-) -commit b17a94c66362001f62bd0e09fab51bffa62d45b3 +commit 61b8ca251aad8c733ad7f033c09af67cefb930ef Author: Michael Catanzaro -Date: Thu Jul 2 14:04:27 2015 -0500 +Date: Mon Jun 29 16:20:59 2015 -0500 - Be more careful with weak pointers + Stop abusing ACLOCAL_AMFLAGS - As a follow-up to bug #747422, be careful to remove weak pointers to - objects when it appears that the lifetime of the object can outlive the - lifetime of the memory location of the pointer. + This is deprecated and it won't work in Automake 2.0, which is + supposedly going to be released later this year. We don't need this + anymore because we call aclocal --install in autogen.sh. Supposedly also + Autoconf 2.70 will be released later this year as well; if that happens, + then autoreconf --install should have learned to pass --install to + aclocal, and we won't need to use it explicitly anymore. In the + meantime, we'll continue to run aclocal in autogen.sh. This is the + recommended practice for all GNOME projects. - https://bugzilla.gnome.org/show_bug.cgi?id=751858 + There is one downside: libtool 2.4.2 and older will complain that we + have not added -I m4 to ACLOCAL_AMFLAGS. The warning is harmless and + should be ignored. I believe libtool 2.4.3 no longer complains (although + I don't have a new enough libtool to test this). + + https://wiki.gnome.org/Projects/GnomeCommon/Migration - embed/ephy-web-view.c | 6 ++++++ - embed/web-extension/ephy-web-extension.c | 2 ++ - 2 files changed, 8 insertions(+) + Makefile.am | 2 -- + 1 file changed, 2 deletions(-) -commit dedbad49530a554b4ccede0d7c2c40481801c93c -Author: Carlos Garnacho -Date: Thu Jul 2 15:56:44 2015 +0200 +commit d483ea45db53b4326434a8d46eb0f88069a9d20b +Author: Michael Catanzaro +Date: Mon Jun 29 16:19:19 2015 -0500 - ephy-web-view: Clean up after outliving web extension proxies + Stop using gnome-autogen - If the EphyWebView is destroyed before the EphyWebExtensionProxy - it's attached to does, we'll leave a dangling weak pointer, which - will nullify random memory at the time the web extension proxy - is actually destroyed. + It's deprecated. - So, prepare for undoing the effects of page_created_cb() in case - we ::dispose() when we still have a web extension attached. + This incidentally fixes the following warning: - https://bugzilla.gnome.org/show_bug.cgi?id=747422 + ***Warning*** PKG_NAME is deprecated, you may remove it from autogen.sh + + https://wiki.gnome.org/Projects/GnomeCommon/Migration - embed/ephy-web-view.c | 6 ++++++ - 1 file changed, 6 insertions(+) + autogen.sh | 44 ++++++++++++++++++++++++++++---------------- + 1 file changed, 28 insertions(+), 16 deletions(-) -commit cd4032bce6abd1bdbe4203660da3c0aab3f3930c +commit 5e5bb440f756c0039c53058042c5fbe88fc0e3fc Author: Michael Catanzaro -Date: Wed Jul 1 10:05:12 2015 -0500 +Date: Mon Jun 29 16:16:09 2015 -0500 - Fix translations in the search provider + configure.ac: Remove explicit use of PKG_PROG_PKG_CONFIG + + This is only needed if the first use of PKG_CHECK_MODULES is inside a + conditional. See pkg-config(1). - src/ephy-search-provider-main.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) + configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +commit 527dd7aa65ac38686191b5f0ad485572acf83db9 +Author: Michael Catanzaro +Date: Mon Jun 29 16:14:05 2015 -0500 + + configure.ac: Use AM_SILENT_RULES unconditionally + + It's guaranteed to be present because we already require automake 1.11 + + configure.ac | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +commit 8d03dd5d54049ea471e46bd720110a07ad676600 +Author: Michael Catanzaro +Date: Mon Jun 29 15:42:17 2015 -0500 + + Really fix translations in the search provider + + We need to call setlocale() manually because we are not a GTK+ + application and do not call gtk_init() (which would normally handle this + for us). + + src/ephy-search-provider-main.c | 2 ++ + 1 file changed, 2 insertions(+) + +commit b73db5522be075a651a7b3a812ad726fde47f585 +Author: Michael Catanzaro +Date: Mon Jun 29 15:06:40 2015 -0500 + + Use plain LOCALEDIR + + The variable rename is itself of no consequence, just to be more + standard. But $(localedir) may not necessarily be $(datadir)/locale, so + this aspect of the change makes a real difference. + + lib/Makefile.am | 1 + + lib/ephy-langs.c | 6 ++---- + src/Makefile.am | 6 +++--- + src/ephy-main.c | 2 +- + src/ephy-search-provider-main.c | 2 +- + 5 files changed, 8 insertions(+), 9 deletions(-) + +commit c205fbe91a1e725be4648688da4e35b8b352d1e6 +Author: Michael Catanzaro +Date: Mon Jun 29 14:46:12 2015 -0500 + + Make gettext mandatory and stop using glib-gettext + + It's fighting with intltool and intltool is winning, so no point in + keeping it around and making things more complicated. In the future, it + would be good to replace intltool with upstream gettext (not + glib-gettext), but we still need intltool to translate the appdata file. + In the meantime, we'll no longer have two competing applications that + both want to create po/Makefile.in.in. + + The AM_GLIB_GNU_GETTEXT macro was defining ENABLE_NLS if gettext is + available, to make i18n optional. But most GNOME programs require + gettext nowadays, and it's installed pretty much everywhere, so there is + no reason for it to be optional anymore. Note, the only reason we were + using glib-gettext before, as far as I see, was to define ENABLE_NLS. + + configure.ac | 6 +----- + lib/Makefile.am | 1 + + lib/ephy-langs.c | 2 -- + po/Makevars | 41 ----------------------------------------- + src/Makefile.am | 10 ++++------ + src/ephy-main.c | 2 -- + src/ephy-search-provider-main.c | 2 -- + 7 files changed, 6 insertions(+), 58 deletions(-) + +commit e3c3269b6bfb4f177b5b4ba3cd94d3348e5f64da +Author: Michael Catanzaro +Date: Sun Jun 21 17:12:06 2015 -0500 + + configure.ac: move IT_PROG_INTLTOOL down to the i18n section + + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit db994dd473a84f28611d409f84f591a50fb808db +Author: Michael Catanzaro +Date: Mon Jun 29 20:51:31 2015 -0500 + + ephy-string: Remove dead code + + https://bugzilla.gnome.org/show_bug.cgi?id=751692 + + lib/ephy-string.c | 286 ------------------------------------------------------ + lib/ephy-string.h | 16 --- + 2 files changed, 302 deletions(-) + +commit ae0754c996c834c671aa89c38e1cf7cf7039b8a8 +Author: Pedro Albuquerque +Date: Mon Jun 29 22:38:04 2015 +0000 + + Updated Portuguese translation -commit 121b541924c4c0e9927170e285eebe0c2571d941 + po/pt.po | 1315 ++++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 805 insertions(+), 510 deletions(-) + +commit 0b4464039e0e1175abd0f90e2700631991d643c0 Author: Carlos Garcia Campos Date: Sat Jun 27 10:41:59 2015 +0200 @@ -68,17 +1693,70 @@ embed/ephy-embed-utils.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) -commit dc4db9278bdcd2a6a951bce14fa3454cb7907788 +commit 8a1c9e21d1b1c1330caaaa67d4a6b80bb820b2e3 +Author: Muhammet Kara +Date: Sat Jun 27 08:48:20 2015 +0000 + + Updated Turkish translation + + po/tr.po | 250 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 128 insertions(+), 122 deletions(-) + +commit cc1d4a89830b3e2e689aff98c63a223ebc7f5ea1 Author: Claudio Saavedra -Date: Tue Jun 23 17:27:55 2015 +0300 +Date: Tue Jun 23 11:51:58 2015 +0300 - [release] 3.16.2 + [release] 3.17.1 - NEWS | 8 ++++++++ - configure.ac | 2 +- - 2 files changed, 9 insertions(+), 1 deletion(-) + NEWS | 13 +++++++++++++ + configure.ac | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) + +commit 8619038fe2c34c13e279560a7879d62de6980775 +Author: Balázs Úr +Date: Mon Jun 22 21:52:53 2015 +0000 + + Updated Hungarian translation + + po/hu.po | 250 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 129 insertions(+), 121 deletions(-) + +commit b4ce1b4f78341deab95c13929cca3a76bcd7f241 +Author: Benjamin Steinwender +Date: Sat Jun 20 06:29:28 2015 +0000 + + Updated German translation -commit 5bbb4bd994fab4d7b9083907e4b5f8335dcfb2b9 + help/de/de.po | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e65dfb8c15b13387574d538c87e09389259f0504 +Author: Benjamin Steinwender +Date: Sat Jun 20 06:28:07 2015 +0000 + + Updated German translation + + po/de.po | 251 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 129 insertions(+), 122 deletions(-) + +commit b83f0beed92a9694eed209d7bb553a78b160c7bc +Author: Miguel Vaello Martínez +Date: Wed Mar 25 22:44:36 2015 +0100 + + Fix typos and remove a duplicated rule + + The rule "#about-subtitle" was duplicated. I assume that the second is the good one because the CSS is read sequentially and the last rule is applied instead the previous rule. + + The table of "memory:about" has a typo: solid and transparent properties there were concatenated by mistake. + + Removed some white spaces and placed some brackets next to the rule instead below. + + https://bugzilla.gnome.org/show_bug.cgi?id=746778 + + src/resources/about.css | 63 ++++++++++++++++++++----------------------------- + 1 file changed, 26 insertions(+), 37 deletions(-) + +commit 772f28933ce4952a8dc8f474e8842923a57f7f69 Author: Claudio Saavedra Date: Fri Jun 12 15:10:59 2015 +0300 @@ -92,7 +1770,7 @@ embed/web-extension/ephy-web-extension.c | 8 ++++++++ 1 file changed, 8 insertions(+) -commit 643b0da823577fc41ea00163b3fe30635db7886c +commit 8a3c7df10f653cd99c5325e37b5e9232ae191396 Author: Claudio Saavedra Date: Fri Jun 12 14:26:15 2015 +0300 @@ -106,10 +1784,10 @@ embed/web-extension/ephy-web-extension.c | 11 ++++++----- lib/ephy-web-dom-utils.c | 26 +++++++++++--------------- - lib/ephy-web-dom-utils.h | 9 +++++---- - 3 files changed, 22 insertions(+), 24 deletions(-) + lib/ephy-web-dom-utils.h | 8 ++++---- + 3 files changed, 21 insertions(+), 24 deletions(-) -commit 2196b1b306aab96255ba2414619be6b106340668 +commit 372b2bbb0e160997d5e47d062c50d85cac18b878 Author: Claudio Saavedra Date: Tue Jun 16 13:38:17 2015 +0300 @@ -118,15 +1796,202 @@ embed/web-extension/ephy-web-extension.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -commit ad6a013a8cae56597254a7581a4120434a2d3f3b -Author: Benjamin Steinwender -Date: Sat Jun 20 06:30:22 2015 +0000 +commit a2264372b48fb14864cb138fbdb94d650332b831 +Author: Claudio Saavedra +Date: Thu Jun 11 12:42:12 2015 +0300 - Updated German translation + form-filler: port to GTask + + GSimpleAsync is deprecated. + + https://bugzilla.gnome.org/show_bug.cgi?id=750768 - help/de/de.po | 10 +++++----- + lib/ephy-form-auth-data.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +commit 3a5f7f40ed9943c7ef4110e3914b0143e09e5fba +Author: Daniel Mustieles +Date: Mon Jun 15 08:49:39 2015 +0000 + + Updated Spanish translation + + po/es.po | 193 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 98 insertions(+), 95 deletions(-) + +commit 09da23951f31787d62953a26ebdd2d71b7d84c42 +Author: Michael Catanzaro +Date: Sun Sep 21 13:47:03 2014 -0500 + + search-provider: initialize translations + + https://bugzilla.gnome.org/show_bug.cgi?id=737085 + + src/ephy-search-provider-main.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +commit 269f01c98e568e18ab69b26ca59786b6f0b84304 +Author: Robert Roth +Date: Fri Jun 12 15:44:31 2015 +0300 + + Removed toolbar-style references from config. + + https://bugzilla.gnome.org/show_bug.cgi?id=728874 + + data/epiphany.convert | 1 - + data/org.gnome.epiphany.gschema.xml | 5 ----- + lib/ephy-prefs.h | 9 --------- + 3 files changed, 15 deletions(-) + +commit e3853d113b7ea537181fd5e9d9dba9449413422c +Author: Michael Catanzaro +Date: Fri Jun 12 12:14:16 2015 -0500 + + Rename some functions + + I was trying so hard to be clean and keep everything in the same commit, + then I pushed before running 'git status' to notice the unstaged + changes... sad day. + + lib/widgets/ephy-download-widget.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) +commit 01d286be7130b07bdc620010c3a898fe67979bbd +Author: Lapo Calamandrei +Date: Sat Sep 13 16:32:22 2014 +0200 + + Theme fixes and improvements + + lib/widgets/Makefile.am | 4 +- + lib/widgets/ephy-download-widget.c | 30 ++++-- + lib/widgets/totem-glow-button.c | 156 --------------------------- + lib/widgets/totem-glow-button.h | 47 --------- + src/Makefile.am | 1 - + src/ephy-window.c | 3 +- + src/epiphany.gresource.xml | 1 - + src/resources/epiphany.css | 209 ++++++++++++++++++++++++------------- + src/resources/epiphany.scss | 138 ++++++++++++++++++++++++ + src/resources/incognito-tinted.png | Bin 8497 -> 0 bytes + src/resources/parse-sass.sh | 5 + + 11 files changed, 305 insertions(+), 289 deletions(-) + +commit 3a7e46f8387ff7b465b5dbf4be288c34ef4e3d7d +Author: Claudio Saavedra +Date: Tue Jun 9 17:48:01 2015 +0300 + + ephy-window: fix a context-menu crasher + + Initialize variable. + + https://bugzilla.gnome.org/show_bug.cgi?id=750643 + + src/ephy-window.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 550b7ae458fc1db265752ba2835212169c2cd7a2 +Author: Yosef Or Boczko +Date: Tue Jun 9 16:18:25 2015 +0300 + + Updated Hebrew translation + + po/he.po | 51 ++++++++++++++++++++++++++++----------------------- + 1 file changed, 28 insertions(+), 23 deletions(-) + +commit 9fdf920fd0ce664c1cb82f2deceb01d57e2709e9 +Author: Claudio Saavedra +Date: Thu Jun 4 17:48:25 2015 +0300 + + Add context-sensitive menu option to search the web for selected text + + When building the context menu in the web process, use the web + extension to find out whether there is text selected and pass it + as custom data to the UI process. Let the UI process use the + selection to build a new menu item that, when activated, will launch + a new tab and search the selected text in the user-preferred search + engine. + + https://bugzilla.gnome.org/show_bug.cgi?id=663545 + + embed/web-extension/ephy-web-extension.c | 41 +++++++++++++++++++ + src/ephy-window.c | 67 ++++++++++++++++++++++++++++++++ + src/popup-commands.c | 20 ++++++++++ + src/popup-commands.h | 3 ++ + 4 files changed, 131 insertions(+) + +commit b516557124a4372e47418cfc51692c2d75e89aec +Author: Claudio Saavedra +Date: Thu Jun 4 15:53:00 2015 +0300 + + ephy-web-dom-utils: add ephy_web_dom_utils_get_selection_as_string() + + The DOMSelection::toString() API is only bound to JavaScript. This method + does not work with selection inside input elements. + + https://bugzilla.gnome.org/show_bug.cgi?id=663545 + + lib/ephy-web-dom-utils.c | 22 ++++++++++++++++++++++ + lib/ephy-web-dom-utils.h | 4 ++++ + 2 files changed, 26 insertions(+) + +commit b92a519ab577c1eb22f6f24dfc5c57da43746048 +Author: Claudio Saavedra +Date: Thu Jun 4 15:47:35 2015 +0300 + + ephy-embed-utils: add ephy_embed_utils_autosearch_address() + + Factor the code to handle a search key from + ephy_embed_utils_normalize_or_autosearch_address() to a new method to + be able to reuse it later. + + https://bugzilla.gnome.org/show_bug.cgi?id=663545 + + embed/ephy-embed-utils.c | 17 ++++++++++++----- + embed/ephy-embed-utils.h | 1 + + 2 files changed, 13 insertions(+), 5 deletions(-) + +commit 96c6add558186729c38d3bb6eb070db7a7161006 +Author: Yosef Or Boczko +Date: Tue Jun 9 12:41:31 2015 +0300 + + Updated Hebrew translation + + po/he.po | 94 +++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 49 insertions(+), 45 deletions(-) + +commit a966accac946ed4b074345135cd8b64c2e60e4e0 +Author: Daniel Mustieles +Date: Fri Jun 5 08:40:51 2015 +0000 + + Updated Spanish translation + + po/es.po | 8992 +++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 4497 insertions(+), 4495 deletions(-) + +commit c54d16d37cbfdfe28e7c1c949a8e56b15314f583 +Author: Claudio Saavedra +Date: Tue Jun 2 17:11:17 2015 +0300 + + window: add a popup command to open links in incognito window + + https://bugzilla.gnome.org/show_bug.cgi?id=749454 + + src/ephy-window.c | 11 ++++++++++- + src/popup-commands.c | 15 +++++++++++++++ + src/popup-commands.h | 3 +++ + 3 files changed, 28 insertions(+), 1 deletion(-) + +commit 5bbb98ca6c5a7136585e9ce37a1ee6ea7ff79982 +Author: Claudio Saavedra +Date: Tue Jun 2 18:32:01 2015 +0300 + + file-helpers: add helper to launch a incognito window + + https://bugzilla.gnome.org/show_bug.cgi?id=749454 + + lib/ephy-file-helpers.c | 24 ++++++++++++++++++++++++ + lib/ephy-file-helpers.h | 1 + + src/window-commands.c | 4 +--- + 3 files changed, 26 insertions(+), 3 deletions(-) + commit 43dd857bdda51113a357cde89556e157d61003b2 Author: Akom Chotiphantawanon Date: Fri May 22 16:25:01 2015 +0700 diff -Nru epiphany-browser-3.16.3/compile epiphany-browser-3.18.0/compile --- epiphany-browser-3.16.3/compile 2015-06-17 08:20:04.000000000 +0000 +++ epiphany-browser-3.18.0/compile 1970-01-01 00:00:00.000000000 +0000 @@ -1,347 +0,0 @@ -#! /bin/sh -# Wrapper for compilers which do not understand '-c -o'. - -scriptversion=2012-10-14.11; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# Written by Tom Tromey . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' - -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent tools from complaining about whitespace usage. -IFS=" "" $nl" - -file_conv= - -# func_file_conv build_file lazy -# Convert a $build file to $host form and store it in $file -# Currently only supports Windows hosts. If the determined conversion -# type is listed in (the comma separated) LAZY, no conversion will -# take place. -func_file_conv () -{ - file=$1 - case $file in - / | /[!/]*) # absolute file, and not a UNC file - if test -z "$file_conv"; then - # lazily determine how to convert abs files - case `uname -s` in - MINGW*) - file_conv=mingw - ;; - CYGWIN*) - file_conv=cygwin - ;; - *) - file_conv=wine - ;; - esac - fi - case $file_conv/,$2, in - *,$file_conv,*) - ;; - mingw/*) - file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` - ;; - cygwin/*) - file=`cygpath -m "$file" || echo "$file"` - ;; - wine/*) - file=`winepath -w "$file" || echo "$file"` - ;; - esac - ;; - esac -} - -# func_cl_dashL linkdir -# Make cl look for libraries in LINKDIR -func_cl_dashL () -{ - func_file_conv "$1" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" -} - -# func_cl_dashl library -# Do a library search-path lookup for cl -func_cl_dashl () -{ - lib=$1 - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - lib=$dir/$lib.dll.lib - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - lib=$dir/$lib.lib - break - fi - if test -f "$dir/lib$lib.a"; then - found=yes - lib=$dir/lib$lib.a - break - fi - done - IFS=$save_IFS - - if test "$found" != yes; then - lib=$lib.lib - fi -} - -# func_cl_wrapper cl arg... -# Adjust compile command to suit cl -func_cl_wrapper () -{ - # Assume a capable shell - lib_path= - shared=: - linker_opts= - for arg - do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - eat=1 - case $2 in - *.o | *.[oO][bB][jJ]) - func_file_conv "$2" - set x "$@" -Fo"$file" - shift - ;; - *) - func_file_conv "$2" - set x "$@" -Fe"$file" - shift - ;; - esac - ;; - -I) - eat=1 - func_file_conv "$2" mingw - set x "$@" -I"$file" - shift - ;; - -I*) - func_file_conv "${1#-I}" mingw - set x "$@" -I"$file" - shift - ;; - -l) - eat=1 - func_cl_dashl "$2" - set x "$@" "$lib" - shift - ;; - -l*) - func_cl_dashl "${1#-l}" - set x "$@" "$lib" - shift - ;; - -L) - eat=1 - func_cl_dashL "$2" - ;; - -L*) - func_cl_dashL "${1#-L}" - ;; - -static) - shared=false - ;; - -Wl,*) - arg=${1#-Wl,} - save_ifs="$IFS"; IFS=',' - for flag in $arg; do - IFS="$save_ifs" - linker_opts="$linker_opts $flag" - done - IFS="$save_ifs" - ;; - -Xlinker) - eat=1 - linker_opts="$linker_opts $2" - ;; - -*) - set x "$@" "$1" - shift - ;; - *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) - func_file_conv "$1" - set x "$@" -Tp"$file" - shift - ;; - *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) - func_file_conv "$1" mingw - set x "$@" "$file" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift - done - if test -n "$linker_opts"; then - linker_opts="-link$linker_opts" - fi - exec "$@" $linker_opts - exit 1 -} - -eat= - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: compile [--help] [--version] PROGRAM [ARGS] - -Wrapper for compilers which do not understand '-c -o'. -Remove '-o dest.o' from ARGS, run PROGRAM with the remaining -arguments, and rename the output as expected. - -If you are trying to build a whole package this is not the -right script to run: please start by reading the file 'INSTALL'. - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "compile $scriptversion" - exit $? - ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) - func_cl_wrapper "$@" # Doesn't return... - ;; -esac - -ofile= -cfile= - -for arg -do - if test -n "$eat"; then - eat= - else - case $1 in - -o) - # configure might choose to run compile as 'compile cc -o foo foo.c'. - # So we strip '-o arg' only if arg is an object. - eat=1 - case $2 in - *.o | *.obj) - ofile=$2 - ;; - *) - set x "$@" -o "$2" - shift - ;; - esac - ;; - *.c) - cfile=$1 - set x "$@" "$1" - shift - ;; - *) - set x "$@" "$1" - shift - ;; - esac - fi - shift -done - -if test -z "$ofile" || test -z "$cfile"; then - # If no '-o' option was seen then we might have been invoked from a - # pattern rule where we don't need one. That is ok -- this is a - # normal compilation that the losing compiler can handle. If no - # '.c' file was seen then we are probably linking. That is also - # ok. - exec "$@" -fi - -# Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` - -# Create the lock directory. -# Note: use '[/\\:.-]' here to ensure that we don't use the same name -# that we are using for the .o file. Also, base the name on the expected -# object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d -while true; do - if mkdir "$lockdir" >/dev/null 2>&1; then - break - fi - sleep 1 -done -# FIXME: race condition here if user kills between mkdir and trap. -trap "rmdir '$lockdir'; exit 1" 1 2 15 - -# Run the compile. -"$@" -ret=$? - -if test -f "$cofile"; then - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" -elif test -f "${cofile}bj"; then - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" -fi - -rmdir "$lockdir" -exit $ret - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru epiphany-browser-3.16.3/config.guess epiphany-browser-3.18.0/config.guess --- epiphany-browser-3.16.3/config.guess 2015-06-17 08:20:04.000000000 +0000 +++ epiphany-browser-3.18.0/config.guess 1970-01-01 00:00:00.000000000 +0000 @@ -1,1420 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. - -timestamp='2014-03-23' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). -# -# Originally written by Per Bothner. -# -# You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -# -# Please send patches with a ChangeLog entry to config-patches@gnu.org. - - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright 1992-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." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` - ;; -esac - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # 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)` - 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 ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ELF__ - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - 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}" - exit ;; - *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - 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" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - 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'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - 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 (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - 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 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep -q __LP64__ - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - 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_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - 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/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - aarch64_be:Linux:*:*) - UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - else - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi - else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf - fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} - exit ;; - frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } - ;; - openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} - exit ;; - or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; - esac - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} - exit ;; - x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi - elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 - fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; - NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "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 - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; - x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; -esac - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru epiphany-browser-3.16.3/config.h.in epiphany-browser-3.18.0/config.h.in --- epiphany-browser-3.16.3/config.h.in 2015-07-09 13:29:27.000000000 +0000 +++ epiphany-browser-3.18.0/config.h.in 2015-09-22 07:50:57.000000000 +0000 @@ -1,29 +1,14 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* always defined to indicate that i18n is enabled */ -#undef ENABLE_NLS - /* Define to compile with NSS support */ #undef ENABLE_NSS /* Compiling epiphany */ #undef EPIPHANY_COMPILATION -/* Gettext package */ -#undef GETTEXT_PACKAGE - -/* Define if debugging is enabled */ -#undef GNOME_ENABLE_DEBUG - /* Define to 1 if you have the `alarm' function. */ #undef HAVE_ALARM -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - -/* Define to 1 if you have the `dcgettext' function. */ -#undef HAVE_DCGETTEXT - /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H @@ -33,21 +18,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H /* Define if you have the iso-codes package */ #undef HAVE_ISO_CODES -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R diff -Nru epiphany-browser-3.16.3/config.sub epiphany-browser-3.18.0/config.sub --- epiphany-browser-3.16.3/config.sub 2015-06-17 08:20:04.000000000 +0000 +++ epiphany-browser-3.18.0/config.sub 1970-01-01 00:00:00.000000000 +0000 @@ -1,1799 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. - -timestamp='2014-09-11' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see . -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that -# program. This Exception is an additional permission under section 7 -# of the GNU General Public License, version 3 ("GPLv3"). - - -# Please send patches with a ChangeLog entry to config-patches@gnu.org. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# 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 - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright 1992-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." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | 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 \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none - ;; - xscaleeb) - basic_machine=armeb-unknown - ;; - - xscaleel) - basic_machine=armel-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | 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?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -nacl*) - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - c8051-*) - os=-elf - ;; - hexagon-*) - os=-elf - ;; - tic54x-*) - os=-coff - ;; - tic55x-*) - os=-coff - ;; - tic6x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -cnk*|-aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Nru epiphany-browser-3.16.3/configure epiphany-browser-3.18.0/configure --- epiphany-browser-3.16.3/configure 2015-07-09 13:29:05.000000000 +0000 +++ epiphany-browser-3.18.0/configure 2015-09-22 07:50:38.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNOME Web Browser 3.16.3. +# Generated by GNU Autoconf 2.69 for GNOME Web Browser 3.18.0. # # Report bugs to . # @@ -198,6 +198,7 @@ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' @@ -205,8 +206,7 @@ ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" if (eval "$as_required") 2>/dev/null; then : as_have_required=yes else @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Web Browser' PACKAGE_TARNAME='epiphany' -PACKAGE_VERSION='3.16.3' -PACKAGE_STRING='GNOME Web Browser 3.16.3' +PACKAGE_VERSION='3.18.0' +PACKAGE_STRING='GNOME Web Browser 3.18.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany' PACKAGE_URL='' @@ -639,54 +639,7 @@ am__EXEEXT_TRUE LTLIBOBJS LSB_RELEASE -YELP_HELP_RULES -XMLLINT -ITSTOOL -HELP_DIR -YELP_LC_DIST -YELP_LC_MEDIA_LINKS -MKINSTALLDIRS -POSUB -POFILES -PO_IN_DATADIR_FALSE -PO_IN_DATADIR_TRUE -INTLLIBS -INSTOBJEXT -GMOFILES -CATOBJEXT -CATALOGS -MSGFMT_OPTS GETTEXT_PACKAGE -ENABLE_NSS_FALSE -ENABLE_NSS_TRUE -NSS_LIBS -NSS_CFLAGS -POW_LIB -LIBOBJS -WEB_EXTENSION_LIBS -WEB_EXTENSION_CFLAGS -DEPENDENCIES_LIBS -DEPENDENCIES_CFLAGS -ENABLE_TESTS_FALSE -ENABLE_TESTS_TRUE -GNOME_CODE_COVERAGE_RULES -CODE_COVERAGE_RULES -CODE_COVERAGE_LDFLAGS -CODE_COVERAGE_CFLAGS -GENHTML -LCOV -CODE_COVERAGE_ENABLED -CODE_COVERAGE_ENABLED_FALSE -CODE_COVERAGE_ENABLED_TRUE -DISABLE_DEPRECATED -WARN_CFLAGS -GSETTINGS_RULES -GLIB_COMPILE_SCHEMAS -gsettingsschemadir -PKG_CONFIG_LIBDIR -PKG_CONFIG_PATH -PKG_CONFIG -GSETTINGS_DISABLE_SCHEMAS_COMPILE DATADIRNAME ALL_LINGUAS INTLTOOL_PERL @@ -723,8 +676,34 @@ INTLTOOL_MERGE INTLTOOL_UPDATE USE_NLS -GLIB_MKENUMS -GLIB_GENMARSHAL +ENABLE_NSS_FALSE +ENABLE_NSS_TRUE +NSS_LIBS +NSS_CFLAGS +POW_LIB +LIBOBJS +WEB_EXTENSION_LIBS +WEB_EXTENSION_CFLAGS +DEPENDENCIES_LIBS +DEPENDENCIES_CFLAGS +ENABLE_TESTS_FALSE +ENABLE_TESTS_TRUE +YELP_HELP_RULES +XMLLINT +ITSTOOL +HELP_DIR +YELP_LC_DIST +YELP_LC_MEDIA_LINKS +GSETTINGS_RULES +GLIB_COMPILE_SCHEMAS +gsettingsschemadir +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG +GSETTINGS_DISABLE_SCHEMAS_COMPILE +APPSTREAM_XML_RULES +appstreamxmldir +APPSTREAM_UTIL CPP OTOOL64 OTOOL @@ -745,24 +724,6 @@ FGREP EGREP GREP -SED -am__fastdepCC_FALSE -am__fastdepCC_TRUE -CCDEPMODE -am__nodep -AMDEPBACKSLASH -AMDEP_FALSE -AMDEP_TRUE -am__quote -am__include -DEPDIR -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC host_os host_vendor host_cpu @@ -779,6 +740,16 @@ AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +am__nodep +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR am__untar am__tar AMTAR @@ -802,9 +773,28 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -EPIPHANY_MICRO_VERSION -EPIPHANY_MINOR_VERSION -EPIPHANY_MAJOR_VERSION +GLIB_MKENUMS +GLIB_GENMARSHAL +WARN_SCANNERFLAGS +WARN_LDFLAGS +WARN_CFLAGS +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +CODE_COVERAGE_RULES +CODE_COVERAGE_LDFLAGS +CODE_COVERAGE_CFLAGS +GENHTML +LCOV +GCOV +CODE_COVERAGE_ENABLED +CODE_COVERAGE_ENABLED_FALSE +CODE_COVERAGE_ENABLED_TRUE +SED EPIPHANY_MAJOR target_alias host_alias @@ -825,6 +815,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -847,25 +838,27 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_debug +with_gcov +enable_code_coverage +enable_compile_warnings +enable_Werror +enable_dependency_tracking enable_silent_rules enable_maintainer_mode enable_static enable_shared with_pic enable_fast_install -enable_dependency_tracking with_gnu_ld with_sysroot enable_libtool_lock -enable_nls +enable_appstream_util enable_schemas_compile -enable_debug -enable_compile_warnings -enable_iso_c -enable_code_coverage +with_help_dir enable_tests enable_nss -with_help_dir +enable_nls with_distributor_name ' ac_precious_vars='build_alias @@ -880,14 +873,14 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR +ITSTOOL +XMLLINT DEPENDENCIES_CFLAGS DEPENDENCIES_LIBS WEB_EXTENSION_CFLAGS WEB_EXTENSION_LIBS NSS_CFLAGS -NSS_LIBS -ITSTOOL -XMLLINT' +NSS_LIBS' # Initialize some variables set by options. @@ -926,6 +919,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1178,6 +1172,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1315,7 +1318,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1428,7 +1431,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 GNOME Web Browser 3.16.3 to adapt to many kinds of systems. +\`configure' configures GNOME Web Browser 3.18.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1468,6 +1471,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1498,7 +1502,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Web Browser 3.16.3:";; + short | recursive ) echo "Configuration of GNOME Web Browser 3.18.0:";; esac cat <<\_ACEOF @@ -1506,6 +1510,16 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-debug=[yes/info/profile/no] + compile with debugging + --enable-code-coverage Whether to enable code coverage support + --enable-compile-warnings=[no/yes/error] + Enable compiler warnings and errors + --disable-Werror Unconditionally make all compiler warnings non-fatal + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") --disable-maintainer-mode @@ -1515,25 +1529,20 @@ --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] - --enable-dependency-tracking - do not reject slow dependency extractors - --disable-dependency-tracking - speeds up one-time build --disable-libtool-lock avoid locking (might break parallel builds) - --disable-nls do not use Native Language Support + --disable-appstream-util + Disable validating AppData XML files during check + phase --disable-schemas-compile Disable regeneration of gschemas.compiled on install - --enable-debug[=no] compile with debugging; one of yes/info/profile/no - --enable-compile-warnings=[no/minimum/yes/maximum/error] - Turn on compiler warnings - --enable-iso-c Try to warn if code is not ISO C - --enable-code-coverage Whether to enable code coverage support --enable-tests Whether to build tests (default: yes) --enable-nss Enable NSS support (default: enabled) + --disable-nls do not use Native Language Support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-gcov=GCOV use given GCOV for coverage (GCOV=gcov). --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] @@ -1557,6 +1566,8 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path + ITSTOOL Path to the `itstool` command + XMLLINT Path to the `xmllint` command DEPENDENCIES_CFLAGS C compiler flags for DEPENDENCIES, overriding pkg-config DEPENDENCIES_LIBS @@ -1567,8 +1578,6 @@ linker flags for WEB_EXTENSION, overriding pkg-config NSS_CFLAGS C compiler flags for NSS, overriding pkg-config NSS_LIBS linker flags for NSS, overriding pkg-config - ITSTOOL Path to the `itstool` command - XMLLINT Path to the `xmllint` command Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1636,7 +1645,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Web Browser configure 3.16.3 +GNOME Web Browser configure 3.18.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2059,7 +2068,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Web Browser $as_me 3.16.3, which was +It was created by GNOME Web Browser $as_me 3.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2414,25 +2423,19 @@ -ac_config_headers="$ac_config_headers config.h" - - - -EPIPHANY_MAJOR=3.16 - - -# for EPHY_CHECK_VERSION -EPIPHANY_MAJOR_VERSION=3 + # $is_release = (.git directory does not exist) + if test -d .git; then : + ax_is_release=no +else + ax_is_release=yes +fi -EPIPHANY_MINOR_VERSION=16 -EPIPHANY_MICRO_VERSION=3 -am__api_version='1.14' ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do +for ac_dir in build-aux "$srcdir"/build-aux; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -2448,7 +2451,7 @@ fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2460,220 +2463,225 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -# Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } -if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - rm -rf conftest.one conftest.two conftest.dir - echo one > conftest.one - echo two > conftest.two - mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && - test -s conftest.one && test -s conftest.two && - test -s conftest.dir/conftest.one && - test -s conftest.dir/conftest.two - then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - fi - done - done - ;; -esac - done -IFS=$as_save_IFS +ac_config_headers="$ac_config_headers config.h" -rm -rf conftest.one conftest.two conftest.dir + +EPIPHANY_MAJOR=3.18 + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5 +$as_echo_n "checking whether to enable debugging... " >&6; } + + ax_enable_debug_default=yes + ax_enable_debug_is_release=$ax_is_release + + # If this is a release, override the default. + if test "$ax_enable_debug_is_release" = "yes"; then : + ax_enable_debug_default="no" fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi + + + + + # Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; +else + enable_debug=$ax_enable_debug_default fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + # empty mean debug yes + if test "x$enable_debug" = "x"; then : + enable_debug="yes" +fi -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + # case of debug + case $enable_debug in #( + yes) : -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; -esac -case $srcdir in - *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + CFLAGS="${CFLAGS} -g -O0" + CXXFLAGS="${CXXFLAGS} -g -O0" + FFLAGS="${FFLAGS} -g -O0" + FCFLAGS="${FCFLAGS} -g -O0" + OBJCFLAGS="${OBJCFLAGS} -g -O0" + ;; #( + info) : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: info" >&5 +$as_echo "info" >&6; } + CFLAGS="${CFLAGS} -g" + CXXFLAGS="${CXXFLAGS} -g" + FFLAGS="${FFLAGS} -g" + FCFLAGS="${FCFLAGS} -g" + OBJCFLAGS="${OBJCFLAGS} -g" + ;; #( + profile) : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5 +$as_echo "profile" >&6; } + CFLAGS="${CFLAGS} -g -pg" + CXXFLAGS="${CXXFLAGS} -g -pg" + FFLAGS="${FFLAGS} -g -pg" + FCFLAGS="${FCFLAGS} -g -pg" + OBJCFLAGS="${OBJCFLAGS} -g -pg" + LDFLAGS="${LDFLAGS} -pg" + ;; #( + *) : + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "x${CFLAGS+set}" != "xset"; then : + CFLAGS="" +fi + if test "x${CXXFLAGS+set}" != "xset"; then : + CXXFLAGS="" +fi + if test "x${FFLAGS+set}" != "xset"; then : + FFLAGS="" +fi + if test "x${FCFLAGS+set}" != "xset"; then : + FCFLAGS="" +fi + if test "x${OBJCFLAGS+set}" != "xset"; then : + OBJCFLAGS="" +fi + ;; esac -# Do 'set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - am_has_slept=no - for am_try in 1 2; do - echo "timestamp, slept: $am_has_slept" > conftest.file - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then + if test "x$enable_debug" = "xyes"; then : - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken - alias in your environment" "$LINENO" 5 - fi - if test "$2" = conftest.file || test $am_try -eq 2; then - break - fi - # Just in case. - sleep 1 - am_has_slept=yes - done - test "$2" = conftest.file - ) -then - # Ok. - : else - as_fn_error $? "newly created file is older than distributed files! -Check your system clock" "$LINENO" 5 + +$as_echo "#define NDEBUG /**/" >>confdefs.h + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -# If we didn't sleep, we still need to ensure time stamps of config.status and -# generated files are strictly newer. -am_sleep_pid= -if grep 'slept: no' conftest.file >/dev/null 2>&1; then - ( sleep 1 ) & - am_sleep_pid=$! + ax_enable_debug=$enable_debug + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_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 sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED fi -rm -f conftest.file +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed -test "$program_prefix" != NONE && - program_transform_name="s&^&$program_prefix&;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. -# By default was `s,x,x', remove it if useless. -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` -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + + # allow to override gcov location + +# Check whether --with-gcov was given. +if test "${with_gcov+set}" = set; then : + withval=$with_gcov; _AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov +else + _AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 +$as_echo_n "checking whether to build with code coverage support... " >&6; } + # Check whether --enable-code-coverage was given. +if test "${enable_code_coverage+set}" = set; then : + enableval=$enable_code_coverage; else - am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + enable_code_coverage=no fi -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac + + if test x$enable_code_coverage = xyes; then + CODE_COVERAGE_ENABLED_TRUE= + CODE_COVERAGE_ENABLED_FALSE='#' +else + CODE_COVERAGE_ENABLED_TRUE='#' + CODE_COVERAGE_ENABLED_FALSE= fi -# Installed binaries are usually stripped using 'strip' when the user -# run "make install-strip". However 'strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the 'STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 + CODE_COVERAGE_ENABLED=$enable_code_coverage + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_code_coverage" >&5 +$as_echo "$enable_code_coverage" >&6; } + + if test "$enable_code_coverage" = "yes" ; then : + + # check for gcov + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy ${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +if ${ac_cv_prog_GCOV+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. + if test -n "$GCOV"; then + ac_cv_prog_GCOV="$GCOV" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2682,7 +2690,7 @@ 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_STRIP="${ac_tool_prefix}strip" + ac_cv_prog_GCOV="${ac_tool_prefix}$_AX_CODE_COVERAGE_GCOV_PROG_WITH" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2692,10 +2700,10 @@ fi fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +GCOV=$ac_cv_prog_GCOV +if test -n "$GCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCOV" >&5 +$as_echo "$GCOV" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -2703,17 +2711,17 @@ fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 +if test -z "$ac_cv_prog_GCOV"; then + ac_ct_GCOV=$GCOV + # Extract the first word of "$_AX_CODE_COVERAGE_GCOV_PROG_WITH", so it can be a program name with args. +set dummy $_AX_CODE_COVERAGE_GCOV_PROG_WITH; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : +if ${ac_cv_prog_ac_ct_GCOV+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. + if test -n "$ac_ct_GCOV"; then + ac_cv_prog_ac_ct_GCOV="$ac_ct_GCOV" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2722,7 +2730,7 @@ 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_STRIP="strip" + ac_cv_prog_ac_ct_GCOV="$_AX_CODE_COVERAGE_GCOV_PROG_WITH" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2732,17 +2740,17 @@ fi fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } +ac_ct_GCOV=$ac_cv_prog_ac_ct_GCOV +if test -n "$ac_ct_GCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GCOV" >&5 +$as_echo "$ac_ct_GCOV" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_STRIP" = x; then - STRIP=":" + if test "x$ac_ct_GCOV" = x; then + GCOV=":" else case $cross_compiling:$ac_tool_warned in yes:) @@ -2750,68 +2758,72 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - STRIP=$ac_ct_STRIP + GCOV=$ac_ct_GCOV fi else - STRIP="$ac_cv_prog_STRIP" + GCOV="$ac_cv_prog_GCOV" fi + if test "X$GCOV" = "X:"; then : + as_fn_error $? "gcov is needed to do coverage" "$LINENO" 5 fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : + + if test "$GCC" = "no" ; then : + + as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5 + +fi + + # List of supported lcov versions. + lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11" + + # Extract the first word of "lcov", so it can be a program name with args. +set dummy lcov; 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_LCOV+:} false; then : $as_echo_n "(cached) " >&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin + if test -n "$LCOV"; then + ac_cv_prog_LCOV="$LCOV" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done + 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_LCOV="lcov" + $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 - - test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then - MKDIR_P="$ac_cv_path_mkdir -p" - else - # As a last resort, use the slow shell script. Don't cache a - # value for MKDIR_P within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - MKDIR_P="$ac_install_sh -d" - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +LCOV=$ac_cv_prog_LCOV +if test -n "$LCOV"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 +$as_echo "$LCOV" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -for ac_prog in gawk mawk nawk awk -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 + + # Extract the first word of "genhtml", so it can be a program name with args. +set dummy genhtml; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : +if ${ac_cv_prog_GENHTML+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$AWK"; then - ac_cv_prog_AWK="$AWK" # Let the user override the test. + if test -n "$GENHTML"; then + ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2820,7 +2832,7 @@ 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_AWK="$ac_prog" + ac_cv_prog_GENHTML="genhtml" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -2830,695 +2842,418 @@ fi fi -AWK=$ac_cv_prog_AWK -if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } +GENHTML=$ac_cv_prog_GENHTML +if test -n "$GENHTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 +$as_echo "$GENHTML" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$AWK" && break -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : + if test "$LCOV" ; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 +$as_echo_n "checking for lcov version... " >&6; } +if ${ax_cv_lcov_version+:} false; then : $as_echo_n "(cached) " >&6 else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi -rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null + ax_cv_lcov_version=invalid + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` + for lcov_check_version in $lcov_version_list; do + if test "$lcov_version" = "$lcov_check_version"; then + ax_cv_lcov_version="$lcov_check_version (ok)" + fi + done -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lcov_version" >&5 +$as_echo "$ax_cv_lcov_version" >&6; } -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=1;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes -else - am_cv_make_support_nested_variables=no -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AM_BACKSLASH='\' -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - am__isrc=' -I$(srcdir)' - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 - fi -fi + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" + as_fn_error $? "$lcov_msg" "$LINENO" 5 -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi fi + case $ax_cv_lcov_version in + ""|invalid) + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." + as_fn_error $? "$lcov_msg" "$LINENO" 5 + LCOV="exit 0;" + ;; + esac -# Define the identity of the package. - PACKAGE='epiphany' - VERSION='3.16.3' + if test -z "$GENHTML" ; then : + as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +fi + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LDFLAGS="-lgcov" -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF -# Some tools Automake needs. -ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +fi -AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +CODE_COVERAGE_RULES=' +# Code coverage +# +# Optional: +# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# (Default: $(top_builddir)) +# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated +# by lcov for code coverage. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) +# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage +# reports to be created. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml +# instance. (Default: empty) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore +# +# The generated report will be titled using the $(PACKAGE_NAME) and +# $(PACKAGE_VERSION). In order to add the current git hash to the title, +# use the git-version-gen script, available online. +# Optional variables +CODE_COVERAGE_DIRECTORY ?= $(top_builddir) +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +CODE_COVERAGE_GENHTML_OPTIONS ?= +CODE_COVERAGE_IGNORE_PATTERN ?= -AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet +# Use recursive makes in order to ignore errors during check +check-code-coverage: +ifeq ($(CODE_COVERAGE_ENABLED),yes) + -$(MAKE) $(AM_MAKEFLAGS) -k check + $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture +else + @echo "Need to reconfigure with --enable-code-coverage" +endif -AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} +# Capture code coverage data +code-coverage-capture: code-coverage-capture-hook +ifeq ($(CODE_COVERAGE_ENABLED),yes) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) + $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp + LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +else + @echo "Need to reconfigure with --enable-code-coverage" +endif +# Hook rule executed before code-coverage-capture, overridable by the user +code-coverage-capture-hook: -MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +ifeq ($(CODE_COVERAGE_ENABLED),yes) +clean: code-coverage-clean +code-coverage-clean: + -$(LCOV) --directory $(top_builddir) -z + -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) + -find . -name "*.gcda" -o -name "*.gcov" -delete +endif -# For better backward compatibility. To be removed once Automake 1.9.x -# dies out for good. For more background, see: -# -# -mkdir_p='$(MKDIR_P)' +GITIGNOREFILES ?= +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) -# We need awk for the "check" target. 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}' - - -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar plaintar pax cpio none' - -# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 -$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } - if test $am_uid -le $am_max_uid; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - _am_tools=none - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 -$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } - if test $am_gid -le $am_max_gid; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - _am_tools=none - fi +DISTCHECK_CONFIGURE_FLAGS ?= +DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean +' - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_ustar-$_am_tools} - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 - ($_am_tar --version) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 - (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 - ($am__untar &5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 - (cat conftest.dir/file) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi - done - rm -rf conftest.dir +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` - if ${am_cv_prog_tar_ustar+:} false; then : +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_prog_tar_ustar=$_am_tool -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 -$as_echo "$am_cv_prog_tar_ustar" >&6; } - - - - - - -# POSIX will say in a future version that running "rm -f" with no argument -# is OK; and we want to be able to make that assumption in our Makefile -# recipes. So use an aggressive probe to check that the usage we want is -# actually supported "in the wild" to an acceptable degree. -# See automake bug#10828. -# To make any issue more visible, cause the running configure to be aborted -# by default if the 'rm' program in use doesn't match our expectations; the -# user can still override this though. -if rm -f && rm -fr && rm -rf; then : OK; else - cat >&2 <<'END' -Oops! - -Your 'rm' program seems unable to run without file operands specified -on the command line, even when the '-f' option is present. This is contrary -to the behaviour of most rm programs out there, and not conforming with -the upcoming POSIX standard: - -Please tell bug-automake@gnu.org about your system, including the value -of your $PATH and any error possibly output before this message. This -can help us improve future automake versions. - -END - if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then - echo 'Configuration will proceed anyway, since you have set the' >&2 - echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 - echo >&2 - else - cat >&2 <<'END' -Aborting the configuration process, to ensure you take notice of the issue. - -You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . - -If you want to complete the configuration process using your problematic -'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM -to "yes", and re-run configure. - -END - as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" + $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 +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# Use AM_SILENT_RULES if present -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; fi - -case $enable_silent_rules in # ((( - yes) AM_DEFAULT_VERBOSITY=0;; - no) AM_DEFAULT_VERBOSITY=1;; - *) AM_DEFAULT_VERBOSITY=0;; -esac -am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if $as_echo 'TRUE=$(BAR$(V)) -BAR0=false -BAR1=true -V=1 -am__doit: - @$(TRUE) -.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then - am_cv_make_support_nested_variables=yes + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - am_cv_make_support_nested_variables=no +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_CC="gcc" + $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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } -if test $am_cv_make_support_nested_variables = yes; then - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -AM_BACKSLASH='\' - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } - # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval + if test "x$ac_ct_CC" = x; then + CC="" + 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 + CC=$ac_ct_CC + fi else - USE_MAINTAINER_MODE=yes + CC="$ac_cv_prog_CC" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } - if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - - MAINT=$MAINTAINER_MODE_TRUE - - - -# Initialize libtool - -case `pwd` in - *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; -esac - - - -macro_version='2.4.2' -macro_revision='1.3337' - - - - - - - - - + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" + $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 +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +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 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -ltmain="$ac_aux_dir/ltmain.sh" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -# Backslashify metacharacters that are still active within -# double-quoted strings. -sed_quote_subst='s/\(["`$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "" -} - -case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; -esac - - - - - - - - - - - - - - -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf - -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi - -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' -fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" - $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 -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" - $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 +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_CC="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi fi @@ -3531,206 +3266,10 @@ $as_echo "no" >&6; } fi - if test "x$ac_ct_CC" = x; then - CC="" - 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 - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" - $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 -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -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 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - + + test -n "$ac_ct_CC" && break +done + if test "x$ac_ct_CC" = x; then CC="" else @@ -4297,1083 +3836,929 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 + + # C support is enabled by default. + + + # Only enable C++ support if AC_PROG_CXX is called. The redefinition of + # AC_PROG_CXX is so that a fatal error is emitted if this macro is called + # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be + # checked. + + + + + # Default value for IS-RELEASE is $ax_is_release + ax_compiler_flags_is_release=$ax_is_release + + # Check whether --enable-compile-warnings was given. +if test "${enable_compile_warnings+set}" = set; then : + enableval=$enable_compile_warnings; else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub + if test "$ax_compiler_flags_is_release" = "yes"; then : + enable_compile_warnings="yes" +else + enable_compile_warnings="error" +fi +fi - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac + # Check whether --enable-Werror was given. +if test "${enable_Werror+set}" = set; then : + enableval=$enable_Werror; +else + enable_Werror=maybe +fi - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done + # Return the user's chosen warning level + if test "$enable_Werror" = "no" -a \ + "$enable_compile_warnings" = "error"; then : - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi + enable_compile_warnings="yes" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi + ax_enable_compile_warnings=$enable_compile_warnings -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : + + + + + + + + + # Variable names + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_cflags variable, and + # Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5 +$as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; } +if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_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 sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_cv_check_cflags___Werror_unknown_warning_option=yes else - ac_cv_path_SED=$SED + ax_cv_check_cflags___Werror_unknown_warning_option=no fi - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5 +$as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; } +if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then : -test -z "$SED" && SED=sed -Xsed="$SED -e 1s/^X//" + ax_compiler_flags_test="-Werror=unknown-warning-option" + +else + ax_compiler_flags_test="" +fi + # Base flags +for flag in -fno-strict-aliasing -Wdeclaration-after-statement ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" else - if test -z "$GREP"; then - ac_path_GREP_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$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; esac - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi else - ac_cv_path_GREP=$GREP + + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + fi +else + : fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : + + if test "$ax_enable_compile_warnings" != "no"; then : + + # "yes" flags + + + + +for flag in -Wall -Wextra -Wundef -Wnested-externs -Wwrite-strings -Wpointer-arith -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wno-unused-parameter -Wno-missing-field-initializers -Wdeclaration-after-statement -Wformat=2 -Wold-style-definition -Wcast-align -Wformat-nonliteral -Wformat-security -Wsign-compare -Wstrict-aliasing -Wshadow -Winline -Wpacked -Wmissing-format-attribute -Wmissing-noreturn -Winit-self -Wredundant-decls -Wmissing-include-dirs -Wunused-but-set-variable -Warray-bounds -Wimplicit-function-declaration -Wreturn-type -Wswitch-enum -Wswitch-default -Wno-incompatible-pointer-types -Wno-empty-body -Wno-unused-function -Wno-unused-variable -Wno-old-style-definition -Wno-shadow -Wno-format-nonliteral -Wno-deprecated-declarations -Wno-switch-enum -Wno-switch-default -Wno-redundant-decls -Wno-discarded-qualifiers -Wno-sign-compare ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : $as_echo_n "(cached) " >&6 else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_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$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" else - ac_cv_path_EGREP=$EGREP + eval "$as_CACHEVAR=no" fi - - fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : +if ${WARN_CFLAGS+:} false; then : -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 - then ac_cv_path_FGREP="$GREP -F" - else - if test -z "$FGREP"; then - ac_path_FGREP_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$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_FGREP" || continue -# Check for GNU ac_path_FGREP and select it if it is found. - # Check for GNU $ac_path_FGREP -case `"$ac_path_FGREP" --version 2>&1` in -*GNU*) - ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" - "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_FGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_FGREP="$ac_path_FGREP" - ac_path_FGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; esac - $ac_path_FGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_FGREP"; then - as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi else - ac_cv_path_FGREP=$FGREP -fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } - FGREP="$ac_cv_path_FGREP" + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +fi -test -z "$GREP" && GREP=grep +else + : +fi +done +fi + if test "$ax_enable_compile_warnings" = "error"; then : + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives +if ${WARN_CFLAGS+:} false; then : + case " $WARN_CFLAGS " in #( + *" -Werror "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains -Werror"; } >&5 + (: WARN_CFLAGS already contains -Werror) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + as_fn_append WARN_CFLAGS " -Werror" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac +else + WARN_CFLAGS=-Werror + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +fi +for flag in -Wno-suggest-attribute=format ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -# 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 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" else - with_gnu_ld=no + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac -ac_prog=ld -if test "$GCC" = yes; 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 - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` - while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do - ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some variants of GNU ld only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU lds only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$lt_cv_prog_gnu_ld - + # In the flags below, when disabling specific flags, always add *both* + # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) + # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, + # which effectively turns that flag back on again as an error. + for flag in $WARN_CFLAGS; do + case $flag in #( + -Wno-*=*) : + ;; #( + -Wno-*) : +for flag in -Wno-error=$($as_echo $flag | $SED 's/^-Wno-//'); do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" else - lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then - lt_nm_to_check="$lt_nm_to_check nm" - fi - for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) - lt_cv_path_NM="$tmp_nm -B" - break - ;; - *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in - */dev/null*) - lt_cv_path_NM="$tmp_nm -p" - break - ;; - *) - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - ;; - esac - ;; - esac - fi - done - IFS="$lt_save_ifs" - done - : ${lt_cv_path_NM=no} + eval "$as_CACHEVAR=no" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags 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" -else - # Didn't find any BSD compatible name lister, look for dumpbin. - if test -n "$DUMPBIN"; then : - # Let the user override the test. - else - if test -n "$ac_tool_prefix"; then - for ac_prog in dumpbin "link -dump" - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DUMPBIN"; then - ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : + +if ${WARN_CFLAGS+:} false; then : + + case " $WARN_CFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5 + (: WARN_CFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_CFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + 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_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + + WARN_CFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5 + (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } fi -fi -DUMPBIN=$ac_cv_prog_DUMPBIN -if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + : fi +done - test -n "$DUMPBIN" && break - done -fi -if test -z "$DUMPBIN"; then - ac_ct_DUMPBIN=$DUMPBIN - for ac_prog in dumpbin "link -dump" -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + ;; #( + *) : + ;; +esac + done + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + # Substitute the variables + + + + + + + + + + + + # Variable names + + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_ldflags variable, + # and Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5 +$as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; } +if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DUMPBIN"; then - ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN -if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_cv_check_cflags___Werror_unknown_warning_option=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ax_cv_check_cflags___Werror_unknown_warning_option=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5 +$as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; } +if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then : + ax_compiler_flags_test="-Werror=unknown-warning-option" - test -n "$ac_ct_DUMPBIN" && break -done - - if test "x$ac_ct_DUMPBIN" = x; then - DUMPBIN=":" - 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 - DUMPBIN=$ac_ct_DUMPBIN - fi -fi +else - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in - *COFF*) - DUMPBIN="$DUMPBIN -symbols" - ;; - *) - DUMPBIN=: - ;; - esac - fi + ax_compiler_flags_test="" - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" - fi fi -test -z "$NM" && NM=nm + # Base flags -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : +for flag in -Wl,--no-as-needed ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 - (eval echo "\"\$as_me:$LINENO: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } -fi - -# find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - cygwin* | mingw* | cegcc*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; +int +main () +{ - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; +if ${WARN_LDFLAGS+:} false; then : - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) - # This has been around since 386BSD, at least. Likely further. - if test -x /sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` - elif test -x /usr/sbin/sysctl; then - lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` - else - lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs - fi - # And add a safety zone - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - ;; + case " $WARN_LDFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5 + (: WARN_LDFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : - interix*) - # We know the value 262144 and hardcode it with a safety zone (like BSD) - lt_cv_sys_max_cmd_len=196608 - ;; + as_fn_append WARN_LDFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac - os2*) - # The test takes a long time on OS/2. - lt_cv_sys_max_cmd_len=8192 - ;; +else - osf*) - # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure - # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not - # nice to cause kernel panics so lets avoid the loop below. - # First set a reasonable default. - lt_cv_sys_max_cmd_len=16384 - # - if test -x /sbin/sysconfig; then - case `/sbin/sysconfig -q proc exec_disable_arg_limit` in - *1*) lt_cv_sys_max_cmd_len=-1 ;; - esac - fi - ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; - sysv5* | sco5v6* | sysv4.2uw2*) - kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` - if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` - else - lt_cv_sys_max_cmd_len=32768 - fi - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len" && \ - test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else - # Make teststring a little bigger before we do anything with it. - # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do - teststring=$teststring$teststring - done - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ - = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - # Only check the string length outside the loop. - lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` - teststring= - # Add a significant safety factor because C++ compilers can tack on - # massive amounts of additional arguments before passing them to the - # linker. It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - fi - ;; - esac + WARN_LDFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } fi -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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + : fi -max_cmd_len=$lt_cv_sys_max_cmd_len +done + if test "$ax_enable_compile_warnings" != "no"; then : + # "yes" flags -: ${CP="cp -f"} -: ${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; } +for flag in ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : + $as_echo_n "(cached) " >&6 +else -{ $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; } + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - lt_unset=unset + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" else - lt_unset=false + eval "$as_CACHEVAR=no" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : +if ${WARN_LDFLAGS+:} false; then : + case " $WARN_LDFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5 + (: WARN_LDFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : - - -# test EBCDIC or ASCII -case `echo X|tr X '\101'` in - A) # ASCII based system - # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr - lt_SP2NL='tr \040 \012' - lt_NL2SP='tr \015\012 \040\040' - ;; - *) # EBCDIC based system - lt_SP2NL='tr \100 \n' - lt_NL2SP='tr \r\n \100\100' - ;; + as_fn_append WARN_LDFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; esac +else + WARN_LDFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +fi +else + : +fi +done +fi + if test "$ax_enable_compile_warnings" = "error"; then : + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : + + + +for flag in -Wl,--fatal-warnings ; do + as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5 +$as_echo_n "checking whether C compiler accepts $flag... " >&6; } +if eval \${$as_CACHEVAR+:} false; then : $as_echo_n "(cached) " >&6 else - case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 - ;; - esac - ;; - *-*-cygwin* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin - ;; - *-*-cygwin* ) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; - * ) # otherwise, assume *nix - lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin - ;; - esac - ;; - * ) # unhandled hosts (and "normal" native builds) - lt_cv_to_host_file_cmd=func_convert_file_noop - ;; -esac + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS $ax_compiler_flags_test $flag" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$as_CACHEVAR=yes" +else + eval "$as_CACHEVAR=no" fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +eval ac_res=\$$as_CACHEVAR + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : -to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +if ${WARN_LDFLAGS+:} false; then : + + case " $WARN_LDFLAGS " in #( + *" $flag "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5 + (: WARN_LDFLAGS already contains $flag) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + as_fn_append WARN_LDFLAGS " $flag" + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac +else + WARN_LDFLAGS=$flag + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5 + (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 else - #assume ordinary cross tools, or native build. -lt_cv_to_tool_file_cmd=func_convert_file_noop -case $host in - *-*-mingw* ) - case $build in - *-*-mingw* ) # actually msys - lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 - ;; - esac - ;; -esac + : +fi + +done + fi -to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } + # Substitute the variables -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 + + # Variable names + + + # Base flags + +if ${WARN_SCANNERFLAGS+:} false; then : + + case " $WARN_SCANNERFLAGS " in #( + *" "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains "; } >&5 + (: WARN_SCANNERFLAGS already contains ) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_SCANNERFLAGS " " + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; +esac + else - lt_cv_ld_reload_flag='-r' + + WARN_SCANNERFLAGS= + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; + + + if test "$ax_enable_compile_warnings" != "no"; then : + + # "yes" flags + +if ${WARN_SCANNERFLAGS+:} false; then : + + case " $WARN_SCANNERFLAGS " in #( + *" --warn-all "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains --warn-all "; } >&5 + (: WARN_SCANNERFLAGS already contains --warn-all ) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_SCANNERFLAGS " --warn-all " + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' -case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then - reload_cmds=false - fi - ;; - darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' - else - reload_cmds='$LD$reload_flag -o $output$reload_objs' - fi - ;; + +else + + WARN_SCANNERFLAGS= --warn-all + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + +fi + + +fi + if test "$ax_enable_compile_warnings" = "error"; then : + + # "error" flags + +if ${WARN_SCANNERFLAGS+:} false; then : + + case " $WARN_SCANNERFLAGS " in #( + *" --warn-error "*) : + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains --warn-error "; } >&5 + (: WARN_SCANNERFLAGS already contains --warn-error ) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } ;; #( + *) : + + as_fn_append WARN_SCANNERFLAGS " --warn-error " + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + ;; esac +else + + WARN_SCANNERFLAGS= --warn-error + { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5 + (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +fi +fi + # Substitute the variables +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5382,7 +4767,7 @@ 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_OBJDUMP="${ac_tool_prefix}objdump" + ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5392,10 +4777,10 @@ fi fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -5403,17 +4788,17 @@ fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5422,7 +4807,7 @@ 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_OBJDUMP="objdump" + ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5432,17 +4817,17 @@ fi fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" + if test "x$ac_ct_CC" = x; then + CC="" else case $cross_compiling:$ac_tool_warned in yes:) @@ -5450,272 +4835,23 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - OBJDUMP=$ac_ct_OBJDUMP + CC=$ac_ct_CC fi else - OBJDUMP="$ac_cv_prog_OBJDUMP" + CC="$ac_cv_prog_CC" fi -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# 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. - -case $host_os in -aix[4-9]*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi[45]*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump', - # unless we find 'file', for example because we are cross-compiling. - # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. - if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - else - # Keep this pattern in sync with the one in func_win32_libid. - lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' - lt_cv_file_magic_cmd='$OBJDUMP -f' - fi - ;; - -cegcc*) - # use the weaker test based on 'objdump'. See mingw*. - lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | dragonfly*) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -haiku*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case $host_cpu in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -interix[3-9]*) - # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -*nto* | *qnx*) - lt_cv_deplibs_check_method=pass_all - ;; - -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - fi - ;; - -osf3* | osf4* | osf5*) - lt_cv_deplibs_check_method=pass_all - ;; - -rdos*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.3*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - pc) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -tpf*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } - -file_magic_glob= -want_nocaseglob=no -if test "$build" = "$host"; then - case $host_os in - mingw* | pw32*) - if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then - want_nocaseglob=yes - else - file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` - fi - ;; - esac -fi - -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - - - - - - - - - - - - - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5724,7 +4860,7 @@ 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_DLLTOOL="${ac_tool_prefix}dlltool" + ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5734,29 +4870,30 @@ fi fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + fi fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else + ac_prog_rejected=no as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do @@ -5764,7 +4901,11 @@ 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_DLLTOOL="dlltool" + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5772,94 +4913,44 @@ done IFS=$as_save_IFS +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi fi fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - 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 - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - - - - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_sharedlib_from_linklib_cmd='unknown' - -case $host_os in -cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL - case `$DLLTOOL --help 2>&1` in - *--identify-strict*) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib - ;; - *) - lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback - ;; - esac - ;; -*) - # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" - ;; -esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } -sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd -test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO - - - - - - - - -if test -n "$ac_tool_prefix"; then - for ac_prog in ar +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5868,7 +4959,7 @@ 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_AR="$ac_tool_prefix$ac_prog" + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5878,32 +4969,32 @@ fi fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +$as_echo "$CC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$AR" && break + test -n "$CC" && break done fi -if test -z "$AR"; then - ac_ct_AR=$AR - for ac_prog in ar +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -5912,7 +5003,7 @@ 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_AR="$ac_prog" + ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -5922,21 +5013,21 @@ fi fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$ac_ct_AR" && break + test -n "$ac_ct_CC" && break done - if test "x$ac_ct_AR" = x; then - AR="false" + if test "x$ac_ct_CC" = x; then + CC="" else case $cross_compiling:$ac_tool_warned in yes:) @@ -5944,199 +5035,334 @@ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac - AR=$ac_ct_AR + CC=$ac_ct_CC fi fi -: ${AR=ar} -: ${AR_FLAGS=cru} - - - - - - - +fi +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } +# Provide some information about the compiler. +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_ar_at_file=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { +#ifndef __GNUC__ + choke me +#endif ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - echo conftest.$ac_objext > conftest.lst - lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -eq 0; then - # Ensure the archiver fails upon bogus file names. - rm -f conftest.$ac_objext libconftest.a - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 - (eval $lt_ar_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if test "$ac_status" -ne 0; then - lt_cv_ar_at_file=@ - fi - fi - rm -f conftest.* libconftest.a - + ac_compiler_gnu=yes +else + ac_compiler_gnu=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } - -if test "x$lt_cv_ar_at_file" = xno; then - archiver_list_spec= +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes else - archiver_list_spec=$lt_cv_ar_at_file + GCC= fi - - - - - - - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_g=yes fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP + CFLAGS="-g" fi else - STRIP="$ac_cv_prog_STRIP" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -test -z "$STRIP" && STRIP=: +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +# Extract the first word of "glib-genmarshal", so it can be a program name with args. +set dummy glib-genmarshal; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_GENMARSHAL in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6144,39 +5370,39 @@ done IFS=$as_save_IFS + ;; +esac fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } +GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL +if test -n "$GLIB_GENMARSHAL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 +$as_echo "$GLIB_GENMARSHAL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 +# Extract the first word of "glib-mkenums", so it can be a program name with args. +set dummy glib-mkenums; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : +if ${ac_cv_path_GLIB_MKENUMS+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $GLIB_MKENUMS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" + ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6184,1224 +5410,1413 @@ done IFS=$as_save_IFS + ;; +esac fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } +GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS +if test -n "$GLIB_MKENUMS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 +$as_echo "$GLIB_MKENUMS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - 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 - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -test -z "$RANLIB" && RANLIB=: - - +am__api_version='1.15' - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } +if test -z "$INSTALL"; then +if ${ac_cv_path_install+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ + /usr/ucb/* ) ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + fi + done + done ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" -fi - -case $host_os in - darwin*) - lock_old_archive_extraction=yes ;; - *) - lock_old_archive_extraction=no ;; esac + done +IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; +esac +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$2" = conftest.file + ) +then + # Ok. + : +else + as_fn_error $? "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +rm -f conftest.file +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. +# By default was `s,x,x', remove it if useless. +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +fi +if test x"${install_sh+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if ${ac_cv_path_mkdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS +fi + test -d ./--version && rmdir ./--version + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + MKDIR_P="$ac_install_sh -d" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AWK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # 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_AWK="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +$as_echo "$AWK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + test -n "$AWK" && break +done - - - - - - - - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + SET_MAKE= +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' +DEPDIR="${am__leading_dot}deps" -# Regexp to match symbols that can be accessed directly from C. -sympat='\([_A-Za-z][_A-Za-z0-9]*\)' +ac_config_commands="$ac_config_commands depfiles" -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32* | cegcc*) - symcode='[ABCDGISTW]' - ;; -hpux*) - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris*) - symcode='[BDRT]' - ;; -sco3.2v5*) - symcode='[DT]' - ;; -sysv4.2uw2*) - symcode='[DT]' - ;; -sysv5* | sco5v6* | unixware* | OpenUNIX*) - symcode='[ABDT]' - ;; -sysv4) - symcode='[DFNSTU]' + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU ;; esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac -# Transform an extracted symbol line into a proper C declaration. -# Some systems (esp. on ia64) link data and code symbols differently, -# so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf -# 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'" +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi -# Try without a prefix underscore, then with it. -for ac_symprfx in "" "_"; do - # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. - symxfrm="\\1 $ac_symprfx\\2 \\2" +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi - # Write the raw and C identifiers. - if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. - # Also find C++ and __fastcall symbols from MSVC++, - # which start with @ or ?. - lt_cv_sys_global_symbol_pipe="$AWK '"\ -" {last_section=section; section=\$ 3};"\ -" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ -" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -" \$ 0!~/External *\|/{next};"\ -" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -" {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -" ' prfx=^$ac_symprfx" +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + CYGPATH_W=echo fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" +fi - # Check to see that the pipe works correctly. - pipe_works=no - rm -f conftest* - cat > conftest.$ac_ext <<_LT_EOF -#ifdef __cplusplus -extern "C" { -#endif -char nm_test_var; -void nm_test_func(void); -void nm_test_func(void){} -#ifdef __cplusplus -} -#endif -int main(){nm_test_var='a';nm_test_func();return(0);} -_LT_EOF +# Define the identity of the package. + PACKAGE='epiphany' + VERSION='3.18.0' - 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 - # Now try to grab the symbols. - nlist=conftest.nm - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 - (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if $GREP ' nm_test_var$' "$nlist" >/dev/null; then - if $GREP ' nm_test_func$' "$nlist" >/dev/null; then - cat <<_LT_EOF > conftest.$ac_ext -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -_LT_EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' - - cat <<_LT_EOF >> conftest.$ac_ext - -/* The mapping between symbol names and symbols. */ -LT_DLSYM_CONST struct { - const char *name; - void *address; -} -lt__PROGRAM__LTX_preloaded_symbols[] = -{ - { "@PROGRAM@", (void *) 0 }, -_LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext - cat <<\_LT_EOF >> conftest.$ac_ext - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt__PROGRAM__LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif -_LT_EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_globsym_save_LIBS=$LIBS - lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_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 - pipe_works=yes - fi - LIBS=$lt_globsym_save_LIBS - CFLAGS=$lt_globsym_save_CFLAGS - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -rf conftest* conftst* - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF -fi -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -fi +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF -# Response file support. -if test "$lt_cv_nm_interface" = "MS dumpbin"; then - nm_file_list_spec='@' -elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then - nm_file_list_spec='@' -fi +# Some tools Automake needs. +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' +# We need awk for the "check" target (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}' +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } +depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if ${am_cv_CC_dependencies_compiler_type+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -# Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : - withval=$with_sysroot; + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir else - with_sysroot=no + am_cv_CC_dependencies_compiler_type=none fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type -lt_sysroot= -case ${with_sysroot} in #( - yes) - if test "$GCC" = yes; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } - as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 - ;; -esac + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. -# Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : - enableval=$enable_libtool_lock; -fi +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { 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 - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line '$LINENO' "configure"' > conftest.$ac_ext - if { { 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 - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi - rm -rf conftest* - ;; +fi -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > 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 - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) - case `/usr/bin/file conftest.o` in - *x86-64*) - LD="${LD-ld} -m elf32_x86_64" - ;; - *) - LD="${LD-ld} -m elf_i386" - ;; - esac - ;; - powerpc64le-*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*kfreebsd*-gnu) - LD="${LD-ld} -m elf_x86_64_fbsd" - ;; - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - powerpcle-*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*|s390*-*tpf*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_cc_needs_belf=yes -else - lt_cv_cc_needs_belf=no +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -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 - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { { 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 - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in - yes*) - case $host in - i?86-*-solaris*) - LD="${LD-ld} -m elf_x86_64" - ;; - sparc*-*-solaris*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - # GNU ld 2.21 introduced _sol2 emulations. Use them if available. - if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" - fi - ;; - *) - if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then - LD="${LD-ld} -64" - fi - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac - -need_locks="$enable_libtool_lock" - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. -set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$MANIFEST_TOOL"; then - ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes else -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_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + am_cv_make_support_nested_variables=no fi fi -MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL -if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY fi +AM_BACKSLASH='\' -fi -if test -z "$ac_cv_prog_MANIFEST_TOOL"; then - ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL - # Extract the first word of "mt", so it can be a program name with args. -set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_MANIFEST_TOOL"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL -if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } + # Check whether --enable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then : + enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + USE_MAINTAINER_MODE=yes fi - if test "x$ac_ct_MANIFEST_TOOL" = x; then - MANIFEST_TOOL=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then + MAINTAINER_MODE_TRUE= + MAINTAINER_MODE_FALSE='#' else - MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" + MAINTAINER_MODE_TRUE='#' + MAINTAINER_MODE_FALSE= fi -test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_path_mainfest_tool=no - echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 - $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out - cat conftest.err >&5 - if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes - fi - rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then - MANIFEST_TOOL=: -fi + MAINT=$MAINTAINER_MODE_TRUE +# Initialize libtool +case `pwd` in + *\ * | *\ *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +esac - case $host_os in - rhapsody* | darwin*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. -set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DSYMUTIL"; then - ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil" - $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 -DSYMUTIL=$ac_cv_prog_DSYMUTIL -if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +macro_version='2.4.2' +macro_revision='1.3337' -fi -if test -z "$ac_cv_prog_DSYMUTIL"; then - ac_ct_DSYMUTIL=$DSYMUTIL - # Extract the first word of "dsymutil", so it can be a program name with args. -set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DSYMUTIL"; then - ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil" - $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_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL -if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_DSYMUTIL" = x; then - DSYMUTIL=":" - 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 - DSYMUTIL=$ac_ct_DSYMUTIL - fi -else - DSYMUTIL="$ac_cv_prog_DSYMUTIL" -fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. -set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$NMEDIT"; then - ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit" - $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 -NMEDIT=$ac_cv_prog_NMEDIT -if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_NMEDIT"; then - ac_ct_NMEDIT=$NMEDIT - # Extract the first word of "nmedit", so it can be a program name with args. -set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + + + + + +ltmain="$ac_aux_dir/ltmain.sh" + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_NMEDIT"; then - ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_NMEDIT="nmedit" - $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 + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi -fi -ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT -if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_NMEDIT" = x; then - NMEDIT=":" - 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 ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac - NMEDIT=$ac_ct_NMEDIT - fi -else - NMEDIT="$ac_cv_prog_NMEDIT" -fi +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. -set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$LIPO"; then - ac_cv_prog_LIPO="$LIPO" # Let the user override the test. + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build 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_LIPO="${ac_tool_prefix}lipo" - $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 - + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi + fi -LIPO=$ac_cv_prog_LIPO -if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac + + +# Backslashify metacharacters that are still active within +# double-quoted strings. +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' + +# Same as above, but do not quote variable references. +double_quote_subst='s/\(["`\\]\)/\\\1/g' + +# Sed substitution to delay expansion of an escaped shell variable in a +# double_quote_subst'ed string. +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' + +# Sed substitution to delay expansion of an escaped single quote. +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' + +# Sed substitution to avoid accidental globbing in evaled expressions +no_glob_subst='s/\*/\\\*/g' + +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +$as_echo_n "checking how to print strings... " >&6; } +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' fi +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "" +} -fi -if test -z "$ac_cv_prog_LIPO"; then - ac_ct_LIPO=$LIPO - # Extract the first word of "lipo", so it can be a program name with args. -set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : +case "$ECHO" in + printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +$as_echo "printf" >&6; } ;; + print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +$as_echo "print -r" >&6; } ;; + *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +$as_echo "cat" >&6; } ;; +esac + + + + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_LIPO"; then - ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_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 sed gsed; do 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_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -IFS=$as_save_IFS + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac -fi -fi -ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO -if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_path_SED=$SED fi - if test "x$ac_ct_LIPO" = x; then - LIPO=":" - 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 - LIPO=$ac_ct_LIPO - fi -else - LIPO="$ac_cv_prog_LIPO" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : +test -z "$SED" && SED=sed +Xsed="$SED -e 1s/^X//" + + + + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$OTOOL"; then - ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + if test -z "$GREP"; then + ac_path_GREP_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$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do 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_OTOOL="${ac_tool_prefix}otool" - $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 -OTOOL=$ac_cv_prog_OTOOL -if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OTOOL"; then - ac_ct_OTOOL=$OTOOL - # Extract the first word of "otool", so it can be a program name with args. -set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OTOOL"; then - ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -IFS=$as_save_IFS + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac -fi -fi -ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL -if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_path_GREP=$GREP fi - if test "x$ac_ct_OTOOL" = x; then - OTOOL=":" - 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 - OTOOL=$ac_ct_OTOOL - fi -else - OTOOL="$ac_cv_prog_OTOOL" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. -set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$OTOOL64"; then - ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_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$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do 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_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -IFS=$as_save_IFS + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac -fi -fi -OTOOL64=$ac_cv_prog_OTOOL64 -if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_path_EGREP=$EGREP fi - + fi fi -if test -z "$ac_cv_prog_OTOOL64"; then - ac_ct_OTOOL64=$OTOOL64 - # Extract the first word of "otool64", so it can be a program name with args. -set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +$as_echo_n "checking for fgrep... " >&6; } +if ${ac_cv_path_FGREP+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ac_ct_OTOOL64"; then - ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH + if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 + then ac_cv_path_FGREP="$GREP -F" + else + if test -z "$FGREP"; then + ac_path_FGREP_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$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. + for ac_prog in fgrep; do 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_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_FGREP" || continue +# Check for GNU ac_path_FGREP and select it if it is found. + # Check for GNU $ac_path_FGREP +case `"$ac_path_FGREP" --version 2>&1` in +*GNU*) + ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo 'FGREP' >> "conftest.nl" + "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_FGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_FGREP="$ac_path_FGREP" + ac_path_FGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break done -IFS=$as_save_IFS - -fi -fi -ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 -if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OTOOL64" = x; then - OTOOL64=":" - 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 ;; + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - OTOOL64=$ac_ct_OTOOL64 + + $ac_path_FGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_FGREP"; then + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else - OTOOL64="$ac_cv_prog_OTOOL64" + ac_cv_path_FGREP=$FGREP fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +$as_echo "$ac_cv_path_FGREP" >&6; } + FGREP="$ac_cv_path_FGREP" +test -z "$GREP" && GREP=grep @@ -7421,557 +6836,637 @@ - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 +# 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 else - lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - # If there is a non-empty error log, and "single_module" - # appears in it, assume the flag caused a linker warning - if test -s conftest.err && $GREP single_module conftest.err; then - cat conftest.err >&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 - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&5 - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi + with_gnu_ld=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : +ac_prog=ld +if test "$GCC" = yes; 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 + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [\\/]* | ?:[\\/]*) + re_direlt='/[^/][^/]*/\.\./' + # Canonicalize the pathname of ld + ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` + while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do + ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } +fi +if ${lt_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_ld_exported_symbols_list=yes + if test -z "$LD"; then + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + lt_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some variants of GNU ld only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + case `"$lt_cv_path_LD" -v 2>&1 &5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : +LD="$lt_cv_path_LD" +if test -n "$LD"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +$as_echo "$LD" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } +if ${lt_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_ld_force_load=no - cat > conftest.c << _LT_EOF -int forced_loaded() { return 2;} -_LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cru libconftest.a conftest.o" >&5 - $AR cru libconftest.a conftest.o 2>&5 - echo "$RANLIB libconftest.a" >&5 - $RANLIB libconftest.a 2>&5 - cat > conftest.c << _LT_EOF -int main() { return 0;} -_LT_EOF - echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 - $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err - _lt_result=$? - if test -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 - lt_cv_ld_force_load=yes - else - cat conftest.err >&5 - fi - rm -f conftest.err libconftest.a conftest conftest.c - rm -rf conftest.dSYM - + # I'd rather use --version here, but apparently some GNU lds only accept -v. +case `$LD -v 2>&1 &5 -$as_echo "$lt_cv_ld_force_load" >&6; } - case $host_os in - rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } +with_gnu_ld=$lt_cv_prog_gnu_ld -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : + + + + + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if ${lt_cv_path_NM+:} false; then : $as_echo_n "(cached) " >&6 else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - + if test -n "$NM"; then + # Let the user override the test. + lt_cv_path_NM="$NM" else - # Broken: fails on valid input. -continue + lt_nm_to_check="${ac_tool_prefix}nm" + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + lt_nm_to_check="$lt_nm_to_check nm" + fi + for lt_tmp_nm in $lt_nm_to_check; do + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do + IFS="$lt_save_ifs" + test -z "$ac_dir" && ac_dir=. + tmp_nm="$ac_dir/$lt_tmp_nm" + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + # Check to see if the nm accepts a BSD-compat flag. + # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # nm: unknown option "B" ignored + # Tru64's nm complains that /dev/null is an invalid object file + case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in + */dev/null* | *'Invalid file or object type'*) + lt_cv_path_NM="$tmp_nm -B" + break + ;; + *) + case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + */dev/null*) + lt_cv_path_NM="$tmp_nm -p" + break + ;; + *) + lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but + continue # so that we can try to find one that supports BSD flags + ;; + esac + ;; + esac + fi + done + IFS="$lt_save_ifs" + done + : ${lt_cv_path_NM=no} fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break fi -rm -f conftest.err conftest.i conftest.$ac_ext - +{ $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" +else + # Didn't find any BSD compatible name lister, look for dumpbin. + if test -n "$DUMPBIN"; then : + # Let the user override the test. + else + if test -n "$ac_tool_prefix"; then + for ac_prog in dumpbin "link -dump" + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DUMPBIN"; then + ac_cv_prog_DUMPBIN="$DUMPBIN" # 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_DUMPBIN="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break + done +IFS=$as_save_IFS + +fi +fi +DUMPBIN=$ac_cv_prog_DUMPBIN +if test -n "$DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +$as_echo "$DUMPBIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - done - ac_cv_prog_CPP=$CPP + test -n "$DUMPBIN" && break + done fi - CPP=$ac_cv_prog_CPP +if test -z "$DUMPBIN"; then + ac_ct_DUMPBIN=$DUMPBIN + for ac_prog in dumpbin "link -dump" +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : + $as_echo_n "(cached) " >&6 else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes + if test -n "$ac_ct_DUMPBIN"; then + ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : + 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_DUMPBIN="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -else - # Broken: fails on valid input. -continue fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue +fi +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN +if test -n "$ac_ct_DUMPBIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +$as_echo "$ac_ct_DUMPBIN" >&6; } else - # Passes both tests. -ac_preproc_ok=: -break + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.err conftest.i conftest.$ac_ext + + test -n "$ac_ct_DUMPBIN" && break done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } + if test "x$ac_ct_DUMPBIN" = x; then + DUMPBIN=":" + 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 + DUMPBIN=$ac_ct_DUMPBIN + fi fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + *COFF*) + DUMPBIN="$DUMPBIN -symbols" + ;; + *) + DUMPBIN=: + ;; + esac + fi + + if test "$DUMPBIN" != ":"; then + NM="$DUMPBIN" + fi +fi +test -z "$NM" && NM=nm -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +$as_echo_n "checking the name lister ($NM) interface... " >&6; } +if ${lt_cv_nm_interface+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext + (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 + (eval echo "\"\$as_me:$LINENO: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +$as_echo "$lt_cv_nm_interface" >&6; } - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } +LN_S=$as_ln_s +if test "$LN_S" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - ac_cv_header_stdc=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include +# find the maximum length of command line arguments +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } +if ${lt_cv_sys_max_cmd_len+:} false; then : + $as_echo_n "(cached) " >&6 +else + i=0 + teststring="ABCD" -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : + case $build_os in + msdosdjgpp*) + # On DJGPP, this test can blow up pretty badly due to problems in libc + # (any single argument exceeding 2000 bytes causes a buffer overrun + # during glob expansion). Even if it were fixed, the result of this + # check would be larger than it should be. + lt_cv_sys_max_cmd_len=12288; # 12K is about right + ;; -else - ac_cv_header_stdc=no -fi -rm -f conftest* + gnu*) + # Under GNU Hurd, this test is not required because there is + # no limit to the length of command line arguments. + # Libtool will interpret -1 as no limit whatsoever + lt_cv_sys_max_cmd_len=-1; + ;; -fi + cygwin* | mingw* | cegcc*) + # On Win9x/ME, this test blows up -- it succeeds, but takes + # about 5 minutes as the teststring grows exponentially. + # Worse, since 9x/ME are not pre-emptively multitasking, + # you end up with a "frozen" computer, even though with patience + # the test eventually succeeds (with a max line length of 256k). + # Instead, let's just punt: use the minimum linelength reported by + # all of the supported platforms: 8192 (on NT/2K/XP). + lt_cv_sys_max_cmd_len=8192; + ;; -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : + amigaos*) + # On AmigaOS with pdksh, this test takes hours, literally. + # So we just punt and use a minimum line length of 8192. + lt_cv_sys_max_cmd_len=8192; + ;; -else - ac_cv_header_stdc=no -fi -rm -f conftest* + netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + # This has been around since 386BSD, at least. Likely further. + if test -x /sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` + elif test -x /usr/sbin/sysctl; then + lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` + else + lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs + fi + # And add a safety zone + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + ;; -fi + interix*) + # We know the value 262144 and hardcode it with a safety zone (like BSD) + lt_cv_sys_max_cmd_len=196608 + ;; -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : + osf*) + # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure + # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not + # nice to cause kernel panics so lets avoid the loop below. + # First set a reasonable default. + lt_cv_sys_max_cmd_len=16384 + # + if test -x /sbin/sysconfig; then + case `/sbin/sysconfig -q proc exec_disable_arg_limit` in + *1*) lt_cv_sys_max_cmd_len=-1 ;; + esac + fi + ;; + sco3.2v5*) + lt_cv_sys_max_cmd_len=102400 + ;; + sysv5* | sco5v6* | sysv4.2uw2*) + kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` + if test -n "$kargmax"; then + lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + else + lt_cv_sys_max_cmd_len=32768 + fi + ;; + *) + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + # Make teststring a little bigger before we do anything with it. + # a 1K string should be a reasonable start. + for i in 1 2 3 4 5 6 7 8 ; do + teststring=$teststring$teststring + done + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + # If test is not a shell built-in, we'll probably end up computing a + # maximum length that is only half of the actual maximum length, but + # we can't tell. + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ + = "X$teststring$teststring"; } >/dev/null 2>&1 && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + # Only check the string length outside the loop. + lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` + teststring= + # Add a significant safety factor because C++ compilers can tack on + # massive amounts of additional arguments before passing them to the + # linker. It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi + ;; + esac -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext fi +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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 +$as_echo "none" >&6; } fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then +max_cmd_len=$lt_cv_sys_max_cmd_len -$as_echo "#define STDC_HEADERS 1" >>confdefs.h -fi -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -fi -done +: ${CP="cp -f"} +: ${MV="mv -f"} +: ${RM="rm -f"} -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default -" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - +{ $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; } -# Set options -enable_dlopen=yes -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + lt_unset=unset else - enable_static=no + lt_unset=false fi +# test EBCDIC or ASCII +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + lt_SP2NL='tr \040 \012' + lt_NL2SP='tr \015\012 \040\040' + ;; + *) # EBCDIC based system + lt_SP2NL='tr \100 \n' + lt_NL2SP='tr \r\n \100\100' + ;; +esac - enable_win32_dll=no - - - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; } +if ${lt_cv_to_host_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32 + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32 + ;; + esac + ;; + *-*-cygwin* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin + ;; + *-*-cygwin* ) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; + * ) # otherwise, assume *nix + lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin + ;; + esac + ;; + * ) # unhandled hosts (and "normal" native builds) + lt_cv_to_host_file_cmd=func_convert_file_noop + ;; +esac +fi +to_host_file_cmd=$lt_cv_to_host_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +$as_echo "$lt_cv_to_host_file_cmd" >&6; } -# Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : - withval=$with_pic; lt_p=${PACKAGE-default} - case $withval in - yes|no) pic_mode=$withval ;; - *) - pic_mode=default - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for lt_pkg in $withval; do - IFS="$lt_save_ifs" - if test "X$lt_pkg" = "X$lt_p"; then - pic_mode=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } +if ${lt_cv_to_tool_file_cmd+:} false; then : + $as_echo_n "(cached) " >&6 else - pic_mode=default -fi - - -test -z "$pic_mode" && pic_mode=default + #assume ordinary cross tools, or native build. +lt_cv_to_tool_file_cmd=func_convert_file_noop +case $host in + *-*-mingw* ) + case $build in + *-*-mingw* ) # actually msys + lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 + ;; + esac + ;; +esac +fi +to_tool_file_cmd=$lt_cv_to_tool_file_cmd +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; } - # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : - enableval=$enable_fast_install; p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } +if ${lt_cv_ld_reload_flag+:} false; then : + $as_echo_n "(cached) " >&6 else - enable_fast_install=yes + lt_cv_ld_reload_flag='-r' fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } +reload_flag=$lt_cv_ld_reload_flag +case $reload_flag in +"" | " "*) ;; +*) reload_flag=" $reload_flag" ;; +esac +reload_cmds='$LD$reload_flag -o $output$reload_objs' +case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + if test "$GCC" != yes; then + reload_cmds=false + fi + ;; + darwin*) + if test "$GCC" = yes; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + else + reload_cmds='$LD$reload_flag -o $output$reload_objs' + fi + ;; +esac @@ -7981,16 +7476,99 @@ +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # 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_OBJDUMP="${ac_tool_prefix}objdump" + $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 +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # 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_OBJDUMP="objdump" + $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_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi +test -z "$OBJDUMP" && OBJDUMP=objdump @@ -8000,756 +7578,779 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } +if ${lt_cv_deplibs_check_method+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_file_magic_cmd='$MAGIC_CMD' +lt_cv_file_magic_test_file= +lt_cv_deplibs_check_method='unknown' +# Need to set the preceding variable on all platforms that support +# interlibrary dependencies. +# 'none' -- dependencies not supported. +# `unknown' -- same as none, but documents that we really don't know. +# 'pass_all' -- all dependencies passed with no checks. +# 'test_compile' -- check by making test program. +# 'file_magic [[regex]]' -- check by looking for files in library path +# 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. +case $host_os in +aix[4-9]*) + lt_cv_deplibs_check_method=pass_all + ;; +beos*) + lt_cv_deplibs_check_method=pass_all + ;; +bsdi[45]*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' + lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_test_file=/shlib/libc.so + ;; +cygwin*) + # func_win32_libid is a shell function defined in ltmain.sh + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + ;; +mingw* | pw32*) + # Base MSYS/MinGW do not provide the 'file' command needed by + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin. + if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + # Keep this pattern in sync with the one in func_win32_libid. + lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi + ;; +cegcc*) + # use the weaker test based on 'objdump'. See mingw*. + lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + ;; +darwin* | rhapsody*) + lt_cv_deplibs_check_method=pass_all + ;; +freebsd* | dragonfly*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + # Not sure whether the presence of OpenBSD here was a mistake. + # Let's accept both of them until this is cleared up. + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; +haiku*) + lt_cv_deplibs_check_method=pass_all + ;; +hpux10.20* | hpux11*) + lt_cv_file_magic_cmd=/usr/bin/file + case $host_cpu in + ia64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' + lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so + ;; + hppa*64*) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]' + lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl + ;; + *) + lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library' + lt_cv_file_magic_test_file=/usr/lib/libc.sl + ;; + esac + ;; +interix[3-9]*) + # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' + ;; +irix5* | irix6* | nonstopux*) + case $LD in + *-32|*"-32 ") libmagic=32-bit;; + *-n32|*"-n32 ") libmagic=N32;; + *-64|*"-64 ") libmagic=64-bit;; + *) libmagic=never-match;; + esac + lt_cv_deplibs_check_method=pass_all + ;; +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + lt_cv_deplibs_check_method=pass_all + ;; +netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' + fi + ;; +newos6*) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=/usr/lib/libnls.so + ;; +*nto* | *qnx*) + lt_cv_deplibs_check_method=pass_all + ;; +openbsd*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' + else + lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' + fi + ;; -test -z "$LN_S" && LN_S="ln -s" +osf3* | osf4* | osf5*) + lt_cv_deplibs_check_method=pass_all + ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; +solaris*) + lt_cv_deplibs_check_method=pass_all + ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + lt_cv_deplibs_check_method=pass_all + ;; +sysv4 | sysv4.3*) + case $host_vendor in + motorola) + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` + ;; + ncr) + lt_cv_deplibs_check_method=pass_all + ;; + sequent) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' + ;; + sni) + lt_cv_file_magic_cmd='/bin/file' + lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" + lt_cv_file_magic_test_file=/lib/libc.so + ;; + siemens) + lt_cv_deplibs_check_method=pass_all + ;; + pc) + lt_cv_deplibs_check_method=pass_all + ;; + esac + ;; +tpf*) + lt_cv_deplibs_check_method=pass_all + ;; +esac +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } +file_magic_glob= +want_nocaseglob=no +if test "$build" = "$host"; then + case $host_os in + mingw* | pw32*) + if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then + want_nocaseglob=yes + else + file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"` + fi + ;; + esac +fi +file_magic_cmd=$lt_cv_file_magic_cmd +deplibs_check_method=$lt_cv_deplibs_check_method +test -z "$deplibs_check_method" && deplibs_check_method=unknown -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } -objdir=$lt_cv_objdir - -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac -# Global variables: -ofile=libtool -can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, -# which needs '.lib'). -libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" -old_CC="$CC" -old_CFLAGS="$CFLAGS" -# Set sane defaults for various variables -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -test -z "$LD" && LD=ld -test -z "$ac_objext" && ac_objext=o -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-%%"` -# Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - 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 -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi +IFS=$as_save_IFS -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; } +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - - - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : $as_echo_n "(cached) " >&6 else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - 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 -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <<_LT_EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -_LT_EOF - fi ;; - esac - fi - break - fi + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # 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_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi +IFS=$as_save_IFS -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; } +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" else - MAGIC_CMD=: + 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 + DLLTOOL=$ac_ct_DLLTOOL fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" fi - fi - ;; -esac +test -z "$DLLTOOL" && DLLTOOL=dlltool -# Use C for the default configuration in the libtool script -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Source file extension for C test sources. -ac_ext=c -# Object file extension for compiled C test sources. -objext=o -objext=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; } +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_sharedlib_from_linklib_cmd='unknown' +case $host_os in +cygwin* | mingw* | pw32* | cegcc*) + # two different shell functions defined in ltmain.sh + # decide which to use based on capabilities of $DLLTOOL + case `$DLLTOOL --help 2>&1` in + *--identify-strict*) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib + ;; + *) + lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback + ;; + esac + ;; +*) + # fallback: assume linklib IS sharedlib + lt_cv_sharedlib_from_linklib_cmd="$ECHO" + ;; +esac -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO -# If no C compiler flags were specified, use CFLAGS. -LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -# Allow CC to be a program name with arguments. -compiler=$CC -# Save the default compiler, since it gets overwritten when the other -# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -compiler_DEFAULT=$CC -# save warnings/boilerplate of simple test code -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext -eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -_lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* -## CAVEAT EMPTOR: -## There is no encapsulation within the following macros, do not change -## the running order or otherwise move them around unless you know exactly -## what you are doing... -if test -n "$compiler"; then +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +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_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -lt_prog_compiler_no_builtin_flag= +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -if test "$GCC" = yes; then - case $cc_basename in - nvcc*) - lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; - *) - lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else - 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" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $RM conftest* + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +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_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS fi -{ $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 - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -fi + test -n "$ac_ct_AR" && break +done + if test "x$ac_ct_AR" = x; then + AR="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi +: ${AR=ar} +: ${AR_FLAGS=cru} - lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - if test "$GCC" = yes; 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 - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - lt_prog_compiler_pic='-fPIC' - ;; - m68k) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - esac - ;; - beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - # Although the cygwin gcc ignores -fPIC, still need this for old-style - # (--disable-auto-import) libraries - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - haiku*) - # PIC is the default for Haiku. - # The "-static" flag exists, but is broken. - lt_prog_compiler_static= - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +$as_echo_n "checking for archiver @FILE support... " >&6; } +if ${lt_cv_ar_at_file+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ar_at_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - hpux*) - # PIC is the default for 64-bit PA HP-UX, but not for 32-bit - # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag - # sets the default TLS model and affects inlining. - case $host_cpu in - hppa*64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - interix[3-9]*) - # Interix 3.x gcc -fpic/-fPIC options generate broken code. - # Instead, we relocate shared libraries at runtime. - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; +int +main () +{ - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + echo conftest.$ac_objext > conftest.lst + lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -eq 0; then + # Ensure the archiver fails upon bogus file names. + rm -f conftest.$ac_objext libconftest.a + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 + (eval $lt_ar_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if test "$ac_status" -ne 0; then + lt_cv_ar_at_file=@ + fi fi - ;; + rm -f conftest.* libconftest.a - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - case $cc_basename in - nvcc*) # Cuda Compiler Driver 2.2 - lt_prog_compiler_wl='-Xlinker ' - if test -n "$lt_prog_compiler_pic"; then - lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" - fi - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +$as_echo "$lt_cv_ar_at_file" >&6; } - 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' - ;; +if test "x$lt_cv_ar_at_file" = xno; then + archiver_list_spec= +else + archiver_list_spec=$lt_cv_ar_at_file +fi - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case $host_cpu in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - # icc used to be incompatible with GCC. - # ICC 10 doesn't accept -KPIC any more. - icc* | ifort*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - # Lahey Fortran 8.1. - lf95*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='--shared' - lt_prog_compiler_static='--static' - ;; - nagfor*) - # NAG Fortran compiler - lt_prog_compiler_wl='-Wl,-Wl,,' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) - # Portland Group compilers (*not* the Pentium gcc compiler, - # which looks to be a dead project) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - xl* | bgxl* | bgf* | mpixl*) - # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-qpic' - lt_prog_compiler_static='-qstaticlink' - ;; - *) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) - # Sun Fortran 8.3 passes all unrecognized flags to the linker - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='' - ;; - *Sun\ F* | *Sun*Fortran*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Qoption ld ' - ;; - *Sun\ C*) - # Sun C 5.9 - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - lt_prog_compiler_wl='-Wl,' - ;; - *Intel*\ [CF]*Compiler*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fPIC' - lt_prog_compiler_static='-static' - ;; - *Portland\ Group*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-fpic' - lt_prog_compiler_static='-Bstatic' - ;; - esac - ;; - esac - ;; - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - *nto* | *qnx*) - # QNX uses GNU C++, but need to define -shared option too, otherwise - # it will coredump. - lt_prog_compiler_pic='-fPIC -shared' - ;; - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - rdos*) - lt_prog_compiler_static='-non_shared' - ;; +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - solaris*) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - case $cc_basename in - f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) - lt_prog_compiler_wl='-Qoption ld ';; - *) - lt_prog_compiler_wl='-Wl,';; - esac - ;; +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - sysv4 | sysv4.2uw2* | sysv4.3*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi - unicos*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_can_build_shared=no - ;; +test -z "$STRIP" && STRIP=: - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi -case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_prog_compiler_pic=$lt_prog_compiler_pic + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # 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_RANLIB="${ac_tool_prefix}ranlib" + $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 +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } -lt_prog_compiler_pic=$lt_cv_prog_compiler_pic -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else - 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" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_pic_works=yes - fi - fi - $RM conftest* + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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_RANLIB="ranlib" + $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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + 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 + RANLIB=$ac_ct_RANLIB + fi else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no + RANLIB="$ac_cv_prog_RANLIB" fi +test -z "$RANLIB" && RANLIB=: + + + + + + +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi +case $host_os in + darwin*) + lock_old_archive_extraction=yes ;; + *) + lock_old_archive_extraction=no ;; +esac @@ -8760,46 +8361,8 @@ -# -# Check to make sure the static flag actually works. -# -wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_static_works=no - 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 - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler_static_works=yes - fi - else - lt_cv_prog_compiler_static_works=yes - fi - fi - $RM -r conftest* - 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 - : -else - lt_prog_compiler_static= -fi @@ -8807,1305 +8370,1146 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler_c_o=no - $RM -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp - $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 - if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . 2>&5 - $RM conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files - $RM out/* && rmdir out - cd .. - $RM -r conftest - $RM conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; 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; } - hard_links=yes - $RM conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $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;} - need_locks=warn - fi -else - need_locks=no -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} - runpath_var= - allow_undefined_flag= - always_export_symbols=no - archive_cmds= - archive_expsym_cmds= - compiler_needs_object=no - enable_shared_with_static_runtimes=no - export_dynamic_flag_spec= - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - hardcode_automatic=no - hardcode_direct=no - hardcode_direct_absolute=no - hardcode_libdir_flag_spec= - hardcode_libdir_separator= - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - inherit_rpath=no - link_all_deplibs=unknown - module_cmds= - module_expsym_cmds= - old_archive_from_new_cmds= - old_archive_from_expsyms_cmds= - thread_safe_flag_spec= - whole_archive_flag_spec= - # include_expsyms should be a list of space-separated symbols to be *always* - # 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'. - 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 - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - # Exclude shared library initialization/finalization symbols. - extract_expsyms_cmds= +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) - with_gnu_ld=yes - ;; - openbsd*) - with_gnu_ld=no - ;; - linux* | k*bsd*-gnu | gnu*) - link_all_deplibs=no - ;; - esac +# Allow CC to be a program name with arguments. +compiler=$CC - ld_shlibs=yes - # On some targets, GNU ld is compatible enough with the native linker - # that we're better off using the native interface for both. - lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then - case $host_os in - aix*) - # The AIX port of GNU ld has always aspired to compatibility - # with the native linker. However, as the warning in the GNU ld - # block says, versions before 2.19.5* couldn't really create working - # shared libraries, regardless of the interface used. - case `$LD -v 2>&1` in - *\ \(GNU\ Binutils\)\ 2.19.5*) ;; - *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; - *\ \(GNU\ Binutils\)\ [3-9]*) ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - ;; - *) - lt_use_gnu_ld_interface=yes - ;; - esac - fi +# Check for command to grab the raw symbol name followed by C symbol from nm. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } +if ${lt_cv_sys_global_symbol_pipe+:} false; then : + $as_echo_n "(cached) " >&6 +else - if test "$lt_use_gnu_ld_interface" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' +# These are sane defaults that work on at least a few old systems. +# [They come from Ultrix. What could be older than Ultrix?!! ;)] - # 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' - # 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' - else - whole_archive_flag_spec= - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in - *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac +# Character class describing NM global symbol codes. +symcode='[BCDEGRST]' - # See if GNU ld supports shared libraries. - case $host_os in - aix[3-9]*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 +# Regexp to match symbols that can be accessed directly from C. +sympat='\([_A-Za-z][_A-Za-z0-9]*\)' -*** Warning: the GNU linker, at least up to release 2.19, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to install binutils -*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. -*** You will then need to restart the configuration process. +# Define system-specific variables. +case $host_os in +aix*) + symcode='[BCDT]' + ;; +cygwin* | mingw* | pw32* | cegcc*) + symcode='[ABCDGISTW]' + ;; +hpux*) + if test "$host_cpu" = ia64; then + symcode='[ABCDEGRST]' + fi + ;; +irix* | nonstopux*) + symcode='[BCDEGRST]' + ;; +osf*) + symcode='[BCDEGQRST]' + ;; +solaris*) + symcode='[BDRT]' + ;; +sco3.2v5*) + symcode='[DT]' + ;; +sysv4.2uw2*) + symcode='[DT]' + ;; +sysv5* | sco5v6* | unixware* | OpenUNIX*) + symcode='[ABDT]' + ;; +sysv4) + symcode='[DFNSTU]' + ;; +esac -_LT_EOF - fi - ;; +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[ABCDGIRSTW]' ;; +esac - amigaos*) - case $host_cpu in - powerpc) - # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; +# Transform an extracted symbol line into a proper C declaration. +# Some systems (esp. on ia64) link data and code symbols differently, +# so use this general approach. +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - beos*) - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - 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' - else - ld_shlibs=no - fi - ;; +# 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'" - cygwin* | mingw* | pw32* | cegcc*) - # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - export_dynamic_flag_spec='${wl}--export-all-symbols' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' - exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' +# Handle CRLF in mingw tool chain +opt_cr= +case $build_os in +mingw*) + opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp + ;; +esac - 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' - else - ld_shlibs=no - fi - ;; +# Try without a prefix underscore, then with it. +for ac_symprfx in "" "_"; do - haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - link_all_deplibs=yes - ;; + # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. + symxfrm="\\1 $ac_symprfx\\2 \\2" - interix[3-9]*) - hardcode_direct=no - hardcode_shlibpath_var=no - 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' - ;; + # Write the raw and C identifiers. + if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Fake it for dumpbin and say T for any non-static function + # and D for any global variable. + # Also find C++ and __fastcall symbols from MSVC++, + # which start with @ or ?. + lt_cv_sys_global_symbol_pipe="$AWK '"\ +" {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ +" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" \$ 0!~/External *\|/{next};"\ +" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ +" {if(hide[section]) next};"\ +" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ +" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ +" s[1]~/^[@?]/{print s[1], s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" ' prfx=^$ac_symprfx" + else + lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + fi + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" - gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) - tmp_diet=no - if test "$host_os" = linux-dietlibc; then - case $cc_basename in - diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) - esac - fi - if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no - then - tmp_addflag=' $pic_flag' - tmp_sharedflag='-shared' - case $cc_basename,$host_cpu in - pgcc*) # Portland Group C compiler - 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' - tmp_addflag=' $pic_flag -Mnomain' ;; - ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 - tmp_addflag=' -i_dynamic' ;; - efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 - tmp_addflag=' -i_dynamic -nofor_main' ;; - ifc* | ifort*) # Intel Fortran compiler - tmp_addflag=' -nofor_main' ;; - lf95*) # Lahey Fortran 8.1 - whole_archive_flag_spec= - tmp_sharedflag='--shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) - tmp_sharedflag='-qmkshrobj' - tmp_addflag= ;; - nvcc*) # Cuda Compiler Driver 2.2 - 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' - 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' + # Check to see that the pipe works correctly. + pipe_works=no - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - fi + rm -f conftest* + cat > conftest.$ac_ext <<_LT_EOF +#ifdef __cplusplus +extern "C" { +#endif +char nm_test_var; +void nm_test_func(void); +void nm_test_func(void){} +#ifdef __cplusplus +} +#endif +int main(){nm_test_var='a';nm_test_func();return(0);} +_LT_EOF - case $cc_basename in - 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' - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then - archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - echo "local: *; };" >> $output_objdir/$libname.ver~ - $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' - fi - ;; - esac - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= + 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 + # Now try to grab the symbols. + nlist=conftest.nm + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 + (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" 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' + rm -f "$nlist"T fi - ;; - solaris*) - if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <<_LT_EOF 1>&2 + # Make sure that we snagged all the symbols we need. + if $GREP ' nm_test_var$' "$nlist" >/dev/null; then + if $GREP ' nm_test_func$' "$nlist" >/dev/null; then + cat <<_LT_EOF > conftest.$ac_ext +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. +#ifdef __cplusplus +extern "C" { +#endif _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' - else - ld_shlibs=no - fi - ;; - - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) - case `$LD -v 2>&1` in - *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) - ld_shlibs=no - cat <<_LT_EOF 1>&2 + # Now generate the symbol file. + eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -*** reliably create shared libraries on SCO systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. + cat <<_LT_EOF >> conftest.$ac_ext +/* The mapping between symbol names and symbols. */ +LT_DLSYM_CONST struct { + const char *name; + void *address; +} +lt__PROGRAM__LTX_preloaded_symbols[] = +{ + { "@PROGRAM@", (void *) 0 }, _LT_EOF - ;; - *) - # For security reasons, it is highly recommended that you always - # use absolute paths for naming shared libraries, and exclude the - # DT_RUNPATH tag from executables and libraries. But doing so - # requires that you compile everything twice, which is a pain. - if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - 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 - ;; - esac - ;; + $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + cat <<\_LT_EOF >> conftest.$ac_ext + {0, (void *) 0} +}; - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; +/* This works around a problem in FreeBSD linker */ +#ifdef FREEBSD_WORKAROUND +static const void *lt_preloaded_setup() { + return lt__PROGRAM__LTX_preloaded_symbols; +} +#endif - *) - 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' +#ifdef __cplusplus +} +#endif +_LT_EOF + # Now try linking the two files. + mv conftest.$ac_objext conftstm.$ac_objext + lt_globsym_save_LIBS=$LIBS + lt_globsym_save_CFLAGS=$CFLAGS + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_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 + pipe_works=yes + fi + LIBS=$lt_globsym_save_LIBS + CFLAGS=$lt_globsym_save_CFLAGS + else + echo "cannot find nm_test_func in $nlist" >&5 + fi else - ld_shlibs=no + echo "cannot find nm_test_var in $nlist" >&5 fi - ;; - esac - - if test "$ld_shlibs" = no; then - runpath_var= - hardcode_libdir_flag_spec= - export_dynamic_flag_spec= - whole_archive_flag_spec= + else + echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 fi else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; + echo "$progname: failed program was:" >&5 + cat conftest.$ac_ext >&5 + fi + rm -rf conftest* conftst* - aix[4-9]*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global - # defined symbols, whereas GNU nm marks them as "W". - if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then - 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' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no + # Do not use the global_symbol_pipe unless it works. + if test "$pipe_works" = yes; then + break + else + lt_cv_sys_global_symbol_pipe= + fi +done - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - ;; - esac +fi - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi +if test -z "$lt_cv_sys_global_symbol_pipe"; then + lt_cv_sys_global_symbol_to_cdecl= +fi +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +$as_echo "failed" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +$as_echo "ok" >&6; } +fi - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. +# Response file support. +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + nm_file_list_spec='@' +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then + nm_file_list_spec='@' +fi - archive_cmds='' - hardcode_direct=yes - hardcode_direct_absolute=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - file_list_spec='${wl}-f,' - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && - strings "$collect2name" | $GREP resolve_lib_name >/dev/null - then - # We have reworked collect2 - : - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - ;; - esac - shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' - fi - link_all_deplibs=no - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - 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 - # 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 - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi -fi - aix_libpath=$lt_cv_aix_libpath_ -fi - 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" - else - if test "$host_cpu" = ia64; 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" - else - # Determine the default libpath from the value encoded in an - # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then - aix_libpath=$lt_cv_aix_libpath -else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *\([^ ]*\) *$/\1/ - p - } - }' - lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - # Check for a 64-bit object if we didn't find anything. - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` - fi -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" - fi -fi - aix_libpath=$lt_cv_aix_libpath_ -fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then - # We only use this code for GNU lds that support --whole-archive. - whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' - else - # Exported symbols can be pulled into shared objects from archives - whole_archive_flag_spec='$convenience' - fi - 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' - fi - fi - ;; - amigaos*) - 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_expsym_cmds='' - ;; - m68k) - archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - ;; - esac - ;; - bsdi[45]*) - export_dynamic_flag_spec=-rdynamic - ;; - cygwin* | mingw* | pw32* | cegcc*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - case $cc_basename in - cl*) - # Native MSVC - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - always_export_symbols=yes - file_list_spec='@' - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' - # The linker will not automatically build a static lib if we build a DLL. - # _LT_TAGVAR(old_archive_from_new_cmds, )='true' - enable_shared_with_static_runtimes=yes - exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' - # Don't use ranlib - old_postinstall_cmds='chmod 644 $oldlib' - postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' - ;; - *) - # Assume MSVC wrapper - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_from_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' - enable_shared_with_static_runtimes=yes - ;; - esac - ;; - darwin* | rhapsody*) - archive_cmds_need_lc=no - hardcode_direct=no - hardcode_automatic=yes - hardcode_shlibpath_var=unsupported - if test "$lt_cv_ld_force_load" = "yes"; then - whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' - else - whole_archive_flag_spec='' - fi - link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=func_echo_all - 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 - fi - ;; - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2.*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +$as_echo_n "checking for sysroot... " >&6; } - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; +# Check whether --with-sysroot was given. +if test "${with_sysroot+set}" = set; then : + withval=$with_sysroot; +else + with_sysroot=no +fi - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - 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' - ;; +lt_sysroot= +case ${with_sysroot} in #( + yes) + if test "$GCC" = yes; then + lt_sysroot=`$CC --print-sysroot 2>/dev/null` + fi + ;; #( + /*) + lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + ;; #( + no|'') + ;; #( + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +$as_echo "${with_sysroot}" >&6; } + as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 + ;; +esac - 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' - 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' - hardcode_libdir_separator=: - hardcode_direct=yes - hardcode_direct_absolute=yes - 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 - fi - ;; + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +$as_echo "${lt_sysroot:-no}" >&6; } - hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - case $host_cpu in - hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' - ;; - ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - archive_cmds='$CC -shared $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' - ;; - ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' - ;; - *) - # Older versions of the 11.00 compiler do not understand -b yet - # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else - lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -b" - echo "$lt_simple_link_test_code" > conftest.$ac_ext - if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The linker can only warn and ignore the option if not recognized - # So say no if there are warnings - if test -s conftest.err; then - # Append any errors to the config.log. - cat conftest.err 1>&5 - $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp - $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 - if diff conftest.exp conftest.er2 >/dev/null; then - lt_cv_prog_compiler__b=yes - fi - else - lt_cv_prog_compiler__b=yes - fi - fi - $RM -r conftest* - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } -if test x"$lt_cv_prog_compiler__b" = xyes; then - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -else - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' + +# Check whether --enable-libtool-lock was given. +if test "${enable_libtool_lock+set}" = set; then : + enableval=$enable_libtool_lock; fi - ;; - esac - fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - case $host_cpu in - hppa*64*|ia64*) - hardcode_direct=no - hardcode_shlibpath_var=no +# Some flags need to be propagated to the compiler or linker for good +# libtool support. +case $host in +ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { 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 + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" + ;; + *ELF-64*) + HPUX_IA64_MODE="64" + ;; + esac + fi + rm -rf conftest* + ;; +*-*-irix6*) + # Find out which ABI we are using. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + if { { 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 + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -melf32bsmip" ;; - *) - hardcode_direct=yes - hardcode_direct_absolute=yes - 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 + *N32*) + LD="${LD-ld} -melf32bmipn32" ;; - esac - fi - ;; + *64-bit*) + LD="${LD-ld} -melf64bmip" + ;; + esac + else + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + LD="${LD-ld} -32" + ;; + *N32*) + LD="${LD-ld} -n32" + ;; + *64-bit*) + LD="${LD-ld} -64" + ;; + esac + fi + fi + rm -rf conftest* + ;; - 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' - # Try to use the -exported_symbol ld option, if it does not - # work, assume that -exports_file does not work either and - # implicitly export all symbols. - # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int foo (void) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - lt_cv_irix_exported_symbol=yes -else - lt_cv_irix_exported_symbol=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +s390*-*linux*|s390*-*tpf*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > 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 + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; + x86_64-*linux*) + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*|s390*-*tpf*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + +*-*-sco3.2v5*) + # On SCO OpenServer 5, we need -belf to get full-featured binaries. + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } +if ${lt_cv_cc_needs_belf+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_cc_needs_belf=yes +else + lt_cv_cc_needs_belf=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +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 + # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf + CFLAGS="$SAVE_CFLAGS" + fi + ;; +*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { { 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 + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; + *) + if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then + LD="${LD-ld} -64" fi - 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' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - inherit_rpath=yes - link_all_deplibs=yes + ;; + esac ;; + esac + fi + rm -rf conftest* + ;; +esac + +need_locks="$enable_libtool_lock" + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. +set dummy ${ac_tool_prefix}mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$MANIFEST_TOOL"; then + ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL +if test -n "$MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +$as_echo "$MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then + ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL + # Extract the first word of "mt", so it can be a program name with args. +set dummy mt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_MANIFEST_TOOL"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL +if test -n "$ac_ct_MANIFEST_TOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_MANIFEST_TOOL" = x; then + MANIFEST_TOOL=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL + fi +else + MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL" +fi + +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if ${lt_cv_path_mainfest_tool+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_path_mainfest_tool=no + echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 + $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out + cat conftest.err >&5 + if $GREP 'Manifest Tool' conftest.out > /dev/null; then + lt_cv_path_mainfest_tool=yes + fi + rm -f conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +$as_echo "$lt_cv_path_mainfest_tool" >&6; } +if test "x$lt_cv_path_mainfest_tool" != xyes; then + MANIFEST_TOOL=: +fi + + + + + + + case $host_os in + rhapsody* | darwin*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DSYMUTIL"; then + ac_cv_prog_DSYMUTIL="$DSYMUTIL" # 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_DSYMUTIL="${ac_tool_prefix}dsymutil" + $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 +DSYMUTIL=$ac_cv_prog_DSYMUTIL +if test -n "$DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DSYMUTIL"; then + ac_ct_DSYMUTIL=$DSYMUTIL + # Extract the first word of "dsymutil", so it can be a program name with args. +set dummy dsymutil; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DSYMUTIL"; then + ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # 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_DSYMUTIL="dsymutil" + $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_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL +if test -n "$ac_ct_DSYMUTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - netbsd* | netbsdelf*-gnu) - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; + if test "x$ac_ct_DSYMUTIL" = x; then + DSYMUTIL=":" + 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 + DSYMUTIL=$ac_ct_DSYMUTIL + fi +else + DSYMUTIL="$ac_cv_prog_DSYMUTIL" +fi - 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_separator=: - hardcode_shlibpath_var=no - ;; + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. +set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NMEDIT"; then + ac_cv_prog_NMEDIT="$NMEDIT" # 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_NMEDIT="${ac_tool_prefix}nmedit" + $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 - *nto* | *qnx*) - ;; +fi +fi +NMEDIT=$ac_cv_prog_NMEDIT +if test -n "$NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - openbsd*) - 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 - 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' - 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 - fi - else - ld_shlibs=no - fi - ;; - os2*) - 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' - ;; +fi +if test -z "$ac_cv_prog_NMEDIT"; then + ac_ct_NMEDIT=$NMEDIT + # Extract the first word of "nmedit", so it can be a program name with args. +set dummy nmedit; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NMEDIT"; then + ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # 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_NMEDIT="nmedit" + $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 - 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' - 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' - fi - archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; +fi +fi +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT +if test -n "$ac_ct_NMEDIT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - 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' - 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_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' + if test "x$ac_ct_NMEDIT" = x; then + NMEDIT=":" + 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 + NMEDIT=$ac_ct_NMEDIT + fi +else + NMEDIT="$ac_cv_prog_NMEDIT" +fi - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - archive_cmds_need_lc='no' - hardcode_libdir_separator=: - ;; + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. +set dummy ${ac_tool_prefix}lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$LIPO"; then + ac_cv_prog_LIPO="$LIPO" # 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_LIPO="${ac_tool_prefix}lipo" + $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 - 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' - 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' - 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_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' - ;; - *) - 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' - ;; - esac - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', - # but is careful enough not to reorder. - # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' - else - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' - fi - ;; - esac - link_all_deplibs=yes - ;; +fi +fi +LIPO=$ac_cv_prog_LIPO +if test -n "$LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +$as_echo "$LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - 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 - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; +fi +if test -z "$ac_cv_prog_LIPO"; then + ac_ct_LIPO=$LIPO + # Extract the first word of "lipo", so it can be a program name with args. +set dummy lipo; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_LIPO+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_LIPO"; then + ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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_LIPO="lipo" + $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 - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; +fi +fi +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO +if test -n "$ac_ct_LIPO"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +$as_echo "$ac_ct_LIPO" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; + if test "x$ac_ct_LIPO" = x; then + LIPO=":" + 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 + LIPO=$ac_ct_LIPO + fi +else + LIPO="$ac_cv_prog_LIPO" +fi - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' - archive_cmds_need_lc=no - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL"; then + ac_cv_prog_OTOOL="$OTOOL" # 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_OTOOL="${ac_tool_prefix}otool" + $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 - 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' - 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' - fi - ;; +fi +fi +OTOOL=$ac_cv_prog_OTOOL +if test -n "$OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +$as_echo "$OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not - # link with -lc, and that would cause any symbols used from libc to - # always be unresolved, which means just about no library would - # ever link correctly. If we're not using GNU ld we use -z text - # though, which does catch some bad symbols but isn't as heavy-handed - # as -z defs. - 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_separator=':' - link_all_deplibs=yes - 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' - 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' - fi - ;; +fi +if test -z "$ac_cv_prog_OTOOL"; then + ac_ct_OTOOL=$OTOOL + # Extract the first word of "otool", so it can be a program name with args. +set dummy otool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL"; then + ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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_OTOOL="otool" + $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 - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; +fi +fi +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL +if test -n "$ac_ct_OTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +$as_echo "$ac_ct_OTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - *) - ld_shlibs=no - ;; - esac + if test "x$ac_ct_OTOOL" = x; then + OTOOL=":" + 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 + OTOOL=$ac_ct_OTOOL + fi +else + OTOOL="$ac_cv_prog_OTOOL" +fi - if test x$host_vendor = xsni; then - case $host in - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' - ;; - esac - fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. +set dummy ${ac_tool_prefix}otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OTOOL64"; then + ac_cv_prog_OTOOL64="$OTOOL64" # 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_OTOOL64="${ac_tool_prefix}otool64" + $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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +fi +fi +OTOOL64=$ac_cv_prog_OTOOL64 +if test -n "$OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +$as_echo "$OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -with_gnu_ld=$with_gnu_ld +fi +if test -z "$ac_cv_prog_OTOOL64"; then + ac_ct_OTOOL64=$OTOOL64 + # Extract the first word of "otool64", so it can be a program name with args. +set dummy otool64; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OTOOL64"; then + ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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_OTOOL64="otool64" + $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_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 +if test -n "$ac_ct_OTOOL64"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +$as_echo "$ac_ct_OTOOL64" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OTOOL64" = x; then + OTOOL64=":" + 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 + OTOOL64=$ac_ct_OTOOL64 + fi +else + OTOOL64="$ac_cv_prog_OTOOL64" +fi @@ -10119,74 +9523,9 @@ -# -# Do we need to explicitly link libc? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else - $RM conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - pic_flag=$lt_prog_compiler_pic - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 - (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - then - lt_cv_archive_cmds_need_lc=no - else - lt_cv_archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $RM conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } - archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc - ;; - esac - fi - ;; -esac @@ -10198,53 +9537,452 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } +if ${lt_cv_apple_cc_single_mod+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_apple_cc_single_mod=no + if test -z "${LT_MULTI_MODULE}"; then + # By default we will add the -single_module flag. You can override + # by either setting the environment variable LT_MULTI_MODULE + # non-empty at configure time, or by adding -multi_module to the + # link flags. + rm -rf libconftest.dylib* + echo "int foo(void){return 1;}" > conftest.c + echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ +-dynamiclib -Wl,-single_module conftest.c" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ + -dynamiclib -Wl,-single_module conftest.c 2>conftest.err + _lt_result=$? + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&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 + lt_cv_apple_cc_single_mod=yes + else + cat conftest.err >&5 + fi + rm -rf libconftest.dylib* + rm -f conftest.* + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } +if ${lt_cv_ld_exported_symbols_list+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_exported_symbols_list=no + save_LDFLAGS=$LDFLAGS + echo "_main" > conftest.sym + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_cv_ld_exported_symbols_list=yes +else + lt_cv_ld_exported_symbols_list=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS="$save_LDFLAGS" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +$as_echo_n "checking for -force_load linker flag... " >&6; } +if ${lt_cv_ld_force_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_ld_force_load=no + cat > conftest.c << _LT_EOF +int forced_loaded() { return 2;} +_LT_EOF + echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 + $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 + echo "$AR cru libconftest.a conftest.o" >&5 + $AR cru libconftest.a conftest.o 2>&5 + echo "$RANLIB libconftest.a" >&5 + $RANLIB libconftest.a 2>&5 + cat > conftest.c << _LT_EOF +int main() { return 0;} +_LT_EOF + echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 + $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err + _lt_result=$? + if test -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 + lt_cv_ld_force_load=yes + else + cat conftest.err >&5 + fi + rm -f conftest.err libconftest.a conftest conftest.c + rm -rf conftest.dSYM +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +$as_echo "$lt_cv_ld_force_load" >&6; } + case $host_os in + rhapsody* | darwin1.[012]) + _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + darwin1.*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + darwin*) # darwin 5.x on + # if running on 10.5 or later, the deployment target defaults + # to the OS version, if on x86, and 10.4, the deployment + # target defaults to 10.4. Don't you love it? + case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in + 10.0,*86*-darwin8*|10.0,*-darwin[91]*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + 10.[012]*) + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + 10.*) + _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + esac + ;; + esac + if test "$lt_cv_apple_cc_single_mod" = "yes"; then + _lt_dar_single_mod='$single_module' + fi + if test "$lt_cv_ld_exported_symbols_list" = "yes"; then + _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + else + _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + fi + if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then + _lt_dsymutil='~$DSYMUTIL $lib || :' + else + _lt_dsymutil= + fi + ;; + esac +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if ${ac_cv_prog_CPP+:} false; then : + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : + break +fi + done + ac_cv_prog_CPP=$CPP +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : +else + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + # Broken: success on invalid input. +continue +else + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok; then : +else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } +if ${ac_cv_header_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdc=yes +else + ac_cv_header_stdc=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then : +else + ac_cv_header_stdc=no +fi +rm -f conftest* +fi +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then : +else + ac_cv_header_stdc=no +fi +rm -f conftest* +fi +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : +else + ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then +$as_echo "#define STDC_HEADERS 1" >>confdefs.h +fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi +done +for ac_header in dlfcn.h +do : + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +" +if test "x$ac_cv_header_dlfcn_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_DLFCN_H 1 +_ACEOF +fi +done +# Set options +enable_dlopen=yes +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no +fi @@ -10256,8 +9994,31 @@ + enable_win32_dll=no + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} + case $enableval in + yes) enable_shared=yes ;; + no) enable_shared=no ;; + *) + enable_shared=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_shared=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_shared=yes +fi @@ -10269,8 +10030,30 @@ +# Check whether --with-pic was given. +if test "${with_pic+set}" = set; then : + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + pic_mode=default +fi +test -z "$pic_mode" && pic_mode=default @@ -10278,6 +10061,28 @@ + # Check whether --enable-fast-install was given. +if test "${enable_fast_install+set}" = set; then : + enableval=$enable_fast_install; p=${PACKAGE-default} + case $enableval in + yes) enable_fast_install=yes ;; + no) enable_fast_install=no ;; + *) + enable_fast_install=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_fast_install=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_fast_install=yes +fi @@ -10289,7 +10094,11 @@ +# This can be used to rebuild libtool when needed +LIBTOOL_DEPS="$ltmain" +# Always use our own libtool. +LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -10320,6 +10129,7 @@ +test -z "$LN_S" && LN_S="ln -s" @@ -10334,769 +10144,722 @@ +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } +if ${lt_cv_objdir+:} false; then : + $as_echo_n "(cached) " >&6 +else + rm -f .libs 2>/dev/null +mkdir .libs 2>/dev/null +if test -d .libs; then + lt_cv_objdir=.libs +else + # MS-DOS does not allow filenames that begin with a dot. + lt_cv_objdir=_libs +fi +rmdir .libs 2>/dev/null +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } +objdir=$lt_cv_objdir - { $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 - case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; - esac - case $host_os in - mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; - *) lt_sed_strip_eq="s,=/,/,g" ;; - esac - lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` - case $lt_search_path_spec in - *\;*) - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` - ;; - *) - lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` - ;; - esac - # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. - lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` - for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else - test -d "$lt_sys_path" && \ - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" - fi - done - lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; - for (lt_i = NF; lt_i > 0; lt_i--) { - if ($lt_i != "" && $lt_i != ".") { - if ($lt_i == "..") { - lt_count++; - } else { - if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; - } else { - lt_count--; - } - } - } - } - if (lt_foo != "") { lt_freq[lt_foo]++; } - if (lt_freq[lt_foo] == 1) { print lt_foo; } -}'` - # AWK program above erroneously prepends '/' to C:/dos/paths - # for these hosts. - case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ - $SED 's,/\([A-Za-z]:\),\1,g'` ;; - esac - sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -need_lib_prefix=unknown -hardcode_into_libs=no +cat >>confdefs.h <<_ACEOF +#define LT_OBJDIR "$lt_cv_objdir/" +_ACEOF -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown -case $host_os in -aix3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; -aix[4-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH +case $host_os in +aix3*) + # AIX sometimes has problems with the GCC collect2 program. For some + # reason, if we set the COLLECT_NAMES environment variable, the problems + # vanish in a puff of smoke. + if test "X${COLLECT_NAMES+set}" != Xset; then + COLLECT_NAMES= + export COLLECT_NAMES fi ;; +esac -amigaos*) - case $host_cpu in - powerpc) - # Since July 2007 AmigaOS4 officially supports .so libraries. - # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - ;; - m68k) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; +# Global variables: +ofile=libtool +can_build_shared=yes + +# All known linkers require a `.a' archive for static linking (except MSVC, +# which needs '.lib'). +libext=a + +with_gnu_ld="$lt_cv_prog_gnu_ld" + +old_CC="$CC" +old_CFLAGS="$CFLAGS" + +# Set sane defaults for various variables +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$LD" && LD=ld +test -z "$ac_objext" && ac_objext=o + +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-%%"` -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; -bsdi[45]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" - sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" - # the default ld.so.conf also contains /usr/contrib/lib and - # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow - # libtool to hard-code these into programs +# Only perform the check for file, if the check method requires it +test -z "$MAGIC_CMD" && MAGIC_CMD=file +case $deplibs_check_method in +file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + 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 -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -cygwin* | mingw* | pw32* | cegcc*) - version_type=windows - shrext_cmds=".dll" - need_version=no - need_lib_prefix=no +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org - case $GCC,$cc_basename in - yes,*) - # gcc - library_names_spec='$libname.dll.a' - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname~ - chmod a+x \$dldir/$dlname~ - if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then - eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; - fi' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" + ;; +esac +fi - 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}' +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" - ;; - mingw* | cegcc*) - # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - pw32*) - # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - ;; - esac - dynamic_linker='Win32 ld.exe' - ;; - *,cl*) - # Native MSVC - libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' - case $build_os in - mingw*) - sys_lib_search_path_spec= - lt_save_ifs=$IFS - IFS=';' - for lt_path in $LIB - do - IFS=$lt_save_ifs - # Let DOS variable expansion print the short 8.3 style file name. - lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` - sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" - done - IFS=$lt_save_ifs - # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` - ;; - cygwin*) - # Convert to unix form, then to dos form, then back to unix form - # but this time dos style (no spaces!) so that the unix form looks - # like /cygdrive/c/PROGRA~1:/cygdr... - sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` - sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` - sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - ;; - *) - sys_lib_search_path_spec="$LIB" - if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then - # It is most probably a Windows format PATH. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi - # FIXME: find the short name or the path components, as spaces are - # common. (e.g. "Program Files" -> "PROGRA~1") - ;; - esac - # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ - dldir=$destdir/`dirname \$dlpath`~ - test -d \$dldir || mkdir -p \$dldir~ - $install_prog $dir/$dlname \$dldir/$dlname' - postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ - dlpath=$dir/\$dldll~ - $RM \$dlpath' - shlibpath_overrides_runpath=yes - dynamic_linker='Win32 link.exe' - ;; - *) - # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' - dynamic_linker='Win32 ld.exe' - ;; - esac - # FIXME: first we should search . and the directory the executable is in - shlibpath_var=PATH +if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } +if ${lt_cv_path_MAGIC_CMD+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MAGIC_CMD in +[\\/*] | ?:[\\/]*) + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ;; +*) + lt_save_MAGIC_CMD="$MAGIC_CMD" + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" + for ac_dir in $ac_dummy; do + 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 -n "$file_magic_test_file"; then + case $deplibs_check_method in + "file_magic "*) + file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` + MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | + $EGREP "$file_magic_regex" > /dev/null; then + : + else + cat <<_LT_EOF 1>&2 -darwin* | rhapsody*) - dynamic_linker="$host_os dyld" - version_type=darwin - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' - shlibpath_overrides_runpath=yes - shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' +*** Warning: the command libtool uses to detect shared libraries, +*** $file_magic_cmd, produces output that libtool cannot recognize. +*** The result is that libtool may fail to recognize shared libraries +*** as such. This will affect the creation of libtool libraries that +*** depend on shared libraries, but programs linked with such libtool +*** libraries will work regardless of this problem. Nevertheless, you +*** may want to report the problem to your system manager and/or to +*** bug-libtool@gnu.org - sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" - sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' +_LT_EOF + fi ;; + esac + fi + break + fi + done + IFS="$lt_save_ifs" + MAGIC_CMD="$lt_save_MAGIC_CMD" ;; +esac +fi + +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -dgux*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; -freebsd* | dragonfly*) - # DragonFly does not have aout. When/if they implement a new - # versioning mechanism, adjust this. - if test -x /usr/bin/objformat; then - objformat=`/usr/bin/objformat` else - case $host_os in - freebsd[23].*) objformat=aout ;; - *) objformat=elf ;; - esac + MAGIC_CMD=: fi - version_type=freebsd-$objformat - case $version_type in - freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - need_version=no - need_lib_prefix=no - ;; - freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' - need_version=yes - ;; - esac - shlibpath_var=LD_LIBRARY_PATH - case $host_os in - freebsd2.*) - shlibpath_overrides_runpath=yes - ;; - freebsd3.[01]* | freebsdelf3.[01]*) - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ - freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - *) # from 4.6 on, and DragonFly - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; - esac - ;; +fi -haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - dynamic_linker="$host_os runtime_loader" - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LIBRARY_PATH - shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' - hardcode_into_libs=yes + fi ;; +esac -hpux9* | hpux10* | hpux11*) - # Give a soname corresponding to the major version so that dld.sl refuses to - # link against other versions. - version_type=sunos - need_lib_prefix=no - need_version=no - case $host_cpu in - ia64*) - shrext_cmds='.so' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.so" - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then - sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" - else - sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" - fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - hppa*64*) - shrext_cmds='.sl' - hardcode_into_libs=yes - dynamic_linker="$host_os dld.sl" - shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH - shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec - ;; - *) - shrext_cmds='.sl' - dynamic_linker="$host_os dld.sl" - shlibpath_var=SHLIB_PATH - shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - ;; - esac - # HP-UX runs *really* slowly unless shared libraries are mode 555, ... - postinstall_cmds='chmod 555 $lib' - # or fails outright, so override atomically: - install_override_mode=555 - ;; +# Use C for the default configuration in the libtool script -interix[3-9]*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; +lt_save_CC="$CC" +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -irix5* | irix6* | nonstopux*) - case $host_os in - nonstopux*) version_type=nonstopux ;; - *) - if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux # correct to gnu/linux during the next big refactor - else - version_type=irix - fi ;; - esac - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' - case $host_os in - irix5* | nonstopux*) - libsuff= shlibsuff= - ;; - *) - case $LD in # libtool.m4 will add one of these switches to LD - *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") - libsuff= shlibsuff= libmagic=32-bit;; - *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") - libsuff=32 shlibsuff=N32 libmagic=N32;; - *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") - libsuff=64 shlibsuff=64 libmagic=64-bit;; - *) libsuff= shlibsuff= libmagic=never-match;; - esac - ;; - esac - shlibpath_var=LD_LIBRARY${shlibsuff}_PATH - shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" - hardcode_into_libs=yes - ;; -# No shared lib support for Linux oldld, aout, or coff. -linux*oldld* | linux*aout* | linux*coff*) - dynamic_linker=no - ;; +# Source file extension for C test sources. +ac_ext=c + +# Object file extension for compiled C test sources. +objext=o +objext=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="int some_variable = 0;" + +# Code to be used in simple link tests +lt_simple_link_test_code='int main(){return(0);}' + + + + + + + +# If no C compiler was specified, use CC. +LTCC=${LTCC-"$CC"} + +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + +# Allow CC to be a program name with arguments. +compiler=$CC + +# Save the default compiler, since it gets overwritten when the other +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. +compiler_DEFAULT=$CC + +# save warnings/boilerplate of simple test code +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$RM conftest* + +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$RM -r conftest* + + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + +lt_prog_compiler_no_builtin_flag= -# This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no +if test "$GCC" = yes; then + case $cc_basename in + nvcc*) + lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; + *) + lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; + esac - # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : $as_echo_n "(cached) " >&6 else - lt_cv_shlibpath_overrides_runpath=no - save_LDFLAGS=$LDFLAGS - save_libdir=$libdir - eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ - LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ + 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" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_rtti_exceptions=yes + fi + fi + $RM conftest* - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : - lt_cv_shlibpath_overrides_runpath=yes fi +{ $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 + lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" +else + : fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LDFLAGS=$save_LDFLAGS - libdir=$save_libdir fi - shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath - # This implies no fast_install, which is unacceptable. - # Some rework will be needed to allow for fast_install - # before this can be enabled. - hardcode_into_libs=yes - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" - fi - # We used to test for /lib/ld.so.1 and disable shared libraries on - # powerpc, because MkLinux only supported shared libraries with the - # GNU dynamic linker. Since this was broken with cross compilers, - # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; -netbsd*) - version_type=sunos - need_lib_prefix=no - need_version=no - if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - dynamic_linker='NetBSD (a.out) ld.so' - else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - dynamic_linker='NetBSD ld.elf_so' - fi - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - ;; + lt_prog_compiler_wl= +lt_prog_compiler_pic= +lt_prog_compiler_static= -newsos6) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - ;; -*nto* | *qnx*) - version_type=qnx - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='ldqnx.so' - ;; + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_static='-static' -openbsd*) - version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" - need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no + aix*) + # All AIX code is PIC. + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + fi + ;; + + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + lt_prog_compiler_pic='-fPIC' + ;; + m68k) + # FIXME: we need at least 68020 code to build shared libraries, but + # adding the `-m68020' flag to GCC prevents building anything better, + # like `-m68040'. + lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' + ;; + esac + ;; + + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + # PIC is the default for these OSes. + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + ;; + + haiku*) + # PIC is the default for Haiku. + # The "-static" flag exists, but is broken. + lt_prog_compiler_static= + ;; + + hpux*) + # PIC is the default for 64-bit PA HP-UX, but not for 32-bit + # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag + # sets the default TLS model and affects inlining. + case $host_cpu in + hppa*64*) + # +Z the default + ;; + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + ;; + + interix[3-9]*) + # Interix 3.x gcc -fpic/-fPIC options generate broken code. + # Instead, we relocate shared libraries at runtime. + ;; + + msdosdjgpp*) + # Just because we use GCC doesn't mean we suddenly get shared libraries + # on systems that don't support them. + lt_prog_compiler_can_build_shared=no + enable_shared=no + ;; + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + lt_prog_compiler_pic=-Kconform_pic + fi + ;; + + *) + lt_prog_compiler_pic='-fPIC' + ;; + esac + + case $cc_basename in + nvcc*) # Cuda Compiler Driver 2.2 + lt_prog_compiler_wl='-Xlinker ' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi + ;; + esac + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in + aix*) + lt_prog_compiler_wl='-Wl,' + if test "$host_cpu" = ia64; then + # AIX 5 now supports IA64 processor + lt_prog_compiler_static='-Bstatic' + else + lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' + fi + ;; + + mingw* | cygwin* | pw32* | os2* | cegcc*) + # This hack is so that the source file can tell whether it is being + # built for inclusion in a dll (and should export symbols for example). + lt_prog_compiler_pic='-DDLL_EXPORT' + ;; + + hpux9* | hpux10* | hpux11*) + lt_prog_compiler_wl='-Wl,' + # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but + # not for PA HP-UX. + case $host_cpu in + hppa*64*|ia64*) + # +Z the default ;; *) - shlibpath_overrides_runpath=yes + lt_prog_compiler_pic='+Z' ;; esac - else - shlibpath_overrides_runpath=yes - fi - ;; - -os2*) - libname_spec='$name' - shrext_cmds=".dll" - need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' - dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH - ;; - -osf3* | osf4* | osf5*) - version_type=osf - need_lib_prefix=no - need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" - ;; - -rdos*) - dynamic_linker=no - ;; - -solaris*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - # ldd complains unless libraries are executable - postinstall_cmds='chmod +x $lib' - ;; + # Is there a better lt_prog_compiler_static that works with the bundled CC? + lt_prog_compiler_static='${wl}-a ${wl}archive' + ;; -sunos4*) - version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then - need_lib_prefix=no - fi - need_version=yes - ;; + irix5* | irix6* | nonstopux*) + lt_prog_compiler_wl='-Wl,' + # PIC (with -KPIC) is the default. + lt_prog_compiler_static='-non_shared' + ;; -sysv4 | sysv4.3*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - case $host_vendor in - sni) - shlibpath_overrides_runpath=no - need_lib_prefix=no - runpath_var=LD_RUN_PATH + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + case $cc_basename in + # old Intel for x86_64 which still supported -KPIC. + ecc*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-static' + ;; + # icc used to be incompatible with GCC. + # ICC 10 doesn't accept -KPIC any more. + icc* | ifort*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + # Lahey Fortran 8.1. + lf95*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='--shared' + lt_prog_compiler_static='--static' + ;; + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) + # Portland Group compilers (*not* the Pentium gcc compiler, + # which looks to be a dead project) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + ccc*) + lt_prog_compiler_wl='-Wl,' + # All Alpha code is PIC. + lt_prog_compiler_static='-non_shared' + ;; + xl* | bgxl* | bgf* | mpixl*) + # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + esac ;; - siemens) - need_lib_prefix=no + + newsos6) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' ;; - motorola) - need_lib_prefix=no - need_version=no - shlibpath_overrides_runpath=no - sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + + *nto* | *qnx*) + # QNX uses GNU C++, but need to define -shared option too, otherwise + # it will coredump. + lt_prog_compiler_pic='-fPIC -shared' ;; - esac - ;; -sysv4*MP*) - if test -d /usr/nec ;then - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' - shlibpath_var=LD_LIBRARY_PATH - fi - ;; + osf3* | osf4* | osf5*) + lt_prog_compiler_wl='-Wl,' + # All OSF/1 code is PIC. + lt_prog_compiler_static='-non_shared' + ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=yes - hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then - sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' - else - sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac - fi - sys_lib_dlsearch_path_spec='/usr/lib' - ;; + rdos*) + lt_prog_compiler_static='-non_shared' + ;; -tpf*) - # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; + solaris*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + case $cc_basename in + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) + lt_prog_compiler_wl='-Qoption ld ';; + *) + lt_prog_compiler_wl='-Wl,';; + esac + ;; -uts4*) - version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - ;; + sunos4*) + lt_prog_compiler_wl='-Qoption ld ' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; -*) - dynamic_linker=no - ;; -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 + sysv4 | sysv4.2uw2* | sysv4.3*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; -variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then - variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -fi + sysv4*MP*) + if test -d /usr/nec ;then + lt_prog_compiler_pic='-Kconform_pic' + lt_prog_compiler_static='-Bstatic' + fi + ;; -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -fi + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + ;; + unicos*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_can_build_shared=no + ;; + uts4*) + lt_prog_compiler_pic='-pic' + lt_prog_compiler_static='-Bstatic' + ;; + *) + lt_prog_compiler_can_build_shared=no + ;; + esac + fi +case $host_os in + # For platforms which do not support PIC, -DPIC is meaningless: + *djgpp*) + lt_prog_compiler_pic= + ;; + *) + lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } +if ${lt_cv_prog_compiler_pic+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_pic=$lt_prog_compiler_pic +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +$as_echo "$lt_cv_prog_compiler_pic" >&6; } +lt_prog_compiler_pic=$lt_cv_prog_compiler_pic +# +# Check to make sure the PIC flag actually works. +# +if test -n "$lt_prog_compiler_pic"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if ${lt_cv_prog_compiler_pic_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + 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" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + # The option is referenced via a variable to avoid confusing sed. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_pic_works=yes + fi + fi + $RM conftest* +fi +{ $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 + case $lt_prog_compiler_pic in + "" | " "*) ;; + *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; + esac +else + lt_prog_compiler_pic= + lt_prog_compiler_can_build_shared=no +fi +fi @@ -11108,8 +10871,46 @@ +# +# Check to make sure the static flag actually works. +# +wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if ${lt_cv_prog_compiler_static_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_static_works=no + 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 + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler_static_works=yes + fi + else + lt_cv_prog_compiler_static_works=yes + fi + fi + $RM -r conftest* + 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 + : +else + lt_prog_compiler_static= +fi @@ -11117,615 +10918,1440 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if ${lt_cv_prog_compiler_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_prog_compiler_c_o=no + $RM -r conftest 2>/dev/null + mkdir conftest + cd conftest + mkdir out + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + lt_compiler_flag="-o out/conftest2.$ac_objext" + # Insert the option either (1) after the last *FLAGS variable, or + # (2) before a word containing "conftest.", or (3) at the end. + # Note that $ac_compile itself does not contain backslashes and begins + # with a dollar sign (not a hyphen), so the echo should work correctly. + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` + (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp + $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 + if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then + lt_cv_prog_compiler_c_o=yes + fi + fi + chmod u+w . 2>&5 + $RM conftest* + # SGI C++ compiler will create directory out/ii_files/ for + # template instantiation + test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files + $RM out/* && rmdir out + cd .. + $RM -r conftest + $RM conftest* +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +hard_links="nottested" +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; 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; } + hard_links=yes + $RM conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no + touch conftest.a + ln conftest.a conftest.b 2>&5 || hard_links=no + ln conftest.a conftest.b 2>/dev/null && hard_links=no + { $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;} + need_locks=warn + fi +else + need_locks=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + runpath_var= + allow_undefined_flag= + always_export_symbols=no + archive_cmds= + archive_expsym_cmds= + compiler_needs_object=no + enable_shared_with_static_runtimes=no + export_dynamic_flag_spec= + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + hardcode_automatic=no + hardcode_direct=no + hardcode_direct_absolute=no + hardcode_libdir_flag_spec= + hardcode_libdir_separator= + hardcode_minus_L=no + hardcode_shlibpath_var=unsupported + inherit_rpath=no + link_all_deplibs=unknown + module_cmds= + module_expsym_cmds= + old_archive_from_new_cmds= + old_archive_from_expsyms_cmds= + thread_safe_flag_spec= + whole_archive_flag_spec= + # include_expsyms should be a list of space-separated symbols to be *always* + # 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'. + 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 + # the symbol is explicitly referenced. Since portable code cannot + # rely on this symbol name, it's probably fine to never include it in + # preloaded symbol tables. + # Exclude shared library initialization/finalization symbols. + extract_expsyms_cmds= + case $host_os in + cygwin* | mingw* | pw32* | cegcc*) + # FIXME: the MSVC++ port hasn't been tested in a loooong time + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + if test "$GCC" != yes; then + with_gnu_ld=no + fi + ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; + openbsd*) + with_gnu_ld=no + ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; + esac + ld_shlibs=yes + # On some targets, GNU ld is compatible enough with the native linker + # that we're better off using the native interface for both. + lt_use_gnu_ld_interface=no + if test "$with_gnu_ld" = yes; then + case $host_os in + aix*) + # The AIX port of GNU ld has always aspired to compatibility + # with the native linker. However, as the warning in the GNU ld + # block says, versions before 2.19.5* couldn't really create working + # shared libraries, regardless of the interface used. + case `$LD -v 2>&1` in + *\ \(GNU\ Binutils\)\ 2.19.5*) ;; + *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;; + *\ \(GNU\ Binutils\)\ [3-9]*) ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + ;; + *) + lt_use_gnu_ld_interface=yes + ;; + esac + fi + if test "$lt_use_gnu_ld_interface" = yes; then + # If archive_cmds runs LD, not CC, wlarc should be empty + wlarc='${wl}' + # 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' + # 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' + else + whole_archive_flag_spec= + fi + supports_anon_versioning=no + case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; + *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 + *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... + *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... + *\ 2.11.*) ;; # other 2.11 versions + *) supports_anon_versioning=yes ;; + esac + # See if GNU ld supports shared libraries. + case $host_os in + aix[3-9]*) + # On AIX/PPC, the GNU linker is very broken + if test "$host_cpu" != ia64; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 +*** Warning: the GNU linker, at least up to release 2.19, is reported +*** to be unable to reliably create shared libraries on AIX. +*** Therefore, libtool is disabling shared libraries support. If you +*** really care for shared libraries, you may want to install binutils +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found. +*** You will then need to restart the configuration process. +_LT_EOF + fi + ;; + amigaos*) + case $host_cpu in + powerpc) + # see comment about AmigaOS4 .so support + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + beos*) + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + 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' + else + ld_shlibs=no + fi + ;; + cygwin* | mingw* | pw32* | cegcc*) + # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, + # as there is no search path for DLLs. + hardcode_libdir_flag_spec='-L$libdir' + export_dynamic_flag_spec='${wl}--export-all-symbols' + allow_undefined_flag=unsupported + always_export_symbols=no + enable_shared_with_static_runtimes=yes + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols' + exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' + 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' + else + ld_shlibs=no + fi + ;; + haiku*) + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + link_all_deplibs=yes + ;; + interix[3-9]*) + hardcode_direct=no + hardcode_shlibpath_var=no + 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' + ;; + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) + tmp_diet=no + if test "$host_os" = linux-dietlibc; then + case $cc_basename in + diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) + esac + fi + if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ + && test "$tmp_diet" = no + then + tmp_addflag=' $pic_flag' + tmp_sharedflag='-shared' + case $cc_basename,$host_cpu in + pgcc*) # Portland Group C compiler + 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' + tmp_addflag=' $pic_flag -Mnomain' ;; + ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 + tmp_addflag=' -i_dynamic' ;; + efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 + tmp_addflag=' -i_dynamic -nofor_main' ;; + ifc* | ifort*) # Intel Fortran compiler + tmp_addflag=' -nofor_main' ;; + lf95*) # Lahey Fortran 8.1 + whole_archive_flag_spec= + tmp_sharedflag='--shared' ;; + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + nvcc*) # Cuda Compiler Driver 2.2 + 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' + 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' + if test "x$supports_anon_versioning" = xyes; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + fi + case $cc_basename in + xlf* | bgf* | bgxlf* | mpixlf*) + # IBM XL Fortran 10.1 on PPC cannot create shared libs itself + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + 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 + 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' + fi + ;; + esac + else + ld_shlibs=no + fi + ;; + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' + wlarc= + else + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + fi + ;; + solaris*) + if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then + ld_shlibs=no + cat <<_LT_EOF 1>&2 +*** Warning: The releases 2.8.* of the GNU linker cannot reliably +*** create shared libraries on Solaris systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.9.1 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. +_LT_EOF + elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + 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 + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + cat <<_LT_EOF 1>&2 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** reliably create shared libraries on SCO systems. Therefore, libtool +*** is disabling shared libraries support. We urge you to upgrade GNU +*** binutils to release 2.16.91.0.3 or newer. Another option is to modify +*** your PATH or compiler configuration so that the native linker is +*** used, and then restart. +_LT_EOF + ;; + *) + # For security reasons, it is highly recommended that you always + # use absolute paths for naming shared libraries, and exclude the + # DT_RUNPATH tag from executables and libraries. But doing so + # requires that you compile everything twice, which is a pain. + if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then + 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 + ;; + esac + ;; + sunos4*) + archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' + wlarc= + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + *) + 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' + else + ld_shlibs=no + fi + ;; + esac + if test "$ld_shlibs" = no; then + runpath_var= + hardcode_libdir_flag_spec= + export_dynamic_flag_spec= + whole_archive_flag_spec= + fi + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in + aix3*) + allow_undefined_flag=unsupported + always_export_symbols=yes + archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' + # Note: this linker hardcodes the directories in LIBPATH if there + # are no directories specified by -L. + hardcode_minus_L=yes + if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + # Neither direct hardcoding nor static linking is supported with a + # broken collect2. + hardcode_direct=unsupported + fi + ;; + aix[4-9]*) + if test "$host_cpu" = ia64; then + # On IA64, the linker does run time linking by default, so we don't + # have to do anything special. + aix_use_runtimelinking=no + exp_sym_flag='-Bexport' + no_entry_flag="" + else + # If we're using GNU nm, then we don't want the "-C" option. + # -C means demangle to AIX nm, but means don't demangle with GNU nm + # Also, AIX nm treats weak defined symbols like other global + # defined symbols, whereas GNU nm marks them as "W". + if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then + 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' + else + export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' + fi + aix_use_runtimelinking=no + # Test if we are trying to use run time linking or normal + # AIX style linking. If -brtl is somewhere in LDFLAGS, we + # need to do runtime linking. + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) + for ld_flag in $LDFLAGS; do + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + aix_use_runtimelinking=yes + break + fi + done + ;; + esac + exp_sym_flag='-bexport' + no_entry_flag='-bnoentry' + fi + # When large executables or shared objects are built, AIX ld can + # have problems creating the table of contents. If linking a library + # or program results in "error TOC overflow" add -mminimal-toc to + # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not + # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. + archive_cmds='' + hardcode_direct=yes + hardcode_direct_absolute=yes + hardcode_libdir_separator=':' + link_all_deplibs=yes + file_list_spec='${wl}-f,' + if test "$GCC" = yes; then + case $host_os in aix4.[012]|aix4.[012].*) + # We only want to do this on AIX 4.2 and lower, the check + # below for broken collect2 doesn't work under 4.3+ + collect2name=`${CC} -print-prog-name=collect2` + if test -f "$collect2name" && + strings "$collect2name" | $GREP resolve_lib_name >/dev/null + then + # We have reworked collect2 + : + else + # We have old collect2 + hardcode_direct=unsupported + # It fails to find uninstalled libraries when the uninstalled + # path is not listed in the libpath. Setting hardcode_minus_L + # to unsupported forces relinking + hardcode_minus_L=yes + hardcode_libdir_flag_spec='-L$libdir' + hardcode_libdir_separator= + fi + ;; + esac + shared_flag='-shared' + if test "$aix_use_runtimelinking" = yes; then + shared_flag="$shared_flag "'${wl}-G' + fi + link_all_deplibs=no + else + # not using gcc + if test "$host_cpu" = ia64; then + # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release + # chokes on -Wl,-G. The following line is correct: + shared_flag='-G' + else + if test "$aix_use_runtimelinking" = yes; then + shared_flag='${wl}-G' + else + shared_flag='${wl}-bM:SRE' + fi + fi + fi + 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 + # 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 + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + fi +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi +fi + aix_libpath=$lt_cv_aix_libpath_ +fi + 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" + else + if test "$host_cpu" = ia64; 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" + else + # Determine the default libpath from the value encoded in an + # empty executable. + if test "${lt_cv_aix_libpath+set}" = set; then + aix_libpath=$lt_cv_aix_libpath +else + if ${lt_cv_aix_libpath_+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int +main () +{ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } -hardcode_action= -if test -n "$hardcode_libdir_flag_spec" || - test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : - # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\([^ ]*\) *$/\1/ + p + } + }' + lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` + # Check for a 64-bit object if we didn't find anything. + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test -z "$lt_cv_aix_libpath_"; then + lt_cv_aix_libpath_="/usr/lib:/lib" + fi -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless fi + aix_libpath=$lt_cv_aix_libpath_ +fi + + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + # Warning - without using the other run time loading flags, + # -berok will link without error, but may produce a broken library. + no_undefined_flag=' ${wl}-bernotok' + allow_undefined_flag=' ${wl}-berok' + if test "$with_gnu_ld" = yes; then + # We only use this code for GNU lds that support --whole-archive. + whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + else + # Exported symbols can be pulled into shared objects from archives + whole_archive_flag_spec='$convenience' + fi + 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' + fi + fi + ;; + + amigaos*) + 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_expsym_cmds='' + ;; + m68k) + archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + ;; + esac + ;; + + bsdi[45]*) + export_dynamic_flag_spec=-rdynamic + ;; + cygwin* | mingw* | pw32* | cegcc*) + # When not using gcc, we currently assume that we are using + # Microsoft Visual C++. + # hardcode_libdir_flag_spec is actually meaningless, as there is + # no search path for DLLs. + case $cc_basename in + cl*) + # Native MSVC + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + always_export_symbols=yes + file_list_spec='@' + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' + archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then + sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; + else + sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' + # The linker will not automatically build a static lib if we build a DLL. + # _LT_TAGVAR(old_archive_from_new_cmds, )='true' + enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' + # Don't use ranlib + old_postinstall_cmds='chmod 644 $oldlib' + postlink_cmds='lt_outputfile="@OUTPUT@"~ + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile="$lt_outputfile.exe" + lt_tool_outputfile="$lt_tool_outputfile.exe" + ;; + esac~ + if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' + ;; + *) + # Assume MSVC wrapper + hardcode_libdir_flag_spec=' ' + allow_undefined_flag=unsupported + # Tell ltmain to make .lib files, not .a files. + libext=lib + # Tell ltmain to make .dll files, not .so files. + shrext_cmds=".dll" + # FIXME: Setting linknames here is a bad hack. + archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' + # The linker will automatically build a .lib file if we build a DLL. + old_archive_from_new_cmds='true' + # FIXME: Should let the user specify the lib program. + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' + enable_shared_with_static_runtimes=yes + ;; + esac + ;; + darwin* | rhapsody*) + archive_cmds_need_lc=no + 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 "x$enable_dlopen" != xyes; then - enable_dlopen=unknown - enable_dlopen_self=unknown - enable_dlopen_self_static=unknown -else - lt_cv_dlopen=no - lt_cv_dlopen_libs= + else + whole_archive_flag_spec='' + fi + link_all_deplibs=yes + allow_undefined_flag="$_lt_dar_allow_undefined" + case $cc_basename in + ifort*) _lt_dar_can_shared=yes ;; + *) _lt_dar_can_shared=$GCC ;; + esac + if test "$_lt_dar_can_shared" = "yes"; then + output_verbose_link_cmd=func_echo_all + 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}" - case $host_os in - beos*) - lt_cv_dlopen="load_add_on" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ;; + else + ld_shlibs=no + fi - mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" - lt_cv_dlopen_libs= - ;; + ;; - cygwin*) - lt_cv_dlopen="dlopen" - lt_cv_dlopen_libs= - ;; + dgux*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; - darwin*) - # 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 : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # support. Future versions do this automatically, but an explicit c++rt0.o + # does not break anything, and helps significantly (at the cost of a little + # extra space). + freebsd2.2*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${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" -else + # Unfortunately, older versions of FreeBSD 2 do not have this feature. + freebsd2.*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes + # FreeBSD 3 and greater uses gcc -shared to do shared libraries. + freebsd* | dragonfly*) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; -fi + hpux9*) + if test "$GCC" = yes; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + else + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + fi + 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' + ;; - *) - 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" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + 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' + 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' + hardcode_libdir_separator=: + hardcode_direct=yes + hardcode_direct_absolute=yes + 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 + fi + ;; -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_shl_load=yes -else - ac_cv_lib_dld_shl_load=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${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" -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" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : + hpux11*) + if test "$GCC" = yes && test "$with_gnu_ld" = no; then + case $host_cpu in + hppa*64*) + archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + ;; + ia64*) + archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + archive_cmds='$CC -shared $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' + ;; + ia64*) + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + ;; + *) + + # Older versions of the 11.00 compiler do not understand -b yet + # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +$as_echo_n "checking if $CC understands -b... " >&6; } +if ${lt_cv_prog_compiler__b+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + lt_cv_prog_compiler__b=no + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -b" + echo "$lt_simple_link_test_code" > conftest.$ac_ext + if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then + # The linker can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s conftest.err; then + # Append any errors to the config.log. + cat conftest.err 1>&5 + $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if diff conftest.exp conftest.er2 >/dev/null; then + lt_cv_prog_compiler__b=yes + fi + else + lt_cv_prog_compiler__b=yes + fi + fi + $RM -r conftest* + LDFLAGS="$save_LDFLAGS" -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dl_dlopen=yes -else - ac_cv_lib_dl_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${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" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsvld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +$as_echo "$lt_cv_prog_compiler__b" >&6; } -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dlopen (); -int -main () -{ -return dlopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_svld_dlopen=yes +if test x"$lt_cv_prog_compiler__b" = xyes; then + archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else - ac_cv_lib_svld_dlopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : + + ;; + esac + fi + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + + case $host_cpu in + hppa*64*|ia64*) + hardcode_direct=no + hardcode_shlibpath_var=no + ;; + *) + hardcode_direct=yes + hardcode_direct_absolute=yes + 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 + ;; + esac + fi + ;; + + irix5* | irix6* | nonstopux*) + if test "$GCC" = yes; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + # Try to use the -exported_symbol ld option, if it does not + # work, assume that -exports_file does not work either and + # implicitly export all symbols. + # This should be the same for all languages, so no per-tag cache variable. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dld_link (); -int -main () -{ -return dld_link (); - ; - return 0; -} +int foo (void) { return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dld_dld_link=yes + lt_cv_irix_exported_symbol=yes else - ac_cv_lib_dld_dld_link=no + lt_cv_irix_exported_symbol=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${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" + LDFLAGS="$save_LDFLAGS" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +$as_echo "$lt_cv_irix_exported_symbol" >&6; } + if test "$lt_cv_irix_exported_symbol" = yes; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + fi + 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' + fi + archive_cmds_need_lc='no' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_separator=: + inherit_rpath=yes + link_all_deplibs=yes + ;; + + netbsd* | netbsdelf*-gnu) + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out + else + archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_direct=yes + hardcode_shlibpath_var=no + ;; + + 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_separator=: + hardcode_shlibpath_var=no + ;; + + *nto* | *qnx*) + ;; + + openbsd*) + 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 + 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' + 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 + fi + else + ld_shlibs=no + fi + ;; + + os2*) + 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' + ;; + + 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' + 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' + fi + archive_cmds_need_lc='no' + 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' + 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_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' + + # Both c and cxx compiler support -rpath directly + hardcode_libdir_flag_spec='-rpath $libdir' + fi + archive_cmds_need_lc='no' + hardcode_libdir_separator=: + ;; + + 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' + 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' + 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_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' + ;; + *) + 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' + ;; + esac + fi + hardcode_libdir_flag_spec='-R$libdir' + hardcode_shlibpath_var=no + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. + # Supported since Solaris 2.6 (maybe 2.5.1?) + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; + esac + link_all_deplibs=yes + ;; + + sunos4*) + if test "x$host_vendor" = xsequent; then + # Use $CC to link under sequent, because it throws in some extra .o + # files that make .init and .fini sections work. + 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 + hardcode_libdir_flag_spec='-L$libdir' + hardcode_direct=yes + hardcode_minus_L=yes + hardcode_shlibpath_var=no + ;; + + sysv4) + case $host_vendor in + sni) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=yes # is this really true??? + ;; + siemens) + ## LD is ld it makes a PLAMLIB + ## CC just makes a GrossModule. + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' + reload_cmds='$CC -r -o $output$reload_objs' + hardcode_direct=no + ;; + motorola) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_direct=no #Motorola manual says yes, but my tests say they lie + ;; + esac + runpath_var='LD_RUN_PATH' + hardcode_shlibpath_var=no + ;; + + sysv4.3*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + export_dynamic_flag_spec='-Bexport' + ;; + + sysv4*MP*) + if test -d /usr/nec; then + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_shlibpath_var=no + runpath_var=LD_RUN_PATH + hardcode_runpath_var=yes + ld_shlibs=yes + fi + ;; + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) + no_undefined_flag='${wl}-z,text' + archive_cmds_need_lc=no + hardcode_shlibpath_var=no + runpath_var='LD_RUN_PATH' -fi + 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' + 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' + fi + ;; + sysv5* | sco3.2v5* | sco5v6*) + # Note: We can NOT use -z defs as we might desire, because we do not + # link with -lc, and that would cause any symbols used from libc to + # always be unresolved, which means just about no library would + # ever link correctly. If we're not using GNU ld we use -z text + # though, which does catch some bad symbols but isn't as heavy-handed + # as -z defs. + 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_separator=':' + link_all_deplibs=yes + export_dynamic_flag_spec='${wl}-Bexport' + runpath_var='LD_RUN_PATH' -fi + 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' + 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' + fi + ;; + uts4*) + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-L$libdir' + hardcode_shlibpath_var=no + ;; -fi + *) + ld_shlibs=no + ;; + esac + if test x$host_vendor = xsni; then + case $host in + sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + export_dynamic_flag_spec='${wl}-Blargedynsym' + ;; + esac + fi + fi -fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } +test "$ld_shlibs" = no && can_build_shared=no +with_gnu_ld=$with_gnu_ld -fi - ;; - esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" -#if HAVE_DLFCN_H -#include -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - return status; -} -_LT_EOF - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 - (eval $ac_link) 2>&5 +# +# Do we need to explicitly link libc? +# +case "x$archive_cmds_need_lc" in +x|xyes) + # Assume -lc should be added + archive_cmds_need_lc=yes + + if test "$enable_shared" = yes && test "$GCC" = yes; then + case $archive_cmds in + *'~'*) + # FIXME: we may have to deal with multi-command sequences. + ;; + '$CC '*) + # Test whether the compiler implicitly links with -lc since on some + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } +if ${lt_cv_archive_cmds_need_lc+:} false; then : + $as_echo_n "(cached) " >&6 +else + $RM conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext + + 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; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + test $ac_status = 0; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext + deplibs= + wl=$lt_prog_compiler_wl + pic_flag=$lt_prog_compiler_pic + compiler_flags=-v + linker_flags=-v + verstring= + output_objdir=. + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 + (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + then + lt_cv_archive_cmds_need_lc=no + else + lt_cv_archive_cmds_need_lc=yes + fi + allow_undefined_flag=$lt_save_allow_undefined_flag + else + cat conftest.err 1>&5 + fi + $RM conftest* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } + archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc + ;; esac - else : - # compilation failed - lt_cv_dlopen_self=no fi -fi -rm -fr conftest* + ;; +esac + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -fi -{ $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 - 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 : - lt_cv_dlopen_self_static=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF -#line $LINENO "configure" -#include "confdefs.h" -#if HAVE_DLFCN_H -#include -#endif -#include -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif -/* When -fvisbility=hidden is used, assume the code has been annotated - correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) -int fnord () __attribute__((visibility("default"))); -#endif -int fnord () { return 42; } -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else - { - if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - else puts (dlerror ()); - } - /* dlclose (self); */ - } - else - puts (dlerror ()); - return status; -} -_LT_EOF - if { { 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} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in - x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; - x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; - esac - else : - # compilation failed - lt_cv_dlopen_self_static=no - fi -fi -rm -fr conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } - fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi @@ -11743,35 +12369,6 @@ -striplib= -old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ;; - esac -fi @@ -11784,54 +12381,15 @@ - # Report which 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 -$as_echo "$can_build_shared" >&6; } - { $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 - # On AIX, shared libraries and static libraries use the same namespace, and - # are all built from PIC. - case $host_os in - aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no - fi - ;; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } - { $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 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" @@ -11847,1035 +12405,800 @@ - ac_config_commands="$ac_config_commands libtool" -# Only expand once: -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}gcc" - $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 -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="gcc" - $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_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_ct_CC" = x; then - CC="" - 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 - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="${ac_tool_prefix}cc" - $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 -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -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 - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - test -n "$ac_ct_CC" && break -done - if test "x$ac_ct_CC" = x; then - CC="" - 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 - CC=$ac_ct_CC - fi -fi -fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : + { $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 + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + case $host_os in + mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;; + *) lt_sed_strip_eq="s,=/,/,g" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` + case $lt_search_path_spec in + *\;*) + # if the path contains ";" then we assume it to be the separator + # otherwise default to the standard path separator (i.e. ":") - it is + # assumed that no part of a normal pathname contains ";" but that should + # okay in the real world where ";" in dirpaths is itself problematic. + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'` + ;; + *) + lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"` + ;; + esac + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + # AWK program above erroneously prepends '/' to C:/dos/paths + # for these hosts. + case $host_os in + mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + $SED 's,/\([A-Za-z]:\),\1,g'` ;; + esac + sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` +else + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi +library_names_spec= +libname_spec='lib$name' +soname_spec= +shrext_cmds=".so" +postinstall_cmds= +postuninstall_cmds= +finish_cmds= +finish_eval= +shlibpath_var= +shlibpath_overrides_runpath=unknown +version_type=none +dynamic_linker="$host_os ld.so" +sys_lib_dlsearch_path_spec="/lib /usr/lib" +need_lib_prefix=unknown +hardcode_into_libs=no -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +# when you set need_version to no, make sure it does not cause -set_version +# flags to be left without arguments +need_version=unknown -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +case $host_os in +aix3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + shlibpath_var=LIBPATH -int -main () -{ + # AIX 3 has no versioning support, so we append a major version to the name. + soname_spec='${libname}${release}${shared_ext}$major' + ;; - ; - return 0; -} -_ACEOF - # Make sure it works both with $CC and with simple cc. - # Following AC_PROG_CC_C_O, we do the test twice because some - # compilers refuse to overwrite an existing .o file with -o, - # though they will create one. - am_cv_prog_cc_c_o=yes - for am_i in 1 2; do - if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 - ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } \ - && test -f conftest2.$ac_objext; then - : OK +aix[4-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + hardcode_into_libs=yes + if test "$host_cpu" = ia64; then + # AIX 5 supports IA64 + library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + else + # With GCC up to 2.95.x, collect2 would create an import file + # for dependence libraries. The import file would start with + # the line `#! .'. This would cause the generated library to + # depend on `.', always an invalid library. This was fixed in + # development snapshots of GCC prior to 3.0. + case $host_os in + aix4 | aix4.[01] | aix4.[01].*) + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' + echo ' yes ' + echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + : + else + can_build_shared=no + fi + ;; + esac + # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # soname into executable. Probably we can add versioning support to + # collect2, so additional links can be useful in future. + if test "$aix_use_runtimelinking" = yes; then + # If using run time linking (on AIX 4.2 or later) use lib.so + # instead of lib.a to let people know that these are not + # typical AIX shared libraries. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' else - am_cv_prog_cc_c_o=no - break + # 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 - done - rm -f core conftest* - unset am_i -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } -if test "$am_cv_prog_cc_c_o" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu + shlibpath_var=LIBPATH + fi + ;; + +amigaos*) + case $host_cpu in + powerpc) + # Since July 2007 AmigaOS4 officially supports .so libraries. + # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + ;; + m68k) + library_names_spec='$libname.ixlibrary $libname.a' + # Create ${libname}_ixlibrary.a entries in /sys/libs. + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' + ;; + esac + ;; +beos*) + library_names_spec='${libname}${shared_ext}' + dynamic_linker="$host_os ld.so" + shlibpath_var=LIBRARY_PATH + ;; -depcc="$CC" am_compiler_list= +bsdi[45]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" + sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" + # the default ld.so.conf also contains /usr/contrib/lib and + # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow + # libtool to hard-code these into programs + ;; -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +cygwin* | mingw* | pw32* | cegcc*) + version_type=windows + shrext_cmds=".dll" + need_version=no + need_lib_prefix=no - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac + case $GCC,$cc_basename in + yes,*) + # gcc + library_names_spec='$libname.dll.a' + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + 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}' - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" + ;; + mingw* | cegcc*) + # MinGW DLLs use traditional 'lib' prefix + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + pw32*) + # pw32 DLLs use 'pw' prefix rather than 'lib' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + ;; + esac + dynamic_linker='Win32 ld.exe' + ;; + + *,cl*) + # Native MSVC + libname_spec='$name' + soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='${libname}.dll.lib' + + case $build_os in + mingw*) + sys_lib_search_path_spec= + lt_save_ifs=$IFS + IFS=';' + for lt_path in $LIB + do + IFS=$lt_save_ifs + # Let DOS variable expansion print the short 8.3 style file name. + lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"` + sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path" + done + IFS=$lt_save_ifs + # Convert to MSYS style. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue + cygwin*) + # Convert to unix form, then to dos form, then back to unix form + # but this time dos style (no spaces!) so that the unix form looks + # like /cygdrive/c/PROGRA~1:/cygdr... + sys_lib_search_path_spec=`cygpath --path --unix "$LIB"` + sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null` + sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + ;; + *) + sys_lib_search_path_spec="$LIB" + if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then + # It is most probably a Windows format PATH. + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` else - break + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # FIXME: find the short name or the path components, as spaces are + # common. (e.g. "Program Files" -> "PROGRA~1") ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - + # DLL is installed to $(libdir)/../bin by postinstall_cmds + postinstall_cmds='base_file=`basename \${file}`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' + shlibpath_overrides_runpath=yes + dynamic_linker='Win32 link.exe' + ;; -# Extract the first word of "glib-genmarshal", so it can be a program name with args. -set dummy glib-genmarshal; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_GENMARSHAL+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_GENMARSHAL in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" # Let the user override the test with a path. - ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_GENMARSHAL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + # Assume MSVC wrapper + library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + dynamic_linker='Win32 ld.exe' + ;; + esac + # FIXME: first we should search . and the directory the executable is in + shlibpath_var=PATH ;; -esac -fi -GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL -if test -n "$GLIB_GENMARSHAL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_GENMARSHAL" >&5 -$as_echo "$GLIB_GENMARSHAL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +darwin* | rhapsody*) + dynamic_linker="$host_os dyld" + version_type=darwin + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' + soname_spec='${libname}${release}${major}$shared_ext' + shlibpath_overrides_runpath=yes + shlibpath_var=DYLD_LIBRARY_PATH + shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -# Extract the first word of "glib-mkenums", so it can be a program name with args. -set dummy glib-mkenums; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_MKENUMS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_MKENUMS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; - *) - 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_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS +dgux*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH ;; -esac -fi -GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS -if test -n "$GLIB_MKENUMS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 -$as_echo "$GLIB_MKENUMS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -$as_echo_n "checking whether NLS is requested... " >&6; } - # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : - enableval=$enable_nls; USE_NLS=$enableval -else - USE_NLS=yes -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } - +freebsd* | dragonfly*) + # DragonFly does not have aout. When/if they implement a new + # versioning mechanism, adjust this. + if test -x /usr/bin/objformat; then + objformat=`/usr/bin/objformat` + else + case $host_os in + freebsd[23].*) objformat=aout ;; + *) objformat=elf ;; + esac + fi + version_type=freebsd-$objformat + case $version_type in + freebsd-elf*) + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + need_version=no + need_lib_prefix=no + ;; + freebsd-*) + library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + need_version=yes + ;; + esac + shlibpath_var=LD_LIBRARY_PATH + case $host_os in + freebsd2.*) + shlibpath_overrides_runpath=yes + ;; + freebsd3.[01]* | freebsdelf3.[01]*) + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd3.[2-9]* | freebsdelf3.[2-9]* | \ + freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1) + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; + *) # from 4.6 on, and DragonFly + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + esac + ;; +haiku*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + dynamic_linker="$host_os runtime_loader" + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LIBRARY_PATH + shlibpath_overrides_runpath=yes + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' + hardcode_into_libs=yes + ;; -case "$am__api_version" in - 1.01234) - as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 +hpux9* | hpux10* | hpux11*) + # Give a soname corresponding to the major version so that dld.sl refuses to + # link against other versions. + version_type=sunos + need_lib_prefix=no + need_version=no + case $host_cpu in + ia64*) + shrext_cmds='.so' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.so" + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + if test "X$HPUX_IA64_MODE" = X32; then + sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + else + sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + fi + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; - *) + hppa*64*) + shrext_cmds='.sl' + hardcode_into_libs=yes + dynamic_linker="$host_os dld.sl" + shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH + shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.50.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "0.50.0"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.50.0" >&5 -$as_echo_n "checking for intltool >= 0.50.0... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 -$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error $? "Your intltool is too old. You need intltool 0.50.0 or later." "$LINENO" 5 -fi - -# Extract the first word of "intltool-update", so it can be a program name with args. -set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_UPDATE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. - ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - + shrext_cmds='.sl' + dynamic_linker="$host_os dld.sl" + shlibpath_var=SHLIB_PATH + shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + ;; + esac + # HP-UX runs *really* slowly unless shared libraries are mode 555, ... + postinstall_cmds='chmod 555 $lib' + # or fails outright, so override atomically: + install_override_mode=555 ;; -esac -fi -INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE -if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 -$as_echo "$INTLTOOL_UPDATE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -# Extract the first word of "intltool-merge", so it can be a program name with args. -set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $INTLTOOL_MERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. +interix[3-9]*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes ;; + +irix5* | irix6* | nonstopux*) + case $host_os in + nonstopux*) version_type=nonstopux ;; + *) + if test "$lt_cv_prog_gnu_ld" = yes; then + version_type=linux # correct to gnu/linux during the next big refactor + else + version_type=irix + fi ;; + esac + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + case $host_os in + irix5* | nonstopux*) + libsuff= shlibsuff= + ;; *) - 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_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + case $LD in # libtool.m4 will add one of these switches to LD + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") + libsuff= shlibsuff= libmagic=32-bit;; + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") + libsuff=32 shlibsuff=N32 libmagic=N32;; + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") + libsuff=64 shlibsuff=64 libmagic=64-bit;; + *) libsuff= shlibsuff= libmagic=never-match;; + esac + ;; + esac + shlibpath_var=LD_LIBRARY${shlibsuff}_PATH + shlibpath_overrides_runpath=no + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + hardcode_into_libs=yes + ;; +# No shared lib support for Linux oldld, aout, or coff. +linux*oldld* | linux*aout* | linux*coff*) + dynamic_linker=no ;; -esac -fi -INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE -if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 -$as_echo "$INTLTOOL_MERGE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi +# This must be glibc/ELF. +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no -# Extract the first word of "intltool-extract", so it can be a program name with args. -set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : + # Some binutils ld are patched to set DT_RUNPATH + if ${lt_cv_shlibpath_overrides_runpath+:} false; then : $as_echo_n "(cached) " >&6 else - case $INTLTOOL_EXTRACT in - [\\/]* | ?:[\\/]*) - ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + lt_cv_shlibpath_overrides_runpath=no + save_LDFLAGS=$LDFLAGS + save_libdir=$libdir + eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \ + LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\"" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; -esac +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : + lt_cv_shlibpath_overrides_runpath=yes fi -INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT -if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 -$as_echo "$INTLTOOL_EXTRACT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LDFLAGS=$save_LDFLAGS + libdir=$save_libdir - -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi + shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath + # This implies no fast_install, which is unacceptable. + # Some rework will be needed to allow for fast_install + # before this can be enabled. + hardcode_into_libs=yes -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + fi + # We used to test for /lib/ld.so.1 and disable shared libraries on + # powerpc, because MkLinux only supported shared libraries with the + # GNU dynamic linker. Since this was broken with cross compilers, + # most powerpc-linux boxes support dynamic linking these days and + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' + ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; +netbsd*) + version_type=sunos + need_lib_prefix=no + need_version=no + if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + dynamic_linker='NetBSD (a.out) ld.so' + else + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + dynamic_linker='NetBSD ld.elf_so' + fi + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' +newsos6) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + ;; +*nto* | *qnx*) + version_type=qnx + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='ldqnx.so' + ;; +openbsd*) + version_type=sunos + sys_lib_dlsearch_path_spec="/usr/lib" + need_lib_prefix=no + # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. + case $host_os in + openbsd3.3 | openbsd3.3.*) need_version=yes ;; + *) need_version=no ;; + esac + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + case $host_os in + openbsd2.[89] | openbsd2.[89].*) + shlibpath_overrides_runpath=no + ;; + *) + shlibpath_overrides_runpath=yes + ;; + esac + else + shlibpath_overrides_runpath=yes + fi + ;; +os2*) + libname_spec='$name' + shrext_cmds=".dll" + need_lib_prefix=no + library_names_spec='$libname${shared_ext} $libname.a' + dynamic_linker='OS/2 ld.exe' + shlibpath_var=LIBPATH + ;; - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +osf3* | osf4* | osf5*) + version_type=osf + need_lib_prefix=no + need_version=no + soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" + sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + ;; + +rdos*) + dynamic_linker=no + ;; +solaris*) + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + # ldd complains unless libraries are executable + postinstall_cmds='chmod +x $lib' + ;; +sunos4*) + version_type=sunos + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + if test "$with_gnu_ld" = yes; then + need_lib_prefix=no + fi + need_version=yes + ;; +sysv4 | sysv4.3*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + case $host_vendor in + sni) + shlibpath_overrides_runpath=no + need_lib_prefix=no + runpath_var=LD_RUN_PATH + ;; + siemens) + need_lib_prefix=no + ;; + motorola) + need_lib_prefix=no + need_version=no + shlibpath_overrides_runpath=no + sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' + ;; + esac + ;; +sysv4*MP*) + if test -d /usr/nec ;then + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' + soname_spec='$libname${shared_ext}.$major' + shlibpath_var=LD_LIBRARY_PATH + fi + ;; +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + version_type=freebsd-elf + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + if test "$with_gnu_ld" = yes; then + sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' + else + sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' + case $host_os in + sco3.2v5*) + sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" + ;; + esac + fi + sys_lib_dlsearch_path_spec='/usr/lib' + ;; +tpf*) + # TPF is a cross-target only. Preferred cross-host = GNU/Linux. + version_type=linux # correct to gnu/linux during the next big refactor + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + ;; +uts4*) + version_type=linux # correct to gnu/linux during the next big refactor + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + ;; +*) + dynamic_linker=no + ;; +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 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var" +if test "$GCC" = yes; then + variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +fi +if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then + sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +fi +if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then + sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" +fi @@ -12963,515 +13286,557 @@ -# Check the gettext tools to make sure they are GNU -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $XGETTEXT in - [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -XGETTEXT=$ac_cv_path_XGETTEXT -if test -n "$XGETTEXT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGMERGE in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -MSGMERGE=$ac_cv_path_MSGMERGE -if test -n "$MSGMERGE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } +hardcode_action= +if test -n "$hardcode_libdir_flag_spec" || + test -n "$runpath_var" || + test "X$hardcode_automatic" = "Xyes" ; then -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $MSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + # We can hardcode non-existent directories. + if test "$hardcode_direct" != no && + # If the only mechanism to avoid hardcoding is shlibpath_var, we + # have to relink, otherwise we might link with an installed library + # when we should be linking with a yet-to-be-installed one + ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && + test "$hardcode_minus_L" != no; then + # Linking always hardcodes the temporary library directory. + hardcode_action=relink + else + # We can link without hardcoding, and we can hardcode nonexisting dirs. + hardcode_action=immediate fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -MSGFMT=$ac_cv_path_MSGFMT -if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + # We cannot hardcode anything, or else we can only hardcode existing + # directories. + hardcode_action=unsupported fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } - -# Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GMSGFMT in - [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" - ;; -esac -fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test "$hardcode_action" = relink || + test "$inherit_rpath" = yes; then + # Fast installation is not supported + enable_fast_install=no +elif test "$shlibpath_overrides_runpath" = yes || + test "$enable_shared" = no; then + # Fast installation is not necessary + enable_fast_install=needless fi -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 -fi -# Extract the first word of "perl", so it can be a program name with args. -set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_INTLTOOL_PERL+:} 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 -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" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -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; } -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 + if test "x$enable_dlopen" != xyes; then + enable_dlopen=unknown + enable_dlopen_self=unknown + enable_dlopen_self_static=unknown 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 -fi + lt_cv_dlopen=no + lt_cv_dlopen_libs= + + case $host_os in + beos*) + lt_cv_dlopen="load_add_on" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes + ;; -# Substitute ALL_LINGUAS so we can use it in po/Makefile + mingw* | pw32* | cegcc*) + lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen_libs= + ;; + cygwin*) + lt_cv_dlopen="dlopen" + lt_cv_dlopen_libs= + ;; -# 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 + darwin*) + # 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 : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); int main () { -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr +return dlopen (); ; 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 + ac_cv_lib_dl_dlopen=yes else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac + ac_cv_lib_dl_dlopen=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi +{ $as_echo "$as_me:${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" +else + lt_cv_dlopen="dyld" + lt_cv_dlopen_libs= + lt_cv_dlopen_self=yes - - - - - - - # Check whether --enable-schemas-compile was given. -if test "${enable_schemas_compile+set}" = set; then : - enableval=$enable_schemas_compile; case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; - esac fi + ;; + *) + 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" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } +if ${ac_cv_lib_dld_shl_load+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char shl_load (); +int +main () +{ +return shl_load (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_shl_load=yes +else + ac_cv_lib_dld_shl_load=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${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" +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" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } +if ${ac_cv_lib_dl_dlopen+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - - - - - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dl_dlopen=yes +else + ac_cv_lib_dl_dlopen=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${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" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } +if ${ac_cv_lib_svld_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS + ac_check_lib_save_LIBS=$LIBS +LIBS="-lsvld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - ;; -esac +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_svld_dlopen=yes +else + ac_cv_lib_svld_dlopen=no fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${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" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } +if ${ac_cv_lib_dld_dld_link+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ldld $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dld_link (); +int +main () +{ +return dld_link (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_dld_dld_link=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + ac_cv_lib_dld_dld_link=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${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" fi fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + fi - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi -else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" + fi + fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.16 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - PKG_CONFIG="" - fi + + fi - gsettingsschemadir=${datadir}/glib-2.0/schemas - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + ;; + esac + + if test "x$lt_cv_dlopen" != xno; then + enable_dlopen=yes else - # Extract the first word of "glib-compile-schemas", so it can be a program name with args. -set dummy glib-compile-schemas; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_COMPILE_SCHEMAS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 + enable_dlopen=no fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS -if test -n "$GLIB_COMPILE_SCHEMAS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5 -$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; } + case $lt_cv_dlopen in + dlopen) + save_CPPFLAGS="$CPPFLAGS" + test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + + save_LDFLAGS="$LDFLAGS" + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" + + save_LIBS="$LIBS" + LIBS="$lt_cv_dlopen_libs $LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } +if ${lt_cv_dlopen_self+:} false; then : + $as_echo_n "(cached) " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + if test "$cross_compiling" = yes; then : + lt_cv_dlopen_self=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" + +#if HAVE_DLFCN_H +#include +#endif + +#include + +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif + +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif + +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif + +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); + return status; +} +_LT_EOF + if { { 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} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self=no fi +fi +rm -fr conftest* + + +fi +{ $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 + 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 : + lt_cv_dlopen_self_static=cross +else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +#line $LINENO "configure" +#include "confdefs.h" - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5 - else - : - fi +#if HAVE_DLFCN_H +#include +#endif - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas +#include -mostlyclean-am: clean-gsettings-schemas +#ifdef RTLD_GLOBAL +# define LT_DLGLOBAL RTLD_GLOBAL +#else +# ifdef DL_GLOBAL +# define LT_DLGLOBAL DL_GLOBAL +# else +# define LT_DLGLOBAL 0 +# endif +#endif -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we + find out it does not work in some platform. */ +#ifndef LT_DLLAZY_OR_NOW +# ifdef RTLD_LAZY +# define LT_DLLAZY_OR_NOW RTLD_LAZY +# else +# ifdef DL_LAZY +# define LT_DLLAZY_OR_NOW DL_LAZY +# else +# ifdef RTLD_NOW +# define LT_DLLAZY_OR_NOW RTLD_NOW +# else +# ifdef DL_NOW +# define LT_DLLAZY_OR_NOW DL_NOW +# else +# define LT_DLLAZY_OR_NOW 0 +# endif +# endif +# endif +# endif +#endif -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@ +/* When -fvisbility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas +int fnord () { return 42; } +int main () +{ + void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); + int status = $lt_dlunknown; -.SECONDARY: $(gsettings_SCHEMAS) + if (self) + { + if (dlsym (self,"fnord")) status = $lt_dlno_uscore; + else + { + if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; + else puts (dlerror ()); + } + /* dlclose (self); */ + } + else + puts (dlerror ()); -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi + return status; +} +_LT_EOF + 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} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in + x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;; + x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;; + esac + else : + # compilation failed + lt_cv_dlopen_self_static=no + fi +fi +rm -fr conftest* -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } + fi -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $^ > $@.tmp && mv $@.tmp $@ -endif -' + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ;; + esac + case $lt_cv_dlopen_self in + yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; + *) enable_dlopen_self=unknown ;; + esac + case $lt_cv_dlopen_self_static in + yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; + *) enable_dlopen_self_static=unknown ;; + esac +fi @@ -13484,420 +13849,155 @@ -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -fi -if test -z "$ac_cv_path_PKG_CONFIG"; then - ac_pt_PKG_CONFIG=$PKG_CONFIG - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - ;; -esac -fi -ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG -if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - if test "x$ac_pt_PKG_CONFIG" = x; then - PKG_CONFIG="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - PKG_CONFIG=$ac_pt_PKG_CONFIG - fi +striplib= +old_striplib= +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -fi - -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +# FIXME - insert some real tests, host_os isn't really good enough + case $host_os in + darwin*) + if test -n "$STRIP" ; then + striplib="$STRIP -x" + old_striplib="$STRIP -S" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - PKG_CONFIG="" - fi + ;; + esac fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5 -$as_echo_n "checking whether to enable debugging... " >&6; } - - - # Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -else - enable_debug=no -fi - if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - CFLAGS="${CFLAGS} -g -O0" - CXXFLAGS="${CXXFLAGS} -g -O0" - FFLAGS="${FFLAGS} -g -O0" - FCFLAGS="${FCFLAGS} -g -O0" - OBJCFLAGS="${OBJCFLAGS} -g -O0" -$as_echo "#define GNOME_ENABLE_DEBUG /**/" >>confdefs.h - else - if test "x$enable_debug" = "xinfo"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: info" >&5 -$as_echo "info" >&6; } - CFLAGS="${CFLAGS} -g" - CXXFLAGS="${CXXFLAGS} -g" - FFLAGS="${FFLAGS} -g" - FCFLAGS="${FCFLAGS} -g" - OBJCFLAGS="${OBJCFLAGS} -g" - elif test "x$enable_debug" = "xprofile"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5 -$as_echo "profile" >&6; } - CFLAGS="${CFLAGS} -g -pg" - CXXFLAGS="${CXXFLAGS} -g -pg" - FFLAGS="${FFLAGS} -g -pg" - FCFLAGS="${FCFLAGS} -g -pg" - OBJCFLAGS="${OBJCFLAGS} -g -pg" - LDFLAGS="${LDFLAGS} -pg" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test "x${CFLAGS+set}" != "xset"; then - CFLAGS="" - fi - if test "x${CXXFLAGS+set}" != "xset"; then - CXXFLAGS="" - fi - if test "x${FFLAGS+set}" != "xset"; then - FFLAGS="" - fi - if test "x${FCFLAGS+set}" != "xset"; then - FCFLAGS="" - fi - if test "x${OBJCFLAGS+set}" != "xset"; then - OBJCFLAGS="" - fi - fi + # Report which 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 +$as_echo "$can_build_shared" >&6; } -$as_echo "#define NDEBUG /**/" >>confdefs.h + { $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 + # On AIX, shared libraries and static libraries use the same namespace, and + # are all built from PIC. + case $host_os in + aix3*) + test "$enable_shared" = yes && enable_static=no + if test -n "$RANLIB"; then + archive_cmds="$archive_cmds~\$RANLIB \$lib" + postinstall_cmds='$RANLIB $lib' fi - ax_enable_debug=$enable_debug - - - + ;; - # Check whether --enable-compile-warnings was given. -if test "${enable_compile_warnings+set}" = set; then : - enableval=$enable_compile_warnings; -else - enable_compile_warnings="maximum" -fi + aix[4-9]*) + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then + test "$enable_shared" = yes && enable_static=no + fi + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } + { $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 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi - warning_flags= - realsave_CFLAGS="$CFLAGS" - base_warn_flags=" \ - -Wall \ - -Wstrict-prototypes \ - -Wnested-externs \ - " - - base_error_flags=" \ - -Werror=missing-prototypes \ - -Werror=implicit-function-declaration \ - -Werror=pointer-arith \ - -Werror=init-self \ - -Werror=format-security \ - -Werror=format=2 \ - -Werror=missing-include-dirs \ - -Werror=return-type \ - " - - additional_flags="" - - case "$enable_compile_warnings" in - no) - warning_flags="-w" - ;; - minimum) - warning_flags="-Wall" - ;; - yes|maximum|error) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" - ;; - *) - as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 - ;; - esac - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - for option in $warning_flags; do - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5 -$as_echo_n "checking whether gcc understands $option... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +CC="$lt_save_CC" -int -main () -{ - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - has_option=yes -else - has_option=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5 -$as_echo "$has_option" >&6; } - if test $has_option = yes; then - tested_warning_flags="$tested_warning_flags $option" - fi - unset has_option - unset save_CFLAGS - done - unset option - CFLAGS="$realsave_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5 -$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tested_warning_flags" >&5 -$as_echo "$tested_warning_flags" >&6; } - - # Check whether --enable-iso-c was given. -if test "${enable_iso_c+set}" = set; then : - enableval=$enable_iso_c; -else - enable_iso_c=no -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5 -$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *\ \ -ansi\ \ *) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *\ \ -pedantic\ \ *) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5 -$as_echo "$complCFLAGS" >&6; } - WARN_CFLAGS="$tested_warning_flags $complCFLAGS" - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi + ac_config_commands="$ac_config_commands libtool" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with code coverage support" >&5 -$as_echo_n "checking whether to build with code coverage support... " >&6; } - # Check whether --enable-code-coverage was given. -if test "${enable_code_coverage+set}" = set; then : - enableval=$enable_code_coverage; -else - enable_code_coverage=no -fi - if test x$enable_code_coverage = xyes; then - CODE_COVERAGE_ENABLED_TRUE= - CODE_COVERAGE_ENABLED_FALSE='#' -else - CODE_COVERAGE_ENABLED_TRUE='#' - CODE_COVERAGE_ENABLED_FALSE= -fi - CODE_COVERAGE_ENABLED=$enable_code_coverage - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_code_coverage" >&5 -$as_echo "$enable_code_coverage" >&6; } +# Only expand once: - if test "$enable_code_coverage" = "yes" ; then : - if test "$GCC" = "no" ; then : - as_fn_error $? "not compiling with gcc, which is required for gcov code coverage" "$LINENO" 5 -fi - # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11" - # Extract the first word of "lcov", so it can be a program name with args. -set dummy lcov; 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_LCOV+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$LCOV"; then - ac_cv_prog_LCOV="$LCOV" # 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_LCOV="lcov" - $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 -LCOV=$ac_cv_prog_LCOV -if test -n "$LCOV"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LCOV" >&5 -$as_echo "$LCOV" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + # Check whether --enable-appstream-util was given. +if test "${enable_appstream_util+set}" = set; then : + enableval=$enable_appstream_util; fi - # Extract the first word of "genhtml", so it can be a program name with args. -set dummy genhtml; ac_word=$2 + if test "x$enable_appstream_validate" != "xno"; then : + # Extract the first word of "appstream-util", so it can be a program name with args. +set dummy appstream-util; 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_GENHTML+:} false; then : +if ${ac_cv_path_APPSTREAM_UTIL+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$GENHTML"; then - ac_cv_prog_GENHTML="$GENHTML" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $APPSTREAM_UTIL in + [\\/]* | ?:[\\/]*) + ac_cv_path_APPSTREAM_UTIL="$APPSTREAM_UTIL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GENHTML="genhtml" + ac_cv_path_APPSTREAM_UTIL="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -13905,1145 +14005,1213 @@ done IFS=$as_save_IFS + ;; +esac fi -fi -GENHTML=$ac_cv_prog_GENHTML -if test -n "$GENHTML"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GENHTML" >&5 -$as_echo "$GENHTML" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - if test "$LCOV" ; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lcov version" >&5 -$as_echo_n "checking for lcov version... " >&6; } -if ${ax_cv_lcov_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - - ax_cv_lcov_version=invalid - lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` - for lcov_check_version in $lcov_version_list; do - if test "$lcov_version" = "$lcov_check_version"; then - ax_cv_lcov_version="$lcov_check_version (ok)" - fi - done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_lcov_version" >&5 -$as_echo "$ax_cv_lcov_version" >&6; } - +APPSTREAM_UTIL=$ac_cv_path_APPSTREAM_UTIL +if test -n "$APPSTREAM_UTIL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $APPSTREAM_UTIL" >&5 +$as_echo "$APPSTREAM_UTIL" >&6; } else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" - as_fn_error $? "$lcov_msg" "$LINENO" 5 - -fi - - case $ax_cv_lcov_version in - ""|invalid) - lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." - as_fn_error $? "$lcov_msg" "$LINENO" 5 - LCOV="exit 0;" - ;; - esac - - if test -z "$GENHTML" ; then : - - as_fn_error $? "Could not find genhtml from the lcov package" "$LINENO" 5 - -fi - - CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" - CODE_COVERAGE_LDFLAGS="-lgcov" - - - - -fi - -CODE_COVERAGE_RULES=' -# Code coverage -# -# Optional: -# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. -# (Default: $(top_builddir)) -# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated -# by lcov for code coverage. (Default: -# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) -# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage -# reports to be created. (Default: -# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) -# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: empty) -# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml -# instance. (Default: empty) -# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore -# -# The generated report will be titled using the $(PACKAGE_NAME) and -# $(PACKAGE_VERSION). In order to add the current git hash to the title, -# use the git-version-gen script, available online. - -# Optional variables -CODE_COVERAGE_DIRECTORY ?= $(top_builddir) -CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info -CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage -CODE_COVERAGE_LCOV_OPTIONS ?= -CODE_COVERAGE_GENHTML_OPTIONS ?= -CODE_COVERAGE_IGNORE_PATTERN ?= - -code_coverage_quiet = $(code_coverage_quiet_$(V)) -code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) -code_coverage_quiet_0 = --quiet -# Use recursive makes in order to ignore errors during check -check-code-coverage: -ifeq ($(CODE_COVERAGE_ENABLED),yes) - -$(MAKE) $(AM_MAKEFLAGS) -k check - $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture + if test "x$APPSTREAM_UTIL" = "x"; then : + have_appstream_validate=no else - @echo "Need to reconfigure with --enable-code-coverage" -endif + have_appstream_validate=yes -# Capture code coverage data -code-coverage-capture: code-coverage-capture-hook -ifeq ($(CODE_COVERAGE_ENABLED),yes) - $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) - $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" - -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp - LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) - @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +fi else - @echo "Need to reconfigure with --enable-code-coverage" -endif + have_appstream_validate=no +fi -# Hook rule executed before code-coverage-capture, overridable by the user -code-coverage-capture-hook: + if test "x$have_appstream_validate" != "xno"; then : + appstream_validate=yes +else + appstream_validate=no + if test "x$enable_appstream_validate" = "xyes"; then : + as_fn_error $? "AppData validation was requested but appstream-util was not found" "$LINENO" 5 +fi +fi -ifeq ($(CODE_COVERAGE_ENABLED),yes) -clean: code-coverage-clean -code-coverage-clean: - -$(LCOV) --directory $(top_builddir) -z - -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) - -find . -name "*.gcda" -o -name "*.gcov" -delete -endif + appstreamxmldir=${datadir}/appdata -GITIGNOREFILES ?= -GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) -DISTCHECK_CONFIGURE_FLAGS ?= -DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage + APPSTREAM_XML_RULES=' +.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml -.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean -' +mostlyclean-am: clean-appstream-xml +%.appdata.valid: %.appdata.xml + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \ + if test -n "$(APPSTREAM_UTIL)"; \ + then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \ + && touch $@ +check-am: $(appstream_XML:.appdata.xml=.appdata.valid) +uninstall-am: uninstall-appstream-xml +install-data-am: install-appstream-xml +.SECONDARY: $(appstream_XML) - GNOME_CODE_COVERAGE_RULES=$CODE_COVERAGE_RULES +install-appstream-xml: $(appstream_XML) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \ + fi +uninstall-appstream-xml: + @$(NORMAL_UNINSTALL) + @list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files +clean-appstream-xml: + rm -f $(appstream_XML:.appdata.xml=.appdata.valid) +' -WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations -Wno-missing-prototypes" -GLIB_REQUIRED=2.38.0 -GTK_REQUIRED=3.13.0 -LIBXML_REQUIRED=2.6.12 -LIBXSLT_REQUIRED=1.1.7 -WEBKIT_GTK_REQUIRED=2.7.4 -LIBSOUP_REQUIRED=2.48.0 -GNOME_DESKTOP_REQUIRED=2.91.2 -LIBSECRET_REQUIRED=0.14 -GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1 -LIBNOTIFY_REQUIRED=0.5.1 -GCR_REQUIRED=3.5.5 -AVAHI_REQUIRED=0.6.22 -# Tests -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build tests" >&5 -$as_echo_n "checking whether to build tests... " >&6; } -# Check whether --enable-tests was given. -if test "${enable_tests+set}" = set; then : - enableval=$enable_tests; -else - enable_tests=yes -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tests" >&5 -$as_echo "$enable_tests" >&6; } - if test "$enable_tests" = "yes"; then - ENABLE_TESTS_TRUE= - ENABLE_TESTS_FALSE='#' -else - ENABLE_TESTS_TRUE='#' - ENABLE_TESTS_FALSE= + + + + # Check whether --enable-schemas-compile was given. +if test "${enable_schemas_compile+set}" = set; then : + enableval=$enable_schemas_compile; case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;; + esac fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCIES" >&5 -$as_echo_n "checking for DEPENDENCIES... " >&6; } -if test -n "$DEPENDENCIES_CFLAGS"; then - pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - glib-2.0 >= \$GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= \$GLIB_REQUIRED - gtk+-3.0 >= \$GTK_REQUIRED - gtk+-unix-print-3.0 >= \$GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= \$LIBXML_REQUIRED - libxslt >= \$LIBXSLT_REQUIRED - webkit2gtk-4.0 >= \$WEBKIT_GTK_REQUIRED - libsoup-2.4 >= \$LIBSOUP_REQUIRED - libsecret-1 >= \$LIBSECRET_REQUIRED - gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= \$LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= \$GCR_REQUIRED - avahi-gobject >= \$AVAHI_REQUIRED - avahi-client >= \$AVAHI_REQUIRED - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gtk+-unix-print-3.0 >= $GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= $LIBXML_REQUIRED - libxslt >= $LIBXSLT_REQUIRED - webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= $LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= $GCR_REQUIRED - avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $AVAHI_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags " - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gtk+-unix-print-3.0 >= $GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= $LIBXML_REQUIRED - libxslt >= $LIBXSLT_REQUIRED - webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= $LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= $GCR_REQUIRED - avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $AVAHI_REQUIRED - " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + + + + + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$DEPENDENCIES_LIBS"; then - pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - glib-2.0 >= \$GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= \$GLIB_REQUIRED - gtk+-3.0 >= \$GTK_REQUIRED - gtk+-unix-print-3.0 >= \$GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= \$LIBXML_REQUIRED - libxslt >= \$LIBXSLT_REQUIRED - webkit2gtk-4.0 >= \$WEBKIT_GTK_REQUIRED - libsoup-2.4 >= \$LIBSOUP_REQUIRED - libsecret-1 >= \$LIBSECRET_REQUIRED - gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= \$LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= \$GCR_REQUIRED - avahi-gobject >= \$AVAHI_REQUIRED - avahi-client >= \$AVAHI_REQUIRED - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gtk+-unix-print-3.0 >= $GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= $LIBXML_REQUIRED - libxslt >= $LIBXSLT_REQUIRED - webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= $LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= $GCR_REQUIRED - avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $AVAHI_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs " - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gtk+-unix-print-3.0 >= $GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= $LIBXML_REQUIRED - libxslt >= $LIBXSLT_REQUIRED - webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= $LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= $GCR_REQUIRED - avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $AVAHI_REQUIRED - " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKG_CONFIG=$ac_cv_path_PKG_CONFIG +if test -n "$PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +$as_echo "$PKG_CONFIG" >&6; } else - pkg_failed=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - else - pkg_failed=untried + + fi +if test -z "$ac_cv_path_PKG_CONFIG"; then + ac_pt_PKG_CONFIG=$PKG_CONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $ac_pt_PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG +if test -n "$ac_pt_PKG_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +$as_echo "$ac_pt_PKG_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.16 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + PKG_CONFIG="" + fi +fi + gsettingsschemadir=${datadir}/glib-2.0/schemas -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + # Extract the first word of "glib-compile-schemas", so it can be a program name with args. +set dummy glib-compile-schemas; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then : + $as_echo_n "(cached) " >&6 else - _pkg_short_errors_supported=no + case $GLIB_COMPILE_SCHEMAS in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS +if test -n "$GLIB_COMPILE_SCHEMAS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5 +$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - if test $_pkg_short_errors_supported = yes; then - DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gtk+-unix-print-3.0 >= $GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= $LIBXML_REQUIRED - libxslt >= $LIBXSLT_REQUIRED - webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= $LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= $GCR_REQUIRED - avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $AVAHI_REQUIRED - " 2>&1` - else - DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gtk+-unix-print-3.0 >= $GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= $LIBXML_REQUIRED - libxslt >= $LIBXSLT_REQUIRED - webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= $LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= $GCR_REQUIRED - avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $AVAHI_REQUIRED - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$DEPENDENCIES_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ( - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 - gio-unix-2.0 >= $GLIB_REQUIRED - gtk+-3.0 >= $GTK_REQUIRED - gtk+-unix-print-3.0 >= $GTK_REQUIRED - x11 - libwnck-3.0 - libxml-2.0 >= $LIBXML_REQUIRED - libxslt >= $LIBXSLT_REQUIRED - webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED - libsoup-2.4 >= $LIBSOUP_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED - gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED - libnotify >= $LIBNOTIFY_REQUIRED - sqlite3 - gcr-3 >= $GCR_REQUIRED - avahi-gobject >= $AVAHI_REQUIRED - avahi-client >= $AVAHI_REQUIRED - ) were not met: -$DEPENDENCIES_PKG_ERRORS + fi + + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5 + else + : + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" $^ > $@.tmp && mv $@.tmp $@ +endif +' + -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS -and DEPENDENCIES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. -Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS -and DEPENDENCIES_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - DEPENDENCIES_CFLAGS=$pkg_cv_DEPENDENCIES_CFLAGS - DEPENDENCIES_LIBS=$pkg_cv_DEPENDENCIES_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEB_EXTENSION" >&5 -$as_echo_n "checking for WEB_EXTENSION... " >&6; } -if test -n "$WEB_EXTENSION_CFLAGS"; then - pkg_cv_WEB_EXTENSION_CFLAGS="$WEB_EXTENSION_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - webkit2gtk-web-extension-4.0 >= \$WEBKIT_GTK_REQUIRED - libsecret-1 >= \$LIBSECRET_REQUIRED - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEB_EXTENSION_CFLAGS=`$PKG_CONFIG --cflags " - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$WEB_EXTENSION_LIBS"; then - pkg_cv_WEB_EXTENSION_LIBS="$WEB_EXTENSION_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - webkit2gtk-web-extension-4.0 >= \$WEBKIT_GTK_REQUIRED - libsecret-1 >= \$LIBSECRET_REQUIRED - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_WEB_EXTENSION_LIBS=`$PKG_CONFIG --libs " - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - " 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 + + +YELP_LC_MEDIA_LINKS=true +YELP_LC_DIST=true + +for yelpopt in ; do + case $yelpopt in + lc-media-links) YELP_LC_MEDIA_LINKS=true ;; + no-lc-media-links) YELP_LC_MEDIA_LINKS= ;; + lc-dist) YELP_LC_DIST=true ;; + no-lc-dist) YELP_LC_DIST= ;; + *) as_fn_error $? "Unrecognized YELP_HELP_INIT option $yelpopt\"" "$LINENO" 5 ;; + esac +done; + + + + +# Check whether --with-help-dir was given. +if test "${with_help_dir+set}" = set; then : + withval=$with_help_dir; else - _pkg_short_errors_supported=no + with_help_dir='${datadir}/help' fi - if test $_pkg_short_errors_supported = yes; then - WEB_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - " 2>&1` - else - WEB_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - " 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$WEB_EXTENSION_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ( - webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED - libsecret-1 >= $LIBSECRET_REQUIRED - ) were not met: +HELP_DIR="$with_help_dir" -$WEB_EXTENSION_PKG_ERRORS -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -Alternatively, you may set the environment variables WEB_EXTENSION_CFLAGS -and WEB_EXTENSION_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +# Extract the first word of "itstool", so it can be a program name with args. +set dummy itstool; 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_ITSTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ITSTOOL"; then + ac_cv_prog_ITSTOOL="$ITSTOOL" # 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_ITSTOOL="itstool" + $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 +ITSTOOL=$ac_cv_prog_ITSTOOL +if test -n "$ITSTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5 +$as_echo "$ITSTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. +fi -Alternatively, you may set the environment variables WEB_EXTENSION_CFLAGS -and WEB_EXTENSION_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +if test x"$ITSTOOL" = x; then + as_fn_error $? "itstool not found" "$LINENO" 5 +fi + + +# Extract the first word of "xmllint", so it can be a program name with args. +set dummy xmllint; 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_XMLLINT+:} false; then : + $as_echo_n "(cached) " >&6 else - WEB_EXTENSION_CFLAGS=$pkg_cv_WEB_EXTENSION_CFLAGS - WEB_EXTENSION_LIBS=$pkg_cv_WEB_EXTENSION_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + if test -n "$XMLLINT"; then + ac_cv_prog_XMLLINT="$XMLLINT" # 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_XMLLINT="xmllint" + $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 +XMLLINT=$ac_cv_prog_XMLLINT +if test -n "$XMLLINT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5 +$as_echo "$XMLLINT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + +if test x"$XMLLINT" = x; then + as_fn_error $? "xmllint not found" "$LINENO" 5 fi +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= + +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir $@); +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) -# ****************** -# Portability checks -# ****************** +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") -for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x$(_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done -fi -done +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(AM_V_at)if test ! -f "$@" -a -f "$(srcdir)/$@"; then cp "$(srcdir)/$@" "$@"; fi + $(AM_V_GEN)if ! test -f "$@"; then \ + (cd "$(dir $@)" && \ + $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir $@).tmp" "$(notdir $@)"); \ + else \ + (cd "$(dir $@)" && \ + $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir $@)" "$(notdir $@)" "$(notdir $@).tmp" && \ + rm "$(notdir $@).tmp"); \ + fi +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(AM_V_GEN)msgfmt -o "$@" "$<" -# for backtrace() -for ac_header in execinfo.h fcntl.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir $@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "$@" -fi +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) -done +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 -$as_echo_n "checking for library containing backtrace... " >&6; } -if ${ac_cv_search_backtrace+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +distdir: distdir-help-files +distdir-help-files: $(_HELP_LC_FILES) + @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char backtrace (); -int -main () -{ -return backtrace (); - ; - return 0; -} -_ACEOF -for ac_lib in '' c execinfo; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_backtrace=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_backtrace+:} false; then : - break -fi -done -if ${ac_cv_search_backtrace+:} false; then : +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done -else - ac_cv_search_backtrace=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 -$as_echo "$ac_cv_search_backtrace" >&6; } -ac_res=$ac_cv_search_backtrace -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -fi +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: $(_HELP_LC_FILES) + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + fi; \ + done; \ + done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include +GLIB_REQUIRED=2.38.0 +GTK_REQUIRED=3.13.0 +LIBXML_REQUIRED=2.6.12 +LIBXSLT_REQUIRED=1.1.7 +WEBKIT_GTK_REQUIRED=2.9.5 +LIBSOUP_REQUIRED=2.48.0 +GNOME_DESKTOP_REQUIRED=2.91.2 +LIBSECRET_REQUIRED=0.14 +GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1 +LIBNOTIFY_REQUIRED=0.5.1 +GCR_REQUIRED=3.5.5 +AVAHI_REQUIRED=0.6.22 -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes +# Tests + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build tests" >&5 +$as_echo_n "checking whether to build tests... " >&6; } +# Check whether --enable-tests was given. +if test "${enable_tests+set}" = set; then : + enableval=$enable_tests; else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + enable_tests=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tests" >&5 +$as_echo "$enable_tests" >&6; } + if test "$enable_tests" = "yes"; then + ENABLE_TESTS_TRUE= + ENABLE_TESTS_FALSE='#' +else + ENABLE_TESTS_TRUE='#' + ENABLE_TESTS_FALSE= fi +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCIES" >&5 +$as_echo_n "checking for DEPENDENCIES... " >&6; } - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - +if test -n "$DEPENDENCIES_CFLAGS"; then + pkg_cv_DEPENDENCIES_CFLAGS="$DEPENDENCIES_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= \$GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= \$GLIB_REQUIRED + gtk+-3.0 >= \$GTK_REQUIRED + gtk+-unix-print-3.0 >= \$GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= \$LIBXML_REQUIRED + libxslt >= \$LIBXSLT_REQUIRED + webkit2gtk-4.0 >= \$WEBKIT_GTK_REQUIRED + libsoup-2.4 >= \$LIBSOUP_REQUIRED + libsecret-1 >= \$LIBSECRET_REQUIRED + gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= \$LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= \$GCR_REQUIRED + avahi-gobject >= \$AVAHI_REQUIRED + avahi-client >= \$AVAHI_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + gtk+-unix-print-3.0 >= $GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED + libsoup-2.4 >= $LIBSOUP_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= $LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags " + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + gtk+-unix-print-3.0 >= $GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED + libsoup-2.4 >= $LIBSOUP_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= $LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED + " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$DEPENDENCIES_LIBS"; then + pkg_cv_DEPENDENCIES_LIBS="$DEPENDENCIES_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + glib-2.0 >= \$GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= \$GLIB_REQUIRED + gtk+-3.0 >= \$GTK_REQUIRED + gtk+-unix-print-3.0 >= \$GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= \$LIBXML_REQUIRED + libxslt >= \$LIBXSLT_REQUIRED + webkit2gtk-4.0 >= \$WEBKIT_GTK_REQUIRED + libsoup-2.4 >= \$LIBSOUP_REQUIRED + libsecret-1 >= \$LIBSECRET_REQUIRED + gnome-desktop-3.0 >= \$GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= \$GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= \$LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= \$GCR_REQUIRED + avahi-gobject >= \$AVAHI_REQUIRED + avahi-client >= \$AVAHI_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + gtk+-unix-print-3.0 >= $GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED + libsoup-2.4 >= $LIBSOUP_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= $LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs " + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + gtk+-unix-print-3.0 >= $GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED + libsoup-2.4 >= $LIBSOUP_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= $LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED + " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried fi -done +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 + DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + gtk+-unix-print-3.0 >= $GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED + libsoup-2.4 >= $LIBSOUP_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= $LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED + " 2>&1` + else + DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + gtk+-unix-print-3.0 >= $GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED + libsoup-2.4 >= $LIBSOUP_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= $LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$DEPENDENCIES_PKG_ERRORS" >&5 + as_fn_error $? "Package requirements ( + glib-2.0 >= $GLIB_REQUIRED + gthread-2.0 + gio-unix-2.0 >= $GLIB_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED + gtk+-unix-print-3.0 >= $GTK_REQUIRED + x11 + libwnck-3.0 + libxml-2.0 >= $LIBXML_REQUIRED + libxslt >= $LIBXSLT_REQUIRED + webkit2gtk-4.0 >= $WEBKIT_GTK_REQUIRED + libsoup-2.4 >= $LIBSOUP_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED + gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED + libnotify >= $LIBNOTIFY_REQUIRED + sqlite3 + gcr-3 >= $GCR_REQUIRED + avahi-gobject >= $AVAHI_REQUIRED + avahi-client >= $AVAHI_REQUIRED + ) were not met: +$DEPENDENCIES_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS +and DEPENDENCIES_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively, you may set the environment variables DEPENDENCIES_CFLAGS +and DEPENDENCIES_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - for ac_func in $ac_func_list -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + DEPENDENCIES_CFLAGS=$pkg_cv_DEPENDENCIES_CFLAGS + DEPENDENCIES_LIBS=$pkg_cv_DEPENDENCIES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -done - - +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEB_EXTENSION" >&5 +$as_echo_n "checking for WEB_EXTENSION... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 -$as_echo_n "checking for working mktime... " >&6; } -if ${ac_cv_func_working_mktime+:} false; then : - $as_echo_n "(cached) " >&6 +if test -n "$WEB_EXTENSION_CFLAGS"; then + pkg_cv_WEB_EXTENSION_CFLAGS="$WEB_EXTENSION_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + webkit2gtk-web-extension-4.0 >= \$WEBKIT_GTK_REQUIRED + libsecret-1 >= \$LIBSECRET_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WEB_EXTENSION_CFLAGS=`$PKG_CONFIG --cflags " + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - if test "$cross_compiling" = yes; then : - ac_cv_func_working_mktime=no + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$WEB_EXTENSION_LIBS"; then + pkg_cv_WEB_EXTENSION_LIBS="$WEB_EXTENSION_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" + webkit2gtk-web-extension-4.0 >= \$WEBKIT_GTK_REQUIRED + libsecret-1 >= \$LIBSECRET_REQUIRED + \""; } >&5 + ($PKG_CONFIG --exists --print-errors " + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WEB_EXTENSION_LIBS=`$PKG_CONFIG --libs " + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Test program from Paul Eggert and Tony Leneis. */ -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include - -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifndef HAVE_ALARM -# define alarm(X) /* empty */ -#endif - -/* Work around redefinition to rpl_putenv by other config tests. */ -#undef putenv - -static time_t time_t_max; -static time_t time_t_min; - -/* Values we'll use to set the TZ environment variable. */ -static const char *tz_strings[] = { - (const char *) 0, "TZ=GMT0", "TZ=JST-9", - "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" -}; -#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) - -/* Return 0 if mktime fails to convert a date in the spring-forward gap. - Based on a problem report from Andreas Jaeger. */ -static int -spring_forward_gap () -{ - /* glibc (up to about 1998-10-07) failed this test. */ - struct tm tm; - - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - - tm.tm_year = 98; - tm.tm_mon = 3; - tm.tm_mday = 5; - tm.tm_hour = 2; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - return mktime (&tm) != (time_t) -1; -} + pkg_failed=yes +fi + else + pkg_failed=untried +fi -static int -mktime_test1 (time_t now) -{ - struct tm *lt; - return ! (lt = localtime (&now)) || mktime (lt) == now; -} -static int -mktime_test (time_t now) -{ - return (mktime_test1 (now) - && mktime_test1 ((time_t) (time_t_max - now)) - && mktime_test1 ((time_t) (time_t_min + now))); -} -static int -irix_6_4_bug () -{ - /* Based on code from Ariel Faigon. */ - struct tm tm; - tm.tm_year = 96; - tm.tm_mon = 3; - tm.tm_mday = 0; - tm.tm_hour = 0; - tm.tm_min = 0; - tm.tm_sec = 0; - tm.tm_isdst = -1; - mktime (&tm); - return tm.tm_mon == 2 && tm.tm_mday == 31; -} +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } -static int -bigtime_test (int j) -{ - struct tm tm; - time_t now; - tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; - now = mktime (&tm); - if (now != (time_t) -1) - { - struct tm *lt = localtime (&now); - if (! (lt - && lt->tm_year == tm.tm_year - && lt->tm_mon == tm.tm_mon - && lt->tm_mday == tm.tm_mday - && lt->tm_hour == tm.tm_hour - && lt->tm_min == tm.tm_min - && lt->tm_sec == tm.tm_sec - && lt->tm_yday == tm.tm_yday - && lt->tm_wday == tm.tm_wday - && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) - == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) - return 0; - } - return 1; -} +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 + WEB_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + " 2>&1` + else + WEB_EXTENSION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$WEB_EXTENSION_PKG_ERRORS" >&5 -static int -year_2050_test () -{ - /* The correct answer for 2050-02-01 00:00:00 in Pacific time, - ignoring leap seconds. */ - unsigned long int answer = 2527315200UL; + as_fn_error $? "Package requirements ( + webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED + libsecret-1 >= $LIBSECRET_REQUIRED + ) were not met: - struct tm tm; - time_t t; - tm.tm_year = 2050 - 1900; - tm.tm_mon = 2 - 1; - tm.tm_mday = 1; - tm.tm_hour = tm.tm_min = tm.tm_sec = 0; - tm.tm_isdst = -1; +$WEB_EXTENSION_PKG_ERRORS - /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver" in order to detect the bug even - on systems that don't support the Olson extension, or don't have the - full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. - t = mktime (&tm); +Alternatively, you may set the environment variables WEB_EXTENSION_CFLAGS +and WEB_EXTENSION_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. - /* Check that the result is either a failure, or close enough - to the correct answer that we can assume the discrepancy is - due to leap seconds. */ - return (t == (time_t) -1 - || (0 < t && answer - 120 <= t && t <= answer + 120)); -} +Alternatively, you may set the environment variables WEB_EXTENSION_CFLAGS +and WEB_EXTENSION_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. -int -main () -{ - time_t t, delta; - int i, j; +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + WEB_EXTENSION_CFLAGS=$pkg_cv_WEB_EXTENSION_CFLAGS + WEB_EXTENSION_LIBS=$pkg_cv_WEB_EXTENSION_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } - /* This test makes some buggy mktime implementations loop. - Give up after 60 seconds; a mktime slower than that - isn't worth using anyway. */ - alarm (60); +fi - for (;;) - { - t = (time_t_max << 1) + 1; - if (t <= time_t_max) - break; - time_t_max = t; - } - time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; - delta = time_t_max / 997; /* a suitable prime number */ - for (i = 0; i < N_STRINGS; i++) - { - if (tz_strings[i]) - putenv ((char*) tz_strings[i]); - for (t = 0; t <= time_t_max - delta; t += delta) - if (! mktime_test (t)) - return 1; - if (! (mktime_test ((time_t) 1) - && mktime_test ((time_t) (60 * 60)) - && mktime_test ((time_t) (60 * 60 * 24)))) - return 1; +# ****************** +# Portability checks +# ****************** - for (j = 1; ; j <<= 1) - if (! bigtime_test (j)) - return 1; - else if (INT_MAX / 2 < j) - break; - if (! bigtime_test (INT_MAX)) - return 1; - } - return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); -} +for ac_func in localtime_r memchr memmove memset mkdir mkdtemp realpath sqrt strchr strcspn strdup strerror strrchr strtol strtoul strstr +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_working_mktime=yes -else - ac_cv_func_working_mktime=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 -$as_echo "$ac_cv_func_working_mktime" >&6; } -if test $ac_cv_func_working_mktime = no; then - case " $LIBOBJS " in - *" mktime.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS mktime.$ac_objext" - ;; -esac +done + + +# for backtrace() +for ac_header in execinfo.h fcntl.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 -$as_echo_n "checking for working strtod... " >&6; } -if ${ac_cv_func_strtod+:} false; then : +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 +$as_echo_n "checking for library containing backtrace... " >&6; } +if ${ac_cv_search_backtrace+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - ac_cv_func_strtod=no -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -$ac_includes_default -#ifndef strtod -double strtod (); +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" #endif +char backtrace (); int -main() +main () { - { - /* Some versions of Linux strtod mis-parse strings with leading '+'. */ - char *string = " +69"; - char *term; - double value; - value = strtod (string, &term); - if (value != 69 || term != (string + 4)) - return 1; - } - - { - /* Under Solaris 2.4, strtod returns the wrong value for the - terminating character under some conditions. */ - char *string = "NaN"; - char *term; - strtod (string, &term); - if (term != string && *(term - 1) == 0) - return 1; - } +return backtrace (); + ; return 0; } - _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_strtod=yes +for ac_lib in '' c execinfo; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_backtrace=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_backtrace+:} false; then : + break +fi +done +if ${ac_cv_search_backtrace+:} false; then : + else - ac_cv_func_strtod=no + ac_cv_search_backtrace=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 +$as_echo "$ac_cv_search_backtrace" >&6; } +ac_res=$ac_cv_search_backtrace +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 -$as_echo "$ac_cv_func_strtod" >&6; } -if test $ac_cv_func_strtod = no; then - case " $LIBOBJS " in - *" strtod.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS strtod.$ac_objext" - ;; -esac -ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" -if test "x$ac_cv_func_pow" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if ${ac_cv_c_inline+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } + +case $ac_cv_c_inline in + inline | yes) ;; + *) + case $ac_cv_c_inline in + no) ac_val=;; + *) ac_val=$ac_cv_c_inline;; + esac + cat >>confdefs.h <<_ACEOF +#ifndef __cplusplus +#define inline $ac_val +#endif +_ACEOF + ;; +esac -if test $ac_cv_func_pow = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 -$as_echo_n "checking for pow in -lm... " >&6; } -if ${ac_cv_lib_m_pow+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 +$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } +if ${ac_cv_header_time+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include +#include +#include -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pow (); int main () { -return pow (); +if ((struct tm *) 0) +return 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_pow=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_time=yes else - ac_cv_lib_m_pow=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_cv_header_time=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 -$as_echo "$ac_cv_lib_m_pow" >&6; } -if test "x$ac_cv_lib_m_pow" = xyes; then : - POW_LIB=-lm -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 -$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 +$as_echo "$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then -fi +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi -ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : - -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF - -fi -# *************** -# Multimedia keys -# *************** -for ac_header in X11/XF86keysym.h + for ac_header in $ac_header_list do : - ac_fn_c_check_header_mongrel "$LINENO" "X11/XF86keysym.h" "ac_cv_header_X11_XF86keysym_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_XF86keysym_h" = xyes; then : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF -#define HAVE_X11_XF86KEYSYM_H 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -15051,407 +15219,324 @@ done -# *** -# NSS -# *** - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NSS support is requested" >&5 -$as_echo_n "checking whether NSS support is requested... " >&6; } -# Check whether --enable-nss was given. -if test "${enable_nss+set}" = set; then : - enableval=$enable_nss; -else - enable_nss=yes -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nss" >&5 -$as_echo "$enable_nss" >&6; } -if test "$enable_nss" = "yes"; then -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 -$as_echo_n "checking for NSS... " >&6; } -if test -n "$NSS_CFLAGS"; then - pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 - ($PKG_CONFIG --exists --print-errors "nss") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$NSS_LIBS"; then - pkg_cv_NSS_LIBS="$NSS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 - ($PKG_CONFIG --exists --print-errors "nss") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 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; } + for ac_func in $ac_func_list +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -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 - NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss" 2>&1` - else - NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$NSS_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (nss) were not met: - -$NSS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables NSS_CFLAGS -and NSS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables NSS_CFLAGS -and NSS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } -else - NSS_CFLAGS=$pkg_cv_NSS_CFLAGS - NSS_LIBS=$pkg_cv_NSS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +done -fi -$as_echo "#define ENABLE_NSS 1" >>confdefs.h -fi - if test "$enable_nss" = "yes"; then - ENABLE_NSS_TRUE= - ENABLE_NSS_FALSE='#' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 +$as_echo_n "checking for working mktime... " >&6; } +if ${ac_cv_func_working_mktime+:} false; then : + $as_echo_n "(cached) " >&6 else - ENABLE_NSS_TRUE='#' - ENABLE_NSS_FALSE= -fi - - -# ******************************* -# Internationalization -# ******************************* - -ISO_CODES_REQUIRED=0.35 - -if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - have_iso_codes=yes + if test "$cross_compiling" = yes; then : + ac_cv_func_working_mktime=no else - have_iso_codes=no -fi - -if test "$have_iso_codes" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 and iso-3166 domains" >&5 -$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; } - if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \ - $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then - result=yes - else - result=no - have_iso_codes=no - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 -$as_echo "$result" >&6; } -fi - -if test "$have_iso_codes" = "yes"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Test program from Paul Eggert and Tony Leneis. */ +#ifdef TIME_WITH_SYS_TIME +# include +# include +#else +# ifdef HAVE_SYS_TIME_H +# include +# else +# include +# endif +#endif -cat >>confdefs.h <<_ACEOF -#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`" -_ACEOF +#include +#include +#ifdef HAVE_UNISTD_H +# include +#endif -$as_echo "#define HAVE_ISO_CODES 1" >>confdefs.h +#ifndef HAVE_ALARM +# define alarm(X) /* empty */ +#endif -else - as_fn_error $? "iso-codes is required" "$LINENO" 5 -fi +/* Work around redefinition to rpl_putenv by other config tests. */ +#undef putenv -GETTEXT_PACKAGE=epiphany +static time_t time_t_max; +static time_t time_t_min; +/* Values we'll use to set the TZ environment variable. */ +static const char *tz_strings[] = { + (const char *) 0, "TZ=GMT0", "TZ=JST-9", + "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" +}; +#define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF +/* Return 0 if mktime fails to convert a date in the spring-forward gap. + Based on a problem report from Andreas Jaeger. */ +static int +spring_forward_gap () +{ + /* glibc (up to about 1998-10-07) failed this test. */ + struct tm tm; + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - for ac_header in locale.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" -if test "x$ac_cv_header_locale_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LOCALE_H 1 -_ACEOF + tm.tm_year = 98; + tm.tm_mon = 3; + tm.tm_mday = 5; + tm.tm_hour = 2; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + return mktime (&tm) != (time_t) -1; +} -fi +static int +mktime_test1 (time_t now) +{ + struct tm *lt; + return ! (lt = localtime (&now)) || mktime (lt) == now; +} -done +static int +mktime_test (time_t now) +{ + return (mktime_test1 (now) + && mktime_test1 ((time_t) (time_t_max - now)) + && mktime_test1 ((time_t) (time_t_min + now))); +} - if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 -$as_echo_n "checking for LC_MESSAGES... " >&6; } -if ${am_cv_val_LC_MESSAGES+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () +static int +irix_6_4_bug () { -return LC_MESSAGES - ; - return 0; + /* Based on code from Ariel Faigon. */ + struct tm tm; + tm.tm_year = 96; + tm.tm_mon = 3; + tm.tm_mday = 0; + tm.tm_hour = 0; + tm.tm_min = 0; + tm.tm_sec = 0; + tm.tm_isdst = -1; + mktime (&tm); + return tm.tm_mon == 2 && tm.tm_mday == 31; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_val_LC_MESSAGES=yes -else - am_cv_val_LC_MESSAGES=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 -$as_echo "$am_cv_val_LC_MESSAGES" >&6; } - if test $am_cv_val_LC_MESSAGES = yes; then -$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h +static int +bigtime_test (int j) +{ + struct tm tm; + time_t now; + tm.tm_year = tm.tm_mon = tm.tm_mday = tm.tm_hour = tm.tm_min = tm.tm_sec = j; + now = mktime (&tm); + if (now != (time_t) -1) + { + struct tm *lt = localtime (&now); + if (! (lt + && lt->tm_year == tm.tm_year + && lt->tm_mon == tm.tm_mon + && lt->tm_mday == tm.tm_mday + && lt->tm_hour == tm.tm_hour + && lt->tm_min == tm.tm_min + && lt->tm_sec == tm.tm_sec + && lt->tm_yday == tm.tm_yday + && lt->tm_wday == tm.tm_wday + && ((lt->tm_isdst < 0 ? -1 : 0 < lt->tm_isdst) + == (tm.tm_isdst < 0 ? -1 : 0 < tm.tm_isdst)))) + return 0; + } + return 1; +} - fi - fi - USE_NLS=yes +static int +year_2050_test () +{ + /* The correct answer for 2050-02-01 00:00:00 in Pacific time, + ignoring leap seconds. */ + unsigned long int answer = 2527315200UL; + struct tm tm; + time_t t; + tm.tm_year = 2050 - 1900; + tm.tm_mon = 2 - 1; + tm.tm_mday = 1; + tm.tm_hour = tm.tm_min = tm.tm_sec = 0; + tm.tm_isdst = -1; - gt_cv_have_gettext=no + /* Use the portable POSIX.1 specification "TZ=PST8PDT,M4.1.0,M10.5.0" + instead of "TZ=America/Vancouver" in order to detect the bug even + on systems that don't support the Olson extension, or don't have the + full zoneinfo tables installed. */ + putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" -if test "x$ac_cv_header_libintl_h" = xyes; then : - gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 -$as_echo_n "checking for ngettext in libc... " >&6; } -if ${gt_cv_func_ngettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + t = mktime (&tm); -#include + /* Check that the result is either a failure, or close enough + to the correct answer that we can assume the discrepancy is + due to leap seconds. */ + return (t == (time_t) -1 + || (0 < t && answer - 120 <= t && t <= answer + 120)); +} int main () { -return !ngettext ("","", 1) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_ngettext_libc=yes -else - gt_cv_func_ngettext_libc=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + time_t t, delta; + int i, j; -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 -$as_echo "$gt_cv_func_ngettext_libc" >&6; } + /* This test makes some buggy mktime implementations loop. + Give up after 60 seconds; a mktime slower than that + isn't worth using anyway. */ + alarm (60); - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 -$as_echo_n "checking for dgettext in libc... " >&6; } -if ${gt_cv_func_dgettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + for (;;) + { + t = (time_t_max << 1) + 1; + if (t <= time_t_max) + break; + time_t_max = t; + } + time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; -#include + delta = time_t_max / 997; /* a suitable prime number */ + for (i = 0; i < N_STRINGS; i++) + { + if (tz_strings[i]) + putenv ((char*) tz_strings[i]); -int -main () -{ -return !dgettext ("","") - ; - return 0; + for (t = 0; t <= time_t_max - delta; t += delta) + if (! mktime_test (t)) + return 1; + if (! (mktime_test ((time_t) 1) + && mktime_test ((time_t) (60 * 60)) + && mktime_test ((time_t) (60 * 60 * 24)))) + return 1; + + for (j = 1; ; j <<= 1) + if (! bigtime_test (j)) + return 1; + else if (INT_MAX / 2 < j) + break; + if (! bigtime_test (INT_MAX)) + return 1; + } + return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_dgettext_libc=yes +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_working_mktime=yes else - gt_cv_func_dgettext_libc=no + ac_cv_func_working_mktime=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF fi -done +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 +$as_echo "$ac_cv_func_working_mktime" >&6; } +if test $ac_cv_func_working_mktime = no; then + case " $LIBOBJS " in + *" mktime.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS mktime.$ac_objext" + ;; +esac - fi +fi - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 -$as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if ${ac_cv_lib_intl_bindtextdomain+:} false; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5 +$as_echo_n "checking for working strtod... " >&6; } +if ${ac_cv_func_strtod+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bindtextdomain (); -int -main () -{ -return bindtextdomain (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_bindtextdomain=yes -else - ac_cv_lib_intl_bindtextdomain=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 -$as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 + if test "$cross_compiling" = yes; then : + ac_cv_func_strtod=no else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" +$ac_includes_default +#ifndef strtod +double strtod (); #endif -char ngettext (); int -main () +main() { -return ngettext (); - ; + { + /* Some versions of Linux strtod mis-parse strings with leading '+'. */ + char *string = " +69"; + char *term; + double value; + value = strtod (string, &term); + if (value != 69 || term != (string + 4)) + return 1; + } + + { + /* Under Solaris 2.4, strtod returns the wrong value for the + terminating character under some conditions. */ + char *string = "NaN"; + char *term; + strtod (string, &term); + if (term != string && *(term - 1) == 0) + return 1; + } return 0; } + _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_strtod=yes else - ac_cv_lib_intl_ngettext=no + ac_cv_func_strtod=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5 +$as_echo "$ac_cv_func_strtod" >&6; } +if test $ac_cv_func_strtod = no; then + case " $LIBOBJS " in + *" strtod.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS strtod.$ac_objext" + ;; +esac + +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow" +if test "x$ac_cv_func_pow" = xyes; then : + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 -$as_echo_n "checking for dgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dgettext+:} false; then : + +if test $ac_cv_func_pow = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5 +$as_echo_n "checking for pow in -lm... " >&6; } +if ${ac_cv_lib_m_pow+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" +LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15461,260 +15546,319 @@ #ifdef __cplusplus extern "C" #endif -char dgettext (); +char pow (); int main () { -return dgettext (); +return pow (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dgettext=yes + ac_cv_lib_m_pow=yes else - ac_cv_lib_intl_dgettext=no + ac_cv_lib_m_pow=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 -$as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = xyes; then : - gt_cv_func_dgettext_libintl=yes +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5 +$as_echo "$ac_cv_lib_m_pow" >&6; } +if test "x$ac_cv_lib_m_pow" = xyes; then : + POW_LIB=-lm +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5 +$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;} fi fi fi +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" +if test "x$ac_cv_type_size_t" = xyes; then : - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 -$as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 -$as_echo_n "checking for ngettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_ngettext+:} false; then : - $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char ngettext (); -int -main () -{ -return ngettext (); - ; - return 0; -} +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_ngettext=yes + +fi + + +# *************** +# Multimedia keys +# *************** + +for ac_header in X11/XF86keysym.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "X11/XF86keysym.h" "ac_cv_header_X11_XF86keysym_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_XF86keysym_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_X11_XF86KEYSYM_H 1 +_ACEOF + +fi + +done + + +# *** +# NSS +# *** + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NSS support is requested" >&5 +$as_echo_n "checking whether NSS support is requested... " >&6; } +# Check whether --enable-nss was given. +if test "${enable_nss+set}" = set; then : + enableval=$enable_nss; else - ac_cv_lib_intl_ngettext=no + enable_nss=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nss" >&5 +$as_echo "$enable_nss" >&6; } + +if test "$enable_nss" = "yes"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS" >&5 +$as_echo_n "checking for NSS... " >&6; } + +if test -n "$NSS_CFLAGS"; then + pkg_cv_NSS_CFLAGS="$NSS_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 + ($PKG_CONFIG --exists --print-errors "nss") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 -$as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 -$as_echo_n "checking for dcgettext in -lintl... " >&6; } -if ${ac_cv_lib_intl_dcgettext+:} false; then : - $as_echo_n "(cached) " >&6 + else + pkg_failed=untried +fi +if test -n "$NSS_LIBS"; then + pkg_cv_NSS_LIBS="$NSS_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"nss\""; } >&5 + ($PKG_CONFIG --exists --print-errors "nss") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NSS_LIBS=`$PKG_CONFIG --libs "nss" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl -liconv $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + pkg_failed=yes +fi + else + pkg_failed=untried +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dcgettext (); -int -main () -{ -return dcgettext (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_intl_dcgettext=yes + + +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 - ac_cv_lib_intl_dcgettext=no + _pkg_short_errors_supported=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + if test $_pkg_short_errors_supported = yes; then + NSS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nss" 2>&1` + else + NSS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nss" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NSS_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (nss) were not met: + +$NSS_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables NSS_CFLAGS +and NSS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables NSS_CFLAGS +and NSS_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + NSS_CFLAGS=$pkg_cv_NSS_CFLAGS + NSS_LIBS=$pkg_cv_NSS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi + + +$as_echo "#define ENABLE_NSS 1" >>confdefs.h + +fi + + if test "$enable_nss" = "yes"; then + ENABLE_NSS_TRUE= + ENABLE_NSS_FALSE='#' +else + ENABLE_NSS_TRUE='#' + ENABLE_NSS_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 -$as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = xyes; then : - gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv + + +# ******************************* +# Internationalization +# ******************************* + +ISO_CODES_REQUIRED=0.35 + +if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iso-codes >= \$ISO_CODES_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "iso-codes >= $ISO_CODES_REQUIRED") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_iso_codes=yes else - : + have_iso_codes=no fi -else - : +if test "$have_iso_codes" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iso-codes has iso-639 and iso-3166 domains" >&5 +$as_echo_n "checking whether iso-codes has iso-639 and iso-3166 domains... " >&6; } + if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \ + $PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then + result=yes + else + result=no + have_iso_codes=no + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } fi - fi +if test "$have_iso_codes" = "yes"; then - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 +cat >>confdefs.h <<_ACEOF +#define ISO_CODES_PREFIX "`$PKG_CONFIG --variable=prefix iso-codes`" _ACEOF + +$as_echo "#define HAVE_ISO_CODES 1" >>confdefs.h + +else + as_fn_error $? "iso-codes is required" "$LINENO" 5 fi -done - LIBS="$glib_save_LIBS" - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 +$as_echo_n "checking whether NLS is requested... " >&6; } + # Check whether --enable-nls was given. +if test "${enable_nls+set}" = set; then : + enableval=$enable_nls; USE_NLS=$enableval +else + USE_NLS=yes +fi - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 +$as_echo "$USE_NLS" >&6; } - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - if test "$gt_cv_have_gettext" = "yes"; then -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 +case "$am__api_version" in + 1.01234) + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + ;; + *) + ;; +esac + +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.50.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "0.50.0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.50.0" >&5 +$as_echo_n "checking for intltool >= 0.50.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 +$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + as_fn_error $? "Your intltool is too old. You need intltool 0.50.0 or later." "$LINENO" 5 +fi + +# Extract the first word of "intltool-update", so it can be a program name with args. +set dummy intltool-update; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : $as_echo_n "(cached) " >&6 else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + case $INTLTOOL_UPDATE in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi + 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_UPDATE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" +IFS=$as_save_IFS + ;; esac fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } +INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE +if test -n "$INTLTOOL_UPDATE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 +$as_echo "$INTLTOOL_UPDATE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - for ac_func in dcgettext -do : - ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" -if test "x$ac_cv_func_dcgettext" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DCGETTEXT 1 -_ACEOF - -fi -done - MSGFMT_OPTS= - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 -$as_echo_n "checking if msgfmt accepts -c... " >&6; } - cat >conftest.foo <<_ACEOF - -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" - -_ACEOF -if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 - ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -echo "$as_me: failed input was:" >&5 -sed 's/^/| /' conftest.foo >&5 -fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 +# Extract the first word of "intltool-merge", so it can be a program name with args. +set dummy intltool-merge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : $as_echo_n "(cached) " >&6 else - case $GMSGFMT in + case $INTLTOOL_MERGE in [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -15724,7 +15868,7 @@ 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15732,133 +15876,156 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } +INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE +if test -n "$INTLTOOL_MERGE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 +$as_echo "$INTLTOOL_MERGE" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 +# Extract the first word of "intltool-extract", so it can be a program name with args. +set dummy intltool-extract; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : $as_echo_n "(cached) " >&6 else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + case $INTLTOOL_EXTRACT in + [\\/]* | ?:[\\/]*) + ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word" - break - fi - fi + 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_EXTRACT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" +IFS=$as_save_IFS + ;; esac fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } +INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT +if test -n "$INTLTOOL_EXTRACT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 +$as_echo "$INTLTOOL_EXTRACT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - CATOBJEXT=.gmo - 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 : - CATOBJEXT=.gmo - DATADIRNAME=share -else - CATOBJEXT=.mo - DATADIRNAME=lib -fi +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 +fi + +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi -fi - if test "$gt_cv_have_gettext" = "yes" ; then -$as_echo "#define ENABLE_NLS 1" >>confdefs.h - fi - if test "$XGETTEXT" != ":"; then - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 -$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } - XGETTEXT=":" - fi - fi - # We need to process the po/ directory. - POSUB=po - ac_config_commands="$ac_config_commands default-1" - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done @@ -15872,71 +16039,12 @@ - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -$as_echo_n "checking for catalogs to be installed... " >&6; } - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -$as_echo "$LINGUAS" >&6; } - fi - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES -# ******************************* -# User help -# ******************************* @@ -15944,51 +16052,47 @@ -YELP_LC_MEDIA_LINKS=true -YELP_LC_DIST=true -for yelpopt in ; do - case $yelpopt in - lc-media-links) YELP_LC_MEDIA_LINKS=true ;; - no-lc-media-links) YELP_LC_MEDIA_LINKS= ;; - lc-dist) YELP_LC_DIST=true ;; - no-lc-dist) YELP_LC_DIST= ;; - *) as_fn_error $? "Unrecognized YELP_HELP_INIT option $yelpopt\"" "$LINENO" 5 ;; - esac -done; -# Check whether --with-help-dir was given. -if test "${with_help_dir+set}" = set; then : - withval=$with_help_dir; -else - with_help_dir='${datadir}/help' -fi -HELP_DIR="$with_help_dir" -# Extract the first word of "itstool", so it can be a program name with args. -set dummy itstool; ac_word=$2 + + + + + + + + + + + +# Check the gettext tools to make sure they are GNU +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ITSTOOL+:} false; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$ITSTOOL"; then - ac_cv_prog_ITSTOOL="$ITSTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $XGETTEXT in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ITSTOOL="itstool" + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -15996,41 +16100,79 @@ done IFS=$as_save_IFS + ;; +esac fi -fi -ITSTOOL=$ac_cv_prog_ITSTOOL -if test -n "$ITSTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ITSTOOL" >&5 -$as_echo "$ITSTOOL" >&6; } +XGETTEXT=$ac_cv_path_XGETTEXT +if test -n "$XGETTEXT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 +$as_echo "$XGETTEXT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test x"$ITSTOOL" = x; then - as_fn_error $? "itstool not found" "$LINENO" 5 +# Extract the first word of "msgmerge", so it can be a program name with args. +set dummy msgmerge; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MSGMERGE+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MSGMERGE in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +MSGMERGE=$ac_cv_path_MSGMERGE +if test -n "$MSGMERGE"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 +$as_echo "$MSGMERGE" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi -# Extract the first word of "xmllint", so it can be a program name with args. -set dummy xmllint; ac_word=$2 +# Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_XMLLINT+:} false; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$XMLLINT"; then - ac_cv_prog_XMLLINT="$XMLLINT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $MSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_XMLLINT="xmllint" + ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -16038,193 +16180,179 @@ done IFS=$as_save_IFS + ;; +esac fi -fi -XMLLINT=$ac_cv_prog_XMLLINT -if test -n "$XMLLINT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5 -$as_echo "$XMLLINT" >&6; } +MSGFMT=$ac_cv_path_MSGFMT +if test -n "$MSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -if test x"$XMLLINT" = x; then - as_fn_error $? "xmllint not found" "$LINENO" 5 -fi - -YELP_HELP_RULES=' -HELP_ID ?= -HELP_POT ?= -HELP_FILES ?= -HELP_EXTRA ?= -HELP_MEDIA ?= -HELP_LINGUAS ?= +# Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS -_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) -_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) -_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) -_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) -_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) -_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) -_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) -_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) -_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) -_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) -_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir $@); -all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 +fi -.PHONY: pot -pot: $(_HELP_POTFILE) -$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ - $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") +# Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_INTLTOOL_PERL+:} 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 +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" + $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 -.PHONY: repo -repo: $(_HELP_POTFILE) - $(AM_V_at)for po in $(_HELP_POFILES); do \ - if test "x$(_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ - msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ - done + ;; +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -$(_HELP_POFILES): - $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi - $(AM_V_at)if test ! -f "$@" -a -f "$(srcdir)/$@"; then cp "$(srcdir)/$@" "$@"; fi - $(AM_V_GEN)if ! test -f "$@"; then \ - (cd "$(dir $@)" && \ - $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ - mv "$(notdir $@).tmp" "$(notdir $@)"); \ - else \ - (cd "$(dir $@)" && \ - $(ITSTOOL) -o "$(notdir $@).tmp" $(_HELP_C_FILES) && \ - msgmerge -o "$(notdir $@)" "$(notdir $@)" "$(notdir $@).tmp" && \ - rm "$(notdir $@).tmp"); \ - fi -$(_HELP_MOFILES): %.mo: %.po - $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi - $(AM_V_GEN)msgfmt -o "$@" "$<" +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 +fi -$(_HELP_LC_FILES): $(_HELP_LINGUAS) -$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) -$(_HELP_LC_STAMPS): %.stamp: %.mo -$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) - $(AM_V_at)if ! test -d "$(dir $@)"; then mkdir "$(dir $@)"; fi - $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ - mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ - if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ - (cd "$(dir $@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ - touch "$@" +# Substitute ALL_LINGUAS so we can use it in po/Makefile -.PHONY: clean-help -mostlyclean-am: $(if $(HELP_ID),clean-help) -clean-help: - rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) -EXTRA_DIST ?= -EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) -EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) -EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) +# 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. */ -distdir: distdir-help-files -distdir-help-files: $(_HELP_LC_FILES) - @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ - $(MKDIR_P) "$(distdir)/$$lc"; \ - for file in $(HELP_FILES); do \ - if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ - cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ - done; \ - done; \ +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 -.PHONY: check-help -check: check-help -check-help: - for lc in C $(_HELP_LINGUAS); do \ - if test -d "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - for page in $(HELP_FILES); do \ - echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ - $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ - done; \ - done + ;; + *) + DATADIRNAME=lib + ;; + esac +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi -.PHONY: install-help -install-data-am: $(if $(HELP_ID),install-help) -install-help: $(_HELP_LC_FILES) - @for lc in C $(_HELP_LINGUAS); do \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ - done - @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - mdir=`dirname "$$f"`; \ - if test "x$mdir" = "x."; then mdir=""; fi; \ - if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ - if test -f "$$d$$lc/$$f"; then \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ - elif test "x$$lc" != "xC"; then \ - if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \ - echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ - fi; \ - fi; \ - done; \ - done -.PHONY: uninstall-help -uninstall-am: $(if $(HELP_ID),uninstall-help) -uninstall-help: - for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir$$f"; \ - rm -f "$$helpdir$$f"; \ - done; \ - done; -' +GETTEXT_PACKAGE=epiphany # **************** @@ -16304,7 +16432,7 @@ $as_echo "#define EPIPHANY_COMPILATION 1" >>confdefs.h -ac_config_files="$ac_config_files Makefile data/Makefile data/epiphany.desktop.in data/pages/Makefile doc/Makefile help/Makefile lib/Makefile lib/egg/Makefile lib/history/Makefile lib/widgets/Makefile embed/Makefile embed/web-extension/Makefile src/Makefile src/bookmarks/Makefile po/Makefile.in tests/Makefile tests/data/Makefile" +ac_config_files="$ac_config_files Makefile data/Makefile data/pages/Makefile doc/Makefile help/Makefile lib/Makefile lib/egg/Makefile lib/history/Makefile lib/widgets/Makefile embed/Makefile embed/web-extension/Makefile src/Makefile src/bookmarks/Makefile po/Makefile.in tests/Makefile tests/data/Makefile" cat >confcache <<\_ACEOF @@ -16416,6 +16544,10 @@ LTLIBOBJS=$ac_ltlibobjs +if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then + as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 $as_echo_n "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then @@ -16424,18 +16556,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 $as_echo "done" >&6; } - if test -n "$EXEEXT"; then - am__EXEEXT_TRUE= - am__EXEEXT_FALSE='#' -else - am__EXEEXT_TRUE='#' - am__EXEEXT_FALSE= -fi - -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -16444,16 +16564,16 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= fi - ac_config_commands="$ac_config_commands po/stamp-it" - - -if test -z "${CODE_COVERAGE_ENABLED_TRUE}" && test -z "${CODE_COVERAGE_ENABLED_FALSE}"; then - as_fn_error $? "conditional \"CODE_COVERAGE_ENABLED\" was never defined. +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then @@ -16465,6 +16585,10 @@ Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi + ac_config_commands="$ac_config_commands po/stamp-it" + + + : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files @@ -16861,7 +16985,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Web Browser $as_me 3.16.3, which was +This file was extended by GNOME Web Browser $as_me 3.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16927,7 +17051,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Web Browser config.status 3.16.3 +GNOME Web Browser config.status 3.18.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17325,7 +17449,6 @@ - _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 @@ -17337,10 +17460,8 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;; - "data/epiphany.desktop.in") CONFIG_FILES="$CONFIG_FILES data/epiphany.desktop.in" ;; "data/pages/Makefile") CONFIG_FILES="$CONFIG_FILES data/pages/Makefile" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;; @@ -18674,9 +18795,6 @@ chmod +x "$ofile" ;; - "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 @@ -18748,6 +18866,5 @@ Extra debugging support : $enable_debug Build tests : $enable_tests Code coverage : $enable_code_coverage - NSS support : $enable_nss " diff -Nru epiphany-browser-3.16.3/configure.ac epiphany-browser-3.18.0/configure.ac --- epiphany-browser-3.16.3/configure.ac 2015-07-09 13:28:56.000000000 +0000 +++ epiphany-browser-3.18.0/configure.ac 2015-09-22 07:48:42.000000000 +0000 @@ -16,60 +16,68 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA m4_define([epiphany_version_major],[3]) -m4_define([epiphany_version_minor],[16]) -m4_define([epiphany_version_micro],[3]) +m4_define([epiphany_version_minor],[18]) +m4_define([epiphany_version_micro],[0]) m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro]) AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) +AX_IS_RELEASE([git-directory]) AC_PREREQ([2.59]) +AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) AC_SUBST([EPIPHANY_MAJOR],[epiphany_version_major.epiphany_version_minor]) -# for EPHY_CHECK_VERSION -AC_SUBST([EPIPHANY_MAJOR_VERSION], [epiphany_version_major]) -AC_SUBST([EPIPHANY_MINOR_VERSION], [epiphany_version_minor]) -AC_SUBST([EPIPHANY_MICRO_VERSION], [epiphany_version_micro]) +AX_CHECK_ENABLE_DEBUG([yes]) +AX_CODE_COVERAGE +AX_COMPILER_FLAGS([WARN_CFLAGS], [WARN_LDFLAGS], [$ax_is_release], [-Wdeclaration-after-statement], + dnl TODO: Remove all of these! These warnings should be fixed, not + dnl silenced. At least, for the most part. -Wswitch-enum really does + dnl seem pretty dumb. + [-Wno-incompatible-pointer-types -Wno-empty-body -Wno-unused-function -Wno-unused-variable -Wno-old-style-definition -Wno-shadow -Wno-format-nonliteral -Wno-deprecated-declarations -Wno-switch-enum -Wno-switch-default -Wno-redundant-decls -Wno-discarded-qualifiers -Wno-sign-compare]) -AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar]) +AC_PROG_CC -# Use AM_SILENT_RULES if present -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) +AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) +dnl Note: I want to enable subdir-objects here, to silence Automake's many +dnl warnings about not using it. But we can't do this until we require Automake +dnl 1.16 (which has not been released as of June 2015), due to GNU bug #13928. +dnl If Automake 2.0 comes out next instead of 1.16, we will need to bump our +dnl requirement straight to that, and then there is no need to use +dnl subdir-objects here as it will be implied. It is unfortunate that there is +dnl no way our build can be compatible with both future and older Automake, but +dnl it is a bug after all, and updating for bugfixes is just how software works. +dnl Note also: the issue is that a directory _literally_ named $(top_srcdir) +dnl will be created under embed/web-extension, and the build will fail due to +dnl misplaced .Plo files (used for dependency tracking). +AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip tar-ustar]) +AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE([enable]) # Initialize libtool -LT_PREREQ(2.2) +LT_PREREQ([2.2]) LT_INIT([dlopen disable-static]) -AC_PROG_CC - -AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) -AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) - -IT_PROG_INTLTOOL([0.50.0]) +AX_REQUIRE_DEFINED([APPSTREAM_XML]) +APPSTREAM_XML +AX_REQUIRE_DEFINED([GLIB_GSETTINGS]) GLIB_GSETTINGS -PKG_PROG_PKG_CONFIG - -GNOME_DEBUG_CHECK -GNOME_COMPILE_WARNINGS([maximum]) -GNOME_MAINTAINER_MODE_DEFINES - -GNOME_CODE_COVERAGE - -WARN_CFLAGS="$WARN_CFLAGS -Wdeclaration-after-statement -Wno-deprecated-declarations -Wno-missing-prototypes" +AX_REQUIRE_DEFINED([YELP_HELP_INIT]) +YELP_HELP_INIT GLIB_REQUIRED=2.38.0 GTK_REQUIRED=3.13.0 LIBXML_REQUIRED=2.6.12 LIBXSLT_REQUIRED=1.1.7 -WEBKIT_GTK_REQUIRED=2.7.4 +WEBKIT_GTK_REQUIRED=2.9.5 LIBSOUP_REQUIRED=2.48.0 GNOME_DESKTOP_REQUIRED=2.91.2 LIBSECRET_REQUIRED=0.14 @@ -110,12 +118,12 @@ avahi-client >= $AVAHI_REQUIRED ]) -PKG_CHECK_MODULES(WEB_EXTENSION, [ +PKG_CHECK_MODULES([WEB_EXTENSION], [ webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED libsecret-1 >= $LIBSECRET_REQUIRED ]) -AC_SUBST(WEB_EXTENSION_CFLAGS) -AC_SUBST(WEB_EXTENSION_LIBS) +AC_SUBST([WEB_EXTENSION_CFLAGS]) +AC_SUBST([WEB_EXTENSION_LIBS]) # ****************** # Portability checks @@ -183,16 +191,8 @@ AC_MSG_ERROR([iso-codes is required]) fi -GETTEXT_PACKAGE=epiphany -AC_SUBST([GETTEXT_PACKAGE]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) -AM_GLIB_GNU_GETTEXT - -# ******************************* -# User help -# ******************************* - -YELP_HELP_INIT +IT_PROG_INTLTOOL([0.50.0]) +AC_SUBST([GETTEXT_PACKAGE], [epiphany]) # **************** # Distributor name @@ -224,7 +224,6 @@ AC_CONFIG_FILES([ Makefile data/Makefile -data/epiphany.desktop.in data/pages/Makefile doc/Makefile help/Makefile @@ -256,6 +255,5 @@ Extra debugging support : $enable_debug Build tests : $enable_tests Code coverage : $enable_code_coverage - NSS support : $enable_nss " diff -Nru epiphany-browser-3.16.3/COPYING.README epiphany-browser-3.18.0/COPYING.README --- epiphany-browser-3.16.3/COPYING.README 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/COPYING.README 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -The present copyright holders of this program have given permission, as a -special exception, to link this program with the Mozilla XPCOM library, -libxpcom and to include header files for xpcom components when those header -files are covered by the MPL or NPL licenses, as long as the GNU GPL is -followed for this program in all other ways. If at a future time xpcom -and/or used header files are dual-licensed, where one of the licenses is -the GNU GPL, this exception clause ceases to apply for the dual-licensed -code, and such code must be used under the GNU GPL. \ No newline at end of file diff -Nru epiphany-browser-3.16.3/data/epiphany.appdata.xml.in epiphany-browser-3.18.0/data/epiphany.appdata.xml.in --- epiphany-browser-3.16.3/data/epiphany.appdata.xml.in 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/data/epiphany.appdata.xml.in 2015-08-07 08:41:06.000000000 +0000 @@ -2,13 +2,17 @@ epiphany.desktop CC0 - <_name>Epiphany + <_name>GNOME Web <_summary>Web browser for GNOME <_p> - The web browser for GNOME, featuring tight - integration with the desktop and a simple and intuitive user - interface that allows you to focus on your web pages. + The web browser for GNOME, featuring tight integration with the desktop + and a simple and intuitive user interface that allows you to focus on your + web pages. If you’re looking for a simple, clean, beautiful view of the + web, this is the browser for you. + + <_p> + GNOME Web is often referred to by its code name, Epiphany. diff -Nru epiphany-browser-3.16.3/data/epiphany.convert epiphany-browser-3.18.0/data/epiphany.convert --- epiphany-browser-3.16.3/data/epiphany.convert 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/data/epiphany.convert 2015-08-07 08:41:06.000000000 +0000 @@ -11,7 +11,6 @@ [org.gnome.Epiphany.ui] always-show-tabs-bar = /apps/epiphany/general/always_show_tabs_bar -toolbar-style = /apps/epiphany/general/toolbar_style downloads-hidden = /apps/epiphany/dialogs/downloads_hidden [org.gnome.Epiphany.web] diff -Nru epiphany-browser-3.16.3/data/epiphany.desktop.in epiphany-browser-3.18.0/data/epiphany.desktop.in --- epiphany-browser-3.16.3/data/epiphany.desktop.in 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/data/epiphany.desktop.in 2015-08-07 08:41:06.000000000 +0000 @@ -0,0 +1,18 @@ +[Desktop Entry] +_Name=Web +_GenericName=Web Browser +_X-GNOME-FullName=Epiphany Web Browser +_Comment=Browse the web +_Keywords=web;browser;internet; +Exec=epiphany %U +StartupNotify=true +Terminal=false +Type=Application +Icon=web-browser +Categories=Network;GNOME;GTK;WebBrowser; +MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;multipart/related;application/x-mimearchive;message/rfc822; +Actions=Incognito; + +[Desktop Action Incognito] +_Name=New Incognito Window +Exec=epiphany --incognito-mode diff -Nru epiphany-browser-3.16.3/data/epiphany.desktop.in.in epiphany-browser-3.18.0/data/epiphany.desktop.in.in --- epiphany-browser-3.16.3/data/epiphany.desktop.in.in 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/data/epiphany.desktop.in.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -[Desktop Entry] -_Name=Web -_GenericName=Web Browser -_X-GNOME-FullName=Epiphany Web Browser -_Comment=Browse the web -_Keywords=web;browser;internet; -Exec=epiphany %U -StartupNotify=true -Terminal=false -Type=Application -Icon=web-browser -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=epiphany -X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=@VERSION@ -X-GNOME-UsesNotifications=true -Categories=Network;GNOME;GTK;WebBrowser; -MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;multipart/related;application/x-mimearchive;message/rfc822; -Actions=Incognito; - -[Desktop Action Incognito] -_Name=New Incognito Window -Exec=epiphany --incognito-mode diff -Nru epiphany-browser-3.16.3/data/Makefile.am epiphany-browser-3.18.0/data/Makefile.am --- epiphany-browser-3.16.3/data/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/data/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -4,9 +4,9 @@ @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_XML_RULE@ -desktop_in_files = epiphany.desktop.in.in +desktop_in_files = epiphany.desktop.in desktopdir = $(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) convertdir = $(datarootdir)/GConf/gsettings convert_DATA = epiphany.convert @@ -17,8 +17,9 @@ gsettings_SCHEMAS = org.gnome.epiphany.gschema.xml @GSETTINGS_RULES@ -appdatadir = $(datadir)/appdata -appdata_DATA = epiphany.appdata.xml +appstream_in_files = epiphany.appdata.xml.in +appstream_XML = $(appstream_in_files:.xml.in=.xml) +@APPSTREAM_XML_RULES@ aboutdialogdir = $(pkgdatadir) aboutdialog_DATA = about.ini @@ -54,23 +55,25 @@ searchproviderdir = $(datadir)/gnome-shell/search-providers dist_searchprovider_DATA = epiphany-search-provider.ini +DISTCHECK_CONFIGURE_FLAGS == --enable-appdata-check + EXTRA_DIST = \ $(aboutdialog_DATA) \ - $(appdata_DATA).in \ + $(appstream_in_files) \ $(service_in_files) \ $(desktop_in_files) \ $(about_DATA) \ $(mimepermission_DATA) \ $(xsl_DATA) \ - $(service_DATA) \ + $(service_in_files) \ $(default_bookmarks_in_files) \ $(gsettings_SCHEMAS) \ $(convert_DATA) \ epiphany-service.xml \ check-mime.py -DISTCLEANFILES = \ - $(appdata_DATA) \ +CLEANFILES = \ + $(appstream_XML) \ $(service_DATA) \ $(desktop_DATA) \ $(default_bookmarks_DATA) diff -Nru epiphany-browser-3.16.3/data/Makefile.in epiphany-browser-3.18.0/data/Makefile.in --- epiphany-browser-3.16.3/data/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/data/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = data -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/epiphany.desktop.in.in $(dist_searchprovider_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -92,9 +110,11 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(dist_searchprovider_DATA) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = epiphany.desktop.in +CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -151,15 +171,13 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs = "$(DESTDIR)$(aboutdialogdir)" \ - "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(convertdir)" \ - "$(DESTDIR)$(default_bookmarksdir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(searchproviderdir)" \ + "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(default_bookmarksdir)" \ + "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(searchproviderdir)" \ "$(DESTDIR)$(mimepermissiondir)" "$(DESTDIR)$(servicedir)" \ "$(DESTDIR)$(xsldir)" -DATA = $(aboutdialog_DATA) $(appdata_DATA) $(convert_DATA) \ - $(default_bookmarks_DATA) $(desktop_DATA) \ - $(dist_searchprovider_DATA) $(mimepermission_DATA) \ - $(service_DATA) $(xsl_DATA) +DATA = $(aboutdialog_DATA) $(convert_DATA) $(default_bookmarks_DATA) \ + $(desktop_DATA) $(dist_searchprovider_DATA) \ + $(mimepermission_DATA) $(service_DATA) $(xsl_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -188,6 +206,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -218,13 +237,12 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -239,7 +257,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -248,17 +265,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -268,8 +282,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -293,9 +305,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -316,11 +326,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -329,6 +335,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -347,6 +355,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -382,6 +391,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -391,16 +401,16 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = pages -desktop_in_files = epiphany.desktop.in.in +desktop_in_files = epiphany.desktop.in desktopdir = $(datadir)/applications -desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) convertdir = $(datarootdir)/GConf/gsettings convert_DATA = epiphany.convert gsettings_ENUM_NAMESPACE = org.gnome.Epiphany gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h gsettings_SCHEMAS = org.gnome.epiphany.gschema.xml -appdatadir = $(datadir)/appdata -appdata_DATA = epiphany.appdata.xml +appstream_in_files = epiphany.appdata.xml.in +appstream_XML = $(appstream_in_files:.xml.in=.xml) aboutdialogdir = $(pkgdatadir) aboutdialog_DATA = about.ini mimepermissiondir = $(pkgdatadir) @@ -424,23 +434,24 @@ default_bookmarks_DATA = $(default_bookmarks_in_files:.rdf.in=.rdf) searchproviderdir = $(datadir)/gnome-shell/search-providers dist_searchprovider_DATA = epiphany-search-provider.ini +DISTCHECK_CONFIGURE_FLAGS = = --enable-appdata-check EXTRA_DIST = \ $(aboutdialog_DATA) \ - $(appdata_DATA).in \ + $(appstream_in_files) \ $(service_in_files) \ $(desktop_in_files) \ $(about_DATA) \ $(mimepermission_DATA) \ $(xsl_DATA) \ - $(service_DATA) \ + $(service_in_files) \ $(default_bookmarks_in_files) \ $(gsettings_SCHEMAS) \ $(convert_DATA) \ epiphany-service.xml \ check-mime.py -DISTCLEANFILES = \ - $(appdata_DATA) \ +CLEANFILES = \ + $(appstream_XML) \ $(service_DATA) \ $(desktop_DATA) \ $(default_bookmarks_DATA) @@ -460,7 +471,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -478,8 +488,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -epiphany.desktop.in: $(top_builddir)/config.status $(srcdir)/epiphany.desktop.in.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ mostlyclean-libtool: -rm -f *.lo @@ -507,27 +515,6 @@ @list='$(aboutdialog_DATA)'; test -n "$(aboutdialogdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(aboutdialogdir)'; $(am__uninstall_files_from_dir) -install-appdataDATA: $(appdata_DATA) - @$(NORMAL_INSTALL) - @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || 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)$(appdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \ - done - -uninstall-appdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir) install-convertDATA: $(convert_DATA) @$(NORMAL_INSTALL) @list='$(convert_DATA)'; test -n "$(convertdir)" || list=; \ @@ -835,7 +822,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(aboutdialogdir)" "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(default_bookmarksdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(searchproviderdir)" "$(DESTDIR)$(mimepermissiondir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(xsldir)"; do \ + for dir in "$(DESTDIR)$(aboutdialogdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(default_bookmarksdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(searchproviderdir)" "$(DESTDIR)$(mimepermissiondir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(xsldir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -860,11 +847,11 @@ mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -889,10 +876,10 @@ info-am: -install-data-am: install-aboutdialogDATA install-appdataDATA \ - install-convertDATA install-default_bookmarksDATA \ - install-desktopDATA install-dist_searchproviderDATA \ - install-mimepermissionDATA install-serviceDATA install-xslDATA +install-data-am: install-aboutdialogDATA install-convertDATA \ + install-default_bookmarksDATA install-desktopDATA \ + install-dist_searchproviderDATA install-mimepermissionDATA \ + install-serviceDATA install-xslDATA install-dvi: install-dvi-recursive @@ -936,11 +923,10 @@ ps-am: -uninstall-am: uninstall-aboutdialogDATA uninstall-appdataDATA \ - uninstall-convertDATA uninstall-default_bookmarksDATA \ - uninstall-desktopDATA uninstall-dist_searchproviderDATA \ - uninstall-mimepermissionDATA uninstall-serviceDATA \ - uninstall-xslDATA +uninstall-am: uninstall-aboutdialogDATA uninstall-convertDATA \ + uninstall-default_bookmarksDATA uninstall-desktopDATA \ + uninstall-dist_searchproviderDATA uninstall-mimepermissionDATA \ + uninstall-serviceDATA uninstall-xslDATA .MAKE: $(am__recursive_targets) install-am install-strip @@ -948,28 +934,30 @@ check-am clean clean-generic clean-libtool cscopelist-am ctags \ ctags-am distclean distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-aboutdialogDATA install-am install-appdataDATA \ - install-convertDATA install-data install-data-am \ - install-default_bookmarksDATA install-desktopDATA \ - install-dist_searchproviderDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man \ - install-mimepermissionDATA install-pdf install-pdf-am \ - install-ps install-ps-am install-serviceDATA install-strip \ - install-xslDATA installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-am uninstall uninstall-aboutdialogDATA \ - uninstall-am uninstall-appdataDATA uninstall-convertDATA \ + install install-aboutdialogDATA install-am install-convertDATA \ + install-data install-data-am install-default_bookmarksDATA \ + install-desktopDATA install-dist_searchproviderDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-mimepermissionDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-serviceDATA \ + install-strip install-xslDATA installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-aboutdialogDATA uninstall-am uninstall-convertDATA \ uninstall-default_bookmarksDATA uninstall-desktopDATA \ uninstall-dist_searchproviderDATA uninstall-mimepermissionDATA \ uninstall-serviceDATA uninstall-xslDATA +.PRECIOUS: Makefile + @INTLTOOL_SERVER_RULE@ @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_XML_RULE@ @GSETTINGS_RULES@ +@APPSTREAM_XML_RULES@ # Rule to make the service file with bindir expanded $(service_DATA): $(service_in_files) Makefile diff -Nru epiphany-browser-3.16.3/data/org.gnome.epiphany.gschema.xml epiphany-browser-3.18.0/data/org.gnome.epiphany.gschema.xml --- epiphany-browser-3.16.3/data/org.gnome.epiphany.gschema.xml 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/data/org.gnome.epiphany.gschema.xml 2015-09-08 11:37:53.000000000 +0000 @@ -71,13 +71,14 @@ Process model This option allows to set the process model used. Use 'shared-secondary-process' to use a single web process shared by all the tabs and 'one-secondary-process-per-web-view' to use a different web process for each tab. + + 0 + Maximum number of web processes created at the same time when using 'one-secondary-process-per-web-view' model + This option sets a limit to the number of web processes that will be used at the same time for the 'one-secondary-process-per-web-view' model. The default value is '0' and means no limit. + + - - 'both-horiz' - Toolbar style - Toolbar style. Allowed values are "" (use GNOME default style), "both" (text and icons), "both-horiz" (text besides icons), "icons", and "text". - false [Deprecated] @@ -183,12 +184,12 @@ Whether to enable support for WebAudio. - false + true Do Not Track Whether to tell websites that we do not wish to be tracked. Please note that web pages are not forced to follow this setting. - false + true Enable Adblock Whether to block the embedded advertisements that web pages might want to show. diff -Nru epiphany-browser-3.16.3/data/org.gnome.Epiphany.service epiphany-browser-3.18.0/data/org.gnome.Epiphany.service --- epiphany-browser-3.16.3/data/org.gnome.Epiphany.service 2015-07-09 13:29:44.000000000 +0000 +++ epiphany-browser-3.18.0/data/org.gnome.Epiphany.service 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.gnome.EpiphanySearchProvider -Exec=/home/claudio/gnome3/libexec/epiphany-search-provider diff -Nru epiphany-browser-3.16.3/data/pages/Makefile.in epiphany-browser-3.18.0/data/pages/Makefile.in --- epiphany-browser-3.16.3/data/pages/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/data/pages/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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,10 +89,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = data/pages -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -91,6 +110,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 = @@ -144,18 +164,18 @@ am__installdirs = "$(DESTDIR)$(stylepagesdir)" DATA = $(stylepages_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -170,7 +190,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -179,17 +198,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -199,8 +215,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -224,9 +238,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -247,11 +259,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -260,6 +268,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -278,6 +288,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -313,6 +324,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -341,7 +353,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/pages/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/pages/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -541,6 +552,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-stylepagesDATA +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/debian/changelog epiphany-browser-3.18.0/debian/changelog --- epiphany-browser-3.16.3/debian/changelog 2015-07-12 22:53:04.000000000 +0000 +++ epiphany-browser-3.18.0/debian/changelog 2015-11-02 15:37:17.000000000 +0000 @@ -1,3 +1,37 @@ +epiphany-browser (3.18.0-1ubuntu2) xenial; urgency=medium + + * No-change rebuild against new gnome libraries + + -- Iain Lane Mon, 02 Nov 2015 15:37:17 +0000 + +epiphany-browser (3.18.0-1ubuntu1) xenial; urgency=medium + + * Merge with Debian, remaining Ubuntu changes: (LP: #1510686) + * debian/patches/07_bookmarks.patch: + - Add Ubuntu-specific default bookmarks, borrowed from Firefox + * debian/patches/81_ubuntu_force_update_bookmarks_menu.patch: + - Update the bookmarks menu every time the internal structure + is changed (needed for the indicator application menu to work + correctly). + * debian/patches/ubuntu_titlebars.patch: + - Use traditional titlebars for non-GNOME sessions + + -- Robert Ancell Thu, 29 Oct 2015 09:37:23 +1300 + +epiphany-browser (3.18.0-1) unstable; urgency=medium + + [ Josselin Mouette ] + * Remove Debian menu entry. + + [ Michael Biebl ] + * New upstream release. + * Refresh patches. + * Update Build-Depends as per configure.ac: + - Bump libwebkit2gtk-4.0-dev to (>= 2.9.5) + - Add appstream-util + + -- Michael Biebl Fri, 09 Oct 2015 22:37:58 +0200 + epiphany-browser (3.16.3-1ubuntu1) wily; urgency=medium * Merge from Debian unstable. Remaining changes: diff -Nru epiphany-browser-3.16.3/debian/control epiphany-browser-3.18.0/debian/control --- epiphany-browser-3.16.3/debian/control 2015-07-12 22:53:05.000000000 +0000 +++ epiphany-browser-3.18.0/debian/control 2015-10-28 20:37:54.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Laurent Bigonville , Michael Biebl , Sjoerd Simons +Uploaders: Debian GNOME Maintainers , Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 9), cdbs (>= 0.4.90), dh-autoreconf, @@ -27,7 +27,7 @@ libnss3-dev, libnotify-dev (>= 0.5.1), libxml-parser-perl, - libwebkit2gtk-4.0-dev (>= 2.7.4), + libwebkit2gtk-4.0-dev (>= 2.9.5), libsecret-1-dev (>= 0.14), libwnck-3-dev, gnome-common (>= 3.6), @@ -39,11 +39,12 @@ x11proto-core-dev, gtk-doc-tools (>= 1.0), gsettings-desktop-schemas-dev (>= 0.0.1), - yelp-tools + yelp-tools, + appstream-util Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc Standards-Version: 3.9.6 Homepage: https://wiki.gnome.org/Apps/Web -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/epiphany-browser/ +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/epiphany-browser/ Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/epiphany-browser/ Package: epiphany-browser diff -Nru epiphany-browser-3.16.3/debian/control.in epiphany-browser-3.18.0/debian/control.in --- epiphany-browser-3.16.3/debian/control.in 2015-07-12 22:53:04.000000000 +0000 +++ epiphany-browser-3.18.0/debian/control.in 2015-10-28 20:37:53.000000000 +0000 @@ -23,7 +23,7 @@ libnss3-dev, libnotify-dev (>= 0.5.1), libxml-parser-perl, - libwebkit2gtk-4.0-dev (>= 2.7.4), + libwebkit2gtk-4.0-dev (>= 2.9.5), libsecret-1-dev (>= 0.14), libwnck-3-dev, gnome-common (>= 3.6), @@ -35,11 +35,12 @@ x11proto-core-dev, gtk-doc-tools (>= 1.0), gsettings-desktop-schemas-dev (>= 0.0.1), - yelp-tools + yelp-tools, + appstream-util Build-Depends-Indep: libglib2.0-doc, libgtk-3-doc Standards-Version: 3.9.6 Homepage: https://wiki.gnome.org/Apps/Web -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/epiphany-browser/ +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/epiphany-browser/ Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/epiphany-browser/ Package: epiphany-browser diff -Nru epiphany-browser-3.16.3/debian/epiphany-browser.menu epiphany-browser-3.18.0/debian/epiphany-browser.menu --- epiphany-browser-3.16.3/debian/epiphany-browser.menu 2015-07-12 22:53:04.000000000 +0000 +++ epiphany-browser-3.18.0/debian/epiphany-browser.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -?package(epiphany-browser):needs="x11" \ - section="Applications/Network/Web Browsing" \ - title="Epiphany web browser" \ - longtitle="Epiphany web browser" \ - command="/usr/bin/epiphany" \ - hints="Web browsers" diff -Nru epiphany-browser-3.16.3/debian/patches/00_epiphany-browser.patch epiphany-browser-3.18.0/debian/patches/00_epiphany-browser.patch --- epiphany-browser-3.16.3/debian/patches/00_epiphany-browser.patch 2015-07-12 22:53:04.000000000 +0000 +++ epiphany-browser-3.18.0/debian/patches/00_epiphany-browser.patch 2015-10-28 20:37:53.000000000 +0000 @@ -1,13 +1,13 @@ -Index: epiphany-3.16.3/configure.ac +Index: epiphany-3.18.0/configure.ac =================================================================== ---- epiphany-3.16.3.orig/configure.ac 2015-07-10 22:41:38.821564468 +0200 -+++ epiphany-3.16.3/configure.ac 2015-07-10 22:41:38.817564370 +0200 +--- epiphany-3.18.0.orig/configure.ac 2015-10-09 22:25:46.356289266 +0200 ++++ epiphany-3.18.0/configure.ac 2015-10-09 22:25:59.108515502 +0200 @@ -20,7 +20,7 @@ - m4_define([epiphany_version_micro],[3]) + m4_define([epiphany_version_micro],[0]) m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro]) -AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) +AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser]) + AX_IS_RELEASE([git-directory]) AC_PREREQ([2.59]) - diff -Nru epiphany-browser-3.16.3/debian/patches/ubuntu_titlebars.patch epiphany-browser-3.18.0/debian/patches/ubuntu_titlebars.patch --- epiphany-browser-3.16.3/debian/patches/ubuntu_titlebars.patch 2015-07-12 22:53:04.000000000 +0000 +++ epiphany-browser-3.18.0/debian/patches/ubuntu_titlebars.patch 2015-10-28 20:37:53.000000000 +0000 @@ -13,11 +13,11 @@ --- -Index: epiphany-3.16.3/src/ephy-window.c +Index: epiphany-3.18.0/src/ephy-window.c =================================================================== ---- epiphany-3.16.3.orig/src/ephy-window.c -+++ epiphany-3.16.3/src/ephy-window.c -@@ -3209,9 +3209,18 @@ setup_toolbar (EphyWindow *window) +--- epiphany-3.18.0.orig/src/ephy-window.c ++++ epiphany-3.18.0/src/ephy-window.c +@@ -3286,9 +3286,18 @@ setup_toolbar (EphyWindow *window) EphyWindowPrivate *priv = window->priv; EphyEmbedShellMode app_mode; EphyTitleBox *title_box; diff -Nru epiphany-browser-3.16.3/depcomp epiphany-browser-3.18.0/depcomp --- epiphany-browser-3.16.3/depcomp 2015-06-17 08:20:05.000000000 +0000 +++ epiphany-browser-3.18.0/depcomp 1970-01-01 00:00:00.000000000 +0000 @@ -1,791 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2013-05-30.07; # UTC - -# Copyright (C) 1999-2013 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by 'PROGRAMS ARGS'. - object Object file output by 'PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputting dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -# Get the directory component of the given path, and save it in the -# global variables '$dir'. Note that this directory component will -# be either empty or ending with a '/' character. This is deliberate. -set_dir_from () -{ - case $1 in - */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; - *) dir=;; - esac -} - -# Get the suffix-stripped basename of the given path, and save it the -# global variable '$base'. -set_base_from () -{ - base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` -} - -# If no dependency file was actually created by the compiler invocation, -# we still have to create a dummy depfile, to avoid errors with the -# Makefile "include basename.Plo" scheme. -make_dummy_depfile () -{ - echo "#dummy" > "$depfile" -} - -# Factor out some common post-processing of the generated depfile. -# Requires the auxiliary global variable '$tmpdepfile' to be set. -aix_post_process_depfile () -{ - # If the compiler actually managed to produce a dependency file, - # post-process it. - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependency.h'. - # Do two passes, one to just change these to - # $object: dependency.h - # and one to simply output - # dependency.h: - # which is needed to avoid the deleted-header problem. - { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" - sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" - } > "$depfile" - rm -f "$tmpdepfile" - else - make_dummy_depfile - fi -} - -# A tabulation character. -tab=' ' -# A newline character. -nl=' -' -# Character ranges might be problematic outside the C locale. -# These definitions help. -upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ -lower=abcdefghijklmnopqrstuvwxyz -digits=0123456789 -alpha=${upper}${lower} - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Avoid interferences from the environment. -gccflag= dashmflag= - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp -fi - -if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 -fi - -if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. - gccflag=-qmakedep=gcc,-MF - depmode=gcc -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. -## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. -## (see the conditional assignment to $gccflag above). -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). Also, it might not be -## supported by the other compilers which use the 'gcc' depmode. -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The second -e expression handles DOS-style file names with drive - # letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the "deleted header file" problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. -## Some versions of gcc put a space before the ':'. On the theory -## that the space means something, we add a space to the output as -## well. hp depmode also adds that space, but also prefixes the VPATH -## to the object. Take care to not repeat it in the output. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ - | tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" - ;; - -xlc) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts '$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - aix_post_process_depfile - ;; - -tcc) - # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 - # FIXME: That version still under development at the moment of writing. - # Make that this statement remains true also for stable, released - # versions. - # It will wrap lines (doesn't matter whether long or short) with a - # trailing '\', as in: - # - # foo.o : \ - # foo.c \ - # foo.h \ - # - # It will put a trailing '\' even on the last line, and will use leading - # spaces rather than leading tabs (at least since its commit 0394caf7 - # "Emit spaces for -MD"). - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. - # We have to change lines of the first kind to '$object: \'. - sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" - # And for each line of the second kind, we have to emit a 'dep.h:' - # dummy dependency, to avoid the deleted-header problem. - sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - -## The order of this option in the case statement is important, since the -## shell code in configure will try each of these formats in the order -## listed in this file. A plain '-MD' option would be understood by many -## compilers, so we must ensure this comes after the gcc and icc options. -pgcc) - # Portland's C compiler understands '-MD'. - # Will always output deps to 'file.d' where file is the root name of the - # source file under compilation, even if file resides in a subdirectory. - # The object file name does not affect the name of the '.d' file. - # pgcc 10.2 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\' : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - set_dir_from "$object" - # Use the source, not the object, to determine the base name, since - # that's sadly what pgcc will do too. - set_base_from "$source" - tmpdepfile=$base.d - - # For projects that build the same source file twice into different object - # files, the pgcc approach of using the *source* file root name can cause - # problems in parallel builds. Use a locking strategy to avoid stomping on - # the same $tmpdepfile. - lockdir=$base.d-lock - trap " - echo '$0: caught signal, cleaning up...' >&2 - rmdir '$lockdir' - exit 1 - " 1 2 13 15 - numtries=100 - i=$numtries - while test $i -gt 0; do - # mkdir is a portable test-and-set. - if mkdir "$lockdir" 2>/dev/null; then - # This process acquired the lock. - "$@" -MD - stat=$? - # Release the lock. - rmdir "$lockdir" - break - else - # If the lock is being held by a different process, wait - # until the winning process is done or we timeout. - while test -d "$lockdir" && test $i -gt 0; do - sleep 1 - i=`expr $i - 1` - done - fi - i=`expr $i - 1` - done - trap - 1 2 13 15 - if test $i -le 0; then - echo "$0: failed to acquire lock after $numtries attempts" >&2 - echo "$0: check lockdir '$lockdir'" >&2 - exit 1 - fi - - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - set_dir_from "$object" - set_base_from "$object" - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" - # Add 'dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - make_dummy_depfile - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - set_dir_from "$object" - set_base_from "$object" - - if test "$libtool" = yes; then - # Libtool generates 2 separate objects for the 2 libraries. These - # two compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir$base.o.d # libtool 1.5 - tmpdepfile2=$dir.libs/$base.o.d # Likewise. - tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -ne 0; then - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - # Same post-processing that is required for AIX mode. - aix_post_process_depfile - ;; - -msvc7) - if test "$libtool" = yes; then - showIncludes=-Wc,-showIncludes - else - showIncludes=-showIncludes - fi - "$@" $showIncludes > "$tmpdepfile" - stat=$? - grep -v '^Note: including file: ' "$tmpdepfile" - if test $stat -ne 0; then - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - # The first sed program below extracts the file names and escapes - # backslashes for cygpath. The second sed program outputs the file - # name when reading, but also accumulates all include files in the - # hold buffer in order to output them again at the end. This only - # works with sed implementations that can handle large buffers. - sed < "$tmpdepfile" -n ' -/^Note: including file: *\(.*\)/ { - s//\1/ - s/\\/\\\\/g - p -}' | $cygpath_u | sort -u | sed -n ' -s/ /\\ /g -s/\(.*\)/'"$tab"'\1 \\/p -s/.\(.*\) \\/\1:/ -H -$ { - s/.*/'"$tab"'/ - G - p -}' >> "$depfile" - echo >> "$depfile" # make sure the fragment doesn't end with a backslash - rm -f "$tmpdepfile" - ;; - -msvc7msys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for ':' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. - "$@" $dashmflag | - sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this sed invocation - # correctly. Breaking it into two sed invocations is a workaround. - tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no eat=no - for arg - do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - if test $eat = yes; then - eat=no - continue - fi - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix=`echo "$object" | sed 's/^.*\././'` - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - # makedepend may prepend the VPATH from the source file name to the object. - # No need to regex-escape $object, excess matching of '.' is harmless. - sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process the last invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed '1,2d' "$tmpdepfile" \ - | tr ' ' "$nl" \ - | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove '-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E \ - | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - | sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - IFS=" " - for arg - do - case "$arg" in - -o) - shift - ;; - $object) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" - echo "$tab" >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru epiphany-browser-3.16.3/doc/Makefile.in epiphany-browser-3.18.0/doc/Makefile.in --- epiphany-browser-3.16.3/doc/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/doc/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,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 \ ?) ;; \ @@ -78,10 +88,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -90,6 +109,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 = @@ -145,18 +165,18 @@ NROFF = nroff MANS = $(man_MANS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -171,7 +191,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -180,17 +199,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -200,8 +216,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -225,9 +239,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -248,11 +260,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -261,6 +269,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -279,6 +289,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -314,6 +325,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -345,7 +357,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -569,6 +580,8 @@ ps ps-am tags-am uninstall uninstall-am uninstall-man \ uninstall-man1 +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/embed/ephy-about-handler.c epiphany-browser-3.18.0/embed/ephy-about-handler.c --- epiphany-browser-3.16.3/embed/ephy-about-handler.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-about-handler.c 2015-08-07 08:41:17.000000000 +0000 @@ -433,14 +433,47 @@ WebKitURISchemeRequest *request) { GString *data_str; - GBytes *html_file; - GString *html = g_string_new (""); gsize data_length; char *lang; GList *l; data_str = g_string_new (NULL); + lang = g_strdup (pango_language_to_string (gtk_get_default_language ())); + g_strdelimit (lang, "_-@", '\0'); + + g_string_append_printf (data_str, + "\n" + "\n" + " %s\n" + " \n" + " \n" + " \n" + "\n" + "\n" + "
\n" + "
\n" + "
    \n", lang, lang, + ((gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) ? "rtl" : "ltr"), + _("Most Visited")); + g_free (lang); + if (success) { EphySnapshotService *snapshot_service = ephy_snapshot_service_get_default (); @@ -466,9 +499,9 @@ g_string_append_printf (data_str, "
  • " " " - "
    ✖
    " - " " - " %s" + "
    ✖
    " + " " + " %s" "     " "
    • ", g_markup_escape_text (url->title, -1), url->url, _("Remove from overview"), @@ -477,25 +510,16 @@ } } - html_file = g_resources_lookup_data (EPHY_PAGE_TEMPLATE_OVERVIEW, 0, NULL); + data_str = g_string_append (data_str, + "
\n" + "
\n" + "
\n" + "\n"); - lang = g_strdup (pango_language_to_string (gtk_get_default_language ())); - g_strdelimit (lang, "_-@", '\0'); - - g_string_printf (html, - g_bytes_get_data (html_file, NULL), - lang, lang, - ((gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) ? "rtl" : "ltr"), - _("Most Visited"), - data_str->str); - data_length = html->len; - ephy_about_handler_finish_request (request, g_string_free (html, FALSE), data_length); + data_length = data_str->len; + ephy_about_handler_finish_request (request, g_string_free (data_str, FALSE), data_length); g_object_unref (request); - - g_string_free (data_str,TRUE); - g_bytes_unref (html_file); - g_free (lang); } static gboolean diff -Nru epiphany-browser-3.16.3/embed/ephy-download.c epiphany-browser-3.18.0/embed/ephy-download.c --- epiphany-browser-3.16.3/embed/ephy-download.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-download.c 2015-08-07 08:41:17.000000000 +0000 @@ -54,6 +54,8 @@ GtkWindow *window; GtkWidget *widget; + + guint inhibitor_cookie; }; enum @@ -497,6 +499,40 @@ return download->priv->start_time; } +static void +acquire_session_inhibitor (EphyDownload *download) +{ + EphyDownloadPrivate *priv; + EphyEmbedShell *shell; + + priv = download->priv; + shell = ephy_embed_shell_get_default (); + + if (priv->inhibitor_cookie) + return; + + priv->inhibitor_cookie = gtk_application_inhibit (GTK_APPLICATION (shell), + priv->window, + GTK_APPLICATION_INHIBIT_LOGOUT | GTK_APPLICATION_INHIBIT_SUSPEND, + "Downloading"); +} + +static void +release_session_inhibitor (EphyDownload *download) +{ + EphyDownloadPrivate *priv; + EphyEmbedShell *shell; + + priv = download->priv; + shell = ephy_embed_shell_get_default (); + + if (!priv->inhibitor_cookie) + return; + + gtk_application_uninhibit (GTK_APPLICATION (shell), priv->inhibitor_cookie); + priv->inhibitor_cookie = 0; +} + /** * ephy_download_cancel: * @download: an #EphyDownload @@ -579,6 +615,8 @@ priv = download->priv; + release_session_inhibitor (download); + if (priv->download) { g_signal_handlers_disconnect_matched (priv->download, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, download); g_object_unref (priv->download); @@ -767,6 +805,14 @@ download->priv->widget = NULL; } +static void +download_created_destination_cb (WebKitDownload *wk_download, + const gchar *destination, + EphyDownload *download) +{ + acquire_session_inhibitor (download); +} + static gboolean download_decide_destination_cb (WebKitDownload *wk_download, const gchar *suggested_filename, @@ -798,6 +844,8 @@ ephy_download_do_download_action (download, EPHY_DOWNLOAD_ACTION_AUTO); else ephy_download_do_download_action (download, priv->action); + + release_session_inhibitor (download); } static void @@ -811,6 +859,8 @@ LOG ("error (%d - %d)! %s", error->code, 0, error->message); g_signal_emit_by_name (download, "error", 0, error->code, error->message, &ret); + + release_session_inhibitor (download); } /** @@ -832,6 +882,9 @@ ephy_download = g_object_new (EPHY_TYPE_DOWNLOAD, "window", parent, NULL); + g_signal_connect (download, "created-destination", + G_CALLBACK (download_created_destination_cb), + ephy_download); g_signal_connect (download, "decide-destination", G_CALLBACK (download_decide_destination_cb), ephy_download); diff -Nru epiphany-browser-3.16.3/embed/ephy-embed.c epiphany-browser-3.18.0/embed/ephy-embed.c --- epiphany-browser-3.16.3/embed/ephy-embed.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-embed.c 2015-09-08 11:37:53.000000000 +0000 @@ -70,6 +70,7 @@ char *title; WebKitURIRequest *delayed_request; + guint delayed_request_source_id; GSList *messages; GSList *keys; @@ -365,6 +366,11 @@ priv->clear_progress_source_id = 0; } + if (priv->delayed_request_source_id) { + g_source_remove (priv->delayed_request_source_id); + priv->delayed_request_source_id = 0; + } + /* Do not listen to status message notifications anymore, if we try * to update the statusbar after dispose we might crash. */ if (priv->status_handler_id) { @@ -441,7 +447,7 @@ embed->priv->web_view = g_value_get_object (value); break; case PROP_TITLE: - ephy_embed_set_title (embed, g_value_dup_string (value)); + ephy_embed_set_title (embed, g_value_get_string (value)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -648,17 +654,19 @@ (loading || progress == 1.0) ? progress : 0.0); } -static void -ephy_embed_maybe_load_delayed_request (EphyEmbed *embed) +static gboolean +load_delayed_request_if_mapped (gpointer user_data) { + EphyEmbed *embed = EPHY_EMBED (user_data); EphyEmbedPrivate *priv = embed->priv; EphyWebView *web_view; - if (!priv->delayed_request) - return; + priv->delayed_request_source_id = 0; - web_view = ephy_embed_get_web_view (embed); + if (!gtk_widget_get_mapped (GTK_WIDGET (embed))) + return G_SOURCE_REMOVE; + web_view = ephy_embed_get_web_view (embed); ephy_web_view_load_request (web_view, priv->delayed_request); g_clear_object (&priv->delayed_request); @@ -666,6 +674,24 @@ * loading as soon as possible. */ g_signal_emit_by_name (web_view, "load-changed", WEBKIT_LOAD_STARTED); + + return G_SOURCE_REMOVE; +} + +static void +ephy_embed_maybe_load_delayed_request (EphyEmbed *embed) +{ + EphyEmbedPrivate *priv = embed->priv; + + if (!priv->delayed_request || priv->delayed_request_source_id != 0) + return; + + /* Add a very small delay before loading the request, so that if the user + * is scrolling rapidly through a bunch of delayed tabs, we don't start + * loading them all. + */ + priv->delayed_request_source_id = g_timeout_add (300, load_delayed_request_if_mapped, embed); + g_source_set_name_by_id (priv->delayed_request_source_id, "[epiphany] load_delayed_request_if_mapped"); } static void diff -Nru epiphany-browser-3.16.3/embed/ephy-embed-prefs.c epiphany-browser-3.18.0/embed/ephy-embed-prefs.c --- epiphany-browser-3.16.3/embed/ephy-embed-prefs.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-embed-prefs.c 2015-08-07 08:41:06.000000000 +0000 @@ -363,10 +363,10 @@ ephy_langs_sanitise (array); - webkit_web_context_set_preferred_languages (web_context, (const char * const *)array->data); + webkit_web_context_set_preferred_languages (web_context, (const char * const *)(void *)array->data); if (g_settings_get_boolean (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_ENABLE_SPELL_CHECKING)) { - char **normalized = normalize_languages ((char **)array->data); + char **normalized = normalize_languages ((char **)(void *)array->data); webkit_web_context_set_spell_checking_languages (web_context, (const char * const *)normalized); g_strfreev (normalized); } diff -Nru epiphany-browser-3.16.3/embed/ephy-embed-shell.c epiphany-browser-3.18.0/embed/ephy-embed-shell.c --- epiphany-browser-3.16.3/embed/ephy-embed-shell.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-embed-shell.c 2015-08-07 08:41:17.000000000 +0000 @@ -550,6 +550,7 @@ ephy_embed_shell_setup_process_model (EphyEmbedShell *shell) { EphyPrefsProcessModel process_model; + guint max_processes; if (ephy_embed_shell_get_mode (shell) == EPHY_EMBED_SHELL_MODE_APPLICATION) process_model = EPHY_PREFS_PROCESS_MODEL_SHARED_SECONDARY_PROCESS; @@ -558,28 +559,40 @@ switch (process_model) { case EPHY_PREFS_PROCESS_MODEL_SHARED_SECONDARY_PROCESS: - webkit_web_context_set_process_model (shell->priv->web_context, - WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS); + max_processes = 1; break; case EPHY_PREFS_PROCESS_MODEL_ONE_SECONDARY_PROCESS_PER_WEB_VIEW: - webkit_web_context_set_process_model (shell->priv->web_context, - WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); + max_processes = g_settings_get_uint (EPHY_SETTINGS_MAIN, EPHY_PREFS_MAX_PROCESSES); break; } + + webkit_web_context_set_process_model (shell->priv->web_context, WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES); + webkit_web_context_set_web_process_count_limit (shell->priv->web_context, max_processes); } static void ephy_embed_shell_create_web_context (EphyEmbedShell *embed_shell) { - char *local_storage_path; + WebKitWebsiteDataManager *manager; + char *data_dir; + char *cache_dir; EphyEmbedShellPrivate *priv = embed_shell->priv; - /* Local Storage */ - local_storage_path = g_build_filename (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (priv->mode) ? - ephy_dot_dir () : g_get_user_data_dir (), - g_get_prgname (), "localstorage", NULL); - priv->web_context = g_object_new (WEBKIT_TYPE_WEB_CONTEXT, "local-storage-directory", local_storage_path, NULL); - g_free (local_storage_path); + data_dir = g_build_filename (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (priv->mode) ? + ephy_dot_dir () : g_get_user_data_dir (), + g_get_prgname (), NULL); + cache_dir = g_build_filename (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (priv->mode) ? + ephy_dot_dir () : g_get_user_cache_dir (), + g_get_prgname (), NULL); + + manager = webkit_website_data_manager_new ("base-data-directory", data_dir, + "base-cache-directory", cache_dir, + NULL); + g_free (data_dir); + g_free (cache_dir); + + priv->web_context = webkit_web_context_new_with_website_data_manager (manager); + g_object_unref (manager); } static void @@ -587,7 +600,6 @@ { EphyEmbedShell *shell = EPHY_EMBED_SHELL (application); EphyEmbedShellPrivate *priv = shell->priv; - char *base_cache_dir; char *favicon_db_path; WebKitCookieManager *cookie_manager; char *filename; @@ -635,19 +647,13 @@ G_CALLBACK (initialize_web_extensions), shell); - /* Disk Cache */ - base_cache_dir = g_build_filename (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (priv->mode) ? - ephy_dot_dir () : g_get_user_cache_dir (), - g_get_prgname (), NULL); - webkit_web_context_set_disk_cache_directory (priv->web_context, base_cache_dir); - /* Favicon Database */ - favicon_db_path = g_build_filename (base_cache_dir, "icondatabase", NULL); + favicon_db_path = g_build_filename (EPHY_EMBED_SHELL_MODE_HAS_PRIVATE_PROFILE (priv->mode) ? + ephy_dot_dir () : g_get_user_cache_dir (), + "icondatabase", NULL); webkit_web_context_set_favicon_database_directory (priv->web_context, favicon_db_path); g_free (favicon_db_path); - g_free (base_cache_dir); - /* Do not ignore TLS errors. */ webkit_web_context_set_tls_errors_policy (priv->web_context, WEBKIT_TLS_ERRORS_POLICY_FAIL); diff -Nru epiphany-browser-3.16.3/embed/ephy-embed-utils.c epiphany-browser-3.18.0/embed/ephy-embed-utils.c --- epiphany-browser-3.16.3/embed/ephy-embed-utils.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-embed-utils.c 2015-08-07 08:41:06.000000000 +0000 @@ -229,14 +229,11 @@ } char * -ephy_embed_utils_normalize_or_autosearch_address (const char *address) +ephy_embed_utils_autosearch_address (const char *search_key) { char *query_param, *url_search; char *effective_address; - if (ephy_embed_utils_address_is_valid (address)) - return ephy_embed_utils_normalize_address (address); - url_search = g_settings_get_string (EPHY_SETTINGS_MAIN, EPHY_PREFS_KEYWORD_SEARCH_URL); if (url_search == NULL || url_search[0] == '\0') { @@ -244,13 +241,23 @@ url_search = g_strdup (_("https://duckduckgo.com/?q=%s&t=epiphany")); } - query_param = soup_form_encode ("q", address, NULL); + query_param = soup_form_encode ("q", search_key, NULL); /* + 2 here is getting rid of 'q=' */ effective_address = g_strdup_printf (url_search, query_param + 2); g_free (query_param); g_free (url_search); return effective_address; + +} + +char * +ephy_embed_utils_normalize_or_autosearch_address (const char *address) +{ + if (ephy_embed_utils_address_is_valid (address)) + return ephy_embed_utils_normalize_address (address); + else + return ephy_embed_utils_autosearch_address (address); } gboolean diff -Nru epiphany-browser-3.16.3/embed/ephy-embed-utils.h epiphany-browser-3.18.0/embed/ephy-embed-utils.h --- epiphany-browser-3.16.3/embed/ephy-embed-utils.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-embed-utils.h 2015-08-07 08:41:06.000000000 +0000 @@ -43,6 +43,7 @@ gboolean ephy_embed_utils_address_is_existing_absolute_filename (const char *address); gboolean ephy_embed_utils_address_is_valid (const char *address); char* ephy_embed_utils_normalize_address (const char *address); +char * ephy_embed_utils_autosearch_address (const char *search_key); char * ephy_embed_utils_normalize_or_autosearch_address (const char *address); gboolean ephy_embed_utils_url_is_empty (const char *location); gboolean ephy_embed_utils_is_no_show_address (const char *address); diff -Nru epiphany-browser-3.16.3/embed/ephy-find-toolbar.c epiphany-browser-3.18.0/embed/ephy-find-toolbar.c --- epiphany-browser-3.16.3/embed/ephy-find-toolbar.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-find-toolbar.c 2015-08-07 08:41:06.000000000 +0000 @@ -513,6 +513,9 @@ G_OBJECT_CLASS (ephy_find_toolbar_parent_class)->dispose (object); } +#ifndef G_DISABLE_ASSERT +G_GNUC_NORETURN +#endif static void ephy_find_toolbar_get_property (GObject *object, guint prop_id, diff -Nru epiphany-browser-3.16.3/embed/ephy-web-view.c epiphany-browser-3.18.0/embed/ephy-web-view.c --- epiphany-browser-3.16.3/embed/ephy-web-view.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-web-view.c 2015-09-21 14:53:44.000000000 +0000 @@ -42,6 +42,7 @@ #include "ephy-settings.h" #include "ephy-snapshot-service.h" #include "ephy-string.h" +#include "ephy-uri-helpers.h" #include "ephy-web-app-utils.h" #include "ephy-web-dom-utils.h" #include "ephy-web-extension-proxy.h" @@ -78,6 +79,7 @@ guint ever_committed : 1; char *address; + char *display_address; char *typed_address; char *loading_message; char *link_message; @@ -489,8 +491,8 @@ LOG ("Going to show infobar about %s", webkit_web_view_get_uri (WEBKIT_WEB_VIEW (web_view))); - info_bar = gtk_info_bar_new_with_buttons (_("_Save"), GTK_RESPONSE_YES, - _("_Don’t Save"), GTK_RESPONSE_CLOSE, + info_bar = gtk_info_bar_new_with_buttons (_("_Don’t Save"), GTK_RESPONSE_CLOSE, + _("_Save"), GTK_RESPONSE_YES, NULL); action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); @@ -791,6 +793,7 @@ ephy_web_view_popups_manager_reset (EPHY_WEB_VIEW (object)); g_free (priv->address); + g_free (priv->display_address); g_free (priv->typed_address); g_free (priv->link_message); g_free (priv->loading_message); @@ -828,7 +831,7 @@ if (!title && uri) title = title_from_address = ephy_embed_utils_get_title_from_address (uri); - if (uri && title && !ephy_web_view_is_history_frozen (webview)) + if (uri && title && *title && !ephy_web_view_is_history_frozen (webview)) ephy_history_service_set_url_title (history, uri, title, NULL, NULL, NULL); g_free (title_from_address); @@ -854,6 +857,9 @@ g_free (priv->address); priv->address = g_strdup (address); + g_free (priv->display_address); + priv->display_address = ephy_uri_safe_unescape (priv->address); + is_blank = address == NULL || strcmp (address, "about:blank") == 0; _ephy_web_view_set_is_blank (view, is_blank); @@ -961,7 +967,7 @@ /** * EphyWebView:address: * - * View's current address. + * View's current address. This is a percent-encoded URI. **/ g_object_class_install_property (gobject_class, PROP_ADDRESS, @@ -1522,9 +1528,11 @@ g_clear_pointer (&priv->loading_message, g_free); if (address) { + char *decoded_address; char *title; - title = ephy_embed_utils_get_title_from_address (address); + decoded_address = ephy_uri_safe_unescape (address); + title = ephy_embed_utils_get_title_from_address (decoded_address); if (title != NULL && title[0] != '\0') { /* translators: %s here is the address of the web page */ @@ -1533,6 +1541,7 @@ priv->loading_message = g_strdup (_("Loading…")); } + g_free (decoded_address); g_free (title); } @@ -1733,7 +1742,7 @@ { const gchar *file; GError *error = NULL; - char *sheet; + char *sheet = NULL; file = ephy_file ("error.css"); if (file && !g_file_get_contents (file, &sheet, NULL, &error)) { @@ -2347,7 +2356,9 @@ * ephy_web_view_get_address: * @view: an #EphyWebView * - * Returns the address of the currently loaded page. + * Returns the address of the currently-loaded page, percent-encoded. + * This URI should not be displayed to the user; to do that, use + * ephy_web_view_get_display_address(). * * Return value: @view's address. Will never be %NULL. **/ @@ -2359,6 +2370,24 @@ } /** + * ephy_web_view_get_display_address: + * @view: an #EphyWebView + * + * Returns the display address of the currently-loaded page. This is a + * decoded URI suitable for display to the user. To get a URI suitable + * for sending to a server, e.g. for storage in the bookmarks or history + * database, use ephy_web_view_get_address(). + * + * Return value: @view's address. Will never be %NULL. + */ +const char * +ephy_web_view_get_display_address (EphyWebView *view) +{ + EphyWebViewPrivate *priv = view->priv; + return priv->display_address ? priv->display_address : "about:blank"; +} + +/** * ephy_web_view_is_loading: * @view: an #EphyWebView * @@ -2486,16 +2515,17 @@ /** * ephy_web_view_set_link_message: * @view: an #EphyWebView - * @link_message: new value for link-message in @view + * @address: new value for link-message in @view * * Sets the value of link-message property which tells the URL of the hovered * link. **/ void ephy_web_view_set_link_message (EphyWebView *view, - const char *link_message) + const char *address) { EphyWebViewPrivate *priv; + char *decoded_address; g_return_if_fail (EPHY_IS_WEB_VIEW (view)); @@ -2503,7 +2533,13 @@ g_free (priv->link_message); - priv->link_message = ephy_embed_utils_link_message_parse (link_message); + if (address) { + decoded_address = ephy_uri_safe_unescape (address); + priv->link_message = ephy_embed_utils_link_message_parse (decoded_address); + g_free (decoded_address); + } else { + priv->link_message = NULL; + } g_object_notify (G_OBJECT (view), "status-message"); g_object_notify (G_OBJECT (view), "link-message"); diff -Nru epiphany-browser-3.16.3/embed/ephy-web-view.h epiphany-browser-3.18.0/embed/ephy-web-view.h --- epiphany-browser-3.16.3/embed/ephy-web-view.h 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/embed/ephy-web-view.h 2015-08-07 08:41:17.000000000 +0000 @@ -120,7 +120,7 @@ const char * ephy_web_view_get_status_message (EphyWebView *view); const char * ephy_web_view_get_link_message (EphyWebView *view); void ephy_web_view_set_link_message (EphyWebView *view, - const char *link_message); + const char *address); void ephy_web_view_set_security_level (EphyWebView *view, EphySecurityLevel level); const char * ephy_web_view_get_typed_address (EphyWebView *view); @@ -141,7 +141,7 @@ GTlsCertificateFlags *errors); void ephy_web_view_print (EphyWebView *view); const char * ephy_web_view_get_address (EphyWebView *view); - +const char * ephy_web_view_get_display_address (EphyWebView *view); void ephy_web_view_set_placeholder (EphyWebView *view, const char *uri, const char *title); diff -Nru epiphany-browser-3.16.3/embed/Makefile.am epiphany-browser-3.18.0/embed/Makefile.am --- epiphany-browser-3.16.3/embed/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -3,6 +3,7 @@ SUBDIRS = web-extension AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephyembed.la @@ -72,8 +73,6 @@ $(AM_CFLAGS) CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-embed-type-builtins.c \ diff -Nru epiphany-browser-3.16.3/embed/Makefile.in epiphany-browser-3.18.0/embed/Makefile.in --- epiphany-browser-3.16.3/embed/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/embed/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = embed -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -92,6 +110,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 = @@ -139,7 +158,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -203,6 +222,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -233,13 +254,12 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -254,7 +274,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -263,17 +282,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -283,8 +299,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -308,9 +322,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -331,11 +343,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -344,6 +352,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -362,6 +372,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -397,6 +408,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -408,6 +420,7 @@ NULL = SUBDIRS = web-extension AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephyembed.la NOINST_H_FILES = \ ephy-about-handler.h \ @@ -474,8 +487,6 @@ $(AM_CFLAGS) CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-embed-type-builtins.c \ stamp-ephy-embed-type-builtins.h @@ -497,7 +508,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign embed/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign embed/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -880,13 +890,11 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ @@ -976,6 +984,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + ephy-embed-type-builtins.c: stamp-ephy-embed-type-builtins.c Makefile @true diff -Nru epiphany-browser-3.16.3/embed/uri-tester.c epiphany-browser-3.18.0/embed/uri-tester.c --- epiphany-browser-3.16.3/embed/uri-tester.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/embed/uri-tester.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,975 +0,0 @@ -/* - * Copyright © 2011 Igalia S.L. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * Some parts of this file based on the Midori's 'adblock' extension, - * licensed with the GNU Lesser General Public License 2.1, Copyright - * (C) 2009-2010 Christian Dywan and 2009 - * Alexander Butenko . Check Midori's web site - * at http://www.twotoasts.de - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#include "config.h" -#include "uri-tester.h" - -#include "ephy-debug.h" - -#include -#include -#include - -#define DEFAULT_FILTER_URL "https://easylist-downloads.adblockplus.org/easylist.txt" -#define FILTERS_LIST_FILENAME "filters.list" -#define SIGNATURE_SIZE 8 -#define UPDATE_FREQUENCY 24 * 60 * 60 /* In seconds */ - -#define URI_TESTER_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), TYPE_URI_TESTER, UriTesterPrivate)) - -struct _UriTesterPrivate -{ - GSList *filters; - char *data_dir; - - GHashTable *pattern; - GHashTable *keys; - GHashTable *optslist; - GHashTable *urlcache; - - GString *blockcss; - GString *blockcssprivate; - - GRegex *regex_third_party; - GRegex *regex_pattern; - GRegex *regex_subdocument; - GRegex *regex_frame_add; -}; - -enum -{ - PROP_0, - PROP_FILTERS, - PROP_BASE_DATA_DIR, -}; - -G_DEFINE_TYPE (UriTester, uri_tester, G_TYPE_OBJECT) - -/* Private functions. */ - -static GString * -uri_tester_fixup_regexp (const char *prefix, char *src); - -static void -uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri); - -static char * -uri_tester_ensure_data_dir (const char *base_data_dir) -{ - char *folder; - - /* Ensure adblock's dir is there. */ - folder = g_build_filename (base_data_dir, "adblock", NULL); - g_mkdir_with_parents (folder, 0700); - - return folder; -} - -static char* -uri_tester_get_fileuri_for_url (UriTester *tester, - const char *url) -{ - char *filename = NULL; - char *path = NULL; - char *uri = NULL; - - if (!strncmp (url, "file", 4)) - return g_strndup (url + 7, strlen (url) - 7); - - filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, url, -1); - - path = g_build_filename (tester->priv->data_dir, filename, NULL); - uri = g_filename_to_uri (path, NULL, NULL); - - g_free (filename); - g_free (path); - - return uri; -} - -typedef struct { - UriTester *tester; - char *dest_uri; -} RetrieveFilterAsyncData; - -static void -uri_tester_retrieve_filter_finished (GFile *src, - GAsyncResult *result, - RetrieveFilterAsyncData *data) -{ - GError *error = NULL; - - if (!g_file_copy_finish (src, result, &error)) { - LOG ("Error retrieving filter: %s\n", error->message); - g_error_free (error); - } else - uri_tester_parse_file_at_uri (data->tester, data->dest_uri); - - g_object_unref (data->tester); - g_free (data->dest_uri); - g_slice_free (RetrieveFilterAsyncData, data); -} - -static void -uri_tester_retrieve_filter (UriTester *tester, const char *url, const char *fileuri) -{ - GFile *src; - GFile *dest; - RetrieveFilterAsyncData *data; - - g_return_if_fail (IS_URI_TESTER (tester)); - g_return_if_fail (url != NULL); - g_return_if_fail (fileuri != NULL); - - src = g_file_new_for_uri (url); - dest = g_file_new_for_uri (fileuri); - - data = g_slice_new (RetrieveFilterAsyncData); - data->tester = g_object_ref (tester); - data->dest_uri = g_file_get_uri (dest); - - g_file_copy_async (src, dest, - G_FILE_COPY_OVERWRITE, - G_PRIORITY_DEFAULT, - NULL, NULL, NULL, - (GAsyncReadyCallback)uri_tester_retrieve_filter_finished, - data); - - g_object_unref (src); - g_object_unref (dest); -} - -static gboolean -uri_tester_filter_is_valid (const char *fileuri) -{ - GFile *file = NULL; - GFileInfo *file_info = NULL; - gboolean result; - - /* Now check if the local file is too old. */ - file = g_file_new_for_uri (fileuri); - file_info = g_file_query_info (file, - G_FILE_ATTRIBUTE_TIME_MODIFIED, - G_FILE_QUERY_INFO_NONE, - NULL, - NULL); - result = FALSE; - if (file_info) - { - GTimeVal current_time; - GTimeVal mod_time; - - g_get_current_time (¤t_time); - g_file_info_get_modification_time (file_info, &mod_time); - - if (current_time.tv_sec > mod_time.tv_sec) - { - gint64 expire_time = mod_time.tv_sec + UPDATE_FREQUENCY; - result = current_time.tv_sec < expire_time; - } - g_object_unref (file_info); - } - - g_object_unref (file); - - return result; -} - -static void -uri_tester_load_patterns (UriTester *tester) -{ - GSList *filter = NULL; - char *url = NULL; - char *fileuri = NULL; - - /* Load patterns from the list of filters. */ - for (filter = tester->priv->filters; filter; filter = g_slist_next(filter)) - { - url = (char*)filter->data; - fileuri = uri_tester_get_fileuri_for_url (tester, url); - - if (!uri_tester_filter_is_valid (fileuri)) - uri_tester_retrieve_filter (tester, url, fileuri); - else - uri_tester_parse_file_at_uri (tester, fileuri); - - g_free (fileuri); - } -} - -static void -uri_tester_load_filters (UriTester *tester) -{ - GSList *list = NULL; - char *filepath = NULL; - - filepath = g_build_filename (tester->priv->data_dir, FILTERS_LIST_FILENAME, NULL); - - if (g_file_test (filepath, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) - { - GFile *file = NULL; - char *contents = NULL; - gsize length = 0; - GError *error = NULL; - - file = g_file_new_for_path (filepath); - if (g_file_load_contents (file, NULL, &contents, &length, NULL, &error)) - { - char **urls_array = NULL; - char *url = NULL; - int i = 0; - - urls_array = g_strsplit (contents, ";", -1); - for (i = 0; urls_array [i]; i++) - { - url = g_strstrip (g_strdup (urls_array[i])); - if (!g_str_equal (url, "")) - list = g_slist_prepend (list, url); - } - g_strfreev (urls_array); - - g_free (contents); - } - - if (error) - { - LOG ("Error loading filters from %s: %s", filepath, error->message); - g_error_free (error); - } - - g_object_unref (file); - } - else - { - /* No file exists yet, so use the default filter and save it. */ - list = g_slist_prepend (list, g_strdup (DEFAULT_FILTER_URL)); - } - - g_free (filepath); - - uri_tester_set_filters (tester, g_slist_reverse(list)); -} - -static void -uri_tester_save_filters (UriTester *tester) -{ - FILE *file = NULL; - char *filepath = NULL; - - filepath = g_build_filename (tester->priv->data_dir, FILTERS_LIST_FILENAME, NULL); - - if ((file = g_fopen (filepath, "w"))) - { - GSList *item = NULL; - char *filter = NULL; - - for (item = tester->priv->filters; item; item = g_slist_next (item)) - { - filter = g_strdup_printf ("%s;", (char*)item->data); - fputs (filter, file); - g_free (filter); - } - fclose (file); - } - g_free (filepath); -} - -static inline int -uri_tester_check_rule (UriTester *tester, - GRegex *regex, - const char *patt, - const char *req_uri, - const char *page_uri) -{ - char *opts; - - if (!g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL)) - return FALSE; - - opts = g_hash_table_lookup (tester->priv->optslist, patt); - if (opts && g_regex_match (tester->priv->regex_third_party, opts, 0, NULL)) - { - if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL)) - return FALSE; - } - /* TODO: Domain opt check */ - LOG ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri); - return TRUE; -} - -static inline gboolean -uri_tester_is_matched_by_pattern (UriTester *tester, - const char *req_uri, - const char *page_uri) -{ - GHashTableIter iter; - gpointer patt, regex; - - g_hash_table_iter_init (&iter, tester->priv->pattern); - while (g_hash_table_iter_next (&iter, &patt, ®ex)) - { - if (uri_tester_check_rule(tester, regex, patt, req_uri, page_uri)) - return TRUE; - } - return FALSE; -} - -static inline gboolean -uri_tester_is_matched_by_key (UriTester *tester, - const char *opts, - const char *req_uri, - const char *page_uri) -{ - UriTesterPrivate *priv = NULL; - char *uri; - int len; - int pos = 0; - GList *regex_bl = NULL; - GString *guri; - gboolean ret = FALSE; - char sig[SIGNATURE_SIZE + 1]; - - priv = tester->priv; - - memset (&sig[0], 0, sizeof (sig)); - /* Signatures are made on pattern, so we need to convert url to a pattern as well */ - guri = uri_tester_fixup_regexp ("", (char*)req_uri); - uri = guri->str; - len = guri->len; - - for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) - { - GRegex *regex; - strncpy (sig, uri + pos, SIGNATURE_SIZE); - regex = g_hash_table_lookup (priv->keys, sig); - - /* Dont check if regex is already blacklisted */ - if (!regex || g_list_find (regex_bl, regex)) - continue; - ret = uri_tester_check_rule (tester, regex, sig, req_uri, page_uri); - if (ret) - break; - regex_bl = g_list_prepend (regex_bl, regex); - } - g_string_free (guri, TRUE); - g_list_free (regex_bl); - return ret; -} - -static gboolean -uri_tester_is_matched (UriTester *tester, - const char *opts, - const char *req_uri, - const char *page_uri) -{ - UriTesterPrivate *priv = NULL; - char *value; - - priv = tester->priv; - - /* Check cached URLs first. */ - if ((value = g_hash_table_lookup (priv->urlcache, req_uri))) - return (value[0] != '0') ? TRUE : FALSE; - - /* Look for a match either by key or by pattern. */ - if (uri_tester_is_matched_by_key (tester, opts, req_uri, page_uri)) - { - g_hash_table_insert (priv->urlcache, g_strdup (req_uri), g_strdup("1")); - return TRUE; - } - - /* Matching by pattern is pretty expensive, so do it if needed only. */ - if (uri_tester_is_matched_by_pattern (tester, req_uri, page_uri)) - { - g_hash_table_insert (priv->urlcache, g_strdup (req_uri), g_strdup("1")); - return TRUE; - } - - g_hash_table_insert (priv->urlcache, g_strdup (req_uri), g_strdup("0")); - return FALSE; -} - -static GString * -uri_tester_fixup_regexp (const char *prefix, char *src) -{ - GString *str; - int len = 0; - - if (!src) - return NULL; - - str = g_string_new (prefix); - - /* lets strip first .* */ - if (src[0] == '*') - { - (void)*src++; - } - - do - { - switch (*src) - { - case '*': - g_string_append (str, ".*"); - break; - /*case '.': - g_string_append (str, "\\."); - break;*/ - case '?': - g_string_append (str, "\\?"); - break; - case '|': - /* FIXME: We actually need to match :[0-9]+ or '/'. Sign means - "here could be port number or nothing". So bla.com^ will match - bla.com/ or bla.com:8080/ but not bla.com.au/ */ - case '^': - case '+': - break; - default: - g_string_append_printf (str,"%c", *src); - break; - } - src++; - } - while (*src); - - len = str->len; - /* We dont need .* in the end of url. Thats stupid */ - if (str->str && str->str[len-1] == '*' && str->str[len-2] == '.') - g_string_erase (str, len-2, 2); - - return str; -} - -static void -uri_tester_compile_regexp (UriTester *tester, - GString *gpatt, - char *opts) -{ - GRegex *regex; - GError *error = NULL; - char *patt; - int len; - - if (!gpatt) - return; - - patt = gpatt->str; - len = gpatt->len; - - /* TODO: Play with optimization flags */ - regex = g_regex_new (patt, G_REGEX_OPTIMIZE | G_REGEX_JAVASCRIPT_COMPAT, - G_REGEX_MATCH_NOTEMPTY, &error); - if (error) - { - g_warning ("%s: %s", G_STRFUNC, error->message); - g_error_free (error); - return; - } - - if (!g_regex_match (tester->priv->regex_pattern, patt, 0, NULL)) - { - int signature_count = 0; - int pos = 0; - char *sig; - - for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) { - sig = g_strndup (patt + pos, SIGNATURE_SIZE); - if (!strchr (sig, '*') && - !g_hash_table_lookup (tester->priv->keys, sig)) - { - LOG ("sig: %s %s", sig, patt); - g_hash_table_insert (tester->priv->keys, g_strdup (sig), g_regex_ref (regex)); - g_hash_table_insert (tester->priv->optslist, g_strdup (sig), g_strdup (opts)); - signature_count++; - } - else - { - if (sig[0] == '*' && - !g_hash_table_lookup (tester->priv->pattern, patt)) - { - LOG ("patt2: %s %s", sig, patt); - g_hash_table_insert (tester->priv->pattern, g_strdup (patt), g_regex_ref (regex)); - g_hash_table_insert (tester->priv->optslist, g_strdup (patt), g_strdup (opts)); - } - } - g_free (sig); - } - g_regex_unref (regex); - - if (signature_count > 1 && g_hash_table_lookup (tester->priv->pattern, patt)) - g_hash_table_steal (tester->priv->pattern, patt); - } - else - { - LOG ("patt: %s%s", patt, ""); - /* Pattern is a regexp chars */ - g_hash_table_insert (tester->priv->pattern, g_strdup (patt), regex); - g_hash_table_insert (tester->priv->optslist, g_strdup (patt), g_strdup (opts)); - } -} - -static void -uri_tester_add_url_pattern (UriTester *tester, - char *prefix, - char *type, - char *line) -{ - char **data; - char *patt; - GString *format_patt; - char *opts; - - data = g_strsplit (line, "$", -1); - if (!data || !data[0]) - { - g_strfreev (data); - return; - } - - if (data[1] && data[2]) - { - patt = g_strconcat (data[0], data[1], NULL); - opts = g_strconcat (type, ",", data[2], NULL); - } - else if (data[1]) - { - patt = data[0]; - opts = g_strconcat (type, ",", data[1], NULL); - } - else - { - patt = data[0]; - opts = type; - } - - if (g_regex_match (tester->priv->regex_subdocument, opts, 0, NULL)) - { - if (data[1] && data[2]) - g_free (patt); - if (data[1]) - g_free (opts); - g_strfreev (data); - return; - } - - format_patt = uri_tester_fixup_regexp (prefix, patt); - - LOG ("got: %s opts %s", format_patt->str, opts); - uri_tester_compile_regexp (tester, format_patt, opts); - - if (data[1] && data[2]) - g_free (patt); - if (data[1]) - g_free (opts); - g_strfreev (data); - - g_string_free (format_patt, TRUE); -} - -static inline void -uri_tester_frame_add (UriTester *tester, char *line) -{ - const char *separator = " , "; - - (void)*line++; - (void)*line++; - if (strchr (line, '\'') - || (strchr (line, ':') - && !g_regex_match (tester->priv->regex_frame_add, line, 0, NULL))) - { - return; - } - g_string_append (tester->priv->blockcss, separator); - g_string_append (tester->priv->blockcss, line); -} - -static inline void -uri_tester_frame_add_private (UriTester *tester, - const char *line, - const char *sep) -{ - char **data; - data = g_strsplit (line, sep, 2); - - if (!(data[1] && *data[1]) - || strchr (data[1], '\'') - || (strchr (data[1], ':') - && !g_regex_match (tester->priv->regex_frame_add, data[1], 0, NULL))) - { - g_strfreev (data); - return; - } - - if (strchr (data[0], ',')) - { - char **domains; - int i; - - domains = g_strsplit (data[0], ",", -1); - for (i = 0; domains[i]; i++) - { - g_string_append_printf (tester->priv->blockcssprivate, ";sites['%s']+=',%s'", - g_strstrip (domains[i]), data[1]); - } - g_strfreev (domains); - } - else - { - g_string_append_printf (tester->priv->blockcssprivate, ";sites['%s']+=',%s'", - data[0], data[1]); - } - g_strfreev (data); -} - -static void -uri_tester_parse_line (UriTester *tester, char *line) -{ - if (!line) - return; - - g_strchomp (line); - /* Ignore comments and new lines */ - if (line[0] == '!') - return; - /* FIXME: No support for whitelisting */ - if (line[0] == '@' && line[1] == '@') - return; - /* FIXME: No support for [include] and [exclude] tags */ - if (line[0] == '[') - return; - /* FIXME: No support for domain= */ - if (strstr (line, "domain=")) - return; - - /* Skip garbage */ - if (line[0] == ' ' || !line[0]) - return; - - /* Got CSS block hider */ - if (line[0] == '#' && line[1] == '#' ) - { - uri_tester_frame_add (tester, line); - return; - } - /* Got CSS block hider. Workaround */ - if (line[0] == '#') - return; - - /* Got per domain CSS hider rule */ - if (strstr (line, "##")) - { - uri_tester_frame_add_private (tester, line, "##"); - return; - } - - /* Got per domain CSS hider rule. Workaround */ - if (strchr (line, '#')) - { - uri_tester_frame_add_private (tester, line, "#"); - return; - } - /* Got URL blocker rule */ - if (line[0] == '|' && line[1] == '|' ) - { - (void)*line++; - (void)*line++; - uri_tester_add_url_pattern (tester, "", "fulluri", line); - return; - } - if (line[0] == '|') - { - (void)*line++; - uri_tester_add_url_pattern (tester, "^", "fulluri", line); - return; - } - uri_tester_add_url_pattern (tester, "", "uri", line); -} - -static void -file_parse_cb (GDataInputStream *stream, GAsyncResult *result, UriTester *tester) -{ - char *line; - GError *error = NULL; - - line = g_data_input_stream_read_line_finish (stream, result, NULL, &error); - if (!line) { - if (error) { - LOG ("Error parsing file: %s\n", error->message); - g_error_free (error); - } - - return; - } - - uri_tester_parse_line (tester, line); - g_free (line); - - g_data_input_stream_read_line_async (stream, G_PRIORITY_DEFAULT_IDLE, NULL, - (GAsyncReadyCallback)file_parse_cb, tester); -} - -static void -file_read_cb (GFile *file, GAsyncResult *result, UriTester *tester) -{ - GFileInputStream *stream; - GDataInputStream *data_stream; - GError *error = NULL; - - stream = g_file_read_finish (file, result, &error); - if (!stream) { - char *path; - - path = g_file_get_path (file); - LOG ("Error opening file %s for parsing: %s\n", path, error->message); - g_free (path); - g_error_free (error); - - return; - } - - data_stream = g_data_input_stream_new (G_INPUT_STREAM (stream)); - g_object_unref (stream); - - g_data_input_stream_read_line_async (data_stream, G_PRIORITY_DEFAULT_IDLE, NULL, - (GAsyncReadyCallback)file_parse_cb, tester); - g_object_unref (data_stream); -} - -static void -uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri) -{ - GFile *file; - GFileInputStream *stream; - - file = g_file_new_for_uri (fileuri); - g_file_read_async (file, G_PRIORITY_DEFAULT_IDLE, NULL, (GAsyncReadyCallback)file_read_cb, tester); - g_object_unref (file); -} - -static void -uri_tester_init (UriTester *tester) -{ - UriTesterPrivate *priv = NULL; - - LOG ("UriTester initializing %p", tester); - - priv = URI_TESTER_GET_PRIVATE (tester); - tester->priv = priv; - - priv->filters = NULL; - priv->pattern = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify)g_free, - (GDestroyNotify)g_regex_unref); - priv->keys = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify)g_free, - (GDestroyNotify)g_regex_unref); - priv->optslist = g_hash_table_new_full (g_str_hash, g_str_equal, - NULL, - (GDestroyNotify)g_free); - priv->urlcache = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify)g_free, - (GDestroyNotify)g_free); - - priv->blockcss = g_string_new ("z-non-exist"); - priv->blockcssprivate = g_string_new (""); - - priv->regex_third_party = g_regex_new (",third-party", - G_REGEX_CASELESS | G_REGEX_OPTIMIZE, - G_REGEX_MATCH_NOTEMPTY, - NULL); - priv->regex_pattern = g_regex_new ("^/.*[\\^\\$\\*].*/$", - G_REGEX_UNGREEDY | G_REGEX_OPTIMIZE, - G_REGEX_MATCH_NOTEMPTY, - NULL); - priv->regex_subdocument = g_regex_new ("subdocument", - G_REGEX_CASELESS | G_REGEX_OPTIMIZE, - G_REGEX_MATCH_NOTEMPTY, - NULL); - priv->regex_frame_add = g_regex_new (".*\\[.*:.*\\].*", - G_REGEX_CASELESS | G_REGEX_OPTIMIZE, - G_REGEX_MATCH_NOTEMPTY, - NULL); -} - -static void -uri_tester_constructed (GObject *object) -{ - UriTester *tester = URI_TESTER (object); - - G_OBJECT_CLASS (uri_tester_parent_class)->constructed (object); - - uri_tester_load_filters (tester); - uri_tester_load_patterns (tester); -} - -static void -uri_tester_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - UriTester *tester = URI_TESTER (object); - - switch (prop_id) - { - case PROP_FILTERS: - uri_tester_set_filters (tester, (GSList*) g_value_get_pointer (value)); - break; - case PROP_BASE_DATA_DIR: - tester->priv->data_dir = uri_tester_ensure_data_dir (g_value_get_string (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -uri_tester_finalize (GObject *object) -{ - UriTesterPrivate *priv = URI_TESTER_GET_PRIVATE (URI_TESTER (object)); - - LOG ("UriTester finalizing %p", object); - - g_slist_foreach (priv->filters, (GFunc) g_free, NULL); - g_slist_free (priv->filters); - g_free (priv->data_dir); - - g_hash_table_destroy (priv->pattern); - g_hash_table_destroy (priv->keys); - g_hash_table_destroy (priv->optslist); - g_hash_table_destroy (priv->urlcache); - - g_string_free (priv->blockcss, TRUE); - g_string_free (priv->blockcssprivate, TRUE); - - g_regex_unref (priv->regex_third_party); - g_regex_unref (priv->regex_pattern); - g_regex_unref (priv->regex_subdocument); - g_regex_unref (priv->regex_frame_add); - - G_OBJECT_CLASS (uri_tester_parent_class)->finalize (object); -} - -static void -uri_tester_class_init (UriTesterClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->set_property = uri_tester_set_property; - object_class->constructed = uri_tester_constructed; - object_class->finalize = uri_tester_finalize; - - g_object_class_install_property - (object_class, - PROP_FILTERS, - g_param_spec_pointer ("filters", - "filters", - "filters", - G_PARAM_WRITABLE)); - g_object_class_install_property - (object_class, - PROP_BASE_DATA_DIR, - g_param_spec_string ("base-data-dir", - "Base data dir", - "The base dir where to create the adblock data dir", - NULL, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); - - g_type_class_add_private (object_class, sizeof (UriTesterPrivate)); -} - -UriTester * -uri_tester_new (const char *base_data_dir) -{ - g_return_val_if_fail (base_data_dir != NULL, NULL); - - return g_object_new (TYPE_URI_TESTER, "base-data-dir", base_data_dir, NULL); -} - -gboolean -uri_tester_test_uri (UriTester *tester, - const char *req_uri, - const char *page_uri, - AdUriCheckType type) -{ - /* Don't block top level documents. */ - if (type == AD_URI_CHECK_TYPE_DOCUMENT) - return FALSE; - - return uri_tester_is_matched (tester, NULL, req_uri, page_uri); -} - -void -uri_tester_set_filters (UriTester *tester, GSList *filters) -{ - UriTesterPrivate *priv = tester->priv; - - if (priv->filters) - { - g_slist_foreach (priv->filters, (GFunc) g_free, NULL); - g_slist_free (priv->filters); - } - - priv->filters = filters; -} - -GSList * -uri_tester_get_filters (UriTester *tester) -{ - return tester->priv->filters; -} - -void -uri_tester_reload (UriTester *tester) -{ - GDir *g_data_dir = NULL; - - /* Remove data files in the data dir first. */ - g_data_dir = g_dir_open (tester->priv->data_dir, 0, NULL); - if (g_data_dir) - { - const char *filename = NULL; - char *filepath = NULL; - - while ((filename = g_dir_read_name (g_data_dir))) - { - /* Omit the list of filters. */ - if (!g_strcmp0 (filename, FILTERS_LIST_FILENAME)) - continue; - - filepath = g_build_filename (tester->priv->data_dir, filename, NULL); - g_unlink (filepath); - - g_free (filepath); - } - - g_dir_close (g_data_dir); - } - - /* Load patterns from current filters. */ - uri_tester_load_patterns (tester); -} diff -Nru epiphany-browser-3.16.3/embed/uri-tester.h epiphany-browser-3.18.0/embed/uri-tester.h --- epiphany-browser-3.16.3/embed/uri-tester.h 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/embed/uri-tester.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -/* - * Copyright © 2011 Igalia S.L. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -#ifndef URI_TESTER_H -#define URI_TESTER_H - -#include -#include - -G_BEGIN_DECLS - -#define TYPE_URI_TESTER (uri_tester_get_type ()) -#define URI_TESTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_URI_TESTER, UriTester)) -#define URI_TESTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_URI_TESTER, UriTesterClass)) -#define IS_URI_TESTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_URI_TESTER)) -#define IS_URI_TESTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_URI_TESTER)) -#define URI_TESTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_URI_TESTER, UriTesterClass)) - -typedef enum -{ - AD_URI_CHECK_TYPE_OTHER = 1U, - AD_URI_CHECK_TYPE_SCRIPT = 2U, /* Indicates an executable script - (such as JavaScript) */ - AD_URI_CHECK_TYPE_IMAGE = 3U, /* Indicates an image (e.g., IMG - elements) */ - AD_URI_CHECK_TYPE_STYLESHEET = 4U, /* Indicates a stylesheet (e.g., - STYLE elements) */ - AD_URI_CHECK_TYPE_OBJECT = 5U, /* Indicates a generic object - (plugin-handled content - typically falls under this - category) */ - AD_URI_CHECK_TYPE_DOCUMENT = 6U, /* Indicates a document at the - top-level (i.e., in a - browser) */ - AD_URI_CHECK_TYPE_SUBDOCUMENT = 7U, /* Indicates a document contained - within another document (e.g., - IFRAMEs, FRAMES, and OBJECTs) */ - AD_URI_CHECK_TYPE_REFRESH = 8U, /* Indicates a timed refresh */ - AD_URI_CHECK_TYPE_XBEL = 9U, /* Indicates an XBL binding request, - triggered either by -moz-binding CSS - property or Document.addBinding method */ - AD_URI_CHECK_TYPE_PING = 10U, /* Indicates a ping triggered by a click on - element */ - AD_URI_CHECK_TYPE_XMLHTTPREQUEST = 11U, /* Indicates a XMLHttpRequest */ - AD_URI_CHECK_TYPE_OBJECT_SUBREQUEST = 12U /* Indicates a request by a plugin */ -} AdUriCheckType; - -typedef struct _UriTester UriTester; -typedef struct _UriTesterClass UriTesterClass; -typedef struct _UriTesterPrivate UriTesterPrivate; - -struct _UriTester -{ - GObject parent_instance; - - /*< private >*/ - UriTesterPrivate *priv; -}; - -struct _UriTesterClass -{ - GObjectClass parent_class; -}; - -GType uri_tester_get_type (void); - -void uri_tester_register (GTypeModule *module); - -UriTester *uri_tester_new (const char *base_data_dir); - -gboolean uri_tester_test_uri (UriTester *tester, - const char *req_uri, - const char *page_uri, - AdUriCheckType type); - -void uri_tester_set_filters (UriTester *tester, GSList *filters); - -GSList *uri_tester_get_filters (UriTester *tester); - -void uri_tester_reload (UriTester *tester); - -G_END_DECLS - -#endif /* URI_TESTER_H */ diff -Nru epiphany-browser-3.16.3/embed/web-extension/ephy-web-extension.c epiphany-browser-3.18.0/embed/web-extension/ephy-web-extension.c --- epiphany-browser-3.16.3/embed/web-extension/ephy-web-extension.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/web-extension/ephy-web-extension.c 2015-08-07 08:41:06.000000000 +0000 @@ -38,6 +38,8 @@ #include #include #include +#define WEBKIT_DOM_USE_UNSTABLE_API +#include #include struct _EphyWebExtensionPrivate @@ -1004,6 +1006,42 @@ g_object_set_data_full (G_OBJECT (web_page), "ephy-web-overview", overview, g_object_unref); } +static gboolean +web_page_context_menu (WebKitWebPage *web_page, + WebKitContextMenu *context_menu, + WebKitWebHitTestResult *hit_test_result, + gpointer user_data) +{ + char *string; + GVariantBuilder builder; + WebKitDOMDocument *document = webkit_web_page_get_dom_document (web_page); + WebKitDOMDOMWindow *window = webkit_dom_document_get_default_view (document); + WebKitDOMDOMSelection *selection = webkit_dom_dom_window_get_selection (window); + + g_object_unref (window); + + if (!selection) + return FALSE; + + string = ephy_web_dom_utils_get_selection_as_string (selection); + g_object_unref (selection); + + if (!string || *string == '\0') + { + g_free (string); + return FALSE; + } + + g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); + g_variant_builder_add (&builder, "{sv}", "SelectedText", g_variant_new_string (g_strstrip (string))); + webkit_context_menu_set_user_data (context_menu, + g_variant_builder_end (&builder)); + + g_free (string); + + return TRUE; +} + static void ephy_web_extension_emit_page_created (EphyWebExtension *extension, guint64 page_id) @@ -1072,6 +1110,9 @@ g_signal_connect (web_page, "notify::uri", G_CALLBACK (web_page_uri_changed), extension); + g_signal_connect (web_page, "context-menu", + G_CALLBACK (web_page_context_menu), + extension); } static WebKitWebPage * diff -Nru epiphany-browser-3.16.3/embed/web-extension/ephy-web-extension-main.c epiphany-browser-3.18.0/embed/web-extension/ephy-web-extension-main.c --- epiphany-browser-3.16.3/embed/web-extension/ephy-web-extension-main.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/web-extension/ephy-web-extension-main.c 2015-08-07 08:41:06.000000000 +0000 @@ -33,6 +33,11 @@ ephy_web_extension_dbus_register (extension, connection); } +/* Placate -Wmissing-prototype */ +void +webkit_web_extension_initialize_with_user_data (WebKitWebExtension *extension, + GVariant *user_data); + G_MODULE_EXPORT void webkit_web_extension_initialize_with_user_data (WebKitWebExtension *extension, GVariant *user_data) diff -Nru epiphany-browser-3.16.3/embed/web-extension/ephy-web-overview.c epiphany-browser-3.18.0/embed/web-extension/ephy-web-overview.c --- epiphany-browser-3.16.3/embed/web-extension/ephy-web-overview.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/embed/web-extension/ephy-web-overview.c 2015-08-07 08:41:17.000000000 +0000 @@ -78,9 +78,9 @@ char *class; class = webkit_dom_element_get_class_name (element); - if (g_strcmp0 (class, "thumbnail") == 0) + if (g_strcmp0 (class, "overview-thumbnail") == 0) item->thumbnail = g_object_ref (element); - else if (g_strcmp0 (class, "title") == 0) + else if (g_strcmp0 (class, "overview-title") == 0) item->title = g_object_ref (element); g_free (class); @@ -142,8 +142,8 @@ item->url = g_strdup (url->url); class_list = webkit_dom_element_get_class_list (webkit_dom_node_get_parent_element (WEBKIT_DOM_NODE (item->anchor))); - if (class_list && webkit_dom_dom_token_list_contains (class_list, "removed", NULL)) - webkit_dom_dom_token_list_remove (class_list, "removed", NULL); + if (class_list && webkit_dom_dom_token_list_contains (class_list, "overview-removed", NULL)) + webkit_dom_dom_token_list_remove (class_list, "overview-removed", NULL); webkit_dom_element_set_attribute (item->anchor, "href", url->url, NULL); webkit_dom_element_set_attribute (item->anchor, "title", url->title, NULL); @@ -167,7 +167,7 @@ item->url = g_strdup (url->url); document = webkit_web_page_get_dom_document (overview->priv->web_page); - item_list = webkit_dom_document_get_element_by_id (document, "item-list"); + item_list = webkit_dom_document_get_element_by_id (document, "overview-item-list"); new_node = WEBKIT_DOM_NODE (webkit_dom_document_create_element (document, "LI", NULL)); webkit_dom_node_append_child (WEBKIT_DOM_NODE (item_list), WEBKIT_DOM_NODE (new_node), NULL); @@ -180,22 +180,22 @@ webkit_dom_node_append_child (WEBKIT_DOM_NODE (new_node), WEBKIT_DOM_NODE (anchor), NULL); new_node = WEBKIT_DOM_NODE (webkit_dom_document_create_element (document, "DIV", NULL)); - webkit_dom_element_set_class_name (WEBKIT_DOM_ELEMENT (new_node), "close-button"); - webkit_dom_element_set_attribute (WEBKIT_DOM_ELEMENT (new_node), "onclick", "removeFromOverview(this.parentNode,event)", NULL); + webkit_dom_element_set_class_name (WEBKIT_DOM_ELEMENT (new_node), "overview-close-button"); + webkit_dom_element_set_attribute (WEBKIT_DOM_ELEMENT (new_node), "onclick", "removeFromOverview(this.parentNode, event)", NULL); webkit_dom_element_set_attribute (WEBKIT_DOM_ELEMENT (new_node), "title", url->title, NULL); webkit_dom_node_set_text_content (new_node, "✖", NULL); webkit_dom_node_append_child (WEBKIT_DOM_NODE (anchor), new_node, NULL); new_node = WEBKIT_DOM_NODE (webkit_dom_document_create_element (document, "SPAN", NULL)); item->thumbnail = g_object_ref (new_node); - webkit_dom_element_set_class_name (WEBKIT_DOM_ELEMENT (new_node), "thumbnail"); + webkit_dom_element_set_class_name (WEBKIT_DOM_ELEMENT (new_node), "overview-thumbnail"); if (thumbnail_path) update_thumbnail_element_style (WEBKIT_DOM_ELEMENT (new_node), thumbnail_path); webkit_dom_node_append_child (WEBKIT_DOM_NODE (anchor), new_node, NULL); new_node = WEBKIT_DOM_NODE (webkit_dom_document_create_element (document, "SPAN", NULL)); item->title = g_object_ref (new_node); - webkit_dom_element_set_class_name (WEBKIT_DOM_ELEMENT (new_node), "title"); + webkit_dom_element_set_class_name (WEBKIT_DOM_ELEMENT (new_node), "overview-title"); webkit_dom_node_set_text_content (new_node, url->title, NULL); webkit_dom_node_append_child (WEBKIT_DOM_NODE (anchor), new_node, NULL); diff -Nru epiphany-browser-3.16.3/embed/web-extension/Makefile.am epiphany-browser-3.18.0/embed/web-extension/Makefile.am --- epiphany-browser-3.16.3/embed/web-extension/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/embed/web-extension/Makefile.am 2015-09-09 07:39:52.000000000 +0000 @@ -1,4 +1,5 @@ AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) webextension_LTLIBRARIES = libephywebextension.la @@ -16,25 +17,10 @@ ephy-web-overview.c \ ephy-web-overview-model.h \ ephy-web-overview-model.c \ - $(top_srcdir)/embed/uri-tester.c \ - $(top_srcdir)/embed/uri-tester.h \ - $(top_srcdir)/lib/ephy-debug.c \ - $(top_srcdir)/lib/ephy-debug.h \ - $(top_srcdir)/lib/ephy-file-helpers.c \ - $(top_srcdir)/lib/ephy-file-helpers.h \ - $(top_srcdir)/lib/ephy-form-auth-data.c \ - $(top_srcdir)/lib/ephy-form-auth-data.h \ - $(top_srcdir)/lib/ephy-settings.c \ - $(top_srcdir)/lib/ephy-settings.h \ - $(top_srcdir)/lib/ephy-string.c \ - $(top_srcdir)/lib/ephy-string.h \ - $(top_srcdir)/lib/ephy-uri-helpers.c \ - $(top_srcdir)/lib/ephy-uri-helpers.h \ - $(top_srcdir)/lib/ephy-web-dom-utils.c \ - $(top_srcdir)/lib/ephy-web-dom-utils.h + uri-tester.c \ + uri-tester.h libephywebextension_la_CPPFLAGS = \ - -I$(top_srcdir)/embed \ -I$(top_srcdir)/lib \ $(AM_CPPFLAGS) @@ -45,6 +31,7 @@ $(WEB_EXTENSION_CFLAGS) libephywebextension_la_LIBADD = \ + $(top_builddir)/lib/libephymisc.la \ $(WEB_EXTENSION_LIBS) libephywebextension_la_LDFLAGS = \ diff -Nru epiphany-browser-3.16.3/embed/web-extension/Makefile.in epiphany-browser-3.18.0/embed/web-extension/Makefile.in --- epiphany-browser-3.16.3/embed/web-extension/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/embed/web-extension/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = embed/web-extension -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -92,6 +110,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 = @@ -126,21 +145,15 @@ am__installdirs = "$(DESTDIR)$(webextensiondir)" LTLIBRARIES = $(webextension_LTLIBRARIES) am__DEPENDENCIES_1 = -libephywebextension_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libephywebextension_la_DEPENDENCIES = \ + $(top_builddir)/lib/libephymisc.la $(am__DEPENDENCIES_1) am_libephywebextension_la_OBJECTS = \ libephywebextension_la-ephy-embed-form-auth.lo \ libephywebextension_la-ephy-web-extension.lo \ libephywebextension_la-ephy-web-extension-main.lo \ libephywebextension_la-ephy-web-overview.lo \ libephywebextension_la-ephy-web-overview-model.lo \ - libephywebextension_la-uri-tester.lo \ - libephywebextension_la-ephy-debug.lo \ - libephywebextension_la-ephy-file-helpers.lo \ - libephywebextension_la-ephy-form-auth-data.lo \ - libephywebextension_la-ephy-settings.lo \ - libephywebextension_la-ephy-string.lo \ - libephywebextension_la-ephy-uri-helpers.lo \ - libephywebextension_la-ephy-web-dom-utils.lo + libephywebextension_la-uri-tester.lo libephywebextension_la_OBJECTS = $(am_libephywebextension_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -163,7 +176,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -210,18 +223,19 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -236,7 +250,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -245,17 +258,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -265,8 +275,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -290,9 +298,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -313,11 +319,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -326,6 +328,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -344,6 +348,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -379,6 +384,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -388,6 +394,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) webextension_LTLIBRARIES = libephywebextension.la webextensiondir = \ $(libdir)/epiphany/$(EPIPHANY_MAJOR)/web-extensions @@ -403,25 +410,10 @@ ephy-web-overview.c \ ephy-web-overview-model.h \ ephy-web-overview-model.c \ - $(top_srcdir)/embed/uri-tester.c \ - $(top_srcdir)/embed/uri-tester.h \ - $(top_srcdir)/lib/ephy-debug.c \ - $(top_srcdir)/lib/ephy-debug.h \ - $(top_srcdir)/lib/ephy-file-helpers.c \ - $(top_srcdir)/lib/ephy-file-helpers.h \ - $(top_srcdir)/lib/ephy-form-auth-data.c \ - $(top_srcdir)/lib/ephy-form-auth-data.h \ - $(top_srcdir)/lib/ephy-settings.c \ - $(top_srcdir)/lib/ephy-settings.h \ - $(top_srcdir)/lib/ephy-string.c \ - $(top_srcdir)/lib/ephy-string.h \ - $(top_srcdir)/lib/ephy-uri-helpers.c \ - $(top_srcdir)/lib/ephy-uri-helpers.h \ - $(top_srcdir)/lib/ephy-web-dom-utils.c \ - $(top_srcdir)/lib/ephy-web-dom-utils.h + uri-tester.c \ + uri-tester.h libephywebextension_la_CPPFLAGS = \ - -I$(top_srcdir)/embed \ -I$(top_srcdir)/lib \ $(AM_CPPFLAGS) @@ -432,6 +424,7 @@ $(WEB_EXTENSION_CFLAGS) libephywebextension_la_LIBADD = \ + $(top_builddir)/lib/libephymisc.la \ $(WEB_EXTENSION_LIBS) libephywebextension_la_LDFLAGS = \ @@ -453,7 +446,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign embed/web-extension/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign embed/web-extension/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -516,14 +508,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-debug.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-embed-form-auth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-file-helpers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-form-auth-data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-settings.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-string.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-uri-helpers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-web-dom-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-web-extension-main.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-web-extension.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywebextension_la-ephy-web-overview-model.Plo@am__quote@ @@ -586,61 +571,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-web-overview-model.lo `test -f 'ephy-web-overview-model.c' || echo '$(srcdir)/'`ephy-web-overview-model.c -libephywebextension_la-uri-tester.lo: $(top_srcdir)/embed/uri-tester.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-uri-tester.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-uri-tester.Tpo -c -o libephywebextension_la-uri-tester.lo `test -f '$(top_srcdir)/embed/uri-tester.c' || echo '$(srcdir)/'`$(top_srcdir)/embed/uri-tester.c +libephywebextension_la-uri-tester.lo: uri-tester.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-uri-tester.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-uri-tester.Tpo -c -o libephywebextension_la-uri-tester.lo `test -f 'uri-tester.c' || echo '$(srcdir)/'`uri-tester.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-uri-tester.Tpo $(DEPDIR)/libephywebextension_la-uri-tester.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/embed/uri-tester.c' object='libephywebextension_la-uri-tester.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-uri-tester.lo `test -f '$(top_srcdir)/embed/uri-tester.c' || echo '$(srcdir)/'`$(top_srcdir)/embed/uri-tester.c - -libephywebextension_la-ephy-debug.lo: $(top_srcdir)/lib/ephy-debug.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-ephy-debug.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-ephy-debug.Tpo -c -o libephywebextension_la-ephy-debug.lo `test -f '$(top_srcdir)/lib/ephy-debug.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-debug.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-ephy-debug.Tpo $(DEPDIR)/libephywebextension_la-ephy-debug.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/lib/ephy-debug.c' object='libephywebextension_la-ephy-debug.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='uri-tester.c' object='libephywebextension_la-uri-tester.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-debug.lo `test -f '$(top_srcdir)/lib/ephy-debug.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-debug.c - -libephywebextension_la-ephy-file-helpers.lo: $(top_srcdir)/lib/ephy-file-helpers.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-ephy-file-helpers.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-ephy-file-helpers.Tpo -c -o libephywebextension_la-ephy-file-helpers.lo `test -f '$(top_srcdir)/lib/ephy-file-helpers.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-file-helpers.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-ephy-file-helpers.Tpo $(DEPDIR)/libephywebextension_la-ephy-file-helpers.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/lib/ephy-file-helpers.c' object='libephywebextension_la-ephy-file-helpers.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-file-helpers.lo `test -f '$(top_srcdir)/lib/ephy-file-helpers.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-file-helpers.c - -libephywebextension_la-ephy-form-auth-data.lo: $(top_srcdir)/lib/ephy-form-auth-data.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-ephy-form-auth-data.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-ephy-form-auth-data.Tpo -c -o libephywebextension_la-ephy-form-auth-data.lo `test -f '$(top_srcdir)/lib/ephy-form-auth-data.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-form-auth-data.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-ephy-form-auth-data.Tpo $(DEPDIR)/libephywebextension_la-ephy-form-auth-data.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/lib/ephy-form-auth-data.c' object='libephywebextension_la-ephy-form-auth-data.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-form-auth-data.lo `test -f '$(top_srcdir)/lib/ephy-form-auth-data.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-form-auth-data.c - -libephywebextension_la-ephy-settings.lo: $(top_srcdir)/lib/ephy-settings.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-ephy-settings.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-ephy-settings.Tpo -c -o libephywebextension_la-ephy-settings.lo `test -f '$(top_srcdir)/lib/ephy-settings.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-settings.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-ephy-settings.Tpo $(DEPDIR)/libephywebextension_la-ephy-settings.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/lib/ephy-settings.c' object='libephywebextension_la-ephy-settings.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-settings.lo `test -f '$(top_srcdir)/lib/ephy-settings.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-settings.c - -libephywebextension_la-ephy-string.lo: $(top_srcdir)/lib/ephy-string.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-ephy-string.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-ephy-string.Tpo -c -o libephywebextension_la-ephy-string.lo `test -f '$(top_srcdir)/lib/ephy-string.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-string.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-ephy-string.Tpo $(DEPDIR)/libephywebextension_la-ephy-string.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/lib/ephy-string.c' object='libephywebextension_la-ephy-string.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-string.lo `test -f '$(top_srcdir)/lib/ephy-string.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-string.c - -libephywebextension_la-ephy-uri-helpers.lo: $(top_srcdir)/lib/ephy-uri-helpers.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-ephy-uri-helpers.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-ephy-uri-helpers.Tpo -c -o libephywebextension_la-ephy-uri-helpers.lo `test -f '$(top_srcdir)/lib/ephy-uri-helpers.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-uri-helpers.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-ephy-uri-helpers.Tpo $(DEPDIR)/libephywebextension_la-ephy-uri-helpers.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/lib/ephy-uri-helpers.c' object='libephywebextension_la-ephy-uri-helpers.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-uri-helpers.lo `test -f '$(top_srcdir)/lib/ephy-uri-helpers.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-uri-helpers.c - -libephywebextension_la-ephy-web-dom-utils.lo: $(top_srcdir)/lib/ephy-web-dom-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -MT libephywebextension_la-ephy-web-dom-utils.lo -MD -MP -MF $(DEPDIR)/libephywebextension_la-ephy-web-dom-utils.Tpo -c -o libephywebextension_la-ephy-web-dom-utils.lo `test -f '$(top_srcdir)/lib/ephy-web-dom-utils.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-web-dom-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywebextension_la-ephy-web-dom-utils.Tpo $(DEPDIR)/libephywebextension_la-ephy-web-dom-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/lib/ephy-web-dom-utils.c' object='libephywebextension_la-ephy-web-dom-utils.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-ephy-web-dom-utils.lo `test -f '$(top_srcdir)/lib/ephy-web-dom-utils.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/ephy-web-dom-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywebextension_la_CPPFLAGS) $(CPPFLAGS) $(libephywebextension_la_CFLAGS) $(CFLAGS) -c -o libephywebextension_la-uri-tester.lo `test -f 'uri-tester.c' || echo '$(srcdir)/'`uri-tester.c mostlyclean-libtool: -rm -f *.lo @@ -855,6 +791,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-webextensionLTLIBRARIES +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/embed/web-extension/uri-tester.c epiphany-browser-3.18.0/embed/web-extension/uri-tester.c --- epiphany-browser-3.16.3/embed/web-extension/uri-tester.c 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/embed/web-extension/uri-tester.c 2015-09-09 07:39:52.000000000 +0000 @@ -0,0 +1,975 @@ +/* + * Copyright © 2011 Igalia S.L. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * Some parts of this file based on the Midori's 'adblock' extension, + * licensed with the GNU Lesser General Public License 2.1, Copyright + * (C) 2009-2010 Christian Dywan and 2009 + * Alexander Butenko . Check Midori's web site + * at http://www.twotoasts.de + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "config.h" +#include "uri-tester.h" + +#include "ephy-debug.h" + +#include +#include +#include + +#define DEFAULT_FILTER_URL "https://easylist-downloads.adblockplus.org/easylist.txt" +#define FILTERS_LIST_FILENAME "filters.list" +#define SIGNATURE_SIZE 8 +#define UPDATE_FREQUENCY 24 * 60 * 60 /* In seconds */ + +#define URI_TESTER_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), TYPE_URI_TESTER, UriTesterPrivate)) + +struct _UriTesterPrivate +{ + GSList *filters; + char *data_dir; + + GHashTable *pattern; + GHashTable *keys; + GHashTable *optslist; + GHashTable *urlcache; + + GString *blockcss; + GString *blockcssprivate; + + GRegex *regex_third_party; + GRegex *regex_pattern; + GRegex *regex_subdocument; + GRegex *regex_frame_add; +}; + +enum +{ + PROP_0, + PROP_FILTERS, + PROP_BASE_DATA_DIR, +}; + +G_DEFINE_TYPE (UriTester, uri_tester, G_TYPE_OBJECT) + +/* Private functions. */ + +static GString * +uri_tester_fixup_regexp (const char *prefix, char *src); + +static void +uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri); + +static char * +uri_tester_ensure_data_dir (const char *base_data_dir) +{ + char *folder; + + /* Ensure adblock's dir is there. */ + folder = g_build_filename (base_data_dir, "adblock", NULL); + g_mkdir_with_parents (folder, 0700); + + return folder; +} + +static char* +uri_tester_get_fileuri_for_url (UriTester *tester, + const char *url) +{ + char *filename = NULL; + char *path = NULL; + char *uri = NULL; + + if (!strncmp (url, "file", 4)) + return g_strndup (url + 7, strlen (url) - 7); + + filename = g_compute_checksum_for_string (G_CHECKSUM_MD5, url, -1); + + path = g_build_filename (tester->priv->data_dir, filename, NULL); + uri = g_filename_to_uri (path, NULL, NULL); + + g_free (filename); + g_free (path); + + return uri; +} + +typedef struct { + UriTester *tester; + char *dest_uri; +} RetrieveFilterAsyncData; + +static void +uri_tester_retrieve_filter_finished (GFile *src, + GAsyncResult *result, + RetrieveFilterAsyncData *data) +{ + GError *error = NULL; + + if (!g_file_copy_finish (src, result, &error)) { + LOG ("Error retrieving filter: %s\n", error->message); + g_error_free (error); + } else + uri_tester_parse_file_at_uri (data->tester, data->dest_uri); + + g_object_unref (data->tester); + g_free (data->dest_uri); + g_slice_free (RetrieveFilterAsyncData, data); +} + +static void +uri_tester_retrieve_filter (UriTester *tester, const char *url, const char *fileuri) +{ + GFile *src; + GFile *dest; + RetrieveFilterAsyncData *data; + + g_return_if_fail (IS_URI_TESTER (tester)); + g_return_if_fail (url != NULL); + g_return_if_fail (fileuri != NULL); + + src = g_file_new_for_uri (url); + dest = g_file_new_for_uri (fileuri); + + data = g_slice_new (RetrieveFilterAsyncData); + data->tester = g_object_ref (tester); + data->dest_uri = g_file_get_uri (dest); + + g_file_copy_async (src, dest, + G_FILE_COPY_OVERWRITE, + G_PRIORITY_DEFAULT, + NULL, NULL, NULL, + (GAsyncReadyCallback)uri_tester_retrieve_filter_finished, + data); + + g_object_unref (src); + g_object_unref (dest); +} + +static gboolean +uri_tester_filter_is_valid (const char *fileuri) +{ + GFile *file = NULL; + GFileInfo *file_info = NULL; + gboolean result; + + /* Now check if the local file is too old. */ + file = g_file_new_for_uri (fileuri); + file_info = g_file_query_info (file, + G_FILE_ATTRIBUTE_TIME_MODIFIED, + G_FILE_QUERY_INFO_NONE, + NULL, + NULL); + result = FALSE; + if (file_info) + { + GTimeVal current_time; + GTimeVal mod_time; + + g_get_current_time (¤t_time); + g_file_info_get_modification_time (file_info, &mod_time); + + if (current_time.tv_sec > mod_time.tv_sec) + { + gint64 expire_time = mod_time.tv_sec + UPDATE_FREQUENCY; + result = current_time.tv_sec < expire_time; + } + g_object_unref (file_info); + } + + g_object_unref (file); + + return result; +} + +static void +uri_tester_load_patterns (UriTester *tester) +{ + GSList *filter = NULL; + char *url = NULL; + char *fileuri = NULL; + + /* Load patterns from the list of filters. */ + for (filter = tester->priv->filters; filter; filter = g_slist_next(filter)) + { + url = (char*)filter->data; + fileuri = uri_tester_get_fileuri_for_url (tester, url); + + if (!uri_tester_filter_is_valid (fileuri)) + uri_tester_retrieve_filter (tester, url, fileuri); + else + uri_tester_parse_file_at_uri (tester, fileuri); + + g_free (fileuri); + } +} + +static void +uri_tester_load_filters (UriTester *tester) +{ + GSList *list = NULL; + char *filepath = NULL; + + filepath = g_build_filename (tester->priv->data_dir, FILTERS_LIST_FILENAME, NULL); + + if (g_file_test (filepath, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) + { + GFile *file = NULL; + char *contents = NULL; + gsize length = 0; + GError *error = NULL; + + file = g_file_new_for_path (filepath); + if (g_file_load_contents (file, NULL, &contents, &length, NULL, &error)) + { + char **urls_array = NULL; + char *url = NULL; + int i = 0; + + urls_array = g_strsplit (contents, ";", -1); + for (i = 0; urls_array [i]; i++) + { + url = g_strstrip (g_strdup (urls_array[i])); + if (!g_str_equal (url, "")) + list = g_slist_prepend (list, url); + } + g_strfreev (urls_array); + + g_free (contents); + } + + if (error) + { + LOG ("Error loading filters from %s: %s", filepath, error->message); + g_error_free (error); + } + + g_object_unref (file); + } + else + { + /* No file exists yet, so use the default filter and save it. */ + list = g_slist_prepend (list, g_strdup (DEFAULT_FILTER_URL)); + } + + g_free (filepath); + + uri_tester_set_filters (tester, g_slist_reverse(list)); +} + +static void +uri_tester_save_filters (UriTester *tester) +{ + FILE *file = NULL; + char *filepath = NULL; + + filepath = g_build_filename (tester->priv->data_dir, FILTERS_LIST_FILENAME, NULL); + + if ((file = g_fopen (filepath, "w"))) + { + GSList *item = NULL; + char *filter = NULL; + + for (item = tester->priv->filters; item; item = g_slist_next (item)) + { + filter = g_strdup_printf ("%s;", (char*)item->data); + fputs (filter, file); + g_free (filter); + } + fclose (file); + } + g_free (filepath); +} + +static inline int +uri_tester_check_rule (UriTester *tester, + GRegex *regex, + const char *patt, + const char *req_uri, + const char *page_uri) +{ + char *opts; + + if (!g_regex_match_full (regex, req_uri, -1, 0, 0, NULL, NULL)) + return FALSE; + + opts = g_hash_table_lookup (tester->priv->optslist, patt); + if (opts && g_regex_match (tester->priv->regex_third_party, opts, 0, NULL)) + { + if (page_uri && g_regex_match_full (regex, page_uri, -1, 0, 0, NULL, NULL)) + return FALSE; + } + /* TODO: Domain opt check */ + LOG ("blocked by pattern regexp=%s -- %s", g_regex_get_pattern (regex), req_uri); + return TRUE; +} + +static inline gboolean +uri_tester_is_matched_by_pattern (UriTester *tester, + const char *req_uri, + const char *page_uri) +{ + GHashTableIter iter; + gpointer patt, regex; + + g_hash_table_iter_init (&iter, tester->priv->pattern); + while (g_hash_table_iter_next (&iter, &patt, ®ex)) + { + if (uri_tester_check_rule(tester, regex, patt, req_uri, page_uri)) + return TRUE; + } + return FALSE; +} + +static inline gboolean +uri_tester_is_matched_by_key (UriTester *tester, + const char *opts, + const char *req_uri, + const char *page_uri) +{ + UriTesterPrivate *priv = NULL; + char *uri; + int len; + int pos = 0; + GList *regex_bl = NULL; + GString *guri; + gboolean ret = FALSE; + char sig[SIGNATURE_SIZE + 1]; + + priv = tester->priv; + + memset (&sig[0], 0, sizeof (sig)); + /* Signatures are made on pattern, so we need to convert url to a pattern as well */ + guri = uri_tester_fixup_regexp ("", (char*)req_uri); + uri = guri->str; + len = guri->len; + + for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) + { + GRegex *regex; + strncpy (sig, uri + pos, SIGNATURE_SIZE); + regex = g_hash_table_lookup (priv->keys, sig); + + /* Dont check if regex is already blacklisted */ + if (!regex || g_list_find (regex_bl, regex)) + continue; + ret = uri_tester_check_rule (tester, regex, sig, req_uri, page_uri); + if (ret) + break; + regex_bl = g_list_prepend (regex_bl, regex); + } + g_string_free (guri, TRUE); + g_list_free (regex_bl); + return ret; +} + +static gboolean +uri_tester_is_matched (UriTester *tester, + const char *opts, + const char *req_uri, + const char *page_uri) +{ + UriTesterPrivate *priv = NULL; + char *value; + + priv = tester->priv; + + /* Check cached URLs first. */ + if ((value = g_hash_table_lookup (priv->urlcache, req_uri))) + return (value[0] != '0') ? TRUE : FALSE; + + /* Look for a match either by key or by pattern. */ + if (uri_tester_is_matched_by_key (tester, opts, req_uri, page_uri)) + { + g_hash_table_insert (priv->urlcache, g_strdup (req_uri), g_strdup("1")); + return TRUE; + } + + /* Matching by pattern is pretty expensive, so do it if needed only. */ + if (uri_tester_is_matched_by_pattern (tester, req_uri, page_uri)) + { + g_hash_table_insert (priv->urlcache, g_strdup (req_uri), g_strdup("1")); + return TRUE; + } + + g_hash_table_insert (priv->urlcache, g_strdup (req_uri), g_strdup("0")); + return FALSE; +} + +static GString * +uri_tester_fixup_regexp (const char *prefix, char *src) +{ + GString *str; + int len = 0; + + if (!src) + return NULL; + + str = g_string_new (prefix); + + /* lets strip first .* */ + if (src[0] == '*') + { + (void)*src++; + } + + do + { + switch (*src) + { + case '*': + g_string_append (str, ".*"); + break; + /*case '.': + g_string_append (str, "\\."); + break;*/ + case '?': + g_string_append (str, "\\?"); + break; + case '|': + /* FIXME: We actually need to match :[0-9]+ or '/'. Sign means + "here could be port number or nothing". So bla.com^ will match + bla.com/ or bla.com:8080/ but not bla.com.au/ */ + case '^': + case '+': + break; + default: + g_string_append_printf (str,"%c", *src); + break; + } + src++; + } + while (*src); + + len = str->len; + /* We dont need .* in the end of url. Thats stupid */ + if (str->str && str->str[len-1] == '*' && str->str[len-2] == '.') + g_string_erase (str, len-2, 2); + + return str; +} + +static void +uri_tester_compile_regexp (UriTester *tester, + GString *gpatt, + char *opts) +{ + GRegex *regex; + GError *error = NULL; + char *patt; + int len; + + if (!gpatt) + return; + + patt = gpatt->str; + len = gpatt->len; + + /* TODO: Play with optimization flags */ + regex = g_regex_new (patt, G_REGEX_OPTIMIZE | G_REGEX_JAVASCRIPT_COMPAT, + G_REGEX_MATCH_NOTEMPTY, &error); + if (error) + { + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); + return; + } + + if (!g_regex_match (tester->priv->regex_pattern, patt, 0, NULL)) + { + int signature_count = 0; + int pos = 0; + char *sig; + + for (pos = len - SIGNATURE_SIZE; pos >= 0; pos--) { + sig = g_strndup (patt + pos, SIGNATURE_SIZE); + if (!strchr (sig, '*') && + !g_hash_table_lookup (tester->priv->keys, sig)) + { + LOG ("sig: %s %s", sig, patt); + g_hash_table_insert (tester->priv->keys, g_strdup (sig), g_regex_ref (regex)); + g_hash_table_insert (tester->priv->optslist, g_strdup (sig), g_strdup (opts)); + signature_count++; + } + else + { + if (sig[0] == '*' && + !g_hash_table_lookup (tester->priv->pattern, patt)) + { + LOG ("patt2: %s %s", sig, patt); + g_hash_table_insert (tester->priv->pattern, g_strdup (patt), g_regex_ref (regex)); + g_hash_table_insert (tester->priv->optslist, g_strdup (patt), g_strdup (opts)); + } + } + g_free (sig); + } + g_regex_unref (regex); + + if (signature_count > 1 && g_hash_table_lookup (tester->priv->pattern, patt)) + g_hash_table_remove (tester->priv->pattern, patt); + } + else + { + LOG ("patt: %s%s", patt, ""); + /* Pattern is a regexp chars */ + g_hash_table_insert (tester->priv->pattern, g_strdup (patt), regex); + g_hash_table_insert (tester->priv->optslist, g_strdup (patt), g_strdup (opts)); + } +} + +static void +uri_tester_add_url_pattern (UriTester *tester, + char *prefix, + char *type, + char *line) +{ + char **data; + char *patt; + GString *format_patt; + char *opts; + + data = g_strsplit (line, "$", -1); + if (!data || !data[0]) + { + g_strfreev (data); + return; + } + + if (data[1] && data[2]) + { + patt = g_strconcat (data[0], data[1], NULL); + opts = g_strconcat (type, ",", data[2], NULL); + } + else if (data[1]) + { + patt = data[0]; + opts = g_strconcat (type, ",", data[1], NULL); + } + else + { + patt = data[0]; + opts = type; + } + + if (g_regex_match (tester->priv->regex_subdocument, opts, 0, NULL)) + { + if (data[1] && data[2]) + g_free (patt); + if (data[1]) + g_free (opts); + g_strfreev (data); + return; + } + + format_patt = uri_tester_fixup_regexp (prefix, patt); + + LOG ("got: %s opts %s", format_patt->str, opts); + uri_tester_compile_regexp (tester, format_patt, opts); + + if (data[1] && data[2]) + g_free (patt); + if (data[1]) + g_free (opts); + g_strfreev (data); + + g_string_free (format_patt, TRUE); +} + +static inline void +uri_tester_frame_add (UriTester *tester, char *line) +{ + const char *separator = " , "; + + (void)*line++; + (void)*line++; + if (strchr (line, '\'') + || (strchr (line, ':') + && !g_regex_match (tester->priv->regex_frame_add, line, 0, NULL))) + { + return; + } + g_string_append (tester->priv->blockcss, separator); + g_string_append (tester->priv->blockcss, line); +} + +static inline void +uri_tester_frame_add_private (UriTester *tester, + const char *line, + const char *sep) +{ + char **data; + data = g_strsplit (line, sep, 2); + + if (!(data[1] && *data[1]) + || strchr (data[1], '\'') + || (strchr (data[1], ':') + && !g_regex_match (tester->priv->regex_frame_add, data[1], 0, NULL))) + { + g_strfreev (data); + return; + } + + if (strchr (data[0], ',')) + { + char **domains; + int i; + + domains = g_strsplit (data[0], ",", -1); + for (i = 0; domains[i]; i++) + { + g_string_append_printf (tester->priv->blockcssprivate, ";sites['%s']+=',%s'", + g_strstrip (domains[i]), data[1]); + } + g_strfreev (domains); + } + else + { + g_string_append_printf (tester->priv->blockcssprivate, ";sites['%s']+=',%s'", + data[0], data[1]); + } + g_strfreev (data); +} + +static void +uri_tester_parse_line (UriTester *tester, char *line) +{ + if (!line) + return; + + g_strchomp (line); + /* Ignore comments and new lines */ + if (line[0] == '!') + return; + /* FIXME: No support for whitelisting */ + if (line[0] == '@' && line[1] == '@') + return; + /* FIXME: No support for [include] and [exclude] tags */ + if (line[0] == '[') + return; + /* FIXME: No support for domain= */ + if (strstr (line, "domain=")) + return; + + /* Skip garbage */ + if (line[0] == ' ' || !line[0]) + return; + + /* Got CSS block hider */ + if (line[0] == '#' && line[1] == '#' ) + { + uri_tester_frame_add (tester, line); + return; + } + /* Got CSS block hider. Workaround */ + if (line[0] == '#') + return; + + /* Got per domain CSS hider rule */ + if (strstr (line, "##")) + { + uri_tester_frame_add_private (tester, line, "##"); + return; + } + + /* Got per domain CSS hider rule. Workaround */ + if (strchr (line, '#')) + { + uri_tester_frame_add_private (tester, line, "#"); + return; + } + /* Got URL blocker rule */ + if (line[0] == '|' && line[1] == '|' ) + { + (void)*line++; + (void)*line++; + uri_tester_add_url_pattern (tester, "", "fulluri", line); + return; + } + if (line[0] == '|') + { + (void)*line++; + uri_tester_add_url_pattern (tester, "^", "fulluri", line); + return; + } + uri_tester_add_url_pattern (tester, "", "uri", line); +} + +static void +file_parse_cb (GDataInputStream *stream, GAsyncResult *result, UriTester *tester) +{ + char *line; + GError *error = NULL; + + line = g_data_input_stream_read_line_finish (stream, result, NULL, &error); + if (!line) { + if (error) { + LOG ("Error parsing file: %s\n", error->message); + g_error_free (error); + } + + return; + } + + uri_tester_parse_line (tester, line); + g_free (line); + + g_data_input_stream_read_line_async (stream, G_PRIORITY_DEFAULT_IDLE, NULL, + (GAsyncReadyCallback)file_parse_cb, tester); +} + +static void +file_read_cb (GFile *file, GAsyncResult *result, UriTester *tester) +{ + GFileInputStream *stream; + GDataInputStream *data_stream; + GError *error = NULL; + + stream = g_file_read_finish (file, result, &error); + if (!stream) { + char *path; + + path = g_file_get_path (file); + LOG ("Error opening file %s for parsing: %s\n", path, error->message); + g_free (path); + g_error_free (error); + + return; + } + + data_stream = g_data_input_stream_new (G_INPUT_STREAM (stream)); + g_object_unref (stream); + + g_data_input_stream_read_line_async (data_stream, G_PRIORITY_DEFAULT_IDLE, NULL, + (GAsyncReadyCallback)file_parse_cb, tester); + g_object_unref (data_stream); +} + +static void +uri_tester_parse_file_at_uri (UriTester *tester, const char *fileuri) +{ + GFile *file; + GFileInputStream *stream; + + file = g_file_new_for_uri (fileuri); + g_file_read_async (file, G_PRIORITY_DEFAULT_IDLE, NULL, (GAsyncReadyCallback)file_read_cb, tester); + g_object_unref (file); +} + +static void +uri_tester_init (UriTester *tester) +{ + UriTesterPrivate *priv = NULL; + + LOG ("UriTester initializing %p", tester); + + priv = URI_TESTER_GET_PRIVATE (tester); + tester->priv = priv; + + priv->filters = NULL; + priv->pattern = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_regex_unref); + priv->keys = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_regex_unref); + priv->optslist = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_free); + priv->urlcache = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify)g_free, + (GDestroyNotify)g_free); + + priv->blockcss = g_string_new ("z-non-exist"); + priv->blockcssprivate = g_string_new (""); + + priv->regex_third_party = g_regex_new (",third-party", + G_REGEX_CASELESS | G_REGEX_OPTIMIZE, + G_REGEX_MATCH_NOTEMPTY, + NULL); + priv->regex_pattern = g_regex_new ("^/.*[\\^\\$\\*].*/$", + G_REGEX_UNGREEDY | G_REGEX_OPTIMIZE, + G_REGEX_MATCH_NOTEMPTY, + NULL); + priv->regex_subdocument = g_regex_new ("subdocument", + G_REGEX_CASELESS | G_REGEX_OPTIMIZE, + G_REGEX_MATCH_NOTEMPTY, + NULL); + priv->regex_frame_add = g_regex_new (".*\\[.*:.*\\].*", + G_REGEX_CASELESS | G_REGEX_OPTIMIZE, + G_REGEX_MATCH_NOTEMPTY, + NULL); +} + +static void +uri_tester_constructed (GObject *object) +{ + UriTester *tester = URI_TESTER (object); + + G_OBJECT_CLASS (uri_tester_parent_class)->constructed (object); + + uri_tester_load_filters (tester); + uri_tester_load_patterns (tester); +} + +static void +uri_tester_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + UriTester *tester = URI_TESTER (object); + + switch (prop_id) + { + case PROP_FILTERS: + uri_tester_set_filters (tester, (GSList*) g_value_get_pointer (value)); + break; + case PROP_BASE_DATA_DIR: + tester->priv->data_dir = uri_tester_ensure_data_dir (g_value_get_string (value)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +uri_tester_finalize (GObject *object) +{ + UriTesterPrivate *priv = URI_TESTER_GET_PRIVATE (URI_TESTER (object)); + + LOG ("UriTester finalizing %p", object); + + g_slist_foreach (priv->filters, (GFunc) g_free, NULL); + g_slist_free (priv->filters); + g_free (priv->data_dir); + + g_hash_table_destroy (priv->pattern); + g_hash_table_destroy (priv->keys); + g_hash_table_destroy (priv->optslist); + g_hash_table_destroy (priv->urlcache); + + g_string_free (priv->blockcss, TRUE); + g_string_free (priv->blockcssprivate, TRUE); + + g_regex_unref (priv->regex_third_party); + g_regex_unref (priv->regex_pattern); + g_regex_unref (priv->regex_subdocument); + g_regex_unref (priv->regex_frame_add); + + G_OBJECT_CLASS (uri_tester_parent_class)->finalize (object); +} + +static void +uri_tester_class_init (UriTesterClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->set_property = uri_tester_set_property; + object_class->constructed = uri_tester_constructed; + object_class->finalize = uri_tester_finalize; + + g_object_class_install_property + (object_class, + PROP_FILTERS, + g_param_spec_pointer ("filters", + "filters", + "filters", + G_PARAM_WRITABLE)); + g_object_class_install_property + (object_class, + PROP_BASE_DATA_DIR, + g_param_spec_string ("base-data-dir", + "Base data dir", + "The base dir where to create the adblock data dir", + NULL, + G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); + + g_type_class_add_private (object_class, sizeof (UriTesterPrivate)); +} + +UriTester * +uri_tester_new (const char *base_data_dir) +{ + g_return_val_if_fail (base_data_dir != NULL, NULL); + + return g_object_new (TYPE_URI_TESTER, "base-data-dir", base_data_dir, NULL); +} + +gboolean +uri_tester_test_uri (UriTester *tester, + const char *req_uri, + const char *page_uri, + AdUriCheckType type) +{ + /* Don't block top level documents. */ + if (type == AD_URI_CHECK_TYPE_DOCUMENT) + return FALSE; + + return uri_tester_is_matched (tester, NULL, req_uri, page_uri); +} + +void +uri_tester_set_filters (UriTester *tester, GSList *filters) +{ + UriTesterPrivate *priv = tester->priv; + + if (priv->filters) + { + g_slist_foreach (priv->filters, (GFunc) g_free, NULL); + g_slist_free (priv->filters); + } + + priv->filters = filters; +} + +GSList * +uri_tester_get_filters (UriTester *tester) +{ + return tester->priv->filters; +} + +void +uri_tester_reload (UriTester *tester) +{ + GDir *g_data_dir = NULL; + + /* Remove data files in the data dir first. */ + g_data_dir = g_dir_open (tester->priv->data_dir, 0, NULL); + if (g_data_dir) + { + const char *filename = NULL; + char *filepath = NULL; + + while ((filename = g_dir_read_name (g_data_dir))) + { + /* Omit the list of filters. */ + if (!g_strcmp0 (filename, FILTERS_LIST_FILENAME)) + continue; + + filepath = g_build_filename (tester->priv->data_dir, filename, NULL); + g_unlink (filepath); + + g_free (filepath); + } + + g_dir_close (g_data_dir); + } + + /* Load patterns from current filters. */ + uri_tester_load_patterns (tester); +} diff -Nru epiphany-browser-3.16.3/embed/web-extension/uri-tester.h epiphany-browser-3.18.0/embed/web-extension/uri-tester.h --- epiphany-browser-3.16.3/embed/web-extension/uri-tester.h 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/embed/web-extension/uri-tester.h 2015-09-09 07:39:52.000000000 +0000 @@ -0,0 +1,99 @@ +/* + * Copyright © 2011 Igalia S.L. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef URI_TESTER_H +#define URI_TESTER_H + +#include +#include + +G_BEGIN_DECLS + +#define TYPE_URI_TESTER (uri_tester_get_type ()) +#define URI_TESTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_URI_TESTER, UriTester)) +#define URI_TESTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_URI_TESTER, UriTesterClass)) +#define IS_URI_TESTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_URI_TESTER)) +#define IS_URI_TESTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_URI_TESTER)) +#define URI_TESTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_URI_TESTER, UriTesterClass)) + +typedef enum +{ + AD_URI_CHECK_TYPE_OTHER = 1U, + AD_URI_CHECK_TYPE_SCRIPT = 2U, /* Indicates an executable script + (such as JavaScript) */ + AD_URI_CHECK_TYPE_IMAGE = 3U, /* Indicates an image (e.g., IMG + elements) */ + AD_URI_CHECK_TYPE_STYLESHEET = 4U, /* Indicates a stylesheet (e.g., + STYLE elements) */ + AD_URI_CHECK_TYPE_OBJECT = 5U, /* Indicates a generic object + (plugin-handled content + typically falls under this + category) */ + AD_URI_CHECK_TYPE_DOCUMENT = 6U, /* Indicates a document at the + top-level (i.e., in a + browser) */ + AD_URI_CHECK_TYPE_SUBDOCUMENT = 7U, /* Indicates a document contained + within another document (e.g., + IFRAMEs, FRAMES, and OBJECTs) */ + AD_URI_CHECK_TYPE_REFRESH = 8U, /* Indicates a timed refresh */ + AD_URI_CHECK_TYPE_XBEL = 9U, /* Indicates an XBL binding request, + triggered either by -moz-binding CSS + property or Document.addBinding method */ + AD_URI_CHECK_TYPE_PING = 10U, /* Indicates a ping triggered by a click on + element */ + AD_URI_CHECK_TYPE_XMLHTTPREQUEST = 11U, /* Indicates a XMLHttpRequest */ + AD_URI_CHECK_TYPE_OBJECT_SUBREQUEST = 12U /* Indicates a request by a plugin */ +} AdUriCheckType; + +typedef struct _UriTester UriTester; +typedef struct _UriTesterClass UriTesterClass; +typedef struct _UriTesterPrivate UriTesterPrivate; + +struct _UriTester +{ + GObject parent_instance; + + /*< private >*/ + UriTesterPrivate *priv; +}; + +struct _UriTesterClass +{ + GObjectClass parent_class; +}; + +GType uri_tester_get_type (void); + +void uri_tester_register (GTypeModule *module); + +UriTester *uri_tester_new (const char *base_data_dir); + +gboolean uri_tester_test_uri (UriTester *tester, + const char *req_uri, + const char *page_uri, + AdUriCheckType type); + +void uri_tester_set_filters (UriTester *tester, GSList *filters); + +GSList *uri_tester_get_filters (UriTester *tester); + +void uri_tester_reload (UriTester *tester); + +G_END_DECLS + +#endif /* URI_TESTER_H */ diff -Nru epiphany-browser-3.16.3/HACKING epiphany-browser-3.18.0/HACKING --- epiphany-browser-3.16.3/HACKING 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/HACKING 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -In order to keep the code nice and clean we have a few requirements you'll -need to stick to in order to get your patch accepted: - -- Use 2-space no-tabs for indentation (mandatory on new files, old - ones will be re-indented eventually. When modifying an existing file - with 8-space indentation keep the old style please). - -- Use K&R style for the braces. - -- No braces for one line control clauses. - -- Callback functions have a suffix _cb. - -- All files have to be encoded in UTF-8. - -- Use char/int/double/..., not gchar/gint/gdouble/... types. - -- All implementation files must include first "config.h", followed by - the primary header, followed by a blank line, followed by all the - local headers sorted alphabetically, followed by a blank line, - followed by all the system headers sorted alphabetically. - - Headers should follow the same pattern excluding the config.h and - self file section, for obvious reasons. - -- Make comments full sentences. This means proper capitalization and - punctuation. - -- data/kr-gnome-indent.cfg is provided as a reference config file for the - uncrustify program to get correct indentation in new files. - -- There's no space between a type cast and the variable name. - - Right: (int*)foo - Wrong: (int*) foo - -See ChangeLog.README for Git checkin rules. -See doc/debugging.txt for some tips and tricks for debugging. - -Do NOT commit to this module without permission from a maintainer. -See the MAINTAINERS file for who they are. diff -Nru epiphany-browser-3.16.3/help/de/de.po epiphany-browser-3.18.0/help/de/de.po --- epiphany-browser-3.16.3/help/de/de.po 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/help/de/de.po 2015-08-07 08:41:06.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: epiphany master\n" -"POT-Creation-Date: 2015-06-20 03:41+0000\n" +"POT-Creation-Date: 2015-06-20 03:44+0000\n" "PO-Revision-Date: 2015-06-20 08:29+0100\n" "Last-Translator: Benjamin Steinwender \n" "Language-Team: German \n" diff -Nru epiphany-browser-3.16.3/help/fr/bookmark-add.page epiphany-browser-3.18.0/help/fr/bookmark-add.page --- epiphany-browser-3.16.3/help/fr/bookmark-add.page 2015-07-09 13:27:41.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/bookmark-add.page 2015-09-22 07:48:08.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Marquer une page diff -Nru epiphany-browser-3.16.3/help/fr/bookmark-delete.page epiphany-browser-3.18.0/help/fr/bookmark-delete.page --- epiphany-browser-3.16.3/help/fr/bookmark-delete.page 2015-07-09 13:27:41.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/bookmark-delete.page 2015-09-22 07:48:08.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Suppression d'un signet diff -Nru epiphany-browser-3.16.3/help/fr/bookmark-edit.page epiphany-browser-3.18.0/help/fr/bookmark-edit.page --- epiphany-browser-3.16.3/help/fr/bookmark-edit.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/bookmark-edit.page 2015-09-22 07:48:08.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Mise à jour d'un signet diff -Nru epiphany-browser-3.16.3/help/fr/bookmark.page epiphany-browser-3.18.0/help/fr/bookmark.page --- epiphany-browser-3.16.3/help/fr/bookmark.page 2015-07-09 13:27:41.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/bookmark.page 2015-09-22 07:48:08.000000000 +0000 @@ -36,6 +36,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Aide des signets diff -Nru epiphany-browser-3.16.3/help/fr/bookmark-smart.page epiphany-browser-3.18.0/help/fr/bookmark-smart.page --- epiphany-browser-3.16.3/help/fr/bookmark-smart.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/bookmark-smart.page 2015-09-22 07:48:08.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Signets intelligents diff -Nru epiphany-browser-3.16.3/help/fr/bookmark-topic.page epiphany-browser-3.18.0/help/fr/bookmark-topic.page --- epiphany-browser-3.16.3/help/fr/bookmark-topic.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/bookmark-topic.page 2015-09-22 07:48:08.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Sujets diff -Nru epiphany-browser-3.16.3/help/fr/browse-local.page epiphany-browser-3.18.0/help/fr/browse-local.page --- epiphany-browser-3.16.3/help/fr/browse-local.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/browse-local.page 2015-09-22 07:48:08.000000000 +0000 @@ -37,6 +37,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Affichage de fichiers locaux diff -Nru epiphany-browser-3.16.3/help/fr/browse-private.page epiphany-browser-3.18.0/help/fr/browse-private.page --- epiphany-browser-3.16.3/help/fr/browse-private.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/browse-private.page 2015-09-22 07:48:08.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Navigation privée diff -Nru epiphany-browser-3.16.3/help/fr/browse-tab.page epiphany-browser-3.18.0/help/fr/browse-tab.page --- epiphany-browser-3.16.3/help/fr/browse-tab.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/browse-tab.page 2015-09-22 07:48:09.000000000 +0000 @@ -20,7 +20,7 @@ - Open another web page in a new tab in the same window. + Ouvrir une autre page Web dans un nouvel onglet de la même fenêtre. naybnet @@ -39,9 +39,15 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + - Open a new tab + Ouverture d'un nouvel onglet diff -Nru epiphany-browser-3.16.3/help/fr/browse-webapps-del.page epiphany-browser-3.18.0/help/fr/browse-webapps-del.page --- epiphany-browser-3.16.3/help/fr/browse-webapps-del.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/browse-webapps-del.page 2015-09-22 07:48:09.000000000 +0000 @@ -19,7 +19,7 @@ - How do I delete a Web Application? + Comment supprimer une Application Web ? naybnet @@ -38,24 +38,27 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + - Remove a Web Application + Suppression d'une Application Web -

You can delete a Web Application when you no longer need it.

+

Vous pouvez supprimer une Application Web dont vous n'avez plus besoin.

-

Press on the window header and type - about:applications.

+

Cliquez sur l'en-tête de la fenêtre et saisissez about:applications.

 -

Press Delete next to the application which you want to - remove.

+

Cliquez sur Supprimer à côté de l'application à supprimer.

 -

If you have Software installed, you can also delete Web - Applications from there.

+

Si vous avez installé Logiciels, vous pouvez aussi supprimer les applications depuis cet emplacement.

diff -Nru epiphany-browser-3.16.3/help/fr/browse-webapps.page epiphany-browser-3.18.0/help/fr/browse-webapps.page --- epiphany-browser-3.16.3/help/fr/browse-webapps.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/browse-webapps.page 2015-09-22 07:48:09.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Création d'une Application Web @@ -49,8 +55,7 @@

Ouvrez la page Web à enregistrer.

-

Open the menu at the top-right of the window, then select - Save as Web Application….

+

Ouvrez le menu dans le coin supérieur droit de la fenêtre, puis cliquez sur Enregistrer comme Application Web….

Nommez votre Application Web puis appuyez sur Créer.

diff -Nru epiphany-browser-3.16.3/help/fr/browse-web.page epiphany-browser-3.18.0/help/fr/browse-web.page --- epiphany-browser-3.16.3/help/fr/browse-web.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/browse-web.page 2015-09-22 07:48:09.000000000 +0000 @@ -40,6 +40,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Navigation sur le Web @@ -55,19 +61,10 @@ -

Tabs are used to view more than one web page in one - window. When you first start up Web, you will not be shown any - tabs. To open a new tab, press the menu button at the top-right of - the screen, then New Tab. Once - the new tab is open, you can use it as you would normally use a new - window.

- -

You can also use the - CtrlT keyboard shortcut to open a new - tab or the new tab button in the top-left of the window.

- -

To open a link in a new tab, right click on the - link, then select Open Link in New Tab or use the - middle mouse button to click on the link.

+

Les onglets sont utilisés pour afficher plus d'une page Web dans une fenêtre. Lors du démarrage de Web, aucun onglet n'est affiché. Pour ouvrir un nouvel onglet, sélectionnez le menu dans le coin supérieur droit de l'écran, puis cliquez sur Nouvel onglet. Une fois le nouvel onglet ouvert, vous pouvez l'utiliser comme on utilise une nouvelle fenêtre.

+ +

Vous pouvez aussi ouvrir un nouvel onglet ou afficher le bouton nouvel onglet dans le coin supérieur gauche de l'écran avec le raccourci clavier CtrlT.

+ +

Vous pouvez également ouvrir le lien dans un nouvel onglet par un clic droit sur le lien et le choix Ouverture dans un nouvel onglet, ou par un clic avec le bouton du milieu de la souris sur le lien.

diff -Nru epiphany-browser-3.16.3/help/fr/cert.page epiphany-browser-3.18.0/help/fr/cert.page --- epiphany-browser-3.16.3/help/fr/cert.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/cert.page 2015-09-22 07:48:09.000000000 +0000 @@ -13,7 +13,7 @@ - Certificate management in Web. + Gérer les certificats dans Web. naybnet @@ -32,19 +32,22 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + - Certificates + Certificats -

Web does not have built-in support for certificate management at - this time.

+

Web ne peut pas prendre en charge la gestion des certificats pour l'instant.

-

You can add certificates through the command line if you have p11-kit - installed. To add a certificate, you need to download the certificate and - run the following command to import it:

- $ sudo trust anchor /home/user/Downloads/certificate.crt -

This will only work on recent systems.

+

Pour ajouter un certificat, installez p11-kit, téléchargez le certificat, et exécutez cette commande pour l'importer :

+ $ sudo trust anchor /home/user/Téléchargements/certificate.crt +

Cela ne fonctionne qu'avec les systèmes récents.

 diff -Nru epiphany-browser-3.16.3/help/fr/cookies.xml epiphany-browser-3.18.0/help/fr/cookies.xml --- epiphany-browser-3.16.3/help/fr/cookies.xml 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/cookies.xml 2015-09-22 07:48:09.000000000 +0000 @@ -31,6 +31,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Description d'un cookie diff -Nru epiphany-browser-3.16.3/help/fr/data-cookies.page epiphany-browser-3.18.0/help/fr/data-cookies.page --- epiphany-browser-3.16.3/help/fr/data-cookies.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/data-cookies.page 2015-09-22 07:48:09.000000000 +0000 @@ -37,6 +37,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Suppression d'un cookie diff -Nru epiphany-browser-3.16.3/help/fr/data-passwords.page epiphany-browser-3.18.0/help/fr/data-passwords.page --- epiphany-browser-3.16.3/help/fr/data-passwords.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/data-passwords.page 2015-09-22 07:48:09.000000000 +0000 @@ -45,6 +45,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Gestion des mots de passe @@ -78,7 +84,7 @@

Vous pouvez afficher les mots de passe enregistrés en cliquant sur le bouton avec un clé en bas à droite de la liste de mots de passe.

-

Vous pouvez également supprimer tous les mots de passe sauvegardés en utilisant le bouton Effacer tout

+

Vous pouvez également supprimer tous les mots de passe sauvegardés en utilisant le bouton Effacer tout.

 diff -Nru epiphany-browser-3.16.3/help/fr/fr.po epiphany-browser-3.18.0/help/fr/fr.po --- epiphany-browser-3.16.3/help/fr/fr.po 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/fr.po 2015-09-21 08:20:22.000000000 +0000 @@ -4,13 +4,14 @@ # naybnet , 2014. # Julien Hardelin , 2014. # Guillaume Bernard , 2014. +# Alain Lojewski , 2015. # msgid "" msgstr "" "Project-Id-Version: epiphany master\n" -"POT-Creation-Date: 2014-09-17 19:37+0000\n" -"PO-Revision-Date: 2014-09-18 00:08+0200\n" -"Last-Translator: Guillaume Bernard \n" +"POT-Creation-Date: 2015-09-12 03:47+0000\n" +"PO-Revision-Date: 2015-09-12 16:30+0200\n" +"Last-Translator: Alain Lojewski \n" "Language-Team: français \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -25,7 +26,8 @@ msgstr "" "naybnet , 2014\n" "Julien Hardelin , 2014\n" -"Guillaume Bernard , 2014" +"Guillaume Bernard , 2014\n" +"Alain Lojewski , 2015" #. (itstool) path: info/title #: C/index.page:8 @@ -95,11 +97,13 @@ #: C/introduction.page:11 C/bookmark.page:15 C/bookmark-add.page:17 #: C/bookmark-delete.page:17 C/bookmark-edit.page:17 C/bookmark-smart.page:12 #: C/bookmark-topic.page:12 C/browse-local.page:11 C/browse-private.page:12 -#: C/browse-web.page:13 C/cookies.xml:12 C/data-cookies.page:11 -#: C/data-passwords.page:19 C/history.page:12 C/history-delete.page:11 -#: C/keyboard-shortcut.page:16 C/pref-cookies.page:13 C/pref-css.page:17 -#: C/pref-downloads.page:13 C/pref-do-not-track.page:17 C/pref-font.page:18 -#: C/pref-passwords.page:13 C/prob-restore-closed-page.page:16 +#: C/browse-tab.page:13 C/browse-web.page:14 C/browse-webapps.page:12 +#: C/browse-webapps-del.page:12 C/cert.page:11 C/cookies.xml:12 +#: C/data-cookies.page:11 C/data-passwords.page:19 C/history.page:12 +#: C/history-delete.page:11 C/keyboard-shortcut.page:16 C/pref-cookies.page:13 +#: C/pref-css.page:17 C/pref-downloads.page:13 C/pref-do-not-track.page:17 +#: C/pref-font.page:18 C/pref-passwords.page:13 +#: C/prob-restore-closed-page.page:16 C/proxy.page:12 msgid "Ekaterina Gerasimova" msgstr "Ekaterina Gerasimova" @@ -108,7 +112,7 @@ #: C/bookmark-add.page:14 C/bookmark-add.page:19 C/bookmark-delete.page:14 #: C/bookmark-delete.page:19 C/bookmark-edit.page:14 C/bookmark-edit.page:19 #: C/bookmark-smart.page:14 C/bookmark-topic.page:14 C/browse-local.page:13 -#: C/browse-private.page:14 C/browse-web.page:15 C/cookies.xml:14 +#: C/browse-private.page:14 C/browse-webapps.page:14 C/cookies.xml:14 #: C/data-cookies.page:13 C/data-passwords.page:16 C/data-passwords.page:21 #: C/history.page:14 C/history-delete.page:13 C/pref-cookies.page:15 #: C/pref-css.page:14 C/pref-css.page:19 C/pref-downloads.page:15 @@ -662,18 +666,42 @@ "fenêtre de gauche et une session de navigation privée dans la fenêtre de " "droite" +#. (itstool) path: credit/years +#: C/browse-tab.page:15 C/data-cookies.page:18 C/data-passwords.page:26 +#: C/keyboard-shortcut.page:13 C/keyboard-shortcut.page:18 +#: C/pref-do-not-track.page:14 C/pref-do-not-track.page:19 +#: C/prob-restore-closed-page.page:13 C/prob-restore-closed-page.page:18 +#: C/proxy.page:14 +msgid "2014" +msgstr "2014" + #. (itstool) path: info/desc -#: C/browse-web.page:25 +#: C/browse-tab.page:25 +msgid "Open another web page in a new tab in the same window." +msgstr "Ouvrir une autre page Web dans un nouvel onglet de la même fenêtre." + +#. (itstool) path: page/title +#: C/browse-tab.page:28 +msgid "Open a new tab" +msgstr "Ouverture d'un nouvel onglet" + +#. (itstool) path: credit/years +#: C/browse-web.page:16 +msgid "2013, 2014" +msgstr "2013, 2014" + +#. (itstool) path: info/desc +#: C/browse-web.page:26 msgid "View web pages on the internet." msgstr "Afficher des pages Web sur Internet." #. (itstool) path: page/title -#: C/browse-web.page:28 +#: C/browse-web.page:29 msgid "Browse the web" msgstr "Navigation sur le Web" #. (itstool) path: page/p -#: C/browse-web.page:30 +#: C/browse-web.page:31 msgid "" "Web browsers can be used to view pages on the Internet when you have an " "Internet connection. To start browsing the web:" @@ -683,7 +711,7 @@ "sur le Web :" #. (itstool) path: item/p -#: C/browse-web.page:35 +#: C/browse-web.page:36 msgid "" "When you start up Web, your cursor should " "be in the text entry field at the top of the window. Type in the URL of the " @@ -694,39 +722,40 @@ "l'URL de la page Web désirée ou un terme à rechercher." #. (itstool) path: item/p -#: C/browse-web.page:40 +#: C/browse-web.page:41 msgid "Press return to go to the web page or to search." msgstr "" "Appuyez sur la touche entrée pour aller à la page Web ou pour effectuer la " "recherche." #. (itstool) path: page/p -#: C/browse-web.page:44 +#: C/browse-web.page:45 +msgid "" +"Tabs are used to view more than one web page in one window. When " +"you first start up Web, you will not be shown any tabs. To " +"open a new tab, press the menu button at the top-right of the " +"screen, then New Tab. Once " +"the new tab is open, you can use it as you would normally use a new window." +msgstr "" +"Les onglets sont utilisés pour afficher plus d'une page Web dans une fenêtre. Lors du démarrage de Web, aucun onglet n'est affiché. Pour ouvrir un nouvel onglet, sélectionnez le menu dans le coin supérieur droit de l'écran, puis cliquez sur Nouvel onglet. Une fois le nouvel onglet ouvert, vous pouvez l'utiliser comme on utilise une nouvelle fenêtre." + +#. (itstool) path: page/p +#: C/browse-web.page:52 +msgid "" +"You can also use the CtrlT keyboard " +"shortcut to open a new tab or the new tab button in the top-left of the " +"window." +msgstr "" +"Vous pouvez aussi ouvrir un nouvel onglet ou afficher le bouton nouvel onglet dans le coin supérieur gauche de l'écran avec le raccourci clavier CtrlT." + +#. (itstool) path: page/p +#: C/browse-web.page:56 msgid "" -"When you first start up Web, you will not be shown any tabs. " -"Tabs are used to view more than one web page in one window. To " -"open a new tab, select the menu at the top-right of the screen, " -"then New Tab. Once the new " -"tab is open, you can use it as you would normally use a new window." -msgstr "" -"Lors du démarrage de Web, aucun onglet n'est affiché. Les " -"onglets sont utilisés pour afficher plus d'une page Web dans une " -"fenêtre. Pour ouvrir un nouvel onglet, sélectionnez le menu dans le " -"coin supérieur droit de l'écran, puis cliquez sur Nouvel onglet. Une fois le nouvel onglet ouvert, " -"vous pouvez l'utiliser comme on utilise une nouvelle fenêtre." - -#. (itstool) path: page/p -#: C/browse-web.page:51 -msgid "" -"You can also open a link in a new tab. Right click on the link, " -"then select Open Link in New Tab or use the " -"middle mouse button to click on the link." -msgstr "" -"Vous pouvez également ouvrir le lien dans un nouvel onglet. " -"Effectuez un clic droit sur le lien puis sélectionnez Ouverture dans un nouvel onglet ou utilisez le bouton du milieu de " -"la souris pour cliquer sur le lien." +"To open a link in a new tab, right click on the link, then select " +"Open Link in New Tab or use the middle mouse " +"button to click on the link." +msgstr "" +"Vous pouvez également ouvrir le lien dans un nouvel onglet par un clic droit sur le lien et le choix Ouverture dans un nouvel onglet, ou par un clic avec le bouton du milieu de la souris sur le lien." #. (itstool) path: info/desc #: C/browse-webapps.page:24 @@ -760,15 +789,13 @@ #. (itstool) path: item/p #: C/browse-webapps.page:39 msgid "" -"Open the menu at the top-right of the window, then Save as Web Application…." +"Open the menu at the top-right of the window, then select Save as Web Application…." msgstr "" -"Ouvrez le menu dans le coin supérieur droit de la fenêtre, puis cliquez sur " -"Enregistrer comme Application Web…." +"Ouvrez le menu dans le coin supérieur droit de la fenêtre, puis cliquez sur Enregistrer comme Application Web…." #. (itstool) path: item/p -#: C/browse-webapps.page:44 +#: C/browse-webapps.page:43 msgid "" "Name your Web Application, then press Create." msgstr "" @@ -776,7 +803,7 @@ "gui>." #. (itstool) path: page/p -#: C/browse-webapps.page:49 +#: C/browse-webapps.page:48 msgid "" "You can now launch the Web Application from the Activities overview. To " "search for your application, start typing the name and it will be shown with " @@ -786,6 +813,85 @@ "d'ensemble des Activités. Pour rechercher votre application, commencez à " "taper son nom et elle s'affiche dans la liste des suggestions." +#. (itstool) path: credit/years +#: C/browse-webapps-del.page:14 C/cert.page:13 +msgid "2015" +msgstr "2015" + +#. (itstool) path: info/desc +#: C/browse-webapps-del.page:24 +msgid "How do I delete a Web Application?" +msgstr "Comment supprimer une Application Web ?" + +#. (itstool) path: page/title +#: C/browse-webapps-del.page:27 +msgid "Remove a Web Application" +msgstr "Suppression d'une Application Web" + +#. (itstool) path: page/p +#: C/browse-webapps-del.page:29 +msgid "You can delete a Web Application when you no longer need it." +msgstr "Vous pouvez supprimer une Application Web dont vous n'avez plus besoin." + +#. (itstool) path: item/p +#: C/browse-webapps-del.page:33 +msgid "Press on the window header and type about:applications." +msgstr "" +"Cliquez sur l'en-tête de la fenêtre et saisissez about:applications." + +#. (itstool) path: item/p +#: C/browse-webapps-del.page:37 +msgid "" +"Press Delete next to the application which you want to remove." +msgstr "" +"Cliquez sur Supprimer à côté de l'application à supprimer." + +#. (itstool) path: page/p +#: C/browse-webapps-del.page:42 +msgid "" +"If you have Software installed, you can also delete Web " +"Applications from there." +msgstr "" +"Si vous avez installé Logiciels, vous pouvez aussi supprimer les applications depuis cet emplacement." + +#. (itstool) path: info/desc +#: C/cert.page:18 +msgid "Certificate management in Web." +msgstr "Gérer les certificats dans Web." + +#. (itstool) path: page/title +#: C/cert.page:21 +msgid "Certificates" +msgstr "Certificats" + +#. (itstool) path: page/p +#: C/cert.page:23 +msgid "" +"Web does not have built-in support for certificate management at " +"this time." +msgstr "" +"Web ne peut pas prendre en charge la gestion des certificats pour l'instant." + +#. (itstool) path: note/p +#: C/cert.page:27 +msgid "" +"You can add certificates through the command line if you have p11-kit " +"installed. To add a certificate, you need to download the certificate and " +"run the following command to import it:" +msgstr "" +"Pour ajouter un certificat, installez p11-kit, téléchargez le certificat, et exécutez cette commande pour l'importer :" + +#. (itstool) path: note/screen +#: C/cert.page:30 +#, no-wrap +msgid "$ sudo trust anchor /home/user/Downloads/certificate.crt" +msgstr "$ sudo trust anchor /home/user/Téléchargements/certificate.crt" + +#. (itstool) path: note/p +#: C/cert.page:31 +msgid "This will only work on recent systems." +msgstr "Cela ne fonctionne qu'avec les systèmes récents." + #. (itstool) path: page/title #: C/cookies.xml:20 msgid "What are cookies?" @@ -814,14 +920,6 @@ msgid "Baptiste Mille-Mathias" msgstr "Baptiste Mille-Mathias" -#. (itstool) path: credit/years -#: C/data-cookies.page:18 C/data-passwords.page:26 C/keyboard-shortcut.page:13 -#: C/keyboard-shortcut.page:18 C/pref-do-not-track.page:14 -#: C/pref-do-not-track.page:19 C/prob-restore-closed-page.page:13 -#: C/prob-restore-closed-page.page:18 -msgid "2014" -msgstr "2014" - #. (itstool) path: info/desc #: C/data-cookies.page:23 msgid "How do I delete a cookie if I don't want a website to track me anymore?" @@ -961,7 +1059,7 @@ "\"button\">Clear All button." msgstr "" "Vous pouvez également supprimer tous les mots de passe sauvegardés en " -"utilisant le bouton Effacer tout" +"utilisant le bouton Effacer tout." #. (itstool) path: section/title #: C/data-passwords.page:78 @@ -1129,7 +1227,9 @@ msgid "" "You can use handy keyboard shortcuts to navigate around Web " "faster." -msgstr "Vous pouvez utiliser des raccourcis clavier pratiques pour réaliser rapidement différentes actions dans Web." +msgstr "" +"Vous pouvez utiliser des raccourcis clavier pratiques pour réaliser " +"rapidement différentes actions dans Web." #. (itstool) path: td/p #: C/keyboard-shortcut.page:35 @@ -1773,7 +1873,7 @@ #: C/pref-do-not-track.page:24 msgid "" "How do I tell websites that I do not want them to monitor my online " -"activites?" +"activities?" msgstr "Indiquer aux sites de ne pas surveiller mon activité en ligne." #. (itstool) path: page/title @@ -1967,3 +2067,22 @@ msgstr "" "Il n'est pas possible de restaurer un onglet fermé en mode de navigation privée." + +#. (itstool) path: info/desc +#: C/proxy.page:19 +msgid "Anonymize your web browsing by using a web proxy." +msgstr "Naviguer anonymement sur le Web en passant par un serveur mandataire." + +#. (itstool) path: page/title +#: C/proxy.page:22 +msgid "Use a proxy" +msgstr "Utilisation d'un serveur mandataire" + +#. (itstool) path: page/p +#: C/proxy.page:24 +msgid "" +"You can use a proxy server for browsing the web. To use a web proxy when " +"browsing, you need to set it up in " +"the GNOME Network settings panel." +msgstr "" +"Vous pouvez naviguer anonymement sur le Web en passant par un serveur mandataire. Pour cela, configurez-le dans le panneau des paramètres de l'application GNOME Réseau." diff -Nru epiphany-browser-3.16.3/help/fr/history-delete.page epiphany-browser-3.18.0/help/fr/history-delete.page --- epiphany-browser-3.16.3/help/fr/history-delete.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/history-delete.page 2015-09-22 07:48:10.000000000 +0000 @@ -37,6 +37,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Suppression de l'historique de navigation diff -Nru epiphany-browser-3.16.3/help/fr/history.page epiphany-browser-3.18.0/help/fr/history.page --- epiphany-browser-3.16.3/help/fr/history.page 2015-07-09 13:27:42.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/history.page 2015-09-22 07:48:09.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Historique de navigation diff -Nru epiphany-browser-3.16.3/help/fr/index.page epiphany-browser-3.18.0/help/fr/index.page --- epiphany-browser-3.16.3/help/fr/index.page 2015-07-09 13:27:41.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/index.page 2015-09-22 07:48:08.000000000 +0000 @@ -28,6 +28,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + <media type="image" mime="image/png" its:translate="no" src="media/web-browser.png"/> Web diff -Nru epiphany-browser-3.16.3/help/fr/introduction.page epiphany-browser-3.18.0/help/fr/introduction.page --- epiphany-browser-3.16.3/help/fr/introduction.page 2015-07-09 13:27:41.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/introduction.page 2015-09-22 07:48:08.000000000 +0000 @@ -32,6 +32,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Introduction diff -Nru epiphany-browser-3.16.3/help/fr/keyboard-shortcut.page epiphany-browser-3.18.0/help/fr/keyboard-shortcut.page --- epiphany-browser-3.16.3/help/fr/keyboard-shortcut.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/keyboard-shortcut.page 2015-09-22 07:48:10.000000000 +0000 @@ -37,6 +37,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Raccourcis clavier diff -Nru epiphany-browser-3.16.3/help/fr/pref-cookies.page epiphany-browser-3.18.0/help/fr/pref-cookies.page --- epiphany-browser-3.16.3/help/fr/pref-cookies.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/pref-cookies.page 2015-09-22 07:48:10.000000000 +0000 @@ -39,6 +39,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Définition des préférences des cookies diff -Nru epiphany-browser-3.16.3/help/fr/pref-css.page epiphany-browser-3.18.0/help/fr/pref-css.page --- epiphany-browser-3.16.3/help/fr/pref-css.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/pref-css.page 2015-09-22 07:48:10.000000000 +0000 @@ -38,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + CSS personnalisé diff -Nru epiphany-browser-3.16.3/help/fr/pref-do-not-track.page epiphany-browser-3.18.0/help/fr/pref-do-not-track.page --- epiphany-browser-3.16.3/help/fr/pref-do-not-track.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/pref-do-not-track.page 2015-09-22 07:48:10.000000000 +0000 @@ -19,8 +19,7 @@ - How do I tell websites that I do not want them to monitor my online - activities? + Indiquer aux sites de ne pas surveiller mon activité en ligne. naybnet @@ -39,6 +38,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Définition des préférences de pistage Internet diff -Nru epiphany-browser-3.16.3/help/fr/pref-downloads.page epiphany-browser-3.18.0/help/fr/pref-downloads.page --- epiphany-browser-3.16.3/help/fr/pref-downloads.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/pref-downloads.page 2015-09-22 07:48:10.000000000 +0000 @@ -39,6 +39,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Téléchargement de fichiers diff -Nru epiphany-browser-3.16.3/help/fr/pref-font.page epiphany-browser-3.18.0/help/fr/pref-font.page --- epiphany-browser-3.16.3/help/fr/pref-font.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/pref-font.page 2015-09-22 07:48:10.000000000 +0000 @@ -39,6 +39,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Modification de la police diff -Nru epiphany-browser-3.16.3/help/fr/pref.page epiphany-browser-3.18.0/help/fr/pref.page --- epiphany-browser-3.16.3/help/fr/pref.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/pref.page 2015-09-22 07:48:10.000000000 +0000 @@ -35,6 +35,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Préférences de <app>Web</app> diff -Nru epiphany-browser-3.16.3/help/fr/pref-passwords.page epiphany-browser-3.18.0/help/fr/pref-passwords.page --- epiphany-browser-3.16.3/help/fr/pref-passwords.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/pref-passwords.page 2015-09-22 07:48:10.000000000 +0000 @@ -39,6 +39,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Mémorisation des mots de passe diff -Nru epiphany-browser-3.16.3/help/fr/prob-restore-closed-page.page epiphany-browser-3.18.0/help/fr/prob-restore-closed-page.page --- epiphany-browser-3.16.3/help/fr/prob-restore-closed-page.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/prob-restore-closed-page.page 2015-09-22 07:48:10.000000000 +0000 @@ -37,6 +37,12 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + Comment restaurer un onglet. diff -Nru epiphany-browser-3.16.3/help/fr/proxy.page epiphany-browser-3.18.0/help/fr/proxy.page --- epiphany-browser-3.16.3/help/fr/proxy.page 2015-07-09 13:27:43.000000000 +0000 +++ epiphany-browser-3.18.0/help/fr/proxy.page 2015-09-22 07:48:10.000000000 +0000 @@ -14,7 +14,7 @@ - Anonymize your web browsing by using a web proxy. + Naviguer anonymement sur le Web en passant par un serveur mandataire. naybnet @@ -33,12 +33,16 @@ filorin@laposte.net 2014 + + + Alain Lojewski + allomervan@gmail.com + 2015 + - Use a proxy + Utilisation d'un serveur mandataire -

You can use a proxy server for browsing the web. To use a web proxy when - browsing, you need to set it up in the - GNOME Network settings panel.

+

Vous pouvez naviguer anonymement sur le Web en passant par un serveur mandataire. Pour cela, configurez-le dans le panneau des paramètres de l'application GNOME Réseau.

diff -Nru epiphany-browser-3.16.3/help/ko/bookmark-add.page epiphany-browser-3.18.0/help/ko/bookmark-add.page --- epiphany-browser-3.16.3/help/ko/bookmark-add.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/bookmark-add.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,68 @@ + + + + + + + + + + Aruna Sankaranarayanan + aruna.evam@gmail.com + 2013 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + 어떻게 책갈피를 추가할 수 있나요? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + 페이지를 책갈피하기 + +

Bookmark a page to store it permanently and access it quickly.

+ + + To add a bookmark: + +

Go to the webpage that you wish to bookmark.

+ + +

Select the menu at the top-right of the window, then + + Bookmarks + Add Bookmark… or + press CtrlD to add a bookmark.

+ + +

Name your bookmark in the Title text entry field, so that + you can identify it easily in the future.

+ + +

Start typing the topic that you would classify the bookmark under and + select it once it is shown. If it does not exist, select Create + topic "Topic name" from the list. Separate different + topic names with commas.

+ + +

Press Add to add the new bookmark.

+ + + +

The Similar button displays the number of + existing bookmarks for the page which you are adding. If there is at least + one existing bookmark, the Similar button becomes + clickable. You can then view the existing bookmark or merge it with the new + one.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/bookmark-delete.page epiphany-browser-3.18.0/help/ko/bookmark-delete.page --- epiphany-browser-3.16.3/help/ko/bookmark-delete.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/bookmark-delete.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,55 @@ + + + + + + + + + + Aruna Sankaranarayanan + aruna.evam@gmail.com + 2013 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + How do I remove an unwanted bookmark? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Delete a bookmark + +

You can delete old and unwanted bookmarks.

+ + + To delete a bookmark: + +

Select Web + Bookmarks to open the + Bookmarks window.

+ + +

From the Topics list on the left side, select the topic + that contains your bookmark.

+ + +

A list of bookmarks in the selected topic will be shown on + the right side of the window. Select the bookmarks that you wish to + delete, then select + EditDelete. + You can also right click the bookmark and select Delete.

+ + + + diff -Nru epiphany-browser-3.16.3/help/ko/bookmark-edit.page epiphany-browser-3.18.0/help/ko/bookmark-edit.page --- epiphany-browser-3.16.3/help/ko/bookmark-edit.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/bookmark-edit.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,63 @@ + + + + + + + + + + Aruna Sankaranarayanan + aruna.evam@gmail.com + 2013 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + How do I edit an existing bookmark? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Update a bookmark + +

You can update your existing bookmarks by editing their + properties.

+ + + To edit a bookmark: + +

Select + WebBookmarks + to open the Bookmarks window.

+ + +

From the Topics list on the left side, select the topic + that contains your bookmark.

+ + +

A list of bookmarks in the selected topic will be shown on + the right side of the window. Select the bookmarks that you wish to + update, then select + FileProperties.

+ + +

You can now update the bookmark title, its URL and the topics that + contain it.

+ + + +

If you only want to rename a bookmark, right click on it, select + Rename… and type in the new name for your + bookmark.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/bookmark.page epiphany-browser-3.18.0/help/ko/bookmark.page --- epiphany-browser-3.16.3/help/ko/bookmark.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/bookmark.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + + + Aruna Sankaranarayanan + aruna.evam@gmail.com + 2013 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + Use bookmarks to save your favorite pages for later. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Bookmarks help + +

Use bookmarks to save websites which you want to visit again.

+ + + + diff -Nru epiphany-browser-3.16.3/help/ko/bookmark-smart.page epiphany-browser-3.18.0/help/ko/bookmark-smart.page --- epiphany-browser-3.16.3/help/ko/bookmark-smart.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/bookmark-smart.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,64 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + What are smart bookmarks and how do I add one? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Smart bookmarks + +

A smart bookmark is used to add a search to the address bar. This can be + useful if you prefer to use a specific search engine regularly.

+ + + Add a smart bookmark + +

Perform a search using the search engine that you want to add.

+ + +

Bookmark the page, replacing the search term with %s + in the URL.

+ + + + +

For example, if you want to be able to search the GNOME user help, start + by doing a test search such as for "epiphany". The resulting URL will look + like https://help.gnome.org/search?q=epiphany. To + add the "bookmark", replace + epiphany with %s when bookmarking the page so + that the Address looks like + https://help.gnome.org/search?q=%s. You may also want to use + a Title such as Search GNOME help.

+

When you next start typing in the address bar, you will see Search + GNOME help where your browsing history + would normally be shown. Click it to submit the search.

+ + +

Apart from search engines, you can also use smart bookmarks for other + queries, such as searching an online show for a product.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/bookmark-topic.page epiphany-browser-3.18.0/help/ko/bookmark-topic.page --- epiphany-browser-3.16.3/help/ko/bookmark-topic.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/bookmark-topic.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,53 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + What are topics and how can I use them to sort bookmarks? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Topics + +

You can sort your bookmarks into different categories using + topics.

+ + + +

Open + WebBookmarks.

+ + +

Select FileNew + Topic.

+ + +

Type the new bookmark name, then press Enter to save it.

+ + + +

You can also create a new topic when adding a + new bookmark.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/browse-local.page epiphany-browser-3.18.0/help/ko/browse-local.page --- epiphany-browser-3.16.3/help/ko/browse-local.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/browse-local.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,48 @@ + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + How do I view files which are on my computer in a web browser? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + View local files + + +

You can view some types of file that are on your computer in the web + browser. This can be useful if you have saved a website for reading later or + want to preview a web page that you are creating.

+ + + +

Select the menu at the top-right of the window, then + Open….

+ + +

Select and open the file that you want to view.

+ + + + diff -Nru epiphany-browser-3.16.3/help/ko/browse-private.page epiphany-browser-3.18.0/help/ko/browse-private.page --- epiphany-browser-3.16.3/help/ko/browse-private.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/browse-private.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,71 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + What is incognito mode? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Private browsing + +

Private browsing is a mode which limits the way that your computer and + websites can access your browsing information. It is useful if you want to + lend your computer to a friend, for example, to check their email using + webmail because you will not be logged into any websites in the private + browsing window, nor will their information be saved. This also means that + private browsing is a more secure way of accessing sensitive websites such as + Internet banking and + questionable content + because it is more difficult for websites to identify you when in + incognito mode.

+ + + + <item> + <p>Select <guiseq><gui style="menu">Web</gui><gui style="menuitem">New + Incognito Window</gui></guiseq>.</p> + </item> + <item> + <p>Browse the web using incognito mode.</p> + </item> + <item> + <p>End the private browsing session by closing the incognito window.</p> + </item> + </steps> + + <p>You can distinguish private browsing from normal browsing by the + watermark for the incognito window:</p> + + <figure> + <media type="image" mime="image/png" src="media/private-browsing-3-12.png"> + <p>Fullscreen screenshot showing a normal session in a window on the left + side of the screen and a private browsing session in a different window + on the right side of the screen.</p> + </media> + <p>A screenshot showing a normal session with some history in the left + window and a private browsing session in the right window</p> + </figure> + +</page> diff -Nru epiphany-browser-3.16.3/help/ko/browse-tab.page epiphany-browser-3.18.0/help/ko/browse-tab.page --- epiphany-browser-3.16.3/help/ko/browse-tab.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/browse-tab.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its" type="topic" style="task" id="browse-tab" xml:lang="ko"> + + <info> + <link type="guide" xref="index#start"/> + <link type="seealso" xref="browse-private"/> + <link type="seealso" xref="browse-web"/> + <revision pkgversion="3.14" date="2014-12-02" status="review"/> + + <credit type="author copyright"> + <name>Ekaterina Gerasimova</name> + <email its:translate="no">kittykat3756@gmail.com</email> + <years>2014</years> + </credit> +<!-- <credit type="copyright editor"> + <name></name> + <email its:translate="no"></email> + <years></years> + </credit>--> + + <include xmlns="http://www.w3.org/2001/XInclude" href="legal.xml"/> + + <desc>Open another web page in a new tab in the same window.</desc> + + <mal:credit xmlns:mal="http://projectmallard.org/1.0/" type="translator copyright"> + <mal:name>ChangSeok Oh</mal:name> + <mal:email>changseok@gnome.org</mal:email> + <mal:years>2015</mal:years> + </mal:credit> + </info> + + <title>Open a new tab + + + + + + + + diff -Nru epiphany-browser-3.16.3/help/ko/browse-webapps-del.page epiphany-browser-3.18.0/help/ko/browse-webapps-del.page --- epiphany-browser-3.16.3/help/ko/browse-webapps-del.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/browse-webapps-del.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,49 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2015 + + + + + + How do I delete a Web Application? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Remove a Web Application + +

You can delete a Web Application when you no longer need it.

+ + + +

Press on the window header and type + about:applications.

+ + +

Press Delete next to the application which you want to + remove.

+ + + +

If you have Software installed, you can also delete Web + Applications from there.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/browse-webapps.page epiphany-browser-3.18.0/help/ko/browse-webapps.page --- epiphany-browser-3.16.3/help/ko/browse-webapps.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/browse-webapps.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,56 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + What is a Web Application and how do I use it? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Create a Web Application + +

You can save webpages as a Web Application. This will add a link + to the page to the Activities + overview. When you open a Web Application, it is shown in a special + type of window without the address bar or the menus.

+ + + +

Open the webpage which you want to save.

+ + +

Open the menu at the top-right of the window, then select + Save as Web Application….

+ + +

Name your Web Application, then press + Create.

+ + + +

You can now launch the Web Application from the Activities + overview. To search for your application, start typing the name + and it will be shown with the other search results.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/browse-web.page epiphany-browser-3.18.0/help/ko/browse-web.page --- epiphany-browser-3.16.3/help/ko/browse-web.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/browse-web.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,64 @@ + + + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013, 2014 + + + + + + View web pages on the internet. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Browse the web + +

Web browsers can be used to view pages on the Internet when you have an + Internet connection. To start browsing the web:

+ + + +

When you start up Web, your cursor + should be in the text entry field at the top of the window. Type in the + URL of the webpage that you want to visit or your search term.

+ + +

Press return to go to the web page or to search.

+ + + +

Tabs are used to view more than one web page in one + window. When you first start up Web, you will not be shown any + tabs. To open a new tab, press the menu button at the top-right of + the screen, then New Tab. Once + the new tab is open, you can use it as you would normally use a new + window.

+ +

You can also use the + CtrlT keyboard shortcut to open a new + tab or the new tab button in the top-left of the window.

+ +

To open a link in a new tab, right click on the + link, then select Open Link in New Tab or use the + middle mouse button to click on the link.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/cert.page epiphany-browser-3.18.0/help/ko/cert.page --- epiphany-browser-3.16.3/help/ko/cert.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/cert.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2015 + + + + + Certificate management in Web. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Certificates + +

Web does not have built-in support for certificate management at + this time.

+ + +

You can add certificates through the command line if you have p11-kit + installed. To add a certificate, you need to download the certificate and + run the following command to import it:

+ $ sudo trust anchor /home/user/Downloads/certificate.crt +

This will only work on recent systems.

+ + + diff -Nru epiphany-browser-3.16.3/help/ko/cookies.xml epiphany-browser-3.18.0/help/ko/cookies.xml --- epiphany-browser-3.16.3/help/ko/cookies.xml 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/cookies.xml 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,33 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + What are cookies? + +

A browser cookie is a small piece of data sent from a website and + stored on your computer while you are browsing that website. When the you + return to the same website in the future, the data stored in the cookie can + be retrieved by the website to notify the website of your previous activity. + Cookies are a common method used by web servers to know whether you are + logged in to an account on a specific website or not.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/data-cookies.page epiphany-browser-3.18.0/help/ko/data-cookies.page --- epiphany-browser-3.16.3/help/ko/data-cookies.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/data-cookies.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,56 @@ + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + Baptiste Mille-Mathias + baptistem@gnome.org + 2014 + + + + + How do I delete a cookie if I don't want a website to track me anymore? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Delete a cookie + + + + +

If you no longer want a specific website to track you, you can check if it + left a cookie and delete it.

+ + + +

Open + WebPreferencesPrivacyManage + Cookies.

+ + +

Select the cookies that you want to delete.

+ + +

Press - button or press + Delete.

+ + + +

You can also delete all of your cookies using the + Clear All button.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/data-passwords.page epiphany-browser-3.18.0/help/ko/data-passwords.page --- epiphany-browser-3.16.3/help/ko/data-passwords.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/data-passwords.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,109 @@ + + + + + + + + + + + + Aruna Sankaranarayanan + aruna.evam@gmail.com + 2013 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + Baptiste Mille-Mathias + baptistem@gnome.org + 2014 + + + + + How do I remove and update stored passwords? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Manage passwords + +

You can save all of your passwords so that you do not have to reenter them + every time that you want to log into a website.

+ +

You can see saved passwords in + WebPreferencesPrivacyManage + Passwords.

+ + + +
+ Remove saved passwords + +

You can remove a stored password at any time.

+ + + +

Open WebPreferencesPrivacyManage + Passwords.

+ + +

Enter the address of the website at the top of the window.

+ + +

Click on the username for the password which you want to delete.

+ + +

Press - button to remove the saved + password or press the Delete key.

+ + + +

You can view the saved passwords by pressing on the key button at the + bottom-right of the password list.

+ + +

You can also delete all of your stored passwords using the + Clear All button.

+ + +
+ +
+ Update a password + +

If you have changed a password that is saved in + Web, you have to update it.

+ + + When you have finished changing your password: + +

Visit the same webpage for which the password was stored and has now + been changed.

+ + +

Your old saved password will automatically be typed in the password + field by Web, so clear the password field.

+ + +

Type your new password in the password field.

+ + +

You will be asked if you want to save the password in Web. + Press Store password to finish. This will + update your old password for the webpage.

+ + + +
+ + diff -Nru epiphany-browser-3.16.3/help/ko/history-delete.page epiphany-browser-3.18.0/help/ko/history-delete.page --- epiphany-browser-3.16.3/help/ko/history-delete.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/history-delete.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,56 @@ + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + How do I delete one or more web pages from my browsing history? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Clear browsing history + +

You may sometimes wish to delete your browsing history, for example to + remove items that you do not want to see in your search results. You can + choose to delete one result, all results from a single website or all of your + history.

+ + + +

Open + WebHistory.

+ + +

Select the web pages that you wish to delete from your history.

+ + +

Select + EditDelete + to permanently delete the selected items.

+ + + +

You can also delete all of your history by selecting + EditClear + History.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/history.page epiphany-browser-3.18.0/help/ko/history.page --- epiphany-browser-3.16.3/help/ko/history.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/history.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,41 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + Why do I see a list of web pages when I start typing in the address bar? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Browsing history + +

Your browsing history, the web pages that you have visited, is + automatically saved so that it is quicker for you to return to those + pages.

+ +

To search your history, start typing your search term into the + address bar, then click on the correct result once you see it. The search + will include the page title and URL, but not the page content.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/index.page epiphany-browser-3.18.0/help/ko/index.page --- epiphany-browser-3.16.3/help/ko/index.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/index.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + + 웹 도움말 + + + + + 이전에 에피퍼니로 알려진 웹은 그놈 웹 브라우저입니다. 웹으로 시작하세요. 그리고 활용가능한 기능을 익혀보세요. + + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + <media type="image" mime="image/png" its:translate="no" src="media/web-browser.png"/> 웹 + +
+ 시작하기 +
+ +
+ 책갈피 사용하기 +
+ +
+ 개인정보 +
+ +
+ 고급 브라우징 +
+ +
+ 옵션과 설정 +
+ +
+ 일반적인 문제 +
+ + diff -Nru epiphany-browser-3.16.3/help/ko/introduction.page epiphany-browser-3.18.0/help/ko/introduction.page --- epiphany-browser-3.16.3/help/ko/introduction.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/introduction.page 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + Web에 대한 소개, 그놈을 위한 안전한 웹 브라우저. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + 머릿말 + +

Web은 인터넷을 탐색하는 간단하고 명료한 방법을 제공합니다. 그것은 다른 인기있는 브라우저와 마찬가지로 빠르고 정확하게 웹페이지를 보여줍니다.

+ +

웹은 이전에 에피퍼니로 알려진 그 애플리케이션입니다.

+ + + +

Fullscreen screenshot of Web with the Web wiki page open in the first + tab and showing the GNOME website open in the second tab.

+ + + diff -Nru epiphany-browser-3.16.3/help/ko/keyboard-shortcut.page epiphany-browser-3.18.0/help/ko/keyboard-shortcut.page --- epiphany-browser-3.16.3/help/ko/keyboard-shortcut.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/keyboard-shortcut.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,371 @@ + + + + + + + + + Siyu Yang + yangsiyu1992@gmail.com + 2014 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2014 + + + + + Browsing the web by using keyboard shortcuts. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Keyboard shortcuts + +

You can use handy keyboard shortcuts to navigate around Web + faster.

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

Action

+ 		+

Shortcut

+
+

Open a new window

+ 		+

CtrlN

+
+

Open a new private browsing (incognito) window

+ 		+

ShiftCtrlN

+
+

Open a file

+ 		+

CtrlO

+
+

Save a new copy of the current page

+ 		+

ShiftCtrlS

+
+

Save the current page as a web application

+ 		+

ShiftCtrlA

+
+

Print the current page

+ 		+

CtrlP

+
+

Close the current tab

+ 		+

CtrlW

+
+

Quit Web

+ 		+

CtrlQ

+
+

Undo the last change to typed text

+ 		+

CtrlZ

+
+

Redo the last change to typed text

+ 		+

ShiftCtrlZ

+
+

Cut the selected text

+ 		+

CtrlX

+
+

Copy the selection

+ 		+

CtrlC

+
+

Paste the selection

+ 		+

CtrlV

+
+

Select all

+ 		+

CtrlA

+
+

Find text on the current page

+ 		+

CtrlF

+
+

Next search result

+ 		+

CtrlG

+
+

Previous search result

+ 		+

ShiftCtrlG

+
+

Edit bookmarks

+ 		+

CtrlB

+
+

View your browsing history

+ 		+

CtrlH

+
+

Web preferences

+ 		+

CtrlE

+
+

Stop loading current page

+ 		+

Escape

+
+

Reload current page

+ 		+

CtrlR

+
+

Reload current page (alternative shortcut)

+ 		+

F5

+
+

Zoom in

+ 		+

Ctrl+

+
+

Zoom out

+ 		+

Ctrl-

+
+

Normal size

+ 		+

Ctrl0

+
+

View the page source

+ 		+

CtrlU

+
+

Bookmark current page

+ 		+

CtrlD

+
+

Select page URL (address)

+ 		+

CtrlL

+
+

View previous tab

+ 		+

CtrlPgUp

+
+

View next tab

+ 		+

CtrlPgDn

+
+

Move the current tab to the left

+ 		+

ShiftCtrlPgUp +

+
+

Move the current tab to the right

+ 		+

ShiftCtrlPgDn +

+
+

View Web in fullscreen

+ 		+

F11

+
+

Enable or disable caret browsing

+ 		+

F7

+
+

Open window menu

+ 		+

F10

+
+

Open your home page

+ 		+

AltHome

+
+

Save the current page

+ 		+

CtrlS

+
+

Go to back to the previous page

+ 		+

AltLeft

+
+

Go forward to the next page

+ 		+

AltRight

+
+ diff -Nru epiphany-browser-3.16.3/help/ko/ko.po epiphany-browser-3.18.0/help/ko/ko.po --- epiphany-browser-3.16.3/help/ko/ko.po 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/ko.po 2015-09-08 11:37:53.000000000 +0000 @@ -0,0 +1,1783 @@ +# Korean translation for epiphany. +# Copyright (C) 2015 epiphany's COPYRIGHT HOLDER +# This file is distributed under the same license as the epiphany package. +# ChangSeok Oh , 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: epiphany master\n" +"POT-Creation-Date: 2015-09-07 03:45+0000\n" +"PO-Revision-Date: 2015-09-07 16:28+0900\n" +"Last-Translator: ChangSeok Oh \n" +"Language-Team: Korean \n" +"Language: ko\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 1.7.5\n" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "ChangSeok Oh , 2015" + +#. (itstool) path: info/title +#: C/index.page:8 +msgctxt "text" +msgid "Web help" +msgstr "웹 도움말" + +#. (itstool) path: info/desc +#: C/index.page:13 +msgid "" +"Web, formerly known as Epiphany, is the GNOME web " +"browser. Get started with Web and learn about the available " +"features." +msgstr "" +"이전에 에피퍼니로 알려진 웹은 그놈 웹 브라우저입니다. " +"웹으로 시작하세요. 그리고 활용가능한 기능을 익혀보세요." + +#. (itstool) path: page/title +#: C/index.page:19 +msgid "<_:media-1/> Web" +msgstr "<_:media-1/> 웹" + +#. (itstool) path: section/title +#: C/index.page:25 +msgid "Getting started" +msgstr "시작하기" + +#. (itstool) path: section/title +#: C/index.page:29 +msgid "Using bookmarks" +msgstr "책갈피 사용하기" + +#. (itstool) path: section/title +#: C/index.page:33 +msgid "Your privacy" +msgstr "개인정보" + +#. (itstool) path: section/title +#: C/index.page:37 +msgid "Advanced browsing" +msgstr "고급 브라우징" + +#. (itstool) path: section/title +#: C/index.page:41 +msgid "Options and settings" +msgstr "옵션과 설정" + +#. (itstool) path: section/title +#: C/index.page:45 +msgid "Common problems" +msgstr "일반적인 문제" + +#. (itstool) path: media +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/introduction.page:31 +msgctxt "_" +msgid "" +"external ref='media/epiphany-3-12.png' md5='073acb7af00b2b634d2e9176f1087324'" +msgstr "" +"external ref='media/epiphany-3-12.png' md5='073acb7af00b2b634d2e9176f1087324'" + +#. (itstool) path: credit/name +#: C/introduction.page:11 C/bookmark.page:15 C/bookmark-add.page:17 +#: C/bookmark-delete.page:17 C/bookmark-edit.page:17 C/bookmark-smart.page:12 +#: C/bookmark-topic.page:12 C/browse-local.page:11 C/browse-private.page:12 +#: C/browse-tab.page:13 C/browse-web.page:14 C/browse-webapps.page:12 +#: C/browse-webapps-del.page:12 C/cert.page:11 C/cookies.xml:12 +#: C/data-cookies.page:11 C/data-passwords.page:19 C/history.page:12 +#: C/history-delete.page:11 C/keyboard-shortcut.page:16 C/pref-cookies.page:13 +#: C/pref-css.page:17 C/pref-downloads.page:13 C/pref-do-not-track.page:17 +#: C/pref-font.page:18 C/pref-passwords.page:13 +#: C/prob-restore-closed-page.page:16 C/proxy.page:12 +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" + +#. (itstool) path: credit/years +#: C/introduction.page:13 C/bookmark.page:12 C/bookmark.page:17 +#: C/bookmark-add.page:14 C/bookmark-add.page:19 C/bookmark-delete.page:14 +#: C/bookmark-delete.page:19 C/bookmark-edit.page:14 C/bookmark-edit.page:19 +#: C/bookmark-smart.page:14 C/bookmark-topic.page:14 C/browse-local.page:13 +#: C/browse-private.page:14 C/browse-webapps.page:14 C/cookies.xml:14 +#: C/data-cookies.page:13 C/data-passwords.page:16 C/data-passwords.page:21 +#: C/history.page:14 C/history-delete.page:13 C/pref-cookies.page:15 +#: C/pref-css.page:14 C/pref-css.page:19 C/pref-downloads.page:15 +#: C/pref-font.page:15 C/pref-font.page:20 C/pref-passwords.page:15 +msgid "2013" +msgstr "2013" + +#. (itstool) path: info/desc +#: C/introduction.page:18 +msgid "" +"An introduction to Web, a web browser for GNOME with built-in " +"privacy." +msgstr "Web에 대한 소개, 그놈을 위한 안전한 웹 브라우저." + +#. (itstool) path: page/title +#: C/introduction.page:22 +msgid "Introduction" +msgstr "머릿말" + +#. (itstool) path: page/p +#: C/introduction.page:24 +msgid "" +"Web offers a simple and clean way to browse the internet. It " +"displays pages with the same speed and accuracy as other popular browsers." +msgstr "" +"Web은 인터넷을 탐색하는 간단하고 명료한 방법을 제공합니다. 그것은 " +"다른 인기있는 브라우저와 마찬가지로 빠르고 정확하게 웹페이지를 보여줍니다." + +#. (itstool) path: page/p +#: C/introduction.page:28 +msgid "" +"Web is the application formerly known as Epiphany." +msgstr "" +"웹은 이전에 에피퍼니로 알려진 그 애플리케이션입니다." + +#. (itstool) path: media/p +#: C/introduction.page:34 +msgid "" +"Fullscreen screenshot of Web with the Web wiki page open in the first tab " +"and showing the GNOME website open in the second tab." +msgstr "" + +#. (itstool) path: p/link +#: C/legal.xml:5 +msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License" +msgstr "" +"크리에이티브 커먼즈 저작자 표시 - 동일조건 변경허락 3.0 Unported 라이선스" + +#. (itstool) path: license/p +#: C/legal.xml:4 +msgid "This work is licensed under a <_:link-1/>." +msgstr "이 작업은 <_:link-1/> 라이선스를 따릅니다." + +#. (itstool) path: credit/name +#: C/bookmark.page:10 C/bookmark-add.page:12 C/bookmark-delete.page:12 +#: C/bookmark-edit.page:12 C/data-passwords.page:14 +msgid "Aruna Sankaranarayanan" +msgstr "Aruna Sankaranarayanan" + +#. (itstool) path: info/desc +#: C/bookmark.page:22 +msgid "Use bookmarks to save your favorite pages for later." +msgstr "" + +#. (itstool) path: page/title +#: C/bookmark.page:25 +msgid "Bookmarks help" +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark.page:33 +msgid "Use bookmarks to save websites which you want to visit again." +msgstr "" + +#. (itstool) path: info/desc +#: C/bookmark-add.page:24 +msgid "How do I add a bookmark?" +msgstr "어떻게 책갈피를 추가할 수 있나요?" + +#. (itstool) path: page/title +#: C/bookmark-add.page:27 +msgid "Bookmark a page" +msgstr "페이지를 책갈피하기" + +#. (itstool) path: page/p +#: C/bookmark-add.page:29 +msgid "Bookmark a page to store it permanently and access it quickly." +msgstr "" + +#. (itstool) path: steps/title +#: C/bookmark-add.page:32 +msgid "To add a bookmark:" +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-add.page:34 +msgid "Go to the webpage that you wish to bookmark." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-add.page:37 +msgid "" +"Select the menu at the top-right of the window, then Bookmarks Add Bookmark… or press CtrlD to add a " +"bookmark." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-add.page:44 +msgid "" +"Name your bookmark in the Title text entry field, so that you can " +"identify it easily in the future." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-add.page:48 +msgid "" +"Start typing the topic that you would classify the bookmark under and select " +"it once it is shown. If it does not exist, select Create topic " +"\"Topic name\" from the list. Separate different topic " +"names with commas." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-add.page:54 +msgid "Press Add to add the new bookmark." +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-add.page:58 +msgid "" +"The Similar button displays the number of " +"existing bookmarks for the page which you are adding. If there is at least " +"one existing bookmark, the Similar button " +"becomes clickable. You can then view the existing bookmark or merge it with " +"the new one." +msgstr "" + +#. (itstool) path: info/desc +#: C/bookmark-delete.page:24 +msgid "How do I remove an unwanted bookmark?" +msgstr "" + +#. (itstool) path: page/title +#: C/bookmark-delete.page:27 +msgid "Delete a bookmark" +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-delete.page:29 +msgid "You can delete old and unwanted bookmarks." +msgstr "" + +#. (itstool) path: steps/title +#: C/bookmark-delete.page:32 +msgid "To delete a bookmark:" +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-delete.page:34 +msgid "" +"Select Web Bookmarks to open the Bookmarks window." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-delete.page:39 C/bookmark-edit.page:40 +msgid "" +"From the Topics list on the left side, select the topic that " +"contains your bookmark." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-delete.page:43 +msgid "" +"A list of bookmarks in the selected topic will be shown on the right side of " +"the window. Select the bookmarks that you wish to delete, then select " +"EditDelete. You can also right click the bookmark and select Delete." +msgstr "" + +#. (itstool) path: info/desc +#: C/bookmark-edit.page:24 +msgid "How do I edit an existing bookmark?" +msgstr "" + +#. (itstool) path: page/title +#: C/bookmark-edit.page:27 +msgid "Update a bookmark" +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-edit.page:29 +msgid "You can update your existing bookmarks by editing their properties." +msgstr "" + +#. (itstool) path: steps/title +#: C/bookmark-edit.page:33 +msgid "To edit a bookmark:" +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-edit.page:35 +msgid "" +"Select WebBookmarks to open the Bookmarks window." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-edit.page:44 +msgid "" +"A list of bookmarks in the selected topic will be shown on the right side of " +"the window. Select the bookmarks that you wish to update, then select " +"FileProperties." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-edit.page:50 +msgid "" +"You can now update the bookmark title, its URL and the topics that contain " +"it." +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-edit.page:55 +msgid "" +"If you only want to rename a bookmark, right click on it, select Rename… and type in the new name for your bookmark." +msgstr "" + +#. (itstool) path: info/desc +#: C/bookmark-smart.page:24 +msgid "What are smart bookmarks and how do I add one?" +msgstr "" + +#. (itstool) path: page/title +#: C/bookmark-smart.page:27 +msgid "Smart bookmarks" +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-smart.page:29 +msgid "" +"A smart bookmark is used to add a search to the address bar. This can be " +"useful if you prefer to use a specific search engine regularly." +msgstr "" + +#. (itstool) path: steps/title +#: C/bookmark-smart.page:33 +msgid "Add a smart bookmark" +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-smart.page:35 +msgid "Perform a search using the search engine that you want to add." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-smart.page:38 +msgid "" +"Bookmark the page, replacing the search term with %s in the " +"URL." +msgstr "" + +#. (itstool) path: example/p +#: C/bookmark-smart.page:44 +msgid "" +"For example, if you want to be able to search the GNOME user help, start by " +"doing a test search such as for \"epiphany\". The resulting URL will look " +"like https://help.gnome.org/search?q=epiphany. To add the \"bookmark\", replace epiphany with " +"%s when bookmarking the page so that the Address looks " +"like https://help.gnome.org/search?q=%s. You may also want to " +"use a Title such as Search GNOME help." +msgstr "" + +#. (itstool) path: example/p +#: C/bookmark-smart.page:52 +msgid "" +"When you next start typing in the address bar, you will see Search " +"GNOME help where your browsing history " +"would normally be shown. Click it to submit the search." +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-smart.page:57 +msgid "" +"Apart from search engines, you can also use smart bookmarks for other " +"queries, such as searching an online show for a product." +msgstr "" + +#. (itstool) path: info/desc +#: C/bookmark-topic.page:24 +msgid "What are topics and how can I use them to sort bookmarks?" +msgstr "" + +#. (itstool) path: page/title +#: C/bookmark-topic.page:27 +msgid "Topics" +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-topic.page:34 +msgid "" +"You can sort your bookmarks into different categories using topics." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-topic.page:39 +msgid "" +"Open WebBookmarks." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-topic.page:43 +msgid "" +"Select FileNew " +"Topic." +msgstr "" + +#. (itstool) path: item/p +#: C/bookmark-topic.page:47 +msgid "Type the new bookmark name, then press Enter to save it." +msgstr "" + +#. (itstool) path: page/p +#: C/bookmark-topic.page:51 +msgid "" +"You can also create a new topic when adding a " +"new bookmark." +msgstr "" + +#. (itstool) path: info/desc +#: C/browse-local.page:23 +msgid "How do I view files which are on my computer in a web browser?" +msgstr "" + +#. (itstool) path: page/title +#: C/browse-local.page:26 +msgid "View local files" +msgstr "" + +#. (itstool) path: page/p +#: C/browse-local.page:30 +msgid "" +"You can view some types of file that are on your computer in the web " +"browser. This can be useful if you have saved a website for reading later or " +"want to preview a web page that you are creating." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-local.page:36 +msgid "" +"Select the menu at the top-right of the window, then Open…." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-local.page:40 +msgid "Select and open the file that you want to view." +msgstr "" + +#. (itstool) path: media +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/browse-private.page:66 +msgctxt "_" +msgid "" +"external ref='media/private-browsing-3-12.png' " +"md5='8cea5d4ab6a79be250506d6881235152'" +msgstr "" + +#. (itstool) path: info/desc +#: C/browse-private.page:24 +msgid "What is incognito mode?" +msgstr "" + +#. (itstool) path: page/title +#: C/browse-private.page:27 +msgid "Private browsing" +msgstr "" + +#. (itstool) path: page/p +#: C/browse-private.page:37 +msgid "" +"Private browsing is a mode which limits the way that your computer and " +"websites can access your browsing information. It is useful if you want to " +"lend your computer to a friend, for example, to check their email using " +"webmail because you will not be logged into any websites in the private " +"browsing window, nor will their information be saved. This also means that " +"private browsing is a more secure way of accessing sensitive websites such " +"as Internet banking and questionable content because it is more difficult for websites to " +"identify you when in incognito mode." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-private.page:51 +msgid "" +"Select WebNew " +"Incognito Window." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-private.page:55 +msgid "Browse the web using incognito mode." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-private.page:58 +msgid "End the private browsing session by closing the incognito window." +msgstr "" + +#. (itstool) path: page/p +#: C/browse-private.page:62 +msgid "" +"You can distinguish private browsing from normal browsing by the watermark " +"for the incognito window:" +msgstr "" + +#. (itstool) path: media/p +#: C/browse-private.page:67 +msgid "" +"Fullscreen screenshot showing a normal session in a window on the left side " +"of the screen and a private browsing session in a different window on the " +"right side of the screen." +msgstr "" + +#. (itstool) path: figure/p +#: C/browse-private.page:71 +msgid "" +"A screenshot showing a normal session with some history in the left window " +"and a private browsing session in the right window" +msgstr "" + +#. (itstool) path: credit/years +#: C/browse-tab.page:15 C/data-cookies.page:18 C/data-passwords.page:26 +#: C/keyboard-shortcut.page:13 C/keyboard-shortcut.page:18 +#: C/pref-do-not-track.page:14 C/pref-do-not-track.page:19 +#: C/prob-restore-closed-page.page:13 C/prob-restore-closed-page.page:18 +#: C/proxy.page:14 +msgid "2014" +msgstr "" + +#. (itstool) path: info/desc +#: C/browse-tab.page:25 +msgid "Open another web page in a new tab in the same window." +msgstr "" + +#. (itstool) path: page/title +#: C/browse-tab.page:28 +msgid "Open a new tab" +msgstr "" + +#. (itstool) path: credit/years +#: C/browse-web.page:16 +msgid "2013, 2014" +msgstr "" + +#. (itstool) path: info/desc +#: C/browse-web.page:26 +msgid "View web pages on the internet." +msgstr "" + +#. (itstool) path: page/title +#: C/browse-web.page:29 +msgid "Browse the web" +msgstr "" + +#. (itstool) path: page/p +#: C/browse-web.page:31 +msgid "" +"Web browsers can be used to view pages on the Internet when you have an " +"Internet connection. To start browsing the web:" +msgstr "" + +#. (itstool) path: item/p +#: C/browse-web.page:36 +msgid "" +"When you start up Web, your cursor should " +"be in the text entry field at the top of the window. Type in the URL of the " +"webpage that you want to visit or your search term." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-web.page:41 +msgid "Press return to go to the web page or to search." +msgstr "" + +#. (itstool) path: page/p +#: C/browse-web.page:45 +msgid "" +"Tabs are used to view more than one web page in one window. When " +"you first start up Web, you will not be shown any tabs. To " +"open a new tab, press the menu button at the top-right of the " +"screen, then New Tab. Once " +"the new tab is open, you can use it as you would normally use a new window." +msgstr "" + +#. (itstool) path: page/p +#: C/browse-web.page:52 +msgid "" +"You can also use the CtrlT keyboard " +"shortcut to open a new tab or the new tab button in the top-left of the " +"window." +msgstr "" + +#. (itstool) path: page/p +#: C/browse-web.page:56 +msgid "" +"To open a link in a new tab, right click on the link, then select " +"Open Link in New Tab or use the middle mouse " +"button to click on the link." +msgstr "" + +#. (itstool) path: info/desc +#: C/browse-webapps.page:24 +msgid "What is a Web Application and how do I use it?" +msgstr "" + +#. (itstool) path: page/title +#: C/browse-webapps.page:27 +msgid "Create a Web Application" +msgstr "" + +#. (itstool) path: page/p +#: C/browse-webapps.page:29 +msgid "" +"You can save webpages as a Web Application. This will add a link to " +"the page to the Activities " +"overview. When you open a Web Application, it is shown in a special " +"type of window without the address bar or the menus." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-webapps.page:36 +msgid "Open the webpage which you want to save." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-webapps.page:39 +msgid "" +"Open the menu at the top-right of the window, then select Save as Web Application…." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-webapps.page:43 +msgid "" +"Name your Web Application, then press Create." +msgstr "" + +#. (itstool) path: page/p +#: C/browse-webapps.page:48 +msgid "" +"You can now launch the Web Application from the Activities overview. To " +"search for your application, start typing the name and it will be shown with " +"the other search results." +msgstr "" + +#. (itstool) path: credit/years +#: C/browse-webapps-del.page:14 C/cert.page:13 +msgid "2015" +msgstr "" + +#. (itstool) path: info/desc +#: C/browse-webapps-del.page:24 +msgid "How do I delete a Web Application?" +msgstr "" + +#. (itstool) path: page/title +#: C/browse-webapps-del.page:27 +msgid "Remove a Web Application" +msgstr "" + +#. (itstool) path: page/p +#: C/browse-webapps-del.page:29 +msgid "You can delete a Web Application when you no longer need it." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-webapps-del.page:33 +msgid "Press on the window header and type about:applications." +msgstr "" + +#. (itstool) path: item/p +#: C/browse-webapps-del.page:37 +msgid "" +"Press Delete next to the application which you want to remove." +msgstr "" + +#. (itstool) path: page/p +#: C/browse-webapps-del.page:42 +msgid "" +"If you have Software installed, you can also delete Web " +"Applications from there." +msgstr "" + +#. (itstool) path: info/desc +#: C/cert.page:18 +msgid "Certificate management in Web." +msgstr "" + +#. (itstool) path: page/title +#: C/cert.page:21 +msgid "Certificates" +msgstr "" + +#. (itstool) path: page/p +#: C/cert.page:23 +msgid "" +"Web does not have built-in support for certificate management at " +"this time." +msgstr "" + +#. (itstool) path: note/p +#: C/cert.page:27 +msgid "" +"You can add certificates through the command line if you have p11-kit " +"installed. To add a certificate, you need to download the certificate and " +"run the following command to import it:" +msgstr "" + +#. (itstool) path: note/screen +#: C/cert.page:30 +#, no-wrap +msgid "$ sudo trust anchor /home/user/Downloads/certificate.crt" +msgstr "" + +#. (itstool) path: note/p +#: C/cert.page:31 +msgid "This will only work on recent systems." +msgstr "" + +#. (itstool) path: page/title +#: C/cookies.xml:20 +msgid "What are cookies?" +msgstr "" + +#. (itstool) path: page/p +#: C/cookies.xml:28 +msgid "" +"A browser cookie is a small piece of data sent from a website and " +"stored on your computer while you are browsing that website. When the you " +"return to the same website in the future, the data stored in the cookie can " +"be retrieved by the website to notify the website of your previous activity. " +"Cookies are a common method used by web servers to know whether you are " +"logged in to an account on a specific website or not." +msgstr "" + +#. (itstool) path: credit/name +#: C/data-cookies.page:16 C/data-passwords.page:24 C/pref-do-not-track.page:12 +#: C/prob-restore-closed-page.page:11 +msgid "Baptiste Mille-Mathias" +msgstr "" + +#. (itstool) path: info/desc +#: C/data-cookies.page:23 +msgid "How do I delete a cookie if I don't want a website to track me anymore?" +msgstr "" + +#. (itstool) path: page/title +#: C/data-cookies.page:26 +msgid "Delete a cookie" +msgstr "" + +#. (itstool) path: page/p +#: C/data-cookies.page:31 +msgid "" +"If you no longer want a specific website to track you, you can check if it " +"left a cookie and delete it." +msgstr "" + +#. (itstool) path: item/p +#: C/data-cookies.page:36 +msgid "" +"Open WebPreferencesPrivacyManage Cookies." +msgstr "" + +#. (itstool) path: item/p +#: C/data-cookies.page:41 +msgid "Select the cookies that you want to delete." +msgstr "" + +#. (itstool) path: item/p +#: C/data-cookies.page:44 +msgid "Press - button or press Delete." +msgstr "" + +#. (itstool) path: page/p +#: C/data-cookies.page:49 +msgid "" +"You can also delete all of your cookies using the Clear All button." +msgstr "" + +#. (itstool) path: info/desc +#: C/data-passwords.page:31 +msgid "How do I remove and update stored passwords?" +msgstr "" + +#. (itstool) path: page/title +#: C/data-passwords.page:34 +msgid "Manage passwords" +msgstr "" + +#. (itstool) path: page/p +#: C/data-passwords.page:36 +msgid "" +"You can save all of your passwords so that you do not have to reenter them " +"every time that you want to log into a website." +msgstr "" + +#. (itstool) path: page/p +#: C/data-passwords.page:39 +msgid "" +"You can see saved passwords in WebPreferencesPrivacyManage Passwords." +msgstr "" + +#. (itstool) path: section/title +#: C/data-passwords.page:46 +msgid "Remove saved passwords" +msgstr "" + +#. (itstool) path: section/p +#: C/data-passwords.page:48 +msgid "You can remove a stored password at any time." +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:52 +msgid "" +"Open WebPreferencesPrivacyManage Passwords." +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:56 +msgid "Enter the address of the website at the top of the window." +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:59 +msgid "Click on the username for the password which you want to delete." +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:62 +msgid "" +"Press - button to remove the saved password or " +"press the Delete key." +msgstr "" + +#. (itstool) path: section/p +#: C/data-passwords.page:67 +msgid "" +"You can view the saved passwords by pressing on the key button at the bottom-" +"right of the password list." +msgstr "" + +#. (itstool) path: note/p +#: C/data-passwords.page:71 +msgid "" +"You can also delete all of your stored passwords using the Clear All button." +msgstr "" + +#. (itstool) path: section/title +#: C/data-passwords.page:78 +msgid "Update a password" +msgstr "" + +#. (itstool) path: section/p +#: C/data-passwords.page:80 +msgid "" +"If you have changed a password that is saved in Web, you have to update it." +msgstr "" + +#. (itstool) path: steps/title +#: C/data-passwords.page:84 +msgid "When you have finished changing your password:" +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:86 +msgid "" +"Visit the same webpage for which the password was stored and has now been " +"changed." +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:90 +msgid "" +"Your old saved password will automatically be typed in the password field by " +"Web, so clear the password field." +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:94 +msgid "Type your new password in the password field." +msgstr "" + +#. (itstool) path: item/p +#: C/data-passwords.page:97 +msgid "" +"You will be asked if you want to save the password in Web. Press " +"Store password to finish. This will update your " +"old password for the webpage." +msgstr "" + +#. (itstool) path: info/desc +#: C/history.page:24 +msgid "" +"Why do I see a list of web pages when I start typing in the address bar?" +msgstr "" + +#. (itstool) path: page/title +#: C/history.page:27 +msgid "Browsing history" +msgstr "" + +#. (itstool) path: page/p +#: C/history.page:29 +msgid "" +"Your browsing history, the web pages that you have visited, is automatically " +"saved so that it is quicker for you to return to those pages." +msgstr "" + +#. (itstool) path: page/p +#: C/history.page:33 +msgid "" +"To search your history, start typing your search term into the " +"address bar, then click on the correct result once you see it. The search " +"will include the page title and URL, but not the page content." +msgstr "" + +#. (itstool) path: info/desc +#: C/history-delete.page:23 +msgid "How do I delete one or more web pages from my browsing history?" +msgstr "" + +#. (itstool) path: page/title +#: C/history-delete.page:26 +msgid "Clear browsing history" +msgstr "" + +#. (itstool) path: page/p +#: C/history-delete.page:28 +msgid "" +"You may sometimes wish to delete your browsing history, for example to " +"remove items that you do not want to see in your search results. You can " +"choose to delete one result, all results from a single website or all of " +"your history." +msgstr "" + +#. (itstool) path: item/p +#: C/history-delete.page:35 +msgid "" +"Open WebHistory." +msgstr "" + +#. (itstool) path: item/p +#: C/history-delete.page:39 +msgid "Select the web pages that you wish to delete from your history." +msgstr "" + +#. (itstool) path: item/p +#: C/history-delete.page:42 +msgid "" +"Select EditDelete to permanently delete the selected items." +msgstr "" + +#. (itstool) path: page/p +#: C/history-delete.page:48 +msgid "" +"You can also delete all of your history by selecting EditClear History." +msgstr "" + +#. (itstool) path: credit/name +#: C/keyboard-shortcut.page:11 +msgid "Siyu Yang" +msgstr "" + +#. (itstool) path: info/desc +#: C/keyboard-shortcut.page:23 +msgid "Browsing the web by using keyboard shortcuts." +msgstr "" + +#. (itstool) path: page/title +#: C/keyboard-shortcut.page:26 +msgid "Keyboard shortcuts" +msgstr "" + +#. (itstool) path: page/p +#: C/keyboard-shortcut.page:28 +msgid "" +"You can use handy keyboard shortcuts to navigate around Web " +"faster." +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:35 +msgid "Action" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:38 +msgid "Shortcut" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:45 +msgid "Open a new window" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:48 +msgid "CtrlN" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:53 +msgid "Open a new private browsing (incognito) window" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:56 +msgid "ShiftCtrlN" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:61 +msgid "Open a file" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:64 +msgid "CtrlO" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:69 +msgid "Save a new copy of the current page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:72 +msgid "ShiftCtrlS" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:77 +msgid "Save the current page as a web application" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:80 +msgid "ShiftCtrlA" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:85 +msgid "Print the current page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:88 +msgid "CtrlP" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:93 +msgid "Close the current tab" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:96 +msgid "CtrlW" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:101 +msgid "Quit Web" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:104 +msgid "CtrlQ" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:109 +msgid "Undo the last change to typed text" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:112 +msgid "CtrlZ" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:117 +msgid "Redo the last change to typed text" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:120 +msgid "ShiftCtrlZ" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:125 +msgid "Cut the selected text" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:128 +msgid "CtrlX" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:133 +msgid "Copy the selection" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:136 +msgid "CtrlC" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:141 +msgid "Paste the selection" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:144 +msgid "CtrlV" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:149 +msgid "Select all" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:152 +msgid "CtrlA" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:157 +msgid "Find text on the current page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:160 +msgid "CtrlF" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:165 +msgid "Next search result" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:168 +msgid "CtrlG" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:173 +msgid "Previous search result" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:176 +msgid "ShiftCtrlG" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:181 +msgid "Edit bookmarks" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:184 +msgid "CtrlB" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:189 +msgid "View your browsing history" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:192 +msgid "CtrlH" +msgstr "" + +#. (itstool) path: td/p +#. (itstool) path: page/title +#: C/keyboard-shortcut.page:197 C/pref.page:24 +msgid "Web preferences" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:200 +msgid "CtrlE" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:205 +msgid "Stop loading current page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:208 +msgid "Escape" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:213 +msgid "Reload current page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:216 +msgid "CtrlR" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:221 +msgid "Reload current page (alternative shortcut)" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:224 +msgid "F5" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:229 +msgid "Zoom in" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:232 +msgid "Ctrl+" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:237 +msgid "Zoom out" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:240 +msgid "Ctrl-" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:245 +msgid "Normal size" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:248 +msgid "Ctrl0" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:253 +msgid "View the page source" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:256 +msgid "CtrlU" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:261 +msgid "Bookmark current page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:264 +msgid "CtrlD" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:269 +msgid "Select page URL (address)" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:272 +msgid "CtrlL" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:277 +msgid "View previous tab" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:280 +msgid "CtrlPgUp" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:285 +msgid "View next tab" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:288 +msgid "CtrlPgDn" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:293 +msgid "Move the current tab to the left" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:296 +msgid "ShiftCtrlPgUp " +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:302 +msgid "Move the current tab to the right" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:305 +msgid "ShiftCtrlPgDn " +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:311 +msgid "View Web in fullscreen" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:314 +msgid "F11" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:319 +msgid "Enable or disable caret browsing" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:322 +msgid "F7" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:327 +msgid "Open window menu" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:330 +msgid "F10" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:335 +msgid "Open your home page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:338 +msgid "AltHome" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:343 +msgid "Save the current page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:346 +msgid "CtrlS" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:351 +msgid "Go to back to the previous page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:354 +msgid "AltLeft" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:359 +msgid "Go forward to the next page" +msgstr "" + +#. (itstool) path: td/p +#: C/keyboard-shortcut.page:362 +msgid "AltRight" +msgstr "" + +#. (itstool) path: credit/name +#: C/pref-cookies.page:18 +msgid "Michael Hill" +msgstr "" + +#. (itstool) path: info/desc +#: C/pref-cookies.page:25 +msgid "How do I choose which websites I allow to set cookies?" +msgstr "" + +#. (itstool) path: page/title +#: C/pref-cookies.page:28 +msgid "Set cookie preference" +msgstr "" + +#. (itstool) path: page/p +#: C/pref-cookies.page:33 +msgid "" +"You can specify whether you want to accept cookies and from which websites." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-cookies.page:38 C/pref-do-not-track.page:39 +msgid "" +"Open WebPreferencesPrivacy." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-cookies.page:42 +msgid "" +"Select whether you want to accept cookies from all websites, accept cookies " +"only from websites which you have visited or to not accept any cookies." +msgstr "" + +#. (itstool) path: page/p +#: C/pref-cookies.page:48 +msgid "" +"You should normally use Only from sites you visit because this " +"option allows you to log into your accounts on most websites while " +"preventing websites that you have not visited from leaving cookies." +msgstr "" + +#. (itstool) path: page/p +#: C/pref-cookies.page:52 +msgid "" +"If you chose to accept cookies from All websites, then websites " +"that you have not visited will be able to leave third party cookies. Third party cookies are often used by advertisers and social media " +"websites to track your activity across websites and offer targeted content. " +"Note that some websites, such as Outlook.com, use third party cookies to " +"monitor whether you are logged in." +msgstr "" + +#. (itstool) path: page/p +#: C/pref-cookies.page:59 +msgid "" +"If you Never accept cookies, you may experience problems on some " +"websites like logging into your accounts, saving your preferences or not " +"being able add items to your shopping basket." +msgstr "" + +#. (itstool) path: credit/name +#: C/pref-css.page:12 C/pref-font.page:13 +msgid "Gordon Hill" +msgstr "" + +#. (itstool) path: info/desc +#: C/pref-css.page:24 +msgid "Override the theme which is used to display web pages." +msgstr "" + +#. (itstool) path: page/title +#: C/pref-css.page:27 +msgid "Custom CSS" +msgstr "" + +#. (itstool) path: page/p +#: C/pref-css.page:29 +msgid "" +"Epiphany allows you to set a custom CSS to change the look and feel of every " +"web page that you visit. You may want to do this to set a preferred font " +"size or color scheme." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-css.page:35 C/pref-font.page:37 +msgid "" +"Open WebPreferencesFonts & Styles." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-css.page:39 +msgid "Press Edit Stylesheet." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-css.page:42 +msgid "" +"Your default text editor will open. Add your custom CSS and save the file." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-css.page:46 +msgid "Tick the Use custom stylesheet checkbox." +msgstr "" + +#. (itstool) path: page/p +#: C/pref-css.page:55 +msgid "An example of a custom CSS:" +msgstr "" + +#. (itstool) path: page/code +#: C/pref-css.page:56 +#, no-wrap +msgid "" +"\n" +"body{\n" +" /*Make everything upside-down*/\n" +" -webkit-transform: rotate(180deg);\n" +"}\n" +msgstr "" + +#. (itstool) path: page/p +#: C/pref-css.page:63 +msgid "" +"Your custom CSS will override the style sheet on pages which you visit after " +"you enable it." +msgstr "" + +#. (itstool) path: info/desc +#: C/pref-downloads.page:25 +msgid "Where are my files downloaded to and how can I change this setting?" +msgstr "" + +#. (itstool) path: page/title +#: C/pref-downloads.page:28 +msgid "Downloading files" +msgstr "" + +#. (itstool) path: page/p +#: C/pref-downloads.page:30 +msgid "" +"Files which you download from the internet, such as email attachments, will " +"automatically be saved into your Downloads folder. You can " +"change this in the Preferences." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-downloads.page:36 +msgid "" +"Open WebPreferencesGeneral." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-downloads.page:40 +msgid "" +"Press the Download folder name to select a different folder for " +"downloads. If the folder that you want to use is not in the list, select " +"Other… to browse for it." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-downloads.page:45 +msgid "" +"If you want the downloaded file to open automatically, tick the " +"Automatically open downloaded files checkbox." +msgstr "" + +#. (itstool) path: page/p +#: C/pref-downloads.page:50 +msgid "" +"If you save a file instead of downloading it, you will still need " +"to specify where you want to save it to." +msgstr "" + +#. (itstool) path: info/desc +#: C/pref-do-not-track.page:24 +msgid "" +"How do I tell websites that I do not want them to monitor my online " +"activities?" +msgstr "" + +#. (itstool) path: page/title +#: C/pref-do-not-track.page:28 +msgid "Set web tracking preference" +msgstr "" + +#. (itstool) path: page/p +#: C/pref-do-not-track.page:30 +msgid "" +"Some websites can monitor your activity when you visit them. For example, " +"they may want to know which pages you view or what you have searched for. " +"This information can be used to improve your web browsing experience, but it " +"can also be sold or shared with other companies which may use it in a " +"malicious way. You can ask websites which you visit to not monitor your " +"activity by enabling Do Not Track." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-do-not-track.page:43 +msgid "" +"Tick the Tell web sites I do no want to be tracked checkbox." +msgstr "" + +#. (itstool) path: note/p +#: C/pref-do-not-track.page:49 +msgid "Websites do not have to honor this preference." +msgstr "" + +#. (itstool) path: info/desc +#: C/pref-font.page:25 +msgid "Use a custom font for displaying web pages." +msgstr "" + +#. (itstool) path: page/title +#: C/pref-font.page:28 +msgid "Change the font" +msgstr "" + +#. (itstool) path: page/p +#: C/pref-font.page:30 +msgid "" +"By default, your system font will be used to display web pages whenever " +"possible. If you use the Large " +"Font accessibility setting, this will be taken into account. You can " +"change this and use different fonts for viewing websites." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-font.page:41 +msgid "Untick the Use system fonts checkbox." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-font.page:44 +msgid "" +"Click on the font to open the font chooser dialog, where you can select a " +"different font type or size." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-font.page:48 +msgid "Press Select to save your choice." +msgstr "" + +#. (itstool) path: page/p +#: C/pref-font.page:52 +msgid "" +"You can also increase font size with Ctrl+ and decrease it with Ctrl-." +msgstr "" + +#. (itstool) path: info/desc +#: C/pref-passwords.page:25 +msgid "How do I enable or disable storing passwords?" +msgstr "" + +#. (itstool) path: page/title +#: C/pref-passwords.page:28 +msgid "Remember passwords" +msgstr "" + +#. (itstool) path: page/p +#: C/pref-passwords.page:30 +msgid "" +"When you enter a username and password for a website, you will usually be " +"asked if you want to remember the login details. You can check if this " +"preference is enabled or change your settings in Preferences." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-passwords.page:36 +msgid "" +"Open Web Preferences Privacy." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-passwords.page:41 +msgid "" +"The Remember passwords checkbox will be ticked " +"if your preferences are set to save passwords. Untick it to stop Web remembering passwords." +msgstr "" + +#. (itstool) path: item/p +#: C/pref-passwords.page:46 +msgid "Press Close." +msgstr "" + +#. (itstool) path: info/desc +#: C/prob-restore-closed-page.page:23 +msgid "I want to reopen a web page that I closed by mistake." +msgstr "" + +#. (itstool) path: page/title +#: C/prob-restore-closed-page.page:26 +msgid "How can I restore a tab?" +msgstr "" + +#. (itstool) path: page/p +#: C/prob-restore-closed-page.page:28 +msgid "" +"You can restore the pages you closed as long as at least one Web " +"is still open." +msgstr "" + +#. (itstool) path: item/p +#: C/prob-restore-closed-page.page:33 +msgid "" +"Open WebReopen " +"Closed Tab, your last closed tab will be reopened." +msgstr "" + +#. (itstool) path: page/p +#: C/prob-restore-closed-page.page:38 +msgid "" +"Repeat the step as many times as you need to until the tab that you want is " +"restored. Tabs will be restored in reverse order to how you closed them. " +"Once you have restored all the closed tabs, you will not be able to restore " +"any more tabs." +msgstr "" + +#. (itstool) path: note/p +#: C/prob-restore-closed-page.page:44 +msgid "" +"It is not possible to restore a closed tab in private browsing mode." +msgstr "" + +#. (itstool) path: info/desc +#: C/proxy.page:19 +msgid "Anonymize your web browsing by using a web proxy." +msgstr "" + +#. (itstool) path: page/title +#: C/proxy.page:22 +msgid "Use a proxy" +msgstr "프록시 사용하기" + +#. (itstool) path: page/p +#: C/proxy.page:24 +msgid "" +"You can use a proxy server for browsing the web. To use a web proxy when " +"browsing, you need to set it up in " +"the GNOME Network settings panel." +msgstr "" diff -Nru epiphany-browser-3.16.3/help/ko/legal.xml epiphany-browser-3.18.0/help/ko/legal.xml --- epiphany-browser-3.16.3/help/ko/legal.xml 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/legal.xml 2015-09-22 07:48:08.000000000 +0000 @@ -0,0 +1,6 @@ + + + +

이 작업은 크리에이티브 커먼즈 저작자 표시 - 동일조건 변경허락 3.0 Unported 라이선스 라이선스를 따릅니다.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/pref-cookies.page epiphany-browser-3.18.0/help/ko/pref-cookies.page --- epiphany-browser-3.16.3/help/ko/pref-cookies.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/pref-cookies.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,67 @@ + + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + Michael Hill + mdhill@gnome.org + + + + + + How do I choose which websites I allow to set cookies? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Set cookie preference + + + + +

You can specify whether you want to accept cookies and from which + websites.

+ + + +

Open + WebPreferencesPrivacy.

+ + +

Select whether you want to accept cookies from all websites, accept + cookies only from websites which you have visited or to not accept any + cookies.

+ + + +

You should normally use Only from sites you visit because this + option allows you to log into your accounts on most websites while preventing + websites that you have not visited from leaving cookies.

+ +

If you chose to accept cookies from All websites, then websites + that you have not visited will be able to leave third party cookies. + Third party cookies are often used by advertisers and social media websites + to track your activity across websites and offer targeted content. Note that + some websites, such as Outlook.com, use third party cookies to monitor + whether you are logged in.

+ +

If you Never accept cookies, you may experience problems on + some websites like logging into your accounts, saving your preferences or not + being able add items to your shopping basket.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/pref-css.page epiphany-browser-3.18.0/help/ko/pref-css.page --- epiphany-browser-3.16.3/help/ko/pref-css.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/pref-css.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,65 @@ + + + + + + + + + + Gordon Hill + caseyweederman@gmail.com + 2013 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + Override the theme which is used to display web pages. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Custom CSS + +

Epiphany allows you to set a custom CSS to change the look and feel of + every web page that you visit. You may want to do this to set a preferred + font size or color scheme.

+ + + +

Open + WebPreferencesFonts & Styles.

+ + +

Press Edit Stylesheet.

+ + +

Your default text editor will open. Add your custom CSS and save + the file.

+ + +

Tick the Use custom stylesheet checkbox.

+ + + +

An example of a custom CSS:

+ + +

Your custom CSS will override the style sheet on pages which you visit + after you enable it.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/pref-do-not-track.page epiphany-browser-3.18.0/help/ko/pref-do-not-track.page --- epiphany-browser-3.16.3/help/ko/pref-do-not-track.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/pref-do-not-track.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,56 @@ + + + + + + + + + + Baptiste Mille-Mathias + baptistem@gnome.org + 2014 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2014 + + + + + How do I tell websites that I do not want them to monitor my online + activities? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Set web tracking preference + +

Some websites can monitor your activity when you visit them. For example, + they may want to know which pages you view or what you have searched for. + This information can be used to improve your web browsing experience, but it + can also be sold or shared with other companies which may use it in a + malicious way. You can ask websites which you visit to not monitor your + activity by enabling Do Not Track.

+ + + +

Open + WebPreferencesPrivacy.

+ + +

Tick the Tell web sites I do no want to + be tracked checkbox.

+ + + + +

Websites do not have to honor this preference.

+ + + diff -Nru epiphany-browser-3.16.3/help/ko/pref-downloads.page epiphany-browser-3.18.0/help/ko/pref-downloads.page --- epiphany-browser-3.16.3/help/ko/pref-downloads.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/pref-downloads.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + Where are my files downloaded to and how can I change this setting? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Downloading files + +

Files which you download from the internet, such as email attachments, + will automatically be saved into your Downloads folder. You can + change this in the Preferences.

+ + + +

Open + WebPreferencesGeneral.

+ + +

Press the Download folder name to select a different folder + for downloads. If the folder that you want to use is not in the list, + select Other… to browse for it.

+ + +

If you want the downloaded file to open automatically, tick the + Automatically open downloaded files checkbox.

+ + + +

If you save a file instead of downloading it, you will still need + to specify where you want to save it to.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/pref-font.page epiphany-browser-3.18.0/help/ko/pref-font.page --- epiphany-browser-3.16.3/help/ko/pref-font.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/pref-font.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,60 @@ + + + + + + + + + + + Gordon Hill + caseyweederman@gmail.com + 2013 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + Use a custom font for displaying web pages. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Change the font + +

By default, your system font will be used to display web pages whenever + possible. If you use the Large + Font accessibility setting, this will be taken into account. You can + change this and use different fonts for viewing websites.

+ + + +

Open + WebPreferencesFonts & Styles.

+ + +

Untick the Use system fonts checkbox.

+ + +

Click on the font to open the font chooser dialog, where you can + select a different font type or size.

+ + +

Press Select to save your choice.

+ + + +

You can also increase font size with + Ctrl+ and decrease it with + Ctrl-.

+ + diff -Nru epiphany-browser-3.16.3/help/ko/pref.page epiphany-browser-3.18.0/help/ko/pref.page --- epiphany-browser-3.16.3/help/ko/pref.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/pref.page 2015-09-22 07:48:09.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + + + + + + + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + <app>Web</app> preferences + + + + diff -Nru epiphany-browser-3.16.3/help/ko/pref-passwords.page epiphany-browser-3.18.0/help/ko/pref-passwords.page --- epiphany-browser-3.16.3/help/ko/pref-passwords.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/pref-passwords.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,54 @@ + + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2013 + + + + + + How do I enable or disable storing passwords? + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + Remember passwords + +

When you enter a username and password for a website, you will usually be + asked if you want to remember the login details. You can check if this + preference is enabled or change your settings in Preferences.

+ + + +

Open Web + Preferences + Privacy.

+ + +

The Remember passwords checkbox will be + ticked if your preferences are set to save passwords. Untick it to stop + Web remembering passwords.

+ + +

Press Close.

+ + + + diff -Nru epiphany-browser-3.16.3/help/ko/prob-restore-closed-page.page epiphany-browser-3.18.0/help/ko/prob-restore-closed-page.page --- epiphany-browser-3.16.3/help/ko/prob-restore-closed-page.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/prob-restore-closed-page.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,52 @@ + + + + + + + + + Baptiste Mille-Mathias + baptistem@gnome.org + 2014 + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2014 + + + + + I want to reopen a web page that I closed by mistake. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + How can I restore a tab? + +

You can restore the pages you closed as long as at least one + Web is still open.

+ + + +

Open WebReopen + Closed Tab, your last closed tab will be reopened.

+ + + +

Repeat the step as many times as you need to until the tab that you want + is restored. Tabs will be restored in reverse order to how you closed them. + Once you have restored all the closed tabs, you will not be able to restore + any more tabs.

+ + +

It is not possible to restore a closed tab in + private browsing mode.

+ + + diff -Nru epiphany-browser-3.16.3/help/ko/proxy.page epiphany-browser-3.18.0/help/ko/proxy.page --- epiphany-browser-3.16.3/help/ko/proxy.page 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/help/ko/proxy.page 2015-09-22 07:48:10.000000000 +0000 @@ -0,0 +1,32 @@ + + + + + + + + + + Ekaterina Gerasimova + kittykat3756@gmail.com + 2014 + + + + + Anonymize your web browsing by using a web proxy. + + + ChangSeok Oh + changseok@gnome.org + 2015 + + + + 프록시 사용하기 + +

You can use a proxy server for browsing the web. To use a web proxy when + browsing, you need to set it up in the + GNOME Network settings panel.

+ + diff -Nru epiphany-browser-3.16.3/help/Makefile.am epiphany-browser-3.18.0/help/Makefile.am --- epiphany-browser-3.16.3/help/Makefile.am 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/help/Makefile.am 2015-09-08 11:37:53.000000000 +0000 @@ -40,6 +40,6 @@ media/private-browsing-3-12.png \ media/web-browser.png -HELP_LINGUAS = cs de el es fr hu pt_BR ru +HELP_LINGUAS = cs de el es fr hu ko pt_BR ru -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/help/Makefile.in epiphany-browser-3.18.0/help/Makefile.in --- epiphany-browser-3.16.3/help/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/help/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,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 \ ?) ;; \ @@ -78,10 +88,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = help -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -90,6 +109,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 = @@ -114,18 +134,18 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -140,7 +160,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -149,17 +168,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -169,8 +185,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -194,9 +208,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -217,11 +229,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -230,6 +238,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -248,6 +258,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -283,6 +294,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -330,7 +342,7 @@ media/private-browsing-3-12.png \ media/web-browser.png -HELP_LINGUAS = cs de el es fr hu pt_BR ru +HELP_LINGUAS = cs de el es fr hu ko pt_BR ru all: all-am .SUFFIXES: @@ -346,7 +358,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign help/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -521,6 +532,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + @YELP_HELP_RULES@ -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/install-sh epiphany-browser-3.18.0/install-sh --- epiphany-browser-3.16.3/install-sh 2015-06-17 08:20:04.000000000 +0000 +++ epiphany-browser-3.18.0/install-sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,527 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2011-11-20.07; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# 'make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# 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 - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -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. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - 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) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -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. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call 'install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - do_exit='(exit $ret); exit $ret' - trap "ret=129; $do_exit" 1 - trap "ret=130; $do_exit" 2 - trap "ret=141; $do_exit" 13 - trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names problematic for 'test' and other utilities. - case $src in - -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - dst=$dst_arg - - # 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 - 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' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - 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;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - 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/ - 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 - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # 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 && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # 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 rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru epiphany-browser-3.16.3/lib/egg/eggtreemultidnd.c epiphany-browser-3.18.0/lib/egg/eggtreemultidnd.c --- epiphany-browser-3.16.3/lib/egg/eggtreemultidnd.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/egg/eggtreemultidnd.c 2015-08-07 08:41:06.000000000 +0000 @@ -316,16 +316,13 @@ model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); if (egg_tree_multi_drag_source_row_draggable (EGG_TREE_MULTI_DRAG_SOURCE (model), path_list)) { - - context = gtk_drag_begin (widget, -#if GTK_CHECK_VERSION (2, 14, 0) - gtk_drag_source_get_target_list (widget), -#else - di->source_target_list, -#endif - di->source_actions, - priv_data->pressed_button, - (GdkEvent*)event); + context = gtk_drag_begin_with_coordinates (widget, + gtk_drag_source_get_target_list (widget), + di->source_actions, + priv_data->pressed_button, + (GdkEvent*)event, + event->x, + event->y); set_context_data (context, path_list); gtk_drag_set_icon_default (context); diff -Nru epiphany-browser-3.16.3/lib/egg/Makefile.in epiphany-browser-3.18.0/lib/egg/Makefile.in --- epiphany-browser-3.16.3/lib/egg/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/lib/egg/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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 \ ?) ;; \ @@ -80,11 +90,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/egg -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -93,6 +111,8 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -124,7 +144,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -172,18 +192,19 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -198,7 +219,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -207,17 +227,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -227,8 +244,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -252,9 +267,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -275,11 +288,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -288,6 +297,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -306,6 +317,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -341,6 +353,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -392,7 +405,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/egg/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/egg/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -670,6 +682,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/lib/ephy-debug.c epiphany-browser-3.18.0/lib/ephy-debug.c --- epiphany-browser-3.16.3/lib/ephy-debug.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-debug.c 2015-08-07 08:41:06.000000000 +0000 @@ -46,7 +46,7 @@ static gboolean ephy_profile_all_modules; #endif /* !DISABLE_PROFILING */ -#ifdef GNOME_ENABLE_DEBUG +#ifndef NDEBUG static char ** build_modules (const char *name, diff -Nru epiphany-browser-3.16.3/lib/ephy-debug.h epiphany-browser-3.18.0/lib/ephy-debug.h --- epiphany-browser-3.16.3/lib/ephy-debug.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-debug.h 2015-08-07 08:41:06.000000000 +0000 @@ -28,7 +28,7 @@ G_BEGIN_DECLS -#ifndef GNOME_ENABLE_DEBUG +#ifdef NDEBUG #define DISABLE_LOGGING #define DISABLE_PROFILING #endif diff -Nru epiphany-browser-3.16.3/lib/ephy-file-helpers.c epiphany-browser-3.18.0/lib/ephy-file-helpers.c --- epiphany-browser-3.16.3/lib/ephy-file-helpers.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-file-helpers.c 2015-08-07 08:41:06.000000000 +0000 @@ -230,7 +230,7 @@ static const char * const paths[] = { -#ifdef GNOME_ENABLE_DEBUG +#ifndef NDEBUG TOP_SRC_DATADIR "/", TOP_SRC_DATADIR "/icons/", TOP_SRC_DATADIR "/pages/", @@ -1071,3 +1071,27 @@ return g_strdelimit (filename, G_DIR_SEPARATOR_S, '_'); } + +void +ephy_open_incognito_window (const char *uri) +{ + char *command; + GError *error = NULL; + + command = g_strdup_printf ("epiphany --incognito-mode --profile %s ", ephy_dot_dir ()); + + if (uri) { + char *str = g_strconcat (command, uri, NULL); + g_free (command); + command = str; + } + + g_spawn_command_line_async (command, &error); + + if (error) { + g_warning ("Couldn't open link in incognito window: %s", error->message); + g_error_free (error); + } + + g_free (command); +} diff -Nru epiphany-browser-3.16.3/lib/ephy-file-helpers.h epiphany-browser-3.18.0/lib/ephy-file-helpers.h --- epiphany-browser-3.16.3/lib/ephy-file-helpers.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-file-helpers.h 2015-08-07 08:41:06.000000000 +0000 @@ -96,6 +96,7 @@ char * ephy_sanitize_filename (char *filename); GAppInfo * ephy_file_launcher_get_app_info_for_file (GFile *file, const char *mime_type); +void ephy_open_incognito_window (const char *uri); G_END_DECLS diff -Nru epiphany-browser-3.16.3/lib/ephy-form-auth-data.c epiphany-browser-3.18.0/lib/ephy-form-auth-data.c --- epiphany-browser-3.16.3/lib/ephy-form-auth-data.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-form-auth-data.c 2015-08-07 08:41:06.000000000 +0000 @@ -84,16 +84,17 @@ static void store_form_password_cb (SecretService *service, GAsyncResult *res, - GSimpleAsyncResult *async) + GTask *task) { GError *error = NULL; secret_service_store_finish (service, res, &error); if (error != NULL) - g_simple_async_result_take_error (async, error); + g_task_return_error (task, error); + else + g_task_return_boolean (task, TRUE); - g_simple_async_result_complete (async); - g_object_unref (async); + g_object_unref (task); } void @@ -110,7 +111,7 @@ SecretValue *value; GHashTable *attributes; char *label; - GSimpleAsyncResult *res; + GTask *task; g_return_if_fail (uri); g_return_if_fail (form_password); @@ -120,7 +121,7 @@ fake_uri = soup_uri_new (uri); g_return_if_fail (fake_uri); - res = g_simple_async_result_new (NULL, callback, userdata, ephy_form_auth_data_store); + task = g_task_new (NULL, NULL, callback, userdata); /* Mailman passwords need the full URI */ if (!form_username && g_strcmp0 (form_password, "adminpw") == 0) @@ -148,14 +149,14 @@ attributes, NULL, label, value, NULL, (GAsyncReadyCallback)store_form_password_cb, - g_object_ref (res)); + g_object_ref (task)); g_free (label); secret_value_unref (value); g_hash_table_unref (attributes); soup_uri_free (fake_uri); g_free (fake_uri_str); - g_object_unref (res); + g_object_unref (task); } @@ -164,9 +165,9 @@ GError **error) { g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, ephy_form_auth_data_store), FALSE); + g_return_val_if_fail (g_task_is_valid (result, NULL), FALSE); - return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), error); + return g_task_propagate_boolean (G_TASK (result), error); } typedef struct diff -Nru epiphany-browser-3.16.3/lib/ephy-langs.c epiphany-browser-3.18.0/lib/ephy-langs.c --- epiphany-browser-3.16.3/lib/ephy-langs.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-langs.c 2015-08-07 08:41:06.000000000 +0000 @@ -147,28 +147,24 @@ ephy_langs_sanitise (array); - return (char **) g_array_free (array, FALSE); + return (char **)(void *) g_array_free (array, FALSE); } -#define ISOCODESLOCALEDIR ISO_CODES_PREFIX "/share/locale" - static void ephy_langs_bind_iso_domains (void) { -#ifdef ENABLE_NLS static gboolean bound = FALSE; if (bound == FALSE) { - bindtextdomain (ISO_639_DOMAIN, ISOCODESLOCALEDIR); + bindtextdomain (ISO_639_DOMAIN, LOCALEDIR); bind_textdomain_codeset (ISO_639_DOMAIN, "UTF-8"); - bindtextdomain(ISO_3166_DOMAIN, ISOCODESLOCALEDIR); + bindtextdomain(ISO_3166_DOMAIN, LOCALEDIR); bind_textdomain_codeset (ISO_3166_DOMAIN, "UTF-8"); bound = TRUE; } -#endif } static void diff -Nru epiphany-browser-3.16.3/lib/ephy-prefs.h epiphany-browser-3.18.0/lib/ephy-prefs.h --- epiphany-browser-3.16.3/lib/ephy-prefs.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-prefs.h 2015-08-07 08:41:17.000000000 +0000 @@ -30,14 +30,6 @@ typedef enum { - EPHY_PREFS_UI_TOOLBAR_STYLE_BOTH, - EPHY_PREFS_UI_TOOLBAR_STYLE_BOTH_HORIZ, - EPHY_PREFS_UI_TOOLBAR_STYLE_ICONS, - EPHY_PREFS_UI_TOOLBAR_STYLE_TEXT -} EphyPrefsUIToolbarStyle; - -typedef enum -{ EPHY_PREFS_RESTORE_SESSION_POLICY_ALWAYS, EPHY_PREFS_RESTORE_SESSION_POLICY_NEVER, EPHY_PREFS_RESTORE_SESSION_POLICY_CRASHED @@ -65,7 +57,6 @@ #define EPHY_PREFS_UI_SCHEMA "org.gnome.Epiphany.ui" #define EPHY_PREFS_UI_ALWAYS_SHOW_TABS_BAR "always-show-tabs-bar" -#define EPHY_PREFS_UI_TOOLBAR_STYLE "toolbar-style" #define EPHY_PREFS_UI_DOWNLOADS_HIDDEN "downloads-hidden" #define EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY "tabs-bar-visibility-policy" @@ -115,6 +106,7 @@ #define EPHY_PREFS_RESTORE_SESSION_POLICY "restore-session-policy" #define EPHY_PREFS_RESTORE_SESSION_DELAYING_LOADS "restore-session-delaying-loads" #define EPHY_PREFS_PROCESS_MODEL "process-model" +#define EPHY_PREFS_MAX_PROCESSES "max-processes" #define EPHY_PREFS_LOCKDOWN_SCHEMA "org.gnome.Epiphany.lockdown" #define EPHY_PREFS_LOCKDOWN_FULLSCREEN "disable-fullscreen" diff -Nru epiphany-browser-3.16.3/lib/ephy-profile-utils.c epiphany-browser-3.18.0/lib/ephy-profile-utils.c --- epiphany-browser-3.16.3/lib/ephy-profile-utils.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-profile-utils.c 2015-09-08 11:37:53.000000000 +0000 @@ -108,8 +108,10 @@ /* If we're not trying to run a migration step in a test and there is nothing to migrate, don't spawn the migrator at all. */ if (test_to_run == -1 && - EPHY_PROFILE_MIGRATION_VERSION == ephy_profile_utils_get_migration_version ()) + EPHY_PROFILE_MIGRATION_VERSION == ephy_profile_utils_get_migration_version ()) { + g_strfreev (envp); return TRUE; + } if (test_to_run != -1) { index = g_strdup_printf ("%d", test_to_run); diff -Nru epiphany-browser-3.16.3/lib/ephy-string.c epiphany-browser-3.18.0/lib/ephy-string.c --- epiphany-browser-3.16.3/lib/ephy-string.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-string.c 2015-08-07 08:41:06.000000000 +0000 @@ -173,260 +173,6 @@ return g_string_free (result, FALSE); } -guint -ephy_string_flags_from_string (GType type, - const char *flags_string) -{ - GFlagsClass *flags_class; - const GFlagsValue *value; - gchar **flags; - guint retval = 0, i; - - g_return_val_if_fail (flags_string != NULL, 0); - - flags = g_strsplit (flags_string, "|", -1); - if (!flags) return 0; - - flags_class = g_type_class_ref (type); - - for (i = 0; flags[i] != NULL; ++i) { - value = g_flags_get_value_by_nick (flags_class, flags[i]); - - if (value != NULL) - retval |= value->value; - } - - g_type_class_unref (flags_class); - - return retval; -} - -char * -ephy_string_flags_to_string (GType type, - guint flags_value) -{ - GFlagsClass *flags_class; - GString *string; - gboolean first = TRUE; - guint i; - - string = g_string_sized_new (128); - - flags_class = g_type_class_ref (type); - - for (i = 0; i < flags_class->n_values; ++i) { - if (flags_value & flags_class->values[i].value) { - if (!first) - g_string_append_c (string, '|'); - - first = FALSE; - g_string_append (string, flags_class->values[i].value_nick); - } - } - - g_type_class_unref (flags_class); - - return g_string_free (string, FALSE); -} - -guint -ephy_string_enum_from_string (GType type, - const char *enum_string) -{ - GEnumClass *enum_class; - const GEnumValue *value; - guint retval = 0; - - g_return_val_if_fail (enum_string != NULL, 0); - - enum_class = g_type_class_ref (type); - value = g_enum_get_value_by_nick (enum_class, enum_string); - - if (value != NULL) - retval = value->value; - - g_type_class_unref (enum_class); - - return retval; -} - -char * -ephy_string_enum_to_string (GType type, - guint enum_value) -{ - GEnumClass *enum_class; - GEnumValue *value; - char *retval = NULL; - - enum_class = g_type_class_ref (type); - - value = g_enum_get_value (enum_class, enum_value); - - if (value) - retval = g_strdup (value->value_nick); - - g_type_class_unref (enum_class); - - return retval; -} - -/* Following code copied from gnome-vfs-private-utils.c */ - -static int -find_next_slash (const char *path, int current_offset) -{ - const char *match; - - g_assert (current_offset <= strlen (path)); - - match = strchr (path + current_offset, G_DIR_SEPARATOR); - return match == NULL ? -1 : match - path; -} - -static int -find_slash_before_offset (const char *path, int to) -{ - int result; - int next_offset; - - result = -1; - next_offset = 0; - - for (;;) { - next_offset = find_next_slash (path, next_offset); - - if (next_offset < 0 || next_offset >= to) - break; - - result = next_offset; - next_offset++; - } - - return result; -} - -static void -collapse_slash_runs (char *path, int from_offset) -{ - int i; - /* Collapse multiple `/'s in a row. */ - for (i = from_offset;; i++) { - if (path[i] != G_DIR_SEPARATOR) - break; - } - - if (from_offset < i) { - memmove (path + from_offset, path + i, strlen (path + i) + 1); - i = from_offset + 1; - } -} - -/* Canonicalize path, and return a new path. Do everything in situ. The new - path differs from path in: - - Multiple `/'s are collapsed to a single `/'. - Leading `./'s and trailing `/.'s are removed. - Non-leading `../'s and trailing `..'s are handled by removing - portions of the path. */ -char * -ephy_string_canonicalize_pathname (const char *cpath) -{ - char *path; - int i, marker; - - path = g_strdup (cpath); - - if (path == NULL || strlen (path) == 0) - return ""; - - /* Walk along path looking for things to compact. */ - for (i = 0, marker = 0;;) { - if (!path[i]) - break; - - /* Check for `../', `./' or trailing `.' by itself. */ - if (path[i] == '.') { - /* Handle trailing `.' by itself. */ - if (path[i + 1] == '\0') { - if (i > 1 && path[i - 1] == G_DIR_SEPARATOR) { - /* strip the trailing /. */ - path[i - 1] = '\0'; - } else { - /* convert path "/." to "/" */ - path[i] = '\0'; - } - break; - } - - /* Handle `./'. */ - if (path[i + 1] == G_DIR_SEPARATOR) { - memmove (path + i, path + i + 2, - strlen (path + i + 2) + 1); - if (i == 0) { - /* don't leave leading '/' for paths that started - * as relative (.//foo) - */ - collapse_slash_runs (path, i); - marker = 0; - } - continue; - } - - /* Handle `../' or trailing `..' by itself. - * Remove the previous xxx/ part - */ - if (path[i + 1] == '.' - && (path[i + 2] == G_DIR_SEPARATOR - || path[i + 2] == '\0')) { - - /* ignore ../ at the beginning of a path */ - if (i != 0) { - marker = find_slash_before_offset (path, i - 1); - - /* Either advance past '/' or point to the first character */ - marker ++; - if (path [i + 2] == '\0' && marker > 1) { - /* If we are looking at a /.. at the end of the uri and we - * need to eat the last '/' too. - */ - marker--; - } - g_assert(marker < i); - - if (path[i + 2] == G_DIR_SEPARATOR) { - /* strip the entire ../ string */ - i++; - } - - memmove (path + marker, path + i + 2, - strlen (path + i + 2) + 1); - i = marker; - } else { - i = 2; - if (path[i] == G_DIR_SEPARATOR) { - i++; - } - } - collapse_slash_runs (path, i); - continue; - } - } - - /* advance to the next '/' */ - i = find_next_slash (path, i); - - /* If we didn't find any slashes, then there is nothing left to do. */ - if (i < 0) - break; - - marker = i++; - collapse_slash_runs (path, i); - } - return path; -} - -/* End of copied code */ - char * ephy_string_get_host_name (const char *url) { @@ -457,38 +203,6 @@ return ret; } -char * -ephy_string_expand_initial_tilde (const char *path) -{ - char *slash_after_user_name, *user_name; - struct passwd *passwd_file_entry; - - g_return_val_if_fail (path != NULL, NULL); - - if (path[0] != '~') - return g_strdup (path); - - if (path[1] == '/' || path[1] == '\0') - return g_strconcat (g_get_home_dir (), &path[1], NULL); - - slash_after_user_name = strchr (&path[1], '/'); - if (slash_after_user_name == NULL) { - user_name = g_strdup (&path[1]); - } else { - user_name = g_strndup (&path[1], - slash_after_user_name - &path[1]); - } - passwd_file_entry = getpwnam (user_name); - g_free (user_name); - - if (passwd_file_entry == NULL || passwd_file_entry->pw_dir == NULL) - return g_strdup (path); - - return g_strconcat (passwd_file_entry->pw_dir, - slash_after_user_name, - NULL); -} - /** * ephy_string_commandline_args_to_uris: * @arguments: a %NULL-terminated array of chars. diff -Nru epiphany-browser-3.16.3/lib/ephy-string.h epiphany-browser-3.18.0/lib/ephy-string.h --- epiphany-browser-3.16.3/lib/ephy-string.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-string.h 2015-08-07 08:41:06.000000000 +0000 @@ -40,24 +40,8 @@ char *ephy_string_collate_key_for_domain (const char *host, gssize len); -guint ephy_string_flags_from_string (GType type, - const char *flags_string); - -char *ephy_string_flags_to_string (GType type, - guint flags_value); - -guint ephy_string_enum_from_string (GType type, - const char *enum_string); - -char *ephy_string_enum_to_string (GType type, - guint enum_value); - -char *ephy_string_canonicalize_pathname (const char *cpath); - char *ephy_string_get_host_name (const char *url); -char *ephy_string_expand_initial_tilde (const char *path); - char **ephy_string_commandline_args_to_uris (char **arguments, GError **error); diff -Nru epiphany-browser-3.16.3/lib/ephy-uri-helpers.c epiphany-browser-3.18.0/lib/ephy-uri-helpers.c --- epiphany-browser-3.16.3/lib/ephy-uri-helpers.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-uri-helpers.c 2015-09-21 14:53:44.000000000 +0000 @@ -248,4 +248,19 @@ soup_uri_free (uri); return ret; } + +char * +ephy_uri_safe_unescape (const char *uri_string) +{ + char *decoded_uri; + + /* This function is not null-safe since it is mostly used in scenarios where + * passing or returning null would typically lead to a security issue. */ + g_return_val_if_fail (uri_string, g_strdup ("")); + + /* Protect against escaped null characters and escaped slashes. */ + decoded_uri = g_uri_unescape_string (uri_string, "/"); + return decoded_uri ? decoded_uri : g_strdup (uri_string); +} + /* vim: set sw=2 ts=2 sts=2 et: */ diff -Nru epiphany-browser-3.16.3/lib/ephy-uri-helpers.h epiphany-browser-3.18.0/lib/ephy-uri-helpers.h --- epiphany-browser-3.16.3/lib/ephy-uri-helpers.h 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-uri-helpers.h 2015-09-21 14:53:44.000000000 +0000 @@ -30,6 +30,7 @@ G_BEGIN_DECLS char *ephy_remove_tracking_from_uri (const char *uri); +char *ephy_uri_safe_unescape (const char *uri); G_END_DECLS diff -Nru epiphany-browser-3.16.3/lib/ephy-web-dom-utils.c epiphany-browser-3.18.0/lib/ephy-web-dom-utils.c --- epiphany-browser-3.16.3/lib/ephy-web-dom-utils.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-web-dom-utils.c 2015-08-07 08:41:17.000000000 +0000 @@ -375,7 +375,9 @@ g_object_get (element, "type", &element_type, "name", &element_name, NULL); - if (g_strcmp0 (element_type, "text") == 0 || g_strcmp0 (element_type, "email") == 0) { + if (g_strcmp0 (element_type, "text") == 0 || + g_strcmp0 (element_type, "email") == 0 || + g_strcmp0 (element_type, "tel") == 0) { /* We found more than one inputs of type text; we won't be saving here. */ if (username_node) { g_free (element_type); @@ -488,3 +490,25 @@ *y += offset_height; } + +/** + * ephy_web_dom_utils_get_selection_as_string: + * @selection: the #WebKitDOMDOMSelection. + * + * Gets the contents of the selection as a string. + * + * Returns: a newly allocated string with the selection or %NULL. + **/ +char * +ephy_web_dom_utils_get_selection_as_string (WebKitDOMDOMSelection *selection) +{ + char *string; + WebKitDOMRange *range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); + if (!range) + return NULL; + + string = webkit_dom_range_to_string (range, NULL); + g_object_unref (range); + + return string; +} diff -Nru epiphany-browser-3.16.3/lib/ephy-web-dom-utils.h epiphany-browser-3.18.0/lib/ephy-web-dom-utils.h --- epiphany-browser-3.16.3/lib/ephy-web-dom-utils.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/ephy-web-dom-utils.h 2015-08-07 08:41:06.000000000 +0000 @@ -25,6 +25,8 @@ #define EPHY_WEB_DOM_UTILS_H #include +#define WEBKIT_DOM_USE_UNSTABLE_API +#include G_BEGIN_DECLS @@ -49,6 +51,7 @@ double *x, double *y); +char *ephy_web_dom_utils_get_selection_as_string (WebKitDOMDOMSelection *selection); G_END_DECLS #endif diff -Nru epiphany-browser-3.16.3/lib/history/ephy-history-service.c epiphany-browser-3.18.0/lib/history/ephy-history-service.c --- epiphany-browser-3.16.3/lib/history/ephy-history-service.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/history/ephy-history-service.c 2015-09-09 07:39:52.000000000 +0000 @@ -876,6 +876,8 @@ g_return_if_fail (EPHY_IS_HISTORY_SERVICE (self)); g_return_if_fail (orig_url != NULL); + g_return_if_fail (title != NULL); + g_return_if_fail (*title != '\0'); url = ephy_history_url_new (orig_url, title, 0, 0, 0); message = ephy_history_service_message_new (self, SET_URL_TITLE, diff -Nru epiphany-browser-3.16.3/lib/history/Makefile.am epiphany-browser-3.18.0/lib/history/Makefile.am --- epiphany-browser-3.16.3/lib/history/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/history/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -1,3 +1,6 @@ +AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) + noinst_LTLIBRARIES = libephyhistory.la libephyhistory_la_SOURCES = \ @@ -32,8 +35,6 @@ ephy-history-type-builtins.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-history-type-builtins.c \ diff -Nru epiphany-browser-3.16.3/lib/history/Makefile.in epiphany-browser-3.18.0/lib/history/Makefile.in --- epiphany-browser-3.16.3/lib/history/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/lib/history/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/history -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -92,6 +110,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 = @@ -129,7 +148,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -177,18 +196,19 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -203,7 +223,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -212,17 +231,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -232,8 +248,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -257,9 +271,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -280,11 +292,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -293,6 +301,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -311,6 +321,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -346,6 +357,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -354,6 +366,8 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephyhistory.la libephyhistory_la_SOURCES = \ ephy-history-service.c \ @@ -386,8 +400,6 @@ ephy-history-type-builtins.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-history-type-builtins.c \ stamp-ephy-history-type-builtins.h @@ -409,7 +421,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/history/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/history/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -639,13 +650,11 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ @@ -733,6 +742,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + ephy-history-type-builtins.c: stamp-ephy-history-type-builtins.c Makefile @true diff -Nru epiphany-browser-3.16.3/lib/Makefile.am epiphany-browser-3.18.0/lib/Makefile.am --- epiphany-browser-3.16.3/lib/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -1,5 +1,8 @@ SUBDIRS = widgets egg history +AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) + noinst_LTLIBRARIES = libephymisc.la NOINST_H_FILES = \ @@ -86,6 +89,7 @@ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \ -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) libephymisc_la_CFLAGS = \ @@ -123,6 +127,7 @@ -I$(top_builddir)/lib \ -I$(srcdir)/history \ -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ $(AM_CPPFLAGS) BUILT_SOURCES = \ @@ -130,8 +135,6 @@ ephy-lib-type-builtins.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-lib-type-builtins.c \ diff -Nru epiphany-browser-3.16.3/lib/Makefile.in epiphany-browser-3.18.0/lib/Makefile.in --- epiphany-browser-3.16.3/lib/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/lib/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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 \ ?) ;; \ @@ -86,11 +96,19 @@ @ENABLE_NSS_TRUE@am__append_2 = $(NSS_LIBS) subdir = lib -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -99,6 +117,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 = @@ -174,7 +193,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -240,6 +259,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -270,13 +291,12 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -291,7 +311,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -300,17 +319,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -320,8 +336,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -345,9 +359,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -368,11 +380,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -381,6 +389,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -399,6 +409,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -434,6 +445,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -443,6 +455,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = widgets egg history +AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephymisc.la NOINST_H_FILES = \ ephy-debug.h \ @@ -528,6 +542,7 @@ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \ -DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) libephymisc_la_CFLAGS = \ @@ -553,6 +568,7 @@ -I$(top_builddir)/lib \ -I$(srcdir)/history \ -DSHARE_DIR=\"$(pkgdatadir)\" \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ $(AM_CPPFLAGS) BUILT_SOURCES = \ @@ -560,8 +576,6 @@ ephy-lib-type-builtins.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-lib-type-builtins.c \ stamp-ephy-lib-type-builtins.h @@ -583,7 +597,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -1148,13 +1161,11 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libtool \ @@ -1244,6 +1255,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS +.PRECIOUS: Makefile + ephy-lib-type-builtins.c: stamp-ephy-lib-type-builtins.c Makefile @true diff -Nru epiphany-browser-3.16.3/lib/widgets/ephy-download-widget.c epiphany-browser-3.18.0/lib/widgets/ephy-download-widget.c --- epiphany-browser-3.16.3/lib/widgets/ephy-download-widget.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/ephy-download-widget.c 2015-09-21 14:53:44.000000000 +0000 @@ -28,7 +28,7 @@ #include "ephy-debug.h" #include "ephy-embed-shell.h" #include "ephy-download.h" -#include "totem-glow-button.h" +#include "ephy-uri-helpers.h" #include #include @@ -92,7 +92,7 @@ return NULL; basename = g_filename_display_basename (dest); - unescaped = g_uri_unescape_string (basename, NULL); + unescaped = ephy_uri_safe_unescape (basename); g_free (basename); return unescaped; @@ -285,13 +285,25 @@ } static void +widget_attention_needed (EphyDownloadWidget *widget) +{ + gtk_style_context_add_class (gtk_widget_get_style_context (widget->priv->button), "needs-attention"); +} + +static void +widget_attention_unneeded (EphyDownloadWidget *widget) +{ + gtk_style_context_remove_class (gtk_widget_get_style_context (widget->priv->button), "needs-attention"); +} + +static void widget_finished_cb (WebKitDownload *download, EphyDownloadWidget *widget) { widget->priv->finished = TRUE; update_popup_menu (widget); update_download_label_and_tooltip (widget, _("Finished")); - totem_glow_button_set_glow (TOTEM_GLOW_BUTTON (widget->priv->button), TRUE); + widget_attention_needed (widget); } static void @@ -311,7 +323,7 @@ gtk_widget_set_tooltip_text (GTK_WIDGET (widget), error_msg); g_free (error_msg); - totem_glow_button_set_glow (TOTEM_GLOW_BUTTON (widget->priv->button), TRUE); + widget_attention_needed (widget); } static void @@ -350,7 +362,7 @@ return; basename = g_filename_display_basename (dest); - name = g_uri_unescape_string (basename, NULL); + name = ephy_uri_safe_unescape (basename); menu = gtk_menu_new (); gtk_widget_set_halign (menu, GTK_ALIGN_END); @@ -396,12 +408,6 @@ } static void -stop_glowing (EphyDownloadWidget *widget) -{ - totem_glow_button_set_glow (TOTEM_GLOW_BUTTON (widget->priv->button), FALSE); -} - -static void disconnect_download (EphyDownloadWidget *widget) { WebKitDownload *download; @@ -572,7 +578,7 @@ grid = gtk_grid_new (); gtk_grid_set_column_spacing (GTK_GRID (grid), 6); - button = totem_glow_button_new (); + button = gtk_button_new (); menu_button = gtk_menu_button_new (); gtk_menu_button_set_direction (GTK_MENU_BUTTON (menu_button), GTK_ARROW_UP); @@ -582,6 +588,7 @@ smallify_label (GTK_LABEL (text)); gtk_misc_set_alignment (GTK_MISC (text), 0, 0.5); gtk_label_set_ellipsize (GTK_LABEL (text), PANGO_ELLIPSIZE_END); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_LABEL (text)), "filename"); remain = gtk_label_new (_("Starting…")); smallify_label (GTK_LABEL (remain)); @@ -608,7 +615,7 @@ g_signal_connect (button, "clicked", G_CALLBACK (download_clicked_cb), widget); g_signal_connect_swapped (menu_button, "clicked", - G_CALLBACK (stop_glowing), widget); + G_CALLBACK (widget_attention_unneeded), widget); gtk_widget_show_all (button); gtk_widget_show_all (menu_button); @@ -628,6 +635,10 @@ GTK_ORIENTATION_HORIZONTAL); context = gtk_widget_get_style_context (GTK_WIDGET (self)); gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED); + + g_object_set (self, + "margin", 2, + NULL); } /** diff -Nru epiphany-browser-3.16.3/lib/widgets/ephy-location-entry.c epiphany-browser-3.18.0/lib/widgets/ephy-location-entry.c --- epiphany-browser-3.16.3/lib/widgets/ephy-location-entry.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/ephy-location-entry.c 2015-08-11 09:36:01.000000000 +0000 @@ -56,7 +56,6 @@ { GdkPixbuf *favicon; GtkTreeModel *model; - GtkEntryCompletion *completion; GSList *search_terms; @@ -1047,69 +1046,6 @@ return TRUE; } -static char * -rgba_to_hex (GdkRGBA *color) -{ - char *hex; - - hex = g_strdup_printf ("#%04X%04X%04X", - (guint)(color->red * (gdouble)65535), - (guint)(color->green * (gdouble)65535), - (guint)(color->blue * (gdouble)65535)); - return hex; -} - -static void -textcell_data_func (GtkCellLayout *cell_layout, - GtkCellRenderer *cell, - GtkTreeModel *tree_model, - GtkTreeIter *iter, - gpointer data) -{ - GtkWidget *entry; - EphyLocationEntryPrivate *priv; - char *ctext; - char *title; - char *url; - GtkStyleContext *style; - GValue text = { 0, }; - - entry = GTK_WIDGET (data); - priv = EPHY_LOCATION_ENTRY (data)->priv; - gtk_tree_model_get (tree_model, iter, - priv->text_col, &title, - priv->url_col, &url, - -1); - - if (url) - { - GdkRGBA color; - char *color_text; - - sanitize_location (&url); - - style = gtk_widget_get_style_context (entry); - gtk_style_context_get_color (style, GTK_STATE_FLAG_INSENSITIVE, - &color); - - color_text = rgba_to_hex (&color); - ctext = g_markup_printf_escaped ("%s\n%s", title, color_text, url); - g_free (color_text); - g_free (title); - } - else - { - ctext = title; - } - - g_value_init (&text, G_TYPE_STRING); - g_value_take_string (&text, ctext); - g_object_set_property (G_OBJECT (cell), "markup", &text); - g_value_unset (&text); - - g_free (url); -} - static void extracell_data_func (GtkCellLayout *cell_layout, GtkCellRenderer *cell, @@ -1244,7 +1180,7 @@ #define ICON_PADDING_LEFT 5 #define ICON_CONTENT_WIDTH 16 -#define ICON_PADDING_RIGHT 4 +#define ICON_PADDING_RIGHT 9 #define ICON_CONTENT_HEIGHT 16 @@ -1265,7 +1201,7 @@ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (completion), cell, TRUE); gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (completion), - cell, "text", text_col); + cell, "markup", text_col); /* Pixel-perfect aligment with the text in the location entry. * See above. @@ -1285,11 +1221,6 @@ gtk_cell_renderer_set_fixed_size (cell, 1, -1); gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (cell), 2); - gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (completion), - cell, textcell_data_func, - entry, - NULL); - cell = gtk_cell_renderer_pixbuf_new (); g_object_set (cell, "follow-state", TRUE, NULL); gtk_cell_layout_pack_end (GTK_CELL_LAYOUT (completion), @@ -1309,8 +1240,6 @@ G_CALLBACK (cursor_on_match_cb), entry); gtk_entry_set_completion (GTK_ENTRY (entry), completion); - - priv->completion = completion; g_object_unref (completion); } diff -Nru epiphany-browser-3.16.3/lib/widgets/ephy-node-view.c epiphany-browser-3.18.0/lib/widgets/ephy-node-view.c --- epiphany-browser-3.16.3/lib/widgets/ephy-node-view.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/ephy-node-view.c 2015-08-07 08:41:17.000000000 +0000 @@ -1269,12 +1269,14 @@ } /** - * ephy_node_view_add_column: + * ephy_node_view_add_column_full: * @view: an #EphyNodeView * @title: title for the column * @value_type: type to be held by the column * @prop_id: numeric id corresponding to the column in the model to be shown * @flags: flags for the new column + * @func: optional function to modify the view of properties in the column + * @user_data: optional data passed to @func * @icon_func: a function providing the icon for the column * @ret: location to store the created column * @@ -1283,22 +1285,23 @@ * Returns: the id of the new column **/ int -ephy_node_view_add_column (EphyNodeView *view, - const char *title, - GType value_type, - guint prop_id, - EphyNodeViewFlags flags, - EphyTreeModelNodeValueFunc icon_func, - GtkTreeViewColumn **ret) - +ephy_node_view_add_column_full (EphyNodeView *view, + const char *title, + GType value_type, + guint prop_id, + EphyNodeViewFlags flags, + EphyTreeModelNodeValueFunc func, + gpointer user_data, + EphyTreeModelNodeValueFunc icon_func, + GtkTreeViewColumn **ret) { GtkTreeViewColumn *gcolumn; GtkCellRenderer *renderer; int column; int icon_column; - column = ephy_tree_model_node_add_prop_column - (view->priv->nodemodel, value_type, prop_id); + column = ephy_tree_model_node_add_column_full + (view->priv->nodemodel, value_type, prop_id, func, user_data); gcolumn = (GtkTreeViewColumn *) gtk_tree_view_column_new (); @@ -1382,6 +1385,33 @@ } /** + * ephy_node_view_add_column: + * @view: an #EphyNodeView + * @title: title for the column + * @value_type: type to be held by the column + * @prop_id: numeric id corresponding to the column in the model to be shown + * @flags: flags for the new column + * @icon_func: a function providing the icon for the column + * @ret: location to store the created column + * + * Adds a new column, corresponding to a @prop_id of the model, to the @view. + * + * Returns: the id of the new column + **/ +int +ephy_node_view_add_column (EphyNodeView *view, + const char *title, + GType value_type, + guint prop_id, + EphyNodeViewFlags flags, + EphyTreeModelNodeValueFunc icon_func, + GtkTreeViewColumn **ret) +{ + return ephy_node_view_add_column_full (view, title, value_type, prop_id, + flags, NULL, NULL, icon_func, ret); +} + +/** * ephy_node_view_set_priority: * @view: an #EphyNodeView * @priority_prop_id: one of #EphyNodeViewPriority diff -Nru epiphany-browser-3.16.3/lib/widgets/ephy-node-view.h epiphany-browser-3.18.0/lib/widgets/ephy-node-view.h --- epiphany-browser-3.16.3/lib/widgets/ephy-node-view.h 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/ephy-node-view.h 2015-08-07 08:41:17.000000000 +0000 @@ -82,6 +82,16 @@ EphyTreeModelNodeValueFunc value_func, gpointer data); +int ephy_node_view_add_column_full (EphyNodeView *view, + const char *title, + GType value_type, + guint prop_id, + EphyNodeViewFlags flags, + EphyTreeModelNodeValueFunc func, + gpointer user_data, + EphyTreeModelNodeValueFunc icon_func, + GtkTreeViewColumn **ret); + int ephy_node_view_add_column (EphyNodeView *view, const char *title, GType value_type, diff -Nru epiphany-browser-3.16.3/lib/widgets/ephy-tree-model-node.c epiphany-browser-3.18.0/lib/widgets/ephy-tree-model-node.c --- epiphany-browser-3.16.3/lib/widgets/ephy-tree-model-node.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/ephy-tree-model-node.c 2015-08-07 08:41:17.000000000 +0000 @@ -335,19 +335,24 @@ } /** - * ephy_tree_model_node_add_prop_column: + * ephy_tree_model_node_add_column_full: * @model: an #EphyTreeModelNode * @value_type: type held by the new column * @prop_id: column in @model to get the value for this column + * @func: data function to be used to modify the value of the new column + * @user_data: optional user data for @func * - * Add a new column to @model obtaining its value from @prop_id in @model. + * Add a new column to @model obtaining its value from @prop_id in @model, + * modified by @func. * * Returns: the id of the new column **/ int -ephy_tree_model_node_add_prop_column (EphyTreeModelNode *model, +ephy_tree_model_node_add_column_full (EphyTreeModelNode *model, GType value_type, - int prop_id) + int prop_id, + EphyTreeModelNodeValueFunc func, + gpointer user_data) { EphyTreeModelNodeColData *col; int col_id; @@ -355,8 +360,8 @@ col = g_new0 (EphyTreeModelNodeColData, 1); col->prop_id = prop_id; col->type = value_type; - col->func = NULL; - col->user_data = NULL; + col->func = func; + col->user_data = user_data; g_ptr_array_add (model->priv->columns, col); col_id = model->priv->columns_num; @@ -365,6 +370,25 @@ return col_id; } + +/** + * ephy_tree_model_node_add_prop_column: + * @model: an #EphyTreeModelNode + * @value_type: type held by the new column + * @prop_id: column in @model to get the value for this column + * + * Add a new column to @model obtaining its value from @prop_id in @model. + * + * Returns: the id of the new column + **/ +int +ephy_tree_model_node_add_prop_column (EphyTreeModelNode *model, + GType value_type, + int prop_id) +{ + return ephy_tree_model_node_add_column_full (model, value_type, prop_id, NULL, NULL); +} + /** * ephy_tree_model_node_add_func_column: * @model: an #EphyTreeModelNode @@ -382,20 +406,7 @@ EphyTreeModelNodeValueFunc func, gpointer user_data) { - EphyTreeModelNodeColData *col; - int col_id; - - col = g_new0 (EphyTreeModelNodeColData, 1); - col->prop_id = -1; - col->type = value_type; - col->func = func; - col->user_data = user_data; - - g_ptr_array_add (model->priv->columns, col); - col_id = model->priv->columns_num; - model->priv->columns_num++; - - return col_id; + return ephy_tree_model_node_add_column_full (model, value_type, -1, func, user_data); } static int @@ -453,7 +464,8 @@ } } } - else + + if (col->func) { col->func (node, value, col->user_data); } diff -Nru epiphany-browser-3.16.3/lib/widgets/ephy-tree-model-node.h epiphany-browser-3.18.0/lib/widgets/ephy-tree-model-node.h --- epiphany-browser-3.16.3/lib/widgets/ephy-tree-model-node.h 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/ephy-tree-model-node.h 2015-08-07 08:41:17.000000000 +0000 @@ -56,6 +56,12 @@ EphyTreeModelNode *ephy_tree_model_node_new (EphyNode *root); +int ephy_tree_model_node_add_column_full (EphyTreeModelNode* model, + GType value_type, + int prop_id, + EphyTreeModelNodeValueFunc func, + gpointer user_data); + int ephy_tree_model_node_add_prop_column (EphyTreeModelNode *model, GType value_type, int prop_id); diff -Nru epiphany-browser-3.16.3/lib/widgets/Makefile.am epiphany-browser-3.18.0/lib/widgets/Makefile.am --- epiphany-browser-3.16.3/lib/widgets/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libephywidgets.la AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) BUILT_SOURCES = \ ephy-widgets-type-builtins.c \ @@ -10,8 +11,6 @@ ephy-location-entry.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-widgets-type-builtins.c \ @@ -84,9 +83,7 @@ ephy-zoom-action.h \ ephy-zoom-action.c \ nautilus-floating-bar.c \ - nautilus-floating-bar.h \ - totem-glow-button.c \ - totem-glow-button.h + nautilus-floating-bar.h libephywidgets_la_CPPFLAGS = \ -I$(top_builddir)/lib \ diff -Nru epiphany-browser-3.16.3/lib/widgets/Makefile.in epiphany-browser-3.18.0/lib/widgets/Makefile.in --- epiphany-browser-3.16.3/lib/widgets/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = lib/widgets -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -92,6 +110,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 = @@ -108,8 +127,7 @@ libephywidgets_la-ephy-tree-model-node.lo \ libephywidgets_la-ephy-tree-model-sort.lo \ libephywidgets_la-ephy-zoom-action.lo \ - libephywidgets_la-nautilus-floating-bar.lo \ - libephywidgets_la-totem-glow-button.lo + libephywidgets_la-nautilus-floating-bar.lo am__objects_1 = libephywidgets_la-ephy-widgets-type-builtins.lo nodist_libephywidgets_la_OBJECTS = $(am__objects_1) libephywidgets_la_OBJECTS = $(am_libephywidgets_la_OBJECTS) \ @@ -135,7 +153,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -183,18 +201,19 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -209,7 +228,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -218,17 +236,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -238,8 +253,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -263,9 +276,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -286,11 +297,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -299,6 +306,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -317,6 +326,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -352,6 +362,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -362,6 +373,7 @@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libephywidgets.la AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) BUILT_SOURCES = \ ephy-widgets-type-builtins.c \ ephy-widgets-type-builtins.h @@ -370,8 +382,6 @@ ephy-location-entry.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) stamp_files = \ stamp-ephy-widgets-type-builtins.c \ stamp-ephy-widgets-type-builtins.h @@ -399,9 +409,7 @@ ephy-zoom-action.h \ ephy-zoom-action.c \ nautilus-floating-bar.c \ - nautilus-floating-bar.h \ - totem-glow-button.c \ - totem-glow-button.h + nautilus-floating-bar.h libephywidgets_la_CPPFLAGS = \ -I$(top_builddir)/lib \ @@ -435,7 +443,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/widgets/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign lib/widgets/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -485,7 +492,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywidgets_la-ephy-widgets-type-builtins.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywidgets_la-ephy-zoom-action.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywidgets_la-nautilus-floating-bar.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libephywidgets_la-totem-glow-button.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -578,13 +584,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywidgets_la_CPPFLAGS) $(CPPFLAGS) $(libephywidgets_la_CFLAGS) $(CFLAGS) -c -o libephywidgets_la-nautilus-floating-bar.lo `test -f 'nautilus-floating-bar.c' || echo '$(srcdir)/'`nautilus-floating-bar.c -libephywidgets_la-totem-glow-button.lo: totem-glow-button.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywidgets_la_CPPFLAGS) $(CPPFLAGS) $(libephywidgets_la_CFLAGS) $(CFLAGS) -MT libephywidgets_la-totem-glow-button.lo -MD -MP -MF $(DEPDIR)/libephywidgets_la-totem-glow-button.Tpo -c -o libephywidgets_la-totem-glow-button.lo `test -f 'totem-glow-button.c' || echo '$(srcdir)/'`totem-glow-button.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywidgets_la-totem-glow-button.Tpo $(DEPDIR)/libephywidgets_la-totem-glow-button.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='totem-glow-button.c' object='libephywidgets_la-totem-glow-button.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywidgets_la_CPPFLAGS) $(CPPFLAGS) $(libephywidgets_la_CFLAGS) $(CFLAGS) -c -o libephywidgets_la-totem-glow-button.lo `test -f 'totem-glow-button.c' || echo '$(srcdir)/'`totem-glow-button.c - libephywidgets_la-ephy-widgets-type-builtins.lo: ephy-widgets-type-builtins.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libephywidgets_la_CPPFLAGS) $(CPPFLAGS) $(libephywidgets_la_CFLAGS) $(CFLAGS) -MT libephywidgets_la-ephy-widgets-type-builtins.lo -MD -MP -MF $(DEPDIR)/libephywidgets_la-ephy-widgets-type-builtins.Tpo -c -o libephywidgets_la-ephy-widgets-type-builtins.lo `test -f 'ephy-widgets-type-builtins.c' || echo '$(srcdir)/'`ephy-widgets-type-builtins.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libephywidgets_la-ephy-widgets-type-builtins.Tpo $(DEPDIR)/libephywidgets_la-ephy-widgets-type-builtins.Plo @@ -713,13 +712,11 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ @@ -807,6 +804,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + ephy-widgets-type-builtins.c: stamp-ephy-widgets-type-builtins.c Makefile @true diff -Nru epiphany-browser-3.16.3/lib/widgets/totem-glow-button.c epiphany-browser-3.18.0/lib/widgets/totem-glow-button.c --- epiphany-browser-3.16.3/lib/widgets/totem-glow-button.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/totem-glow-button.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -/* - * (C) Copyright 2007, 2013 Bastien Nocera - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include -#include "totem-glow-button.h" - -struct _TotemGlowButtonClass { - GtkButtonClass parent_class; -}; - -struct _TotemGlowButton { - GtkButton parent; - - gboolean glow; -}; - -enum { - PROP_0, - PROP_GLOW -}; - -static GtkButtonClass *parent_class; - -G_DEFINE_TYPE (TotemGlowButton, totem_glow_button, GTK_TYPE_BUTTON); - -static const char *css = -"@keyframes blink {\n" -" 100% { background-color: @suggested_action_button_a; }\n" -"}\n" -".blink {\n" -" background-color: @theme_bg_color;\n" -" background-image: none;\n" -" animation: blink 1s ease-in 5 alternate;\n" -"}"; - -static void -totem_glow_button_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - switch (param_id) { - case PROP_GLOW: - g_value_set_boolean (value, TOTEM_GLOW_BUTTON (object)->glow); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - } -} - -static void -totem_glow_button_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (param_id) { - case PROP_GLOW: - totem_glow_button_set_glow (TOTEM_GLOW_BUTTON (object), g_value_get_boolean (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - } -} - -static void -totem_glow_button_class_init (TotemGlowButtonClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - parent_class = g_type_class_peek_parent (klass); - - object_class->get_property = totem_glow_button_get_property; - object_class->set_property = totem_glow_button_set_property; - - g_object_class_install_property (object_class, - PROP_GLOW, - g_param_spec_boolean ("glow", - "Glow", - "Whether the button is glowing", - FALSE, - G_PARAM_READWRITE)); -} - -static void -totem_glow_button_init (TotemGlowButton *button) -{ - static gsize initialization_value = 0; - - if (g_once_init_enter (&initialization_value)) { - GtkCssProvider *provider; - - provider = gtk_css_provider_new (); - gtk_css_provider_load_from_data (provider, css, -1, NULL); - gtk_style_context_add_provider_for_screen (gdk_screen_get_default (), - GTK_STYLE_PROVIDER (provider), - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); - g_object_unref (provider); - - g_once_init_leave (&initialization_value, 1); - } -} - -GtkWidget * -totem_glow_button_new (void) -{ - return g_object_new (TOTEM_TYPE_GLOW_BUTTON, NULL); -} - -void -totem_glow_button_set_glow (TotemGlowButton *button, - gboolean glow) -{ - GtkStyleContext *context; - - g_return_if_fail (TOTEM_IS_GLOW_BUTTON (button)); - - if (button->glow == glow) - return; - - button->glow = glow; - g_object_notify (G_OBJECT (button), "glow"); - - context = gtk_widget_get_style_context (GTK_WIDGET (button)); - if (glow) - gtk_style_context_add_class (context, "blink"); - else - gtk_style_context_remove_class (context, "blink"); -} - -gboolean -totem_glow_button_get_glow (TotemGlowButton *button) -{ - return button->glow != FALSE; -} - diff -Nru epiphany-browser-3.16.3/lib/widgets/totem-glow-button.h epiphany-browser-3.18.0/lib/widgets/totem-glow-button.h --- epiphany-browser-3.16.3/lib/widgets/totem-glow-button.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/lib/widgets/totem-glow-button.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/* - * (C) Copyright 2007 Bastien Nocera - * - * Glow code from libwnck/libwnck/tasklist.c: - * Copyright © 2001 Havoc Pennington - * Copyright © 2003 Kim Woelders - * Copyright © 2003 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - */ - -#ifndef __TOTEM_GLOW_BUTTON_H__ -#define __TOTEM_GLOW_BUTTON_H__ - -#include - -G_BEGIN_DECLS - -#define TOTEM_TYPE_GLOW_BUTTON (totem_glow_button_get_type ()) -#define TOTEM_GLOW_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TOTEM_TYPE_GLOW_BUTTON, TotemGlowButton)) -#define TOTEM_IS_GLOW_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TOTEM_TYPE_GLOW_BUTTON)) - -typedef struct _TotemGlowButton TotemGlowButton; -typedef struct _TotemGlowButtonClass TotemGlowButtonClass; - -GType totem_glow_button_get_type (void) G_GNUC_CONST; - -GtkWidget * totem_glow_button_new (void); -void totem_glow_button_set_glow (TotemGlowButton *button, gboolean glow); -gboolean totem_glow_button_get_glow (TotemGlowButton *button); - -G_END_DECLS - -#endif /* __TOTEM_GLOW_BUTTON_H__ */ diff -Nru epiphany-browser-3.16.3/ltmain.sh epiphany-browser-3.18.0/ltmain.sh --- epiphany-browser-3.16.3/ltmain.sh 2015-06-17 08:19:59.000000000 +0000 +++ epiphany-browser-3.18.0/ltmain.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,9661 +0,0 @@ - -# libtool (GNU libtool) 2.4.2 -# 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. -# 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 the License, or -# (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -# 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 Debian-2.4.2-1.11 -# 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 Debian-2.4.2-1.11" -TIMESTAMP="" -package_revision=1.3337 - -# Be Bourne compatible -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 - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac -fi -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 -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\" - fi" -done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL - -$lt_unset CDPATH - - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - - - -: ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${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 - - -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation - - -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# 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 - - -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation - - -# These SED scripts presuppose an absolute path with a trailing slash. -pathcar='s,^/\([^/]*\).*$,\1,' -pathcdr='s,^/[^/]*,,' -removedotparts=':dotsl - s@/\./@/@g - t dotsl - s,/\.$,/,' -collapseslashes='s@/\{1,\}@/@g' -finalslash='s,/*$,/,' - -# func_normal_abspath PATH -# Remove doubled-up and trailing slashes, "." path components, -# and cancel out any ".." path components in PATH after making -# it an absolute path. -# value returned in "$func_normal_abspath_result" -func_normal_abspath () -{ - # Start from root dir and reassemble the path. - func_normal_abspath_result= - func_normal_abspath_tpath=$1 - func_normal_abspath_altnamespace= - case $func_normal_abspath_tpath in - "") - # Empty path, that just means $cwd. - func_stripname '' '/' "`pwd`" - func_normal_abspath_result=$func_stripname_result - return - ;; - # The next three entries are used to spot a run of precisely - # two leading slashes without using negated character classes; - # we take advantage of case's first-match behaviour. - ///*) - # Unusual form of absolute path, do nothing. - ;; - //*) - # Not necessarily an ordinary path; POSIX reserves leading '//' - # and for example Cygwin uses it to access remote file shares - # over CIFS/SMB, so we conserve a leading double slash if found. - func_normal_abspath_altnamespace=/ - ;; - /*) - # Absolute path, do nothing. - ;; - *) - # Relative path, prepend $cwd. - func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath - ;; - esac - # Cancel out all the simple stuff to save iterations. We also want - # the path to end with a slash for ease of parsing, so make sure - # there is one (and only one) here. - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` - while :; do - # Processed it all yet? - if test "$func_normal_abspath_tpath" = / ; then - # If we ascended to the root using ".." the result may be empty now. - if test -z "$func_normal_abspath_result" ; then - func_normal_abspath_result=/ - fi - break - fi - func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcar"` - func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ - -e "$pathcdr"` - # Figure out what to do with it - case $func_normal_abspath_tcomponent in - "") - # Trailing empty path component, ignore it. - ;; - ..) - # Parent dir; strip last assembled component from result. - func_dirname "$func_normal_abspath_result" - func_normal_abspath_result=$func_dirname_result - ;; - *) - # Actual path component, append it. - func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent - ;; - esac - done - # Restore leading double-slash if one was found on entry. - func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result -} - -# func_relative_path SRCDIR DSTDIR -# generates a relative path from SRCDIR to DSTDIR, with a trailing -# slash if non-empty, suitable for immediately appending a filename -# without needing to append a separator. -# value returned in "$func_relative_path_result" -func_relative_path () -{ - func_relative_path_result= - func_normal_abspath "$1" - func_relative_path_tlibdir=$func_normal_abspath_result - func_normal_abspath "$2" - func_relative_path_tbindir=$func_normal_abspath_result - - # Ascend the tree starting from libdir - while :; do - # check if we have found a prefix of bindir - case $func_relative_path_tbindir in - $func_relative_path_tlibdir) - # found an exact match - func_relative_path_tcancelled= - break - ;; - $func_relative_path_tlibdir*) - # found a matching prefix - func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" - func_relative_path_tcancelled=$func_stripname_result - if test -z "$func_relative_path_result"; then - func_relative_path_result=. - fi - break - ;; - *) - func_dirname $func_relative_path_tlibdir - func_relative_path_tlibdir=${func_dirname_result} - if test "x$func_relative_path_tlibdir" = x ; then - # Have to descend all the way to the root! - func_relative_path_result=../$func_relative_path_result - func_relative_path_tcancelled=$func_relative_path_tbindir - break - fi - func_relative_path_result=../$func_relative_path_result - ;; - esac - done - - # Now calculate path; take care to avoid doubling-up slashes. - func_stripname '' '/' "$func_relative_path_result" - func_relative_path_result=$func_stripname_result - func_stripname '/' '/' "$func_relative_path_tcancelled" - if test "x$func_stripname_result" != x ; then - func_relative_path_result=${func_relative_path_result}/${func_stripname_result} - fi - - # Normalisation. If bindir is libdir, return empty string, - # else relative path ending with a slash; either way, target - # file name can be directly appended. - if test ! -z "$func_relative_path_result"; then - func_stripname './' '' "$func_relative_path_result/" - func_relative_path_result=$func_stripname_result - fi -} - -# The name of this program: -func_dirname_and_basename "$progpath" -progname=$func_basename_result - -# Make sure we have an absolute path for reexecution: -case $progpath in - [\\/]*|[A-Za-z]:\\*) ;; - *[\\/]*) - progdir=$func_dirname_result - progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" - ;; - *) - save_IFS="$IFS" - IFS=${PATH_SEPARATOR-:} - for progdir in $PATH; do - IFS="$save_IFS" - test -x "$progdir/$progname" && break - done - IFS="$save_IFS" - test -n "$progdir" || progdir=`pwd` - 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: -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+"$@"} - - # 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_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 -} - -# 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 - - # 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_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 - - -# func_grep expression filename -# Check whether EXPRESSION matches any line of FILENAME, without output. -func_grep () -{ - $GREP "$1" "$2" >/dev/null 2>&1 -} - - -# 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= - - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then - - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; - esac - - # While some portion of DIR does not yet exist... - while test ! -d "$my_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" - - # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac - - # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` - done - my_dir_list=`$ECHO "$my_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 - # try to create one of the directories concurrently. Don't - # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : - done - IFS="$save_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'" - fi -} - - -# func_mktempdir [string] -# 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. -func_mktempdir () -{ - my_template="${TMPDIR-/tmp}/${1-$progname}" - - if test "$opt_dry_run" = ":"; then - # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" - else - - # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` - - if test ! -d "$my_tmpdir"; then - # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" - - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi - - # 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 - - $ECHO "$my_tmpdir" -} - - -# 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 () -{ - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac - - 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 -} - - -# 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 () -{ - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac - - 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_quote_for_expand_result="$my_arg" -} - - -# 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-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - 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 -} - - -# 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 () -{ - my_cmd="$1" - my_fail_exp="${2-:}" - - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } - - 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_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac -} - - -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $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 $? -} - -# func_usage -# Echo short help message to standard output and exit. -func_usage () -{ - $opt_debug - - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? -} - -# func_help [NOEXIT] -# Echo long help message to standard output and exit, -# unless 'noexit' is passed as argument. -func_help () -{ - $opt_debug - - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - 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_missing_arg argname -# Echo program name prefixed message to standard error and set global -# exit_cmd. -func_missing_arg () -{ - $opt_debug - - func_error "missing argument for $1." - exit_cmd=exit -} - - -# func_split_short_opt shortopt -# Set func_split_short_opt_name and func_split_short_opt_arg shell -# variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () -{ - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' - - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation - - -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () -{ - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' - - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation - -exit_cmd=: - - - - - -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" - -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -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= - -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () -{ - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation - -# 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 - - -# func_arith arithmetic-term... -func_arith () -{ - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation - - -# 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 - - -# func_lo2o object -func_lo2o () -{ - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation - - -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation - - -# func_fatal_configuration arg... -# Echo program name prefixed message to standard error, followed by -# a configuration failure hint, and exit. -func_fatal_configuration () -{ - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." -} - - -# func_config -# Display the configuration for all the tags in this script. -func_config () -{ - re_begincf='^# ### BEGIN LIBTOOL' - re_endcf='^# ### END LIBTOOL' - - # Default configuration. - $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath" - - # Now print the configurations for the tags. - for tagname in $taglist; do - $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath" - done - - exit $? -} - -# func_features -# Display the features supported by this script. -func_features () -{ - echo "host: $host" - if test "$build_libtool_libs" = yes; then - echo "enable shared libraries" - else - echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - echo "enable static libraries" - else - echo "disable static libraries" - fi - - exit $? -} - -# 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" - - 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) ;; - *) - 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 -} - -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF - fi - - exit $EXIT_MISMATCH - fi -} - - -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac - - - -# 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 - - -# 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: - - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi - - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" - - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # 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 - - 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 - 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 -} - - - - -## ----------- ## -## Main. ## -## ----------- ## - -# func_lalib_p 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 -} - -# func_lalib_unsafe_p 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. -func_lalib_unsafe_p () -{ - lalib_p=no - if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then - for lalib_p_l in 1 2 3 4 - do - read lalib_p_line - case "$lalib_p_line" in - \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; - esac - done - exec 0<&5 5<&- - fi - test "$lalib_p" = yes -} - -# func_ltwrapper_script_p file -# True iff FILE is a libtool wrapper script -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_script_p () -{ - func_lalib_p "$1" -} - -# func_ltwrapper_executable_p file -# True iff FILE is a libtool wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_executable_p () -{ - func_ltwrapper_exec_suffix= - case $1 in - *.exe) ;; - *) func_ltwrapper_exec_suffix=.exe ;; - esac - $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1 -} - -# func_ltwrapper_scriptname file -# Assumes file is an ltwrapper_executable -# uses $file to determine the appropriate filename for a -# temporary ltwrapper_script. -func_ltwrapper_scriptname () -{ - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" -} - -# func_ltwrapper_p file -# True iff FILE is a libtool wrapper script or wrapper executable -# This function is only a basic sanity check; it will hardly flush out -# determined imposters. -func_ltwrapper_p () -{ - func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1" -} - - -# func_execute_cmds commands fail_cmd -# Execute tilde-delimited COMMANDS. -# If FAIL_CMD is given, eval that upon failure. -# FAIL_CMD may read-access the current command in variable CMD! -func_execute_cmds () -{ - $opt_debug - save_ifs=$IFS; IFS='~' - for cmd in $1; do - IFS=$save_ifs - eval cmd=\"$cmd\" - func_show_eval "$cmd" "${2-:}" - done - IFS=$save_ifs -} - - -# func_source file -# Source FILE, adding directory component if necessary. -# 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. -func_source () -{ - $opt_debug - case $1 in - */* | *\\*) . "$1" ;; - *) . "./$1" ;; - esac -} - - -# func_resolve_sysroot PATH -# Replace a leading = in PATH with a sysroot. Store the result into -# func_resolve_sysroot_result -func_resolve_sysroot () -{ - func_resolve_sysroot_result=$1 - case $func_resolve_sysroot_result in - =*) - func_stripname '=' '' "$func_resolve_sysroot_result" - func_resolve_sysroot_result=$lt_sysroot$func_stripname_result - ;; - esac -} - -# func_replace_sysroot PATH -# If PATH begins with the sysroot, replace it with = and -# store the result into func_replace_sysroot_result. -func_replace_sysroot () -{ - case "$lt_sysroot:$1" in - ?*:"$lt_sysroot"*) - func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" - ;; - *) - # Including no sysroot. - func_replace_sysroot_result=$1 - ;; - esac -} - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () -{ - $opt_debug - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - 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`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - func_append_quoted CC_quoted "$arg" - done - CC_expanded=`func_echo_all $CC` - CC_quoted_expanded=`func_echo_all $CC_quoted` - case "$@ " in - " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ - " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # 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'" -# else -# func_verbose "using $tagname tagged configuration" - fi - ;; - esac - fi -} - - - -# func_write_libtool_object output_name pic_name nonpic_name -# Create a libtool object file (analogous to a ".la" file), -# 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}\' - else - write_lobj=none - fi - - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' - else - write_oldobj=none - fi - - $opt_dry_run || { - cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then - func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` - else - func_convert_core_file_wine_to_w32_result= - fi - fi -} -# end: func_convert_core_file_wine_to_w32 - - -# func_convert_core_path_wine_to_w32 ARG -# Helper function used by path conversion functions when $build is *nix, and -# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly -# configured wine environment available, with the winepath program in $build's -# $PATH. Assumes ARG has no leading or trailing path separator characters. -# -# ARG is path to be converted from $build format to win32. -# Result is available in $func_convert_core_path_wine_to_w32_result. -# Unconvertible file (directory) names in ARG are skipped; if no directory names -# are convertible, then the result may be empty. -func_convert_core_path_wine_to_w32 () -{ - $opt_debug - # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" - if test -n "$1"; then - oldIFS=$IFS - IFS=: - for func_convert_core_path_wine_to_w32_f in $1; do - IFS=$oldIFS - func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then - if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" - else - func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" - fi - fi - done - IFS=$oldIFS - fi -} -# end: func_convert_core_path_wine_to_w32 - - -# func_cygpath ARGS... -# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when -# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) -# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or -# (2), returns the Cygwin file name or path in func_cygpath_result (input -# file name or path is assumed to be in w32 format, as previously converted -# from $build's *nix or MSYS format). In case (3), returns the w32 file name -# or path in func_cygpath_result (input file name or path is assumed to be in -# Cygwin format). Returns an empty string on error. -# -# ARGS are passed to cygpath, with the last one being the file name or path to -# be converted. -# -# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH -# environment variable; do not put it in $PATH. -func_cygpath () -{ - $opt_debug - if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then - func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` - if test "$?" -ne 0; then - # on failure, ensure result is empty - func_cygpath_result= - fi - else - func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" - fi -} -#end: func_cygpath - - -# func_convert_core_msys_to_w32 ARG -# Convert file name or path ARG from MSYS format to w32 format. Return -# result in func_convert_core_msys_to_w32_result. -func_convert_core_msys_to_w32 () -{ - $opt_debug - # awkward: cmd appends spaces to result - func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` -} -#end: func_convert_core_msys_to_w32 - - -# func_convert_file_check ARG1 ARG2 -# Verify that ARG1 (a file name in $build format) was converted to $host -# format in ARG2. Otherwise, emit an error message, but continue (resetting -# func_to_host_file_result to ARG1). -func_convert_file_check () -{ - $opt_debug - if test -z "$2" && test -n "$1" ; then - func_error "Could not determine host file name corresponding to" - func_error " \`$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_file_result="$1" - fi -} -# end func_convert_file_check - - -# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH -# Verify that FROM_PATH (a path in $build format) was converted to $host -# format in TO_PATH. Otherwise, emit an error message, but continue, resetting -# func_to_host_file_result to a simplistic fallback value (see below). -func_convert_path_check () -{ - $opt_debug - if test -z "$4" && test -n "$3"; then - func_error "Could not determine the host path corresponding to" - func_error " \`$3'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This is a deliberately simplistic "conversion" and - # should not be "improved". See libtool.info. - if test "x$1" != "x$2"; then - lt_replace_pathsep_chars="s|$1|$2|g" - func_to_host_path_result=`echo "$3" | - $SED -e "$lt_replace_pathsep_chars"` - else - func_to_host_path_result="$3" - fi - fi -} -# end func_convert_path_check - - -# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG -# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT -# and appending REPL if ORIG matches BACKPAT. -func_convert_path_front_back_pathsep () -{ - $opt_debug - case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" - ;; - esac - case $4 in - $2 ) func_append func_to_host_path_result "$3" - ;; - esac -} -# end func_convert_path_front_back_pathsep - - -################################################## -# $build to $host FILE NAME CONVERSION FUNCTIONS # -################################################## -# invoked via `$to_host_file_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# Result will be available in $func_to_host_file_result. - - -# func_to_host_file ARG -# Converts the file name ARG from $build format to $host format. Return result -# in func_to_host_file_result. -func_to_host_file () -{ - $opt_debug - $to_host_file_cmd "$1" -} -# end func_to_host_file - - -# func_to_tool_file ARG LAZY -# converts the file name ARG from $build format to toolchain format. Return -# result in func_to_tool_file_result. If the conversion in use is listed -# in (the comma separated) LAZY, no conversion takes place. -func_to_tool_file () -{ - $opt_debug - case ,$2, in - *,"$to_tool_file_cmd",*) - func_to_tool_file_result=$1 - ;; - *) - $to_tool_file_cmd "$1" - func_to_tool_file_result=$func_to_host_file_result - ;; - esac -} -# end func_to_tool_file - - -# func_convert_file_noop ARG -# Copy ARG to func_to_host_file_result. -func_convert_file_noop () -{ - func_to_host_file_result="$1" -} -# end func_convert_file_noop - - -# func_convert_file_msys_to_w32 ARG -# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_file_result. -func_convert_file_msys_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_w32 - - -# func_convert_file_cygwin_to_w32 ARG -# Convert file name ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_file_cygwin_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # because $build is cygwin, we call "the" cygpath in $PATH; no need to use - # LT_CYGPATH in this case. - func_to_host_file_result=`cygpath -m "$1"` - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_cygwin_to_w32 - - -# func_convert_file_nix_to_w32 ARG -# Convert file name ARG from *nix to w32 format. Requires a wine environment -# and a working winepath. Returns result in func_to_host_file_result. -func_convert_file_nix_to_w32 () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_w32 - - -# func_convert_file_msys_to_cygwin ARG -# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_file_msys_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - func_convert_core_msys_to_w32 "$1" - func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_msys_to_cygwin - - -# func_convert_file_nix_to_cygwin ARG -# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed -# in a wine environment, working winepath, and LT_CYGPATH set. Returns result -# in func_to_host_file_result. -func_convert_file_nix_to_cygwin () -{ - $opt_debug - func_to_host_file_result="$1" - if test -n "$1"; then - # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. - func_convert_core_file_wine_to_w32 "$1" - func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" - fi - func_convert_file_check "$1" "$func_to_host_file_result" -} -# end func_convert_file_nix_to_cygwin - - -############################################# -# $build to $host PATH CONVERSION FUNCTIONS # -############################################# -# invoked via `$to_host_path_cmd ARG' -# -# In each case, ARG is the path to be converted from $build to $host format. -# The result will be available in $func_to_host_path_result. -# -# Path separators are also converted from $build format to $host format. If -# ARG begins or ends with a path separator character, it is preserved (but -# converted to $host format) on output. -# -# All path conversion functions are named using the following convention: -# file name conversion function : func_convert_file_X_to_Y () -# path conversion function : func_convert_path_X_to_Y () -# where, for any given $build/$host combination the 'X_to_Y' value is the -# same. If conversion functions are added for new $build/$host combinations, -# the two new functions must follow this pattern, or func_init_to_host_path_cmd -# will break. - - -# func_init_to_host_path_cmd -# Ensures that function "pointer" variable $to_host_path_cmd is set to the -# appropriate value, based on the value of $to_host_file_cmd. -to_host_path_cmd= -func_init_to_host_path_cmd () -{ - $opt_debug - if test -z "$to_host_path_cmd"; then - func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" - fi -} - - -# func_to_host_path ARG -# Converts the path ARG from $build format to $host format. Return result -# in func_to_host_path_result. -func_to_host_path () -{ - $opt_debug - func_init_to_host_path_cmd - $to_host_path_cmd "$1" -} -# end func_to_host_path - - -# func_convert_path_noop ARG -# Copy ARG to func_to_host_path_result. -func_convert_path_noop () -{ - func_to_host_path_result="$1" -} -# end func_convert_path_noop - - -# func_convert_path_msys_to_w32 ARG -# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic -# conversion to w32 is not available inside the cwrapper. Returns result in -# func_to_host_path_result. -func_convert_path_msys_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from ARG. MSYS - # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; - # and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_msys_to_w32 - - -# func_convert_path_cygwin_to_w32 ARG -# Convert path ARG from Cygwin to w32 format. Returns result in -# func_to_host_file_result. -func_convert_path_cygwin_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_cygwin_to_w32 - - -# func_convert_path_nix_to_w32 ARG -# Convert path ARG from *nix to w32 format. Requires a wine environment and -# a working winepath. Returns result in func_to_host_file_result. -func_convert_path_nix_to_w32 () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" - func_convert_path_check : ";" \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" - fi -} -# end func_convert_path_nix_to_w32 - - -# func_convert_path_msys_to_cygwin ARG -# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. -# Returns result in func_to_host_file_result. -func_convert_path_msys_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # See func_convert_path_msys_to_w32: - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_msys_to_cygwin - - -# func_convert_path_nix_to_cygwin ARG -# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a -# a wine environment, working winepath, and LT_CYGPATH set. Returns result in -# func_to_host_file_result. -func_convert_path_nix_to_cygwin () -{ - $opt_debug - func_to_host_path_result="$1" - if test -n "$1"; then - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_stripname : : "$1" - func_to_host_path_tmp1=$func_stripname_result - func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" - func_convert_path_check : : \ - "$func_to_host_path_tmp1" "$func_to_host_path_result" - func_convert_path_front_back_pathsep ":*" "*:" : "$1" - fi -} -# end func_convert_path_nix_to_cygwin - - -# func_mode_compile arg... -func_mode_compile () -{ - $opt_debug - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - pie_flag= - - for arg - do - case $arg_mode in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" - arg_mode=target - continue - ;; - - -pie | -fpie | -fPIE) - func_append pie_flag " $arg" - continue - ;; - - -shared | -static | -prefer-pic | -prefer-non-pic) - func_append later " $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - func_append_quoted lastarg "$arg" - done - IFS="$save_ifs" - func_stripname ' ' '' "$lastarg" - lastarg=$func_stripname_result - - # Add the arguments to base_compile. - func_append base_compile " $lastarg" - continue - ;; - - *) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - func_append_quoted base_compile "$lastarg" - done # for arg - - case $arg_mode in - arg) - func_fatal_error "you must specify an argument for -Xcompile" - ;; - target) - 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" - } - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - case $libobj in - *.[cCFSifmso] | \ - *.ada | *.adb | *.ads | *.asm | \ - *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) - func_xform "$libobj" - libobj=$func_xform_result - ;; - esac - - case $libobj in - *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; - *) - func_fatal_error "cannot determine name of library object from \`$libobj'" - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" - build_old_libs=no - continue - ;; - - -static) - build_libtool_libs=no - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - 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_dirname_and_basename "$obj" "/" "" - 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 - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2* | cegcc*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; 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" - else - output_obj= - need_locks=no - lockfile= - fi - - # 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 - 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 - if test -f "$lockfile"; then - $ECHO "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -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 -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." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - func_append removelist " $output_obj" - $ECHO "$srcfile" > "$lockfile" - fi - - $opt_dry_run || $RM $removelist - func_append removelist " $lockfile" - trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - - func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 - srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result - - # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then - # Without this assignment, base_compile gets emptied. - fbsd_hideous_sh_bug=$base_compile - - if test "$pic_mode" != no; then - command="$base_compile $qsrcfile $pic_flag" - else - # Don't build PIC code - command="$base_compile $qsrcfile" - fi - - func_mkdir_p "$xdir$objdir" - - if test -z "$output_obj"; then - # Place PIC objects in $objdir - func_append command " -o $lobj" - fi - - func_show_eval_locale "$command" \ - 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -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 -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." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - func_show_eval '$MV "$output_obj" "$lobj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - - # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; 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 - # 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 - func_append command " -o $obj" - fi - - # Suppress compiler output if we already did a PIC compilation. - func_append command "$suppress_output" - func_show_eval_locale "$command" \ - '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - - if test "$need_locks" = warn && - test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then - $ECHO "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -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 -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." - - $opt_dry_run || $RM $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - func_show_eval '$MV "$output_obj" "$obj"' \ - 'error=$?; $opt_dry_run || $RM $removelist; exit $error' - fi - fi - - $opt_dry_run || { - func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" - - # Unlock the critical section if it was locked - if test "$need_locks" != no; then - removelist=$lockfile - $RM "$lockfile" - fi - } - - exit $EXIT_SUCCESS -} - -$opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} -} - -func_mode_help () -{ - # We need to display help for each of the modes. - case $opt_mode in - "") - # Generic help is extracted from the usage comments - # at the start of this file. - func_help - ;; - - clean) - $ECHO \ -"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -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 -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - - compile) - $ECHO \ -"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to build PIC objects only - -prefer-non-pic try to build non-PIC objects only - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -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'." - ;; - - execute) - $ECHO \ -"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -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 -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - - finish) - $ECHO \ -"Usage: $progname [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -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." - ;; - - install) - $ECHO \ -"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The following components of INSTALL-COMMAND are treated specially: - - -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - - link) - $ECHO \ -"Usage: $progname [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -bindir BINDIR specify path to binaries directory (for systems where - libraries must be found in the PATH setting at runtime) - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -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 - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -shared only do dynamic linking of libtool libraries - -shrext SUFFIX override the standard shared library file extension - -static do not do any dynamic linking of uninstalled libtool libraries - -static-libtool-libs - do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -weak LIBNAME declare that the target provides the LIBNAME interface - -Wc,FLAG - -Xcompiler FLAG pass linker-specific FLAG directly to the compiler - -Wl,FLAG - -Xlinker FLAG pass linker-specific FLAG directly to the linker - -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) - -All other options (arguments beginning with \`-') are ignored. - -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 -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 \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - - uninstall) - $ECHO \ -"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -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 -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - - *) - func_fatal_help "invalid operation mode \`$opt_mode'" - ;; - esac - - echo - $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 - func_mode_help - else - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - func_mode_help - done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' - { - func_help noexit - for opt_mode in compile link execute install finish uninstall clean; do - echo - func_mode_help - done - } | - sed '1d - /^When reporting/,/^Report/{ - H - d - } - $x - /information about other modes/d - /more detailed .*MODE/d - s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' - fi - exit $? -fi - - -# func_mode_execute arg... -func_mode_execute () -{ - $opt_debug - # The first argument is the command name. - 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" - - dir= - case $file in - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" - - # Read the libtool library. - dlname= - library_names= - func_source "$file" - - # Skip this library if it cannot be dlopened. - 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'" - continue - fi - - func_dirname "$file" "" "." - 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'" - fi - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - func_dirname "$file" "" "." - dir="$func_dirname_result" - ;; - - *) - 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" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -* | *.la | *.lo ) ;; - *) - # Do a test to see if this is really a libtool program. - if func_ltwrapper_script_p "$file"; then - func_source "$file" - # Transform arg to wrapped name. - 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" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - func_append_quoted args "$file" - done - - if test "X$opt_dry_run" = Xfalse; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES - do - eval "if test \"\${save_$lt_var+set}\" = set; then - $lt_var=\$save_$lt_var; export $lt_var - else - $lt_unset $lt_var - fi" - 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 - fi -} - -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} - - -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libs= - libdirs= - admincmds= - - for opt in "$nonopt" ${1+"$@"} - do - if test -d "$opt"; then - func_append libdirs " $opt" - - elif test -f "$opt"; then - if func_lalib_unsafe_p "$opt"; then - func_append libs " $opt" - else - func_warning "\`$opt' is not a valid libtool archive" - fi - - else - func_fatal_error "invalid argument \`$opt'" - fi - done - - if test -n "$libs"; then - if test -n "$lt_sysroot"; then - sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` - sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" - else - sysroot_cmd= - fi - - # Remove sysroot references - if $opt_dry_run; then - for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" - done - else - tmpdir=`func_mktempdir` - for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ - > $tmpdir/tmp-la - mv -f $tmpdir/tmp-la $lib - done - ${RM}r "$tmpdir" - fi - fi - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - func_execute_cmds "$finish_cmds" 'admincmds="$admincmds -'"$cmd"'"' - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || func_append admincmds " - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - echo "----------------------------------------------------------------------" - echo "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - echo - echo "If you ever happen to want to link against installed libraries" - echo "in a given directory, LIBDIR, you must either use libtool, and" - echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - echo " during execution" - fi - if test -n "$runpath_var"; then - echo " - add LIBDIR to the \`$runpath_var' environment variable" - echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - echo - - echo "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" - echo "pages." - ;; - *) - echo "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - echo "----------------------------------------------------------------------" - fi - exit $EXIT_SUCCESS -} - -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} - - -# func_mode_install arg... -func_mode_install () -{ - $opt_debug - # 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 || - # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then - # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " - arg=$1 - shift - else - install_prog= - arg=$nonopt - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" - install_shared_prog=$install_prog - case " $install_prog " in - *[\\\ /]cp\ *) install_cp=: ;; - *) install_cp=false ;; - esac - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - no_mode=: - for arg - do - arg2= - if test -n "$dest"; then - func_append files " $dest" - dest=$arg - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) - if $install_cp; then :; else - prev=$arg - fi - ;; - -g | -m | -o) - prev=$arg - ;; - -s) - stripme=" -s" - continue - ;; - -*) - ;; - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - if test "x$prev" = x-m && test -n "$install_override_mode"; then - arg2=$install_override_mode - no_mode=false - fi - prev= - else - dest=$arg - continue - fi - ;; - esac - - # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" - if test -n "$arg2"; then - func_quote_for_eval "$arg2" - fi - func_append install_shared_prog " $func_quote_for_eval_result" - done - - test -z "$install_prog" && \ - func_fatal_help "you must specify an install program" - - test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" - - if test -n "$install_override_mode" && $no_mode; then - if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" - fi - fi - - if test -z "$files"; then - if test -z "$dest"; then - func_fatal_help "no file or destination specified" - else - func_fatal_help "you must specify a destination" - fi - fi - - # Strip any trailing slash from the destination. - func_stripname '' '/' "$dest" - 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" - destname= - else - func_dirname_and_basename "$dest" "" "." - 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" - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - func_fatal_help "\`$destdir' must be an absolute directory name" - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - func_append staticlibs " $file" - ;; - - *.la) - func_resolve_sysroot "$file" - file=$func_resolve_sysroot_result - - # Check to see that this really is a libtool archive. - func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" - - library_names= - old_library= - relink_command= - func_source "$file" - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) func_append current_libdirs " $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) func_append future_libdirs " $libdir" ;; - esac - fi - - func_dirname "$file" "/" "" - dir="$func_dirname_result" - func_append dir "$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # 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" - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - func_warning "relinking \`$file'" - func_show_eval "$relink_command" \ - '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" - shift - - 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" - case $host_os in - cygwin* | mingw* | pw32* | cegcc*) - case $realname in - *.dll.a) - tstripme="" - ;; - esac - ;; - esac - if test -n "$tstripme" && test -n "$striplib"; then - func_show_eval "$striplib $destdir/$realname" 'exit $?' - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - # 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 - do - test "$linkname" != "$realname" \ - && func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })" - done - fi - - # Do each command in the postinstall commands. - 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 - func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' - - # Maybe install the static library, too. - test -n "$old_library" && func_append staticlibs " $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - func_lo2o "$destfile" - staticdest=$func_lo2o_result - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" - ;; - esac - - # Install the libtool object if requested. - test -n "$destfile" && \ - func_show_eval "$install_prog $file $destfile" 'exit $?' - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - func_lo2o "$file" - staticobj=$func_lo2o_result - func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?' - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - func_basename "$file" - 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="" - case $file in - *.exe) - if test ! -f "$file"; then - func_stripname '' '.exe' "$file" - file=$func_stripname_result - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin* | *mingw*) - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - wrapper=$func_ltwrapper_scriptname_result - else - func_stripname '' '.exe' "$file" - wrapper=$func_stripname_result - fi - ;; - *) - wrapper=$file - ;; - esac - if func_ltwrapper_script_p "$wrapper"; then - notinst_deplibs= - relink_command= - - func_source "$wrapper" - - # Check the variables that should have been set. - test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" - - finalize=yes - 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 - if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no - fi - done - - relink_command= - func_source "$wrapper" - - outputname= - if test "$fast_install" = no && test -n "$relink_command"; then - $opt_dry_run || { - if test "$finalize" = yes; then - tmpdir=`func_mktempdir` - func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - - $opt_silent || { - 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" - $opt_dry_run || ${RM}r "$tmpdir" - continue - fi - file="$outputname" - else - func_warning "cannot relink \`$file'" - fi - } - else - # Install the binary that we compiled earlier. - file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyway - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - func_stripname '' '.exe' "$destfile" - destfile=$func_stripname_result - ;; - esac - ;; - esac - func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?' - $opt_dry_run || if test -n "$outputname"; then - ${RM}r "$tmpdir" - fi - ;; - esac - done - - for file in $staticlibs; do - func_basename "$file" - name="$func_basename_result" - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - - func_show_eval "$install_prog \$file \$oldlib" 'exit $?' - - if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $tool_oldlib" 'exit $?' - fi - - # Do each command in the postinstall commands. - func_execute_cmds "$old_postinstall_cmds" 'exit $?' - done - - test -n "$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' - else - exit $EXIT_SUCCESS - fi -} - -test "$opt_mode" = install && func_mode_install ${1+"$@"} - - -# func_generate_dlsyms outputname originator pic_p -# Extract symbols from dlprefiles and create ${outputname}S.o with -# 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'` - my_dlsyms= - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" - else - func_error "not configured to extract global symbols from dlpreopened files" - fi - fi - - if test -n "$my_dlsyms"; then - case $my_dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" - - func_show_eval "$RM $nlist ${nlist}S ${nlist}T" - - # Parse the name list into a source file. - 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 */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) -#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" -#endif - -/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime - relocations are performed -- see ld's documentation on pseudo-relocs. */ -# define LT_DLSYM_CONST -#elif defined(__osf__) -/* This system does not cope well with relocations in const data. */ -# define LT_DLSYM_CONST -#else -# define LT_DLSYM_CONST const -#endif - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" - - $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - 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'" - $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $opt_dry_run || { - eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - if test -n "$export_symbols_regex"; then - $opt_dry_run || { - eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - eval '$MV "$nlist"T "$nlist"' - } - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - 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"' - case $host in - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"' - ;; - esac - } - else - $opt_dry_run || { - 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 - *cygwin* | *mingw* | *cegcc* ) - eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' - eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' - ;; - esac - } - fi - fi - - for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" - func_basename "$dlprefile" - 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="" - if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then - # Use subshell, to avoid clobbering current variable values - dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then - func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" - else - # no lafile. user explicitly requested -dlpreopen . - $sharedlib_from_linklib_cmd "$dlprefile" - dlprefile_dlbasename=$sharedlib_from_linklib_result - fi - fi - $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then - eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' - else - func_warning "Could not compute DLL name from $name" - eval '$ECHO ": $name " >> "$nlist"' - fi - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | - $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" - } - else # not an import lib - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - fi - ;; - *) - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 - eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } - ;; - esac - done - - $opt_dry_run || { - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $MV "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if $GREP -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - $GREP -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' - else - echo '/* NONE */' >> "$output_objdir/$my_dlsyms" - fi - - echo >> "$output_objdir/$my_dlsyms" "\ - -/* The mapping between symbol names and symbols. */ -typedef struct { - const char *name; - void *address; -} lt_dlsymlist; -extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; -LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," - - case $need_lib_prefix in - no) - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - *) - eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" - ;; - esac - echo >> "$output_objdir/$my_dlsyms" "\ - {0, (void *) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_${my_prefix}_LTX_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - } # !$opt_dry_run - - pic_flag_for_symtable= - case "$compile_command " in - *" -static "*) ;; - *) - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; - *-*-hpux*) - pic_flag_for_symtable=" $pic_flag" ;; - *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi - ;; - esac - ;; - esac - symtab_cflags= - for arg in $LTCFLAGS; do - case $arg in - -pie | -fpie | -fPIE) ;; - *) func_append symtab_cflags " $arg" ;; - esac - done - - # Now compile the dynamic symbol file. - 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"' - - # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" - case $host in - *cygwin* | *mingw* | *cegcc* ) - if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - else - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - fi - ;; - *) - compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` - ;; - esac - ;; - *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` - finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` - fi -} - -# func_win32_libid arg -# return the library type of file 'arg' -# -# Need a lot of goo to handle *both* DLLs and import libs -# Has to be a shell function in order to 'eat' the argument -# that is supplied when $file_magic_command is called. -# Despite the name, also deal with 64 bit binaries. -func_win32_libid () -{ - $opt_debug - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' - 1,100{ - / I /{ - s,.*,import, - p - q - } - }'` - case $win32_nmres in - import*) win32_libid_type="x86 archive import";; - *) win32_libid_type="x86 archive static";; - esac - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $ECHO "$win32_libid_type" -} - -# func_cygming_dll_for_implib ARG -# -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib () -{ - $opt_debug - sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` -} - -# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs -# -# The is the core of a fallback implementation of a -# platform-specific function to extract the name of the -# DLL associated with the specified import library LIBNAME. -# -# SECTION_NAME is either .idata$6 or .idata$7, depending -# on the platform and compiler that created the implib. -# -# Echos the name of the DLL associated with the -# specified import library. -func_cygming_dll_for_implib_fallback_core () -{ - $opt_debug - match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` - $OBJDUMP -s --section "$1" "$2" 2>/dev/null | - $SED '/^Contents of section '"$match_literal"':/{ - # Place marker at beginning of archive member dllname section - s/.*/====MARK====/ - p - d - } - # These lines can sometimes be longer than 43 characters, but - # are always uninteresting - /:[ ]*file format pe[i]\{,1\}-/d - /^In archive [^:]*:/d - # Ensure marker is printed - /^====MARK====/p - # Remove all lines with less than 43 characters - /^.\{43\}/!d - # From remaining lines, remove first 43 characters - s/^.\{43\}//' | - $SED -n ' - # Join marker and all lines until next marker into a single line - /^====MARK====/ b para - H - $ b para - b - :para - x - s/\n//g - # Remove the marker - s/^====MARK====// - # Remove trailing dots and whitespace - s/[\. \t]*$// - # Print - /./p' | - # we now have a list, one entry per line, of the stringified - # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is - # a '.' (that is, objdump's representation of an unprintable - # character.) This should work for all archives with less than - # 0x302f exports -- but will fail for DLLs whose name actually - # begins with a literal '.' or a single character followed by - # a '.'. - # - # Of those that remain, print the first one. - $SED -e '/^\./d;/^.\./d;q' -} - -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - -# func_cygming_dll_for_implib_fallback ARG -# Platform-specific function to extract the -# name of the DLL associated with the specified -# import library ARG. -# -# This fallback implementation is for use when $DLLTOOL -# does not support the --identify-strict option. -# Invoked by eval'ing the libtool variable -# $sharedlib_from_linklib_cmd -# Result is available in the variable -# $sharedlib_from_linklib_result -func_cygming_dll_for_implib_fallback () -{ - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then - # binutils import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then - # ms-generated import library - sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` - else - # unknown - sharedlib_from_linklib_result="" - fi -} - - -# func_extract_an_archive dir oldlib -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 - lockfile=$f_ex_an_ar_oldlib.lock - until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do - func_echo "Waiting for $lockfile to be removed" - sleep 2 - done - fi - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ - 'stat=$?; rm -f "$lockfile"; exit $stat' - if test "$lock_old_archive_extraction" = yes; then - $opt_dry_run || rm -f "$lockfile" - fi - if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then - : - else - func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" - fi -} - - -# func_extract_archives gentop oldlib ... -func_extract_archives () -{ - $opt_debug - my_gentop="$1"; shift - my_oldlibs=${1+"$@"} - 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" ;; - *) my_xabs=`pwd`"/$my_xlib" ;; - esac - func_basename "$my_xlib" - my_xlib="$func_basename_result" - my_xlib_u=$my_xlib - while :; do - case " $extracted_archives " in - *" $my_xlib_u "*) - func_arith $extracted_serial + 1 - extracted_serial=$func_arith_result - my_xlib_u=lt$extracted_serial-$my_xlib ;; - *) break ;; - esac - done - extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" - - func_mkdir_p "$my_xdir" - - case $host in - *-darwin*) - func_verbose "Extracting $my_xabs" - # Do not bother doing anything if just a dry run - $opt_dry_run || { - darwin_orig_dir=`pwd` - cd $my_xdir || exit $? - darwin_archive=$my_xabs - darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` - 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}" - cd "$darwin_curdir" - $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_file= - darwin_files= - for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` - $LIPO -create -output "$darwin_file" $darwin_files - done # $darwin_filelist - $RM -rf unfat-$$ - cd "$darwin_orig_dir" - else - cd $darwin_orig_dir - func_extract_an_archive "$my_xdir" "$my_xabs" - fi # $darwin_arches - } # !$opt_dry_run - ;; - *) - func_extract_an_archive "$my_xdir" "$my_xabs" - ;; - esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` - done - - func_extract_archives_result="$my_oldobjs" -} - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=${1-no} - - $ECHO "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -sed_quote_subst='$sed_quote_subst' - -# Be Bourne compatible -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 - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac -fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variables: - generated_by_libtool_version='$macro_version' - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$ECHO are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - file=\"\$0\"" - - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` - $ECHO "\ - -# A function that is used when there is no print builtin or printf. -func_fallback_echo () -{ - eval 'cat <<_LTECHO_EOF -\$1 -_LTECHO_EOF' -} - ECHO=\"$qECHO\" - fi - -# Very basic option parsing. These options are (a) specific to -# the libtool wrapper, (b) are identical between the wrapper -# /script/ and the wrapper /executable/ which is used only on -# windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match -# this pattern). -# -# There are only two supported options: --lt-debug and -# --lt-dump-script. There is, deliberately, no --lt-help. -# -# The first argument to this parsing function should be the -# script's $0 value, followed by "$@". -lt_option_debug= -func_parse_lt_options () -{ - lt_script_arg0=\$0 - shift - for lt_opt - do - case \"\$lt_opt\" in - --lt-debug) lt_option_debug=1 ;; - --lt-dump-script) - lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` - test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. - lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` - cat \"\$lt_dump_D/\$lt_dump_F\" - exit 0 - ;; - --lt-*) - \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 - exit 1 - ;; - esac - done - - # Print the debug banner immediately: - if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 - fi -} - -# Used when --lt-debug. Prints its arguments to stdout -# (redirection is the responsibility of the caller) -func_lt_dump_args () -{ - lt_dump_args_N=1; - for lt_arg - do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" - lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` - done -} - -# Core function for launching the target application -func_exec_program_core () -{ -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 - func_lt_dump_args \${1+\"\$@\"} 1>&2 - fi - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 -} - -# A function to encapsulate launching the target application -# Strips options in the --lt-* namespace from \$@ and -# launches target application with the remaining arguments. -func_exec_program () -{ - case \" \$* \" in - *\\ --lt-*) - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done ;; - esac - func_exec_program_core \${1+\"\$@\"} -} - - # Parse options - func_parse_lt_options \"\$0\" \${1+\"\$@\"} - - # Find the directory that this script lives in. - thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` - done - - # Usually 'no', except on cygwin/mingw when embedded into - # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 - if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then - # special case for '.' - if test \"\$thisdir\" = \".\"; then - thisdir=\`pwd\` - fi - # remove .libs from thisdir - case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; - $objdir ) thisdir=. ;; - esac - fi - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; 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\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $MKDIR \"\$progdir\" - else - $RM \"\$progdir/\$file\" - fi" - - $ECHO "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $ECHO \"\$relink_command_output\" >&2 - $RM \"\$progdir/\$file\" - exit 1 - fi - fi - - $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $RM \"\$progdir/\$program\"; - $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $RM \"\$progdir/\$file\" - fi" - else - $ECHO "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $ECHO "\ - - if test -f \"\$progdir/\$program\"; then" - - # fixup the dll searchpath if we need to. - # - # Fix the DLL searchpath if we need to. Do this before prepending - # to shlibpath, because on Windows, both are PATH and uninstalled - # libraries must come first. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $ECHO "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` - - export $shlibpath_var -" - fi - - $ECHO "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. - func_exec_program \${1+\"\$@\"} - fi - else - # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 - \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} - - -# func_emit_cwrapperexe_src -# emit the source code for a wrapper executable on stdout -# Must ONLY be called from within func_mode_link because -# it depends on a number of variable set therein. -func_emit_cwrapperexe_src () -{ - cat < -#include -#ifdef _MSC_VER -# include -# include -# include -#else -# include -# include -# ifdef __CYGWIN__ -# include -# endif -#endif -#include -#include -#include -#include -#include -#include -#include -#include - -/* declarations of non-ANSI functions */ -#if defined(__MINGW32__) -# ifdef __STRICT_ANSI__ -int _putenv (const char *); -# endif -#elif defined(__CYGWIN__) -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif -/* #elif defined (other platforms) ... */ -#endif - -/* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -# define S_IXUSR _S_IEXEC -# ifndef _INTPTR_T_DEFINED -# define _INTPTR_T_DEFINED -# define intptr_t int -# endif -#elif defined(__MINGW32__) -# define setmode _setmode -# define stat _stat -# define chmod _chmod -# define getcwd _getcwd -# define putenv _putenv -#elif defined(__CYGWIN__) -# define HAVE_SETENV -# define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ -#endif - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef S_IXOTH -# define S_IXOTH 0 -#endif -#ifndef S_IXGRP -# define S_IXGRP 0 -#endif - -/* path handling portability macros */ -#ifndef DIR_SEPARATOR -# define DIR_SEPARATOR '/' -# define PATH_SEPARATOR ':' -#endif - -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) -# define HAVE_DOS_BASED_FILE_SYSTEM -# define FOPEN_WB "wb" -# ifndef DIR_SEPARATOR_2 -# define DIR_SEPARATOR_2 '\\' -# endif -# ifndef PATH_SEPARATOR_2 -# define PATH_SEPARATOR_2 ';' -# endif -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#ifndef PATH_SEPARATOR_2 -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR) -#else /* PATH_SEPARATOR_2 */ -# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) -#endif /* PATH_SEPARATOR_2 */ - -#ifndef FOPEN_WB -# define FOPEN_WB "w" -#endif -#ifndef _O_BINARY -# define _O_BINARY 0 -#endif - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -#if defined(LT_DEBUGWRAPPER) -static int lt_debug = 1; -#else -static int lt_debug = 0; -#endif - -const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ - -void *xmalloc (size_t num); -char *xstrdup (const char *string); -const char *base_name (const char *name); -char *find_executable (const char *wrapper); -char *chase_symlinks (const char *pathspec); -int make_executable (const char *path); -int check_executable (const char *path); -char *strendzap (char *str, const char *pat); -void lt_debugprintf (const char *file, int line, const char *fmt, ...); -void lt_fatal (const char *file, int line, const char *message, ...); -static const char *nonnull (const char *s); -static const char *nonempty (const char *s); -void lt_setenv (const char *name, const char *value); -char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_update_exe_path (const char *name, const char *value); -void lt_update_lib_path (const char *name, const char *value); -char **prepare_spawn (char **argv); -void lt_dump_script (FILE *f); -EOF - - cat <= 0) - && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH))) - return 1; - else - return 0; -} - -int -make_executable (const char *path) -{ - int rval = 0; - struct stat st; - - lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", - nonempty (path)); - if ((!path) || (!*path)) - return 0; - - if (stat (path, &st) >= 0) - { - rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR); - } - return rval; -} - -/* Searches for the full path of the wrapper. Returns - newly allocated full path name if found, NULL otherwise - Does not chase symlinks, even on platforms that support them. -*/ -char * -find_executable (const char *wrapper) -{ - int has_slash = 0; - const char *p; - const char *p_next; - /* static buffer for getcwd */ - char tmp[LT_PATHMAX + 1]; - int tmp_len; - char *concat_name; - - lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", - nonempty (wrapper)); - - if ((wrapper == NULL) || (*wrapper == '\0')) - return NULL; - - /* Absolute path? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':') - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - else - { -#endif - if (IS_DIR_SEPARATOR (wrapper[0])) - { - concat_name = xstrdup (wrapper); - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - } -#endif - - for (p = wrapper; *p; p++) - if (*p == '/') - { - has_slash = 1; - break; - } - if (!has_slash) - { - /* no slashes; search PATH */ - const char *path = getenv ("PATH"); - if (path != NULL) - { - for (p = path; *p; p = p_next) - { - const char *q; - size_t p_len; - for (q = p; *q; q++) - if (IS_PATH_SEPARATOR (*q)) - break; - p_len = q - p; - p_next = (*q == '\0' ? q : q + 1); - if (p_len == 0) - { - /* empty path: current directory */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = - XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - } - else - { - concat_name = - XMALLOC (char, p_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, p, p_len); - concat_name[p_len] = '/'; - strcpy (concat_name + p_len + 1, wrapper); - } - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - } - } - /* not found in PATH; assume curdir */ - } - /* Relative path | not found in path: prepend cwd */ - if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", - nonnull (strerror (errno))); - tmp_len = strlen (tmp); - concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); - memcpy (concat_name, tmp, tmp_len); - concat_name[tmp_len] = '/'; - strcpy (concat_name + tmp_len + 1, wrapper); - - if (check_executable (concat_name)) - return concat_name; - XFREE (concat_name); - return NULL; -} - -char * -chase_symlinks (const char *pathspec) -{ -#ifndef S_ISLNK - return xstrdup (pathspec); -#else - char buf[LT_PATHMAX]; - struct stat s; - char *tmp_pathspec = xstrdup (pathspec); - char *p; - int has_symlinks = 0; - while (strlen (tmp_pathspec) && !has_symlinks) - { - lt_debugprintf (__FILE__, __LINE__, - "checking path component for symlinks: %s\n", - tmp_pathspec); - if (lstat (tmp_pathspec, &s) == 0) - { - if (S_ISLNK (s.st_mode) != 0) - { - has_symlinks = 1; - break; - } - - /* search backwards for last DIR_SEPARATOR */ - p = tmp_pathspec + strlen (tmp_pathspec) - 1; - while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - p--; - if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p))) - { - /* no more DIR_SEPARATORS left */ - break; - } - *p = '\0'; - } - else - { - lt_fatal (__FILE__, __LINE__, - "error accessing file \"%s\": %s", - tmp_pathspec, nonnull (strerror (errno))); - } - } - XFREE (tmp_pathspec); - - if (!has_symlinks) - { - return xstrdup (pathspec); - } - - tmp_pathspec = realpath (pathspec, buf); - if (tmp_pathspec == 0) - { - lt_fatal (__FILE__, __LINE__, - "could not follow symlinks for %s", pathspec); - } - return xstrdup (tmp_pathspec); -#endif -} - -char * -strendzap (char *str, const char *pat) -{ - size_t len, patlen; - - assert (str != NULL); - assert (pat != NULL); - - len = strlen (str); - patlen = strlen (pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp (str, pat) == 0) - *str = '\0'; - } - return str; -} - -void -lt_debugprintf (const char *file, int line, const char *fmt, ...) -{ - va_list args; - if (lt_debug) - { - (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); - } -} - -static void -lt_error_core (int exit_status, const char *file, - int line, const char *mode, - const char *message, va_list ap) -{ - fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *file, int line, const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); - va_end (ap); -} - -static const char * -nonnull (const char *s) -{ - return s ? s : "(null)"; -} - -static const char * -nonempty (const char *s) -{ - return (s && !*s) ? "(empty)" : nonnull (s); -} - -void -lt_setenv (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_setenv) setting '%s' to '%s'\n", - nonnull (name), nonnull (value)); - { -#ifdef HAVE_SETENV - /* always make a copy, for consistency with !HAVE_SETENV */ - char *str = xstrdup (value); - setenv (name, str, 1); -#else - int len = strlen (name) + 1 + strlen (value) + 1; - char *str = XMALLOC (char, len); - sprintf (str, "%s=%s", name, value); - if (putenv (str) != EXIT_SUCCESS) - { - XFREE (str); - } -#endif - } -} - -char * -lt_extend_str (const char *orig_value, const char *add, int to_end) -{ - char *new_value; - if (orig_value && *orig_value) - { - int orig_value_len = strlen (orig_value); - int add_len = strlen (add); - new_value = XMALLOC (char, add_len + orig_value_len + 1); - if (to_end) - { - strcpy (new_value, orig_value); - strcpy (new_value + orig_value_len, add); - } - else - { - strcpy (new_value, add); - strcpy (new_value + add_len, orig_value); - } - } - else - { - new_value = xstrdup (add); - } - return new_value; -} - -void -lt_update_exe_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - /* some systems can't cope with a ':'-terminated path #' */ - int len = strlen (new_value); - while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1])) - { - new_value[len-1] = '\0'; - } - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -void -lt_update_lib_path (const char *name, const char *value) -{ - lt_debugprintf (__FILE__, __LINE__, - "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - nonnull (name), nonnull (value)); - - if (name && *name && value && *value) - { - char *new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - } -} - -EOF - case $host_os in - mingw*) - cat <<"EOF" - -/* Prepares an argument vector before calling spawn(). - Note that spawn() does not by itself call the command interpreter - (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : - ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&v); - v.dwPlatformId == VER_PLATFORM_WIN32_NT; - }) ? "cmd.exe" : "command.com"). - Instead it simply concatenates the arguments, separated by ' ', and calls - CreateProcess(). We must quote the arguments since Win32 CreateProcess() - interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a - special way: - - Space and tab are interpreted as delimiters. They are not treated as - delimiters if they are surrounded by double quotes: "...". - - Unescaped double quotes are removed from the input. Their only effect is - that within double quotes, space and tab are treated like normal - characters. - - Backslashes not followed by double quotes are not special. - - But 2*n+1 backslashes followed by a double quote become - n backslashes followed by a double quote (n >= 0): - \" -> " - \\\" -> \" - \\\\\" -> \\" - */ -#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" -char ** -prepare_spawn (char **argv) -{ - size_t argc; - char **new_argv; - size_t i; - - /* Count number of arguments. */ - for (argc = 0; argv[argc] != NULL; argc++) - ; - - /* Allocate new argument vector. */ - new_argv = XMALLOC (char *, argc + 1); - - /* Put quoted arguments into the new argument vector. */ - for (i = 0; i < argc; i++) - { - const char *string = argv[i]; - - if (string[0] == '\0') - new_argv[i] = xstrdup ("\"\""); - else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) - { - int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); - size_t length; - unsigned int backslashes; - const char *s; - char *quoted_string; - char *p; - - length = 0; - backslashes = 0; - if (quote_around) - length++; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - length += backslashes + 1; - length++; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - length += backslashes + 1; - - quoted_string = XMALLOC (char, length + 1); - - p = quoted_string; - backslashes = 0; - if (quote_around) - *p++ = '"'; - for (s = string; *s != '\0'; s++) - { - char c = *s; - if (c == '"') - { - unsigned int j; - for (j = backslashes + 1; j > 0; j--) - *p++ = '\\'; - } - *p++ = c; - if (c == '\\') - backslashes++; - else - backslashes = 0; - } - if (quote_around) - { - unsigned int j; - for (j = backslashes; j > 0; j--) - *p++ = '\\'; - *p++ = '"'; - } - *p = '\0'; - - new_argv[i] = quoted_string; - } - else - new_argv[i] = (char *) string; - } - new_argv[argc] = NULL; - - return new_argv; -} -EOF - ;; - esac - - cat <<"EOF" -void lt_dump_script (FILE* f) -{ -EOF - func_emit_wrapper yes | - $SED -n -e ' -s/^\(.\{79\}\)\(..*\)/\1\ -\2/ -h -s/\([\\"]\)/\\\1/g -s/$/\\n/ -s/\([^\n]*\).*/ fputs ("\1", f);/p -g -D' - cat <<"EOF" -} -EOF -} -# end: func_emit_cwrapperexe_src - -# func_win32_import_lib_p ARG -# True if ARG is an import lib, as indicated by $file_magic_cmd -func_win32_import_lib_p () -{ - $opt_debug - case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in - *import*) : ;; - *) false ;; - esac -} - -# func_mode_link arg... -func_mode_link () -{ - $opt_debug - 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 - # 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 - # 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. - allow_undefined=yes - ;; - *) - allow_undefined=yes - ;; - esac - libtool_args=$nonopt - base_compile="$nonopt $@" - compile_command=$nonopt - finalize_command=$nonopt - - compile_rpath= - finalize_rpath= - compile_shlibpath= - finalize_shlibpath= - convenience= - old_convenience= - deplibs= - old_deplibs= - compiler_flags= - linker_flags= - dllsearchpath= - lib_search_path=`pwd` - inst_prefix_dir= - new_inherited_linker_flags= - - avoid_version=no - bindir= - dlfiles= - dlprefiles= - dlself=no - export_dynamic=no - export_symbols= - export_symbols_regex= - generated= - libobjs= - ltlibs= - module=no - no_install=no - objs= - non_pic_objects= - precious_files_regex= - prefer_static_libs=no - preload=no - prev= - prevarg= - release= - rpath= - xrpath= - perm_rpath= - temp_rpath= - thread_safe=no - vinfo= - vinfo_number=no - weak_libs= - single_module="${wl}-single_module" - func_infer_tag $base_compile - - # We need to know -static, to get the right output filenames. - for arg - do - case $arg in - -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not 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 - func_warning "complete static linking is impossible in this configuration" - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - -static) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=built - ;; - -static-libtool-libs) - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - prefer_static_libs=yes - ;; - esac - build_libtool_libs=no - build_old_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - func_append compile_command " @OUTPUT@" - func_append finalize_command " @OUTPUT@" - ;; - esac - - case $prev in - bindir) - bindir="$arg" - prev= - continue - ;; - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - func_append compile_command " @SYMFILE@" - func_append finalize_command " @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - func_append dlfiles " $arg" - else - func_append dlprefiles " $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - framework) - case $host in - *-*-darwin*) - case "$deplibs " in - *" $qarg.ltframework "*) ;; - *) func_append deplibs " $qarg.ltframework" # this is fixed later - ;; - esac - ;; - esac - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat "$save_arg"` - do -# func_append moreargs " $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - 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'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - 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" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - done - else - func_fatal_error "link input file \`$arg' does not exist" - fi - arg=$save_arg - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) func_append rpath " $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) func_append xrpath " $arg" ;; - esac - fi - prev= - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - weak) - func_append weak_libs " $arg" - prev= - continue - ;; - xcclinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xcompiler) - func_append compiler_flags " $qarg" - prev= - func_append compile_command " $qarg" - func_append finalize_command " $qarg" - continue - ;; - xlinker) - func_append linker_flags " $qarg" - func_append compiler_flags " $wl$qarg" - prev= - func_append compile_command " $wl$qarg" - func_append finalize_command " $wl$qarg" - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - # See comment for -static flag below, for more details. - func_append compile_command " $link_static_flag" - func_append finalize_command " $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -bindir) - prev=bindir - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - 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 - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -framework) - prev=framework - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - func_append compile_command " $arg" - func_append finalize_command " $arg" - ;; - esac - continue - ;; - - -L*) - func_stripname "-L" '' "$arg" - if test -z "$func_stripname_result"; then - if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" - else - func_fatal_error "need path for \`-L' option" - fi - fi - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "* | *" $arg "*) - # Will only happen for absolute or sysroot arguments - ;; - *) - # Preserve sysroot, but never include relative directories - case $dir in - [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; - *) func_append deplibs " -L$dir" ;; - esac - func_append lib_search_path " $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$dir:"*) ;; - ::) dllsearchpath=$dir;; - *) func_append dllsearchpath ":$dir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - func_append deplibs " System.ltframework" - continue - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - func_append deplibs " $arg" - continue - ;; - - -module) - module=yes - continue - ;; - - # Tru64 UNIX uses -model [arg] to determine the layout of C++ - # classes, name mangling, and exception handling. - # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot|--sysroot) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - prev=xcompiler - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - func_append compiler_flags " $arg" - func_append compile_command " $arg" - func_append finalize_command " $arg" - case "$new_inherited_linker_flags " in - *" $arg "*) ;; - * ) func_append new_inherited_linker_flags " $arg" ;; - esac - continue - ;; - - -multi_module) - single_module="${wl}-multi_module" - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-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" - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - func_stripname '-R' '' "$arg" - dir=$func_stripname_result - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - =*) - func_stripname '=' '' "$dir" - dir=$lt_sysroot$func_stripname_result - ;; - *) - func_fatal_error "only absolute run-paths are allowed" - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - continue - ;; - - -shared) - # The effects of -shared are defined in a previous loop. - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -static | -static-libtool-libs) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -weak) - prev=weak - continue - ;; - - -Wc,*) - func_stripname '-Wc,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - 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" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - 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" - func_stripname ' ' '' "$arg" - arg=$func_stripname_result - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # -msg_* for osf cc - -msg_*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - # Flags to be passed through unchanged, with rationale: - # -64, -mips[0-9] enable 64-bit mode for the SGI compiler - # -r[0-9][0-9]* specify processor for the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler - # +DA*, +DD* enable 64-bit mode for the HP compiler - # -q* compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* architecture-specific flags for GCC - # -F/path path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* profiling flags for GCC - # @file GCC response files - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" - func_append finalize_command " $arg" - func_append compiler_flags " $arg" - continue - ;; - - # Some other compiler flag. - -* | +*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - ;; - - *.$objext) - # A standard object. - func_append objs " $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if func_lalib_unsafe_p "$arg"; then - pic_object= - non_pic_object= - - # Read the .lo file - func_source "$arg" - - 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'" - fi - - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - func_append dlfiles " $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - func_append dlprefiles " $pic_object" - prev= - fi - - # A PIC object. - func_append libobjs " $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - 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" - fi - else - # If the PIC object exists, use it instead. - # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" - func_append non_pic_objects " $non_pic_object" - fi - else - # Only an error if not doing a dry-run. - if $opt_dry_run; then - # Extract subdirectory from the argument. - func_dirname "$arg" "/" "" - xdir="$func_dirname_result" - - func_lo2o "$arg" - pic_object=$xdir$objdir/$func_lo2o_result - non_pic_object=$xdir$func_lo2o_result - func_append libobjs " $pic_object" - func_append non_pic_objects " $non_pic_object" - else - func_fatal_error "\`$arg' is not a valid libtool object" - fi - fi - ;; - - *.$libext) - # An archive. - func_append deplibs " $arg" - func_append old_deplibs " $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - func_append dlfiles " $func_resolve_sysroot_result" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - func_append dlprefiles " $func_resolve_sysroot_result" - prev= - else - func_append deplibs " $func_resolve_sysroot_result" - fi - continue - ;; - - # Some other compiler argument. - *) - # 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" - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - done # argument parsing loop - - test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - func_append compile_command " $arg" - func_append finalize_command " $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - func_basename "$output" - 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\'\` - 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\" - - func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" - func_to_tool_file "$output_objdir/" - tool_output_objdir=$func_to_tool_file_result - # Create the object directory. - func_mkdir_p "$output_objdir" - - # Determine the type of output - case $output in - "") - func_fatal_help "you must specify an output file" - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - specialdeplibs= - - libs= - # 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 - case "$libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append libs " $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if $opt_duplicate_compiler_generated_deps; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; - esac - func_append pre_post_deps " $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - - case $linkmode in - lib) - passes="conv dlpreopen link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - - 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 - ## 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" - fi - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then - # Collect and forward deplibs of preopened libtool libs - for lib in $dlprefiles; do - # Ignore non-libtool-libs - dependency_libs= - func_resolve_sysroot "$lib" - case $lib in - *.la) func_source "$func_resolve_sysroot_result" ;; - esac - - # Collect preopened libtool deplibs, except any this library - # has declared as weak libs - for deplib in $dependency_libs; do - func_basename "$deplib" - deplib_base=$func_basename_result - case " $weak_libs " in - *" $deplib_base "*) ;; - *) func_append deplibs " $deplib" ;; - esac - done - done - libs="$dlprefiles" - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - - for deplib in $libs; do - lib= - found=no - 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 - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" - continue - fi - func_stripname '-l' '' "$deplib" - name=$func_stripname_result - if test "$linkmode" = lib; 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" - fi - 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}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - 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 $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 - case " $predeps $postdeps " in - *" $deplib "*) - if func_lalib_p "$lib"; then - library_names= - old_library= - func_source "$lib" - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - func_dirname "$lib" "" "." - ladir="$func_dirname_result" - lib=$ladir/$old_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 - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then - case "$new_inherited_linker_flags " in - *" $deplib "*) ;; - * ) func_append new_inherited_linker_flags " $deplib" ;; - esac - fi - fi - continue - ;; - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && 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 - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - *) - func_warning "\`-L' is ignored for archives/objects" - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - func_stripname '-R' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - dir=$func_resolve_sysroot_result - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) func_append xrpath " $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) - func_resolve_sysroot "$deplib" - lib=$func_resolve_sysroot_result - ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - # Linking convenience modules into shared libraries is allowed, - # but linking other static libraries is non-portable. - case " $dlpreconveniencelibs " in - *" $deplib "*) ;; - *) - valid_a_lib=no - 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 - fi - ;; - pass_all) - valid_a_lib=yes - ;; - esac - if test "$valid_a_lib" != yes; then - echo - $ECHO "*** Warning: Trying to link with static lib archive $deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because the file extensions .$libext of this argument makes me believe" - echo "*** that it is just a static archive that I should not use here." - 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 - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - func_append newdlprefiles " $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - func_append newdlfiles " $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - 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 - - # 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_dirname "$lib" "" "." - ladir="$func_dirname_result" - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - inherited_linker_flags= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - avoidtemprpath= - - - # Read the .la file - func_source "$lib" - - # Convert "-framework foo" to "foo.ltframework" - if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` - for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do - case " $new_inherited_linker_flags " in - *" $tmp_inherited_linker_flag "*) ;; - *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; - esac - 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 - test -n "$dlopen" && func_append dlfiles " $dlopen" - test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" - fi - - if test "$pass" = conv; 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'" - 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" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" - fi - continue - fi # $pass = conv - - - # 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 - linklib=$old_library - else - for l in $old_library $library_names; do - linklib="$l" - done - fi - if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" - fi - - # 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 -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; 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 - # bomb out in the load deplibs phase. - func_append dlprefiles " $lib $dependency_libs" - else - func_append newdlfiles " $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [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 "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" - fi - ;; - esac - func_basename "$lib" - laname="$func_basename_result" - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else - if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - func_append notinst_path " $abs_ladir" - fi - fi # $installed = yes - func_stripname 'lib' '.la' "$laname" - 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'" - fi - case "$host" in - # special handling for platforms with PE-DLLs. - *cygwin* | *mingw* | *cegcc* ) - # Linker will automatically link against shared library if both - # static and shared are present. Therefore, ensure we extract - # symbols from the import library if a shared library is present - # (otherwise, the dlopen module name will be incorrect). We do - # this by putting the import library name into $newdlprefiles. - # We recover the dlopen module name by 'saving' the la file - # name in a special purpose variable, and (later) extracting the - # dlname from the la file. - if test -n "$dlname"; then - func_tr_sh "$dir/$linklib" - eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" - func_append newdlprefiles " $dir/$linklib" - else - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - fi - ;; - * ) - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - func_append newdlprefiles " $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - func_append dlpreconveniencelibs " $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - func_append newdlprefiles " $dir/$dlname" - else - func_append newdlprefiles " $dir/$linklib" - fi - ;; - esac - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; 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 - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result" - func_append newlib_search_path " $func_resolve_sysroot_result" - ;; - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; 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 - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || - test -z "$old_library"; }; then - # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then - # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in - *"$absdir:"*) ;; - *) func_append temp_rpath "$absdir:" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - 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 - use_static_libs=no - fi - if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then - case $host in - *cygwin* | *mingw* | *cegcc*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" - need_relink=no - ;; - *) - if test "$installed" = no; then - func_append notinst_deplibs " $lib" - need_relink=yes - fi - ;; - esac - # This is a shared library - - # Warn about portability, can't link against -module's on some - # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" - for dlpremoduletest in $dlprefiles; do - if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" - break - fi - done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - echo - if test "$linkmode" = prog; 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 - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) func_append compile_rpath " $absdir" ;; - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - shift - 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" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw* | *cegcc*) - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - func_basename "$soroot" - 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_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_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$opt_mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; - *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not - # link against it, someone is ignoring the earlier warnings - if /usr/bin/file -L $add 2> /dev/null | - $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 - echo - echo "*** And there doesn't seem to be a static archive available" - echo "*** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - elif test -n "$old_library"; then - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-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" - 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" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - func_fatal_configuration "unsupported hardcode properties" - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) func_append compile_shlibpath "$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; 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 - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$opt_mode" = relink; 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 - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) func_append finalize_shlibpath "$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - 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 - [\\/]*) - func_append add_dir " -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; 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" - 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 - # Not a shared library - if test "$deplibs_check_method" != pass_all; 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 "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - echo "*** But as you try to build a module library, libtool will still create " - echo "*** a static module, that should work as long as the dlopening application" - echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) func_stripname '-R' '' "$libdir" - temp_xrpath=$func_stripname_result - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) func_append xrpath " $temp_xrpath";; - esac;; - *) func_append temp_deplibs " $libdir";; - esac - done - 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" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - case $deplib in - -L*) func_stripname '-L' '' "$deplib" - func_resolve_sysroot "$func_stripname_result";; - *) func_resolve_sysroot "$deplib" ;; - esac - if $opt_preserve_dup_deps ; then - case "$tmp_libs " in - *" $func_resolve_sysroot_result "*) - func_append specialdeplibs " $func_resolve_sysroot_result" ;; - esac - fi - func_append tmp_libs " $func_resolve_sysroot_result" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - path= - case $deplib in - -L*) path="$deplib" ;; - *.la) - func_resolve_sysroot "$deplib" - deplib=$func_resolve_sysroot_result - func_dirname "$deplib" "" "." - dir=$func_dirname_result - # We need an absolute path. - case $dir in - [\\/]* | [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" - fi - ;; - esac - if $GREP "^installed=no" $deplib > /dev/null; then - 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 - 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 -z "$darwin_install_name"; then - 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}" - path= - fi - fi - ;; - *) - path="-L$absdir/$objdir" - ;; - esac - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" - test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" - - path="-L$absdir" - fi - ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$path $deplibs" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; 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 - # 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 - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) func_append lib_search_path " $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) func_append tmp_libs " $deplib" ;; - esac - ;; - *) func_append tmp_libs " $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - 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" - fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" - - test -n "$release" && \ - func_warning "\`-release' is ignored for archives" - - test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - func_append objs "$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - func_stripname 'lib' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" - - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - func_stripname '' '.la' "$outputname" - name=$func_stripname_result - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - func_stripname '' '.la' "$outputname" - libname=$func_stripname_result - fi - ;; - 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" - else - echo - $ECHO "*** Warning: Linking the shared library $output against the non-libtool" - $ECHO "*** objects $objs is not portable!" - func_append libobjs " $objs" - fi - fi - - test "$dlself" != no && \ - 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" - - install_libdir="$1" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # 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" - build_libtool_libs=convenience - build_old_libs=yes - fi - - test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" - - test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - shift - IFS="$save_ifs" - - test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - 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 - # - case $version_type in - # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) - func_arith $number_major + $number_minor - current=$func_arith_result - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|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" - lt_irix_increment=no - ;; - *) - func_fatal_configuration "$modename: unknown library version type \`$version_type'" - ;; - esac - ;; - no) - current="$1" - revision="$2" - age="$3" - ;; - esac - - # Check that each of the things are valid numbers. - 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" - ;; - 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" - ;; - 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" - ;; - 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" - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - func_arith $current - $age - major=.$func_arith_result - 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" - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current" - ;; - - irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then - func_arith $current - $age - else - func_arith $current - $age + 1 - fi - major=$func_arith_result - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - func_arith $revision - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - 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" - ;; - - osf) - func_arith $current - $age - major=.$func_arith_result - 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 - func_arith $current - $loop - iface=$func_arith_result - func_arith $loop - 1 - loop=$func_arith_result - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - func_append verstring ":${current}.0" - ;; - - qnx) - major=".$current" - versuffix=".$current" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - func_arith $current - $age - major=$func_arith_result - versuffix="-$major" - ;; - - *) - func_fatal_configuration "unknown library version type \`$version_type'" - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - 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 - major= - versuffix= - 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 - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - - fi - - func_generate_dlsyms "$libname" "$libname" "yes" - func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= - - if test "$opt_mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$ECHO "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext | *.gcno) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - func_append removelist " $p" - ;; - *) ;; - esac - done - test -n "$removelist" && \ - func_show_eval "${RM}r \$removelist" - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - func_append oldlibs " $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - #for path in $notinst_path; do - # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` - # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` - # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` - #done - - if test -n "$xrpath"; then - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - func_replace_sysroot "$libdir" - func_append temp_xrpath " -R$func_replace_sysroot_result" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) func_append dlfiles " $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) func_append dlprefiles " $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - func_append deplibs " System.ltframework" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) - # Do not include libc due to us having libc/libc_r. - ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; - *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) - # Compiler inserts libc in the correct place for threads to work - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - func_append deplibs " -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # 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="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $opt_dry_run || $RM conftest.c - cat > conftest.c </dev/null` - $nocaseglob - else - potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` - fi - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null | - $GREP " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [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="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - 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" - $ECHO "*** using a file magic. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method; shift - match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - for a_deplib in $deplibs; do - case $a_deplib in - -l*) - func_stripname -l '' "$a_deplib" - name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - func_append newdeplibs " $a_deplib" - a_deplib="" - ;; - esac - fi - 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 - if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ - $EGREP "$match_pattern_regex" > /dev/null; then - func_append newdeplibs " $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - echo - $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - echo "*** I have the capability to make that library automatically link in when" - echo "*** you link to this library. But I can only do this if you have a" - echo "*** shared version of the library, which you do not appear to have" - echo "*** because I did check the linker path looking for a file starting" - 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" - $ECHO "*** using a regex pattern. Last file checked: $potlib" - fi - fi - ;; - *) - # Add a -L argument. - func_append newdeplibs " $a_deplib" - ;; - esac - done # Gone through all deplibs. - ;; - none | unknown | *) - 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 - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` - done - fi - case $tmp_deplibs in - *[!\ \ ]*) - echo - if test "X$deplibs_check_method" = "Xnone"; then - echo "*** Warning: inter-library dependencies are not supported in this platform." - else - echo "*** Warning: inter-library dependencies are not known to be supported." - fi - echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - ;; - esac - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - echo - echo "*** Warning: libtool could not satisfy all declared inter-library" - $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - echo "*** a static module, that should work as long as the dlopening" - echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - echo - echo "*** However, this would only work if libtool was able to extract symbol" - echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not find such a program. So, this module is probably useless." - echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - echo "*** The inter-library dependencies that have been dropped here will be" - echo "*** automatically added whenever a program is linked with this library" - echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - echo - echo "*** Since this library must not contain undefined symbols," - echo "*** because either the platform does not support them or" - echo "*** it was explicitly requested with -no-undefined," - echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - case $host in - *-*-darwin*) - newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - deplibs="$new_libs" - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - 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. - # FIXME: should test the right _cmds variable. - case $archive_cmds in - *\$LD\ *) wl= ;; - esac - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append dep_rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - shift - realname="$1" - shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - linknames= - for link - do - func_append linknames " $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` - test "X$libobjs" = "X " && libobjs= - - delfiles= - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" - func_append delfiles " $export_symbols" - fi - - orig_export_symbols= - case $host_os in - 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 - # 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" - 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" - $opt_dry_run || $RM $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd1 in $cmds; do - 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 - *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) - try_normal_branch=yes - eval cmd=\"$cmd1\" - func_len " $cmd" - len=$func_len_result - ;; - *) - try_normal_branch=no - ;; - esac - if test "$try_normal_branch" = yes \ - && { test "$len" -lt "$max_cmd_len" \ - || test "$max_cmd_len" -le -1; } - then - func_show_eval "$cmd" 'exit $?' - skipped_export=false - elif test -n "$nm_file_list_spec"; then - func_basename "$output" - output_la=$func_basename_result - save_libobjs=$libobjs - save_output=$output - output=${output_objdir}/${output_la}.nm - func_to_tool_file "$output" - libobjs=$nm_file_list_spec$func_to_tool_file_result - func_append delfiles " $output" - func_verbose "creating $NM input file list: $output" - for obj in $save_libobjs; do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > "$output" - eval cmd=\"$cmd1\" - func_show_eval "$cmd" 'exit $?' - output=$save_output - libobjs=$save_libobjs - skipped_export=false - else - # The command line is too long to execute in one step. - func_verbose "using reloadable object file for export list..." - skipped_export=: - # Break out early, otherwise skipped_export may be - # set to false by a later but shorter cmd. - break - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then - func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - 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" - $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' - fi - - if test "X$skipped_export" != "X:" && 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" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # '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. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - func_append tmp_deplibs " $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && - test -z "$libobjs"; then - # extract the archives, so we have objects to list. - # TODO: could optimize this to just extract one archive. - whole_archive_flag_spec= - fi - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - else - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - func_append linker_flags " $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; 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 -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && - func_len " $test_cmds" && - len=$func_len_result && - test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise - # or, if using GNU ld and skipped_export is not :, use a linker - # script. - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - func_basename "$output" - output_la=$func_basename_result - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - 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 - func_verbose "creating GNU ld script: $output" - echo 'INPUT (' > $output - for obj in $save_libobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - echo ')' >> $output - func_append delfiles " $output" - func_to_tool_file "$output" - output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk - func_verbose "creating linker input file list: $output" - : > $output - set x $save_libobjs - shift - firstobj= - if test "$compiler_needs_object" = yes; then - firstobj="$1 " - shift - fi - for obj - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" >> $output - done - func_append delfiles " $output" - func_to_tool_file "$output" - output=$firstobj\"$file_list_spec$func_to_tool_file_result\" - else - if test -n "$save_libobjs"; then - func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext - eval test_cmds=\"$reload_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - - # Loop over the list of objects to be linked. - for obj in $save_libobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - if test "X$objlist" = X || - 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 - # The first file doesn't have a previous command to add. - reload_objs=$objlist - eval concat_cmds=\"$reload_cmds\" - else - # All subsequent reloadable object files will link in - # the last one created. - reload_objs="$objlist $last_robj" - eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" - fi - last_robj=$output_objdir/$output_la-${k}.$objext - func_arith $k + 1 - k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext - objlist=" $obj" - func_len " $last_robj" - func_arith $len0 + $func_len_result - len=$func_arith_result - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # 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\" - if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" - fi - func_append delfiles " $output" - - else - output= - fi - - if ${skipped_export-false}; then - 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. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\" - 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='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - 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"' - func_show_eval '$MV "${export_symbols}T" "$export_symbols"' - fi - fi - - if ${skipped_export-false}; then - if test -n "$export_symbols" && test -n "$include_expsyms"; then - tmp_export_symbols="$export_symbols" - test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "$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" - # FIXME: $output_objdir/$libname.filter potentially contains lots of - # '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. - $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - func_append delfiles " $export_symbols $output_objdir/$libname.filter" - export_symbols=$output_objdir/$libname.def - $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols - fi - fi - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - test "X$libobjs" = "X " && libobjs= - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - fi - - if test -n "$delfiles"; then - # Append the command to remove temporary files to $cmds. - eval cmds=\"\$cmds~\$RM $delfiles\" - fi - - # Add any objects from preloaded convenience libraries - if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append libobjs " $func_extract_archives_result" - test "X$libobjs" = "X " && libobjs= - fi - - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $opt_silent || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" - } - $opt_dry_run || eval "$cmd" || { - lt_exit=$? - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - ( cd "$output_objdir" && \ - $RM "${realname}T" && \ - $MV "${realname}U" "$realname" ) - fi - - exit $lt_exit - } - done - IFS="$save_ifs" - - # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then - $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? - - if test -n "$convenience"; then - if test -z "$whole_archive_flag_spec"; then - func_show_eval '${RM}r "$gentop"' - fi - fi - - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?' - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" - fi - - case " $deplibs" in - *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; - esac - - test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" - - test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" - - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" - - test -n "$release" && \ - 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" - - libobj=$output - func_lo2o "$libobj" - obj=$func_lo2o_result - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $opt_dry_run || $RM $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # 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 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'` - else - gentop="$output_objdir/${obj}x" - func_append generated " $gentop" - - func_extract_archives $gentop $convenience - reload_conv_objs="$reload_objs $func_extract_archives_result" - fi - fi - - # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - func_execute_cmds "$reload_cmds" 'exit $?' - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $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 - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - func_execute_cmds "$reload_cmds" 'exit $?' - fi - - if test -n "$gentop"; then - func_show_eval '${RM}r "$gentop"' - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) func_stripname '' '.exe' "$output" - output=$func_stripname_result.exe;; - esac - test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" - - test -n "$release" && \ - 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." - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` - ;; - esac - - case $host in - *-*-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 - 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" - ;; - esac - fi - # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - ;; - esac - - - # move library search paths that coincide with paths to not yet - # installed libraries to the beginning of the library search list - new_libs= - for path in $notinst_path; do - case " $new_libs " in - *" -L$path/$objdir "*) ;; - *) - case " $compile_deplibs " in - *" -L$path/$objdir "*) - func_append new_libs " -L$path/$objdir" ;; - esac - ;; - esac - done - for deplib in $compile_deplibs; do - case $deplib in - -L*) - case " $new_libs " in - *" $deplib "*) ;; - *) func_append new_libs " $deplib" ;; - esac - ;; - *) func_append new_libs " $deplib" ;; - esac - done - compile_deplibs="$new_libs" - - - func_append compile_command " $compile_deplibs" - func_append finalize_command " $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) func_append finalize_rpath " $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) func_append perm_rpath " $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` - case :$dllsearchpath: in - *":$libdir:"*) ;; - ::) dllsearchpath=$libdir;; - *) func_append dllsearchpath ":$libdir";; - esac - case :$dllsearchpath: in - *":$testbindir:"*) ;; - ::) dllsearchpath=$testbindir;; - *) func_append dllsearchpath ":$testbindir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - func_append rpath " $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) func_append finalize_perm_rpath " $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; 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" - - # template prelinking step - if test -n "$prelink_cmds"; then - func_execute_cmds "$prelink_cmds" 'exit $?' - fi - - wrappers_required=yes - case $host in - *cegcc* | *mingw32ce*) - # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no - ;; - *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no - fi - ;; - esac - if test "$wrappers_required" = no; then - # Replace the output file specification. - compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - exit_status=0 - func_show_eval "$link_command" 'exit_status=$?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' - 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" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - func_append rpath "$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - func_append rpath "$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $opt_dry_run || $RM $output - # Link the executable and exit - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - exit $EXIT_SUCCESS - fi - - 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 - - # Replace the output file specification. - link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname - - func_show_eval "$link_command" 'exit $?' - - if test -n "$postlink_cmds"; then - func_to_tool_file "$output_objdir/$outputname" - postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` - func_execute_cmds "$postlink_cmds" 'exit $?' - fi - - # Now create the wrapper script. - func_verbose "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - fi - - # Only actually do things if not in dry run mode. - $opt_dry_run || { - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) func_stripname '' '.exe' "$output" - output=$func_stripname_result ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - func_stripname '' '.exe' "$outputname" - outputname=$func_stripname_result ;; - *) exeext= ;; - esac - case $host in - *cygwin* | *mingw* ) - 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" - $RM $cwrappersource $cwrapper - trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 - - func_emit_cwrapperexe_src > $cwrappersource - - # The wrapper executable is built using the $host compiler, - # because it contains $host paths and files. If cross- - # compiling, it, like the target executable, must be - # executed on the $host or under an emulation environment. - $opt_dry_run || { - $LTCC $LTCFLAGS -o $cwrapper $cwrappersource - $STRIP $cwrapper - } - - # Now, create the wrapper script for func_source use: - func_ltwrapper_scriptname $cwrapper - $RM $func_ltwrapper_scriptname_result - 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 - $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result - else - func_emit_wrapper no > $func_ltwrapper_scriptname_result - fi - } - ;; - * ) - $RM $output - trap "$RM $output; exit $EXIT_FAILURE" 1 2 15 - - func_emit_wrapper no > $output - chmod +x $output - ;; - esac - } - exit $EXIT_SUCCESS - ;; - esac - - # 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" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi - - if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - - func_extract_archives $gentop $addlibs - func_append oldobjs " $func_extract_archives_result" - fi - - # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; 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" - func_append generated " $gentop" - - func_extract_archives $gentop $dlprefiles - func_append oldobjs " $func_extract_archives_result" - fi - - # POSIX demands no paths to be encoded in archives. We have - # to avoid creating archives with duplicate basenames if we - # might have to extract them afterwards, e.g., when creating a - # static archive out of a convenience library, or when linking - # the entirety of a libtool archive into another (currently - # not supported by libtool). - if (for obj in $oldobjs - do - func_basename "$obj" - $ECHO "$func_basename_result" - done | sort | sort -uc >/dev/null 2>&1); then - : - else - echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" - func_append generated " $gentop" - func_mkdir_p "$gentop" - save_oldobjs=$oldobjs - oldobjs= - counter=1 - for obj in $save_oldobjs - do - func_basename "$obj" - objbase="$func_basename_result" - case " $oldobjs " in - " ") oldobjs=$obj ;; - *[\ /]"$objbase "*) - while :; do - # Make sure we don't pick an alternate name that also - # overlaps. - newobj=lt$counter-$objbase - func_arith $counter + 1 - counter=$func_arith_result - case " $oldobjs " in - *[\ /]"$newobj "*) ;; - *) if test ! -f "$gentop/$newobj"; then break; fi ;; - esac - done - func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - func_append oldobjs " $gentop/$newobj" - ;; - *) func_append oldobjs " $obj" ;; - esac - done - fi - func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 - tool_oldlib=$func_to_tool_file_result - eval cmds=\"$old_archive_cmds\" - - func_len " $cmds" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - elif test -n "$archiver_list_spec"; then - func_verbose "using command file archive linking..." - for obj in $oldobjs - do - func_to_tool_file "$obj" - $ECHO "$func_to_tool_file_result" - done > $output_objdir/$libname.libcmd - func_to_tool_file "$output_objdir/$libname.libcmd" - oldobjs=" $archiver_list_spec$func_to_tool_file_result" - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - func_verbose "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - oldobjs= - # Is there a better way of finding the last object in the list? - for obj in $save_oldobjs - do - last_oldobj=$obj - done - eval test_cmds=\"$old_archive_cmds\" - func_len " $test_cmds" - len0=$func_len_result - len=$len0 - for obj in $save_oldobjs - do - func_len " $obj" - func_arith $len + $func_len_result - len=$func_arith_result - func_append objlist " $obj" - if test "$len" -lt "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - 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\" - objlist= - len=$len0 - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - func_execute_cmds "$cmds" 'exit $?' - done - - test -n "$generated" && \ - func_show_eval "${RM}r$generated" - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - func_verbose "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" - 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=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; 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 -z "$install_libdir"; then - break - fi - 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" - func_resolve_sysroot "$deplib" - 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_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" - ;; - -L*) - func_stripname -L '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -L$func_replace_sysroot_result" - ;; - -R*) - func_stripname -R '' "$deplib" - func_replace_sysroot "$func_stripname_result" - func_append newdependency_libs " -R$func_replace_sysroot_result" - ;; - *) func_append newdependency_libs " $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - 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` - test -z "$libdir" && \ - 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" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - *.la) - # Only pass preopened files to the pseudo-archive (for - # eventual linking with the app. that links it) if we - # 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` - test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" - func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" - ;; - esac - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlfiles " $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - func_append newdlprefiles " $abs" - done - dlprefiles="$newdlprefiles" - fi - $RM $output - # place dlname in correct position for cygwin - # In fact, it would be nice if we could use this code for all target - # systems that can't hard-code library paths into their executables - # and that have no shared library path variable independent of PATH, - # but it turns out we can't easily determine that from inspecting - # libtool variables, so we have to hard-code the OSs to which it - # applies here; at the moment, that means platforms that use the PE - # object format with DLL files. See the long comment at the top of - # tests/bindir.at for full details. - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) - # If a -bindir argument was supplied, place the dll there. - if test "x$bindir" != x ; - then - func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname - else - # Otherwise fall back on heuristic. - tdlname=../bin/$dlname - fi - ;; - esac - $ECHO > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Linker flags that can not go in dependency_libs. -inherited_linker_flags='$new_inherited_linker_flags' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Names of additional weak libraries provided by this library -weak_library_names='$weak_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $ECHO >> $output "\ -relink_command=\"$relink_command\"" - fi - done - } - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?' - ;; - esac - exit $EXIT_SUCCESS -} - -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} - - -# func_mode_uninstall arg... -func_mode_uninstall () -{ - $opt_debug - RM="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; - -*) func_append RM " $arg" ;; - *) func_append files " $arg" ;; - esac - done - - test -z "$RM" && \ - func_fatal_help "you must specify an RM program" - - rmdirs= - - for file in $files; do - func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" - else - odir="$dir/$objdir" - fi - func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" - - # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then - case " $rmdirs " in - *" $odir "*) ;; - *) func_append rmdirs " $odir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if { test -L "$file"; } >/dev/null 2>&1 || - { test -h "$file"; } >/dev/null 2>&1 || - test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if func_lalib_p "$file"; then - func_source $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - func_append rmfiles " $odir/$n" - done - test -n "$old_library" && func_append rmfiles " $odir/$old_library" - - case "$opt_mode" in - clean) - case " $library_names " in - *" $dlname "*) ;; - *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; - esac - test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" - ;; - 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' - 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' - fi - # FIXME: should reinstall the best remaining shared library. - ;; - esac - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if func_lalib_p "$file"; then - - # Read the .lo file - func_source $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; 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 - func_append rmfiles " $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$opt_mode" = clean ; then - noexename=$name - case $file in - *.exe) - func_stripname '' '.exe' "$file" - file=$func_stripname_result - func_stripname '' '.exe' "$name" - noexename=$func_stripname_result - # $file with .exe has already been added to rmfiles, - # add $file without .exe - func_append rmfiles " $file" - ;; - esac - # Do a test to see if this is a libtool program. - if func_ltwrapper_p "$file"; then - if func_ltwrapper_executable_p "$file"; then - func_ltwrapper_scriptname "$file" - relink_command= - func_source $func_ltwrapper_scriptname_result - func_append rmfiles " $func_ltwrapper_scriptname_result" - else - relink_command= - func_source $dir/$noexename - fi - - # 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/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - func_show_eval "$RM $rmfiles" 'exit_status=1' - done - - # 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" - fi - done - - exit $exit_status -} - -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} - -test -z "$opt_mode" && { - help="$generic_help" - func_fatal_help "you must specify a MODE" -} - -test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" - -if test -n "$exec_cmd"; then - eval exec "$exec_cmd" - exit $EXIT_FAILURE -fi - -exit $exit_status - - -# The TAGs below are defined such that we never get into a situation -# in which 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 -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# configuration. But we'll never go from static-only to shared-only. - -# ### BEGIN LIBTOOL TAG CONFIG: disable-shared -build_libtool_libs=no -build_old_libs=yes -# ### END LIBTOOL TAG CONFIG: disable-shared - -# ### BEGIN LIBTOOL TAG CONFIG: disable-static -build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: -# vi:sw=2 - diff -Nru epiphany-browser-3.16.3/m4/appstream-xml.m4 epiphany-browser-3.18.0/m4/appstream-xml.m4 --- epiphany-browser-3.16.3/m4/appstream-xml.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/appstream-xml.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,86 @@ +# appstream-xml.m4 +# +# serial 6 + +dnl APPSTREAM_XML +dnl Installs and validates AppData XML files. +dnl +dnl Call APPSTREAM_XML in configure.ac to check for the appstream-util tool. +dnl Add @APPSTREAM_XML_RULES@ to a Makefile.am to substitute the make rules. Add +dnl .appdata.xml files to appstream_XML in Makefile.am and they will be validated +dnl at make check time, if appstream-util is installed, as well as installed +dnl to the correct location automatically. Add --enable-appstream-util to +dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when +dnl doing a distcheck. +dnl +dnl Adding files to appstream_XML does not distribute them automatically. + +AC_DEFUN([APPSTREAM_XML], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE([appstream-util], + [AS_HELP_STRING([--disable-appstream-util], + [Disable validating AppData XML files during check phase])]) + + AS_IF([test "x$enable_appstream_validate" != "xno"], + [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util]) + AS_IF([test "x$APPSTREAM_UTIL" = "x"], + [have_appstream_validate=no], + [have_appstream_validate=yes + AC_SUBST([APPSTREAM_UTIL])])], + [have_appstream_validate=no]) + + AS_IF([test "x$have_appstream_validate" != "xno"], + [appstream_validate=yes], + [appstream_validate=no + AS_IF([test "x$enable_appstream_validate" = "xyes"], + [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])]) + + AC_SUBST([appstreamxmldir], [${datadir}/appdata]) + + APPSTREAM_XML_RULES=' +.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml + +mostlyclean-am: clean-appstream-xml + +%.appdata.valid: %.appdata.xml + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \ + if test -n "$(APPSTREAM_UTIL)"; \ + then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \ + && touch [$]@ + +check-am: $(appstream_XML:.appdata.xml=.appdata.valid) +uninstall-am: uninstall-appstream-xml +install-data-am: install-appstream-xml + +.SECONDARY: $(appstream_XML) + +install-appstream-xml: $(appstream_XML) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \ + fi + +uninstall-appstream-xml: + @$(NORMAL_UNINSTALL) + @list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files + +clean-appstream-xml: + rm -f $(appstream_XML:.appdata.xml=.appdata.valid) +' + _APPSTREAM_XML_SUBST(APPSTREAM_XML_RULES) +]) + +dnl _APPSTREAM_XML_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_APPSTREAM_XML_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) diff -Nru epiphany-browser-3.16.3/m4/ax_append_compile_flags.m4 epiphany-browser-3.18.0/m4/ax_append_compile_flags.m4 --- epiphany-browser-3.16.3/m4/ax_append_compile_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_append_compile_flags.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,65 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the compiler works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. During the check the flag is always added to the +# current language's flags. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with +# AX_APPEND_LINK_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans +# +# 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 . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_APPEND_COMPILE_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3]) +done +])dnl AX_APPEND_COMPILE_FLAGS diff -Nru epiphany-browser-3.16.3/m4/ax_append_flag.m4 epiphany-browser-3.18.0/m4/ax_append_flag.m4 --- epiphany-browser-3.16.3/m4/ax_append_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_append_flag.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# 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 . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_APPEND_FLAG], +[dnl +AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) +AS_VAR_SET_IF(FLAGS,[ + AS_CASE([" AS_VAR_GET(FLAGS) "], + [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], + [ + AS_VAR_APPEND(FLAGS," $1") + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) + ], + [ + AS_VAR_SET(FLAGS,[$1]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG diff -Nru epiphany-browser-3.16.3/m4/ax_check_compile_flag.m4 epiphany-browser-3.18.0/m4/ax_check_compile_flag.m4 --- epiphany-browser-3.16.3/m4/ax_check_compile_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_check_compile_flag.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# 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 . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 4 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff -Nru epiphany-browser-3.16.3/m4/ax_check_enable_debug.m4 epiphany-browser-3.18.0/m4/ax_check_enable_debug.m4 --- epiphany-browser-3.16.3/m4/ax_check_enable_debug.m4 2015-07-09 10:25:18.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_check_enable_debug.m4 2015-09-09 07:43:59.000000000 +0000 @@ -1,48 +1,49 @@ # =========================================================================== -# http://autoconf-archive.cryp.to/ax_check_enable_debug.html +# http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html # =========================================================================== # # SYNOPSIS # -# Check for the presence of an --enable-debug option to configure and -# allow/avoid compiled debugging flags appropriately. -# -# AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], -# [ENABLE DEBUG VARIABLES …], -# [DISABLE DEBUG VARIABLES NDEBUG …]) +# AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], [ENABLE DEBUG VARIABLES ...], [DISABLE DEBUG VARIABLES NDEBUG ...], [IS-RELEASE]) # # DESCRIPTION # -# Check for the presence of an --enable-debug option to configure, with the -# specified default value used when the option is not present. Return the -# value in the variable $ax_enable_debug. -# -# Specifying 'yes' adds '-g -O0' to the compilation flags for all languages. -# Specifying 'info' adds '-g' to the compilation flags. Specifying 'profile' -# adds '-g -pg' to the compilation flags and '-pg' to the linking flags. -# Otherwise, nothing is added. +# Check for the presence of an --enable-debug option to configure, with +# the specified default value used when the option is not present. Return +# the value in the variable $ax_enable_debug. +# +# Specifying 'yes' adds '-g -O0' to the compilation flags for all +# languages. Specifying 'info' adds '-g' to the compilation flags. +# Specifying 'profile' adds '-g -pg' to the compilation flags and '-pg' to +# the linking flags. Otherwise, nothing is added. # # Define the variables listed in the second argument if debug is enabled, # defaulting to no variables. Defines the variables listed in the third # argument if debug is disabled, defaulting to NDEBUG. All lists of # variables should be space-separated. # -# If debug is not enabled, ensure AC_PROG_* will not add debugging flags. +# If debug is not enabled, ensure AC_PROG_* will not add debugging flags. # Should be invoked prior to any AC_PROG_* compiler checks. # -# LAST MODIFICATION +# IS-RELEASE can be used to change the default to 'no' when making a +# release. Set IS-RELEASE to 'yes' or 'no' as appropriate. By default, it +# uses the value of $ax_is_release, so if you are using the AX_IS_RELEASE +# macro, there is no need to pass this parameter. # -# 2014-05-12 +# AX_IS_RELEASE([git-directory]) +# AX_CHECK_ENABLE_DEBUG() # -# COPYLEFT +# LICENSE # # Copyright (c) 2011 Rhys Ulerich -# Copyright © 2014 Philip Withnall +# Copyright (c) 2014, 2015 Philip Withnall # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. +#serial 5 + AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[ AC_BEFORE([$0],[AC_PROG_CC])dnl AC_BEFORE([$0],[AC_PROG_CXX])dnl @@ -51,63 +52,73 @@ AC_MSG_CHECKING(whether to enable debugging) - m4_define(ax_enable_debug_default,[m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))]) + ax_enable_debug_default=m4_tolower(m4_normalize(ifelse([$1],,[no],[$1]))) + ax_enable_debug_is_release=m4_tolower(m4_normalize(ifelse([$4],, + [$ax_is_release], + [$4]))) + + # If this is a release, override the default. + AS_IF([test "$ax_enable_debug_is_release" = "yes"], + [ax_enable_debug_default="no"]) + m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))]) m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))]) AC_ARG_ENABLE(debug, - [AS_HELP_STRING([--enable-debug]@<:@=ax_enable_debug_default@:>@,[compile with debugging; one of yes/info/profile/no])], - [],enable_debug=ax_enable_debug_default) - if test "x$enable_debug" = "xyes" || test "x$enable_debug" = "x"; then - AC_MSG_RESULT(yes) - CFLAGS="${CFLAGS} -g -O0" - CXXFLAGS="${CXXFLAGS} -g -O0" - FFLAGS="${FFLAGS} -g -O0" - FCFLAGS="${FCFLAGS} -g -O0" - OBJCFLAGS="${OBJCFLAGS} -g -O0" - - dnl Define various variables if debugging is enabled. - m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])]) - else - if test "x$enable_debug" = "xinfo"; then - AC_MSG_RESULT(info) - CFLAGS="${CFLAGS} -g" - CXXFLAGS="${CXXFLAGS} -g" - FFLAGS="${FFLAGS} -g" - FCFLAGS="${FCFLAGS} -g" - OBJCFLAGS="${OBJCFLAGS} -g" - elif test "x$enable_debug" = "xprofile"; then - AC_MSG_RESULT(profile) - CFLAGS="${CFLAGS} -g -pg" - CXXFLAGS="${CXXFLAGS} -g -pg" - FFLAGS="${FFLAGS} -g -pg" - FCFLAGS="${FCFLAGS} -g -pg" - OBJCFLAGS="${OBJCFLAGS} -g -pg" - LDFLAGS="${LDFLAGS} -pg" - else - AC_MSG_RESULT(no) - dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags - dnl by setting any unset environment flag variables - if test "x${CFLAGS+set}" != "xset"; then - CFLAGS="" - fi - if test "x${CXXFLAGS+set}" != "xset"; then - CXXFLAGS="" - fi - if test "x${FFLAGS+set}" != "xset"; then - FFLAGS="" - fi - if test "x${FCFLAGS+set}" != "xset"; then - FCFLAGS="" - fi - if test "x${OBJCFLAGS+set}" != "xset"; then - OBJCFLAGS="" - fi - fi - - dnl Define various variables if debugging is disabled. - dnl assert.h is a NOP if NDEBUG is defined, so define it by default. - m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])]) - fi + [AS_HELP_STRING([--enable-debug=]@<:@yes/info/profile/no@:>@,[compile with debugging])], + [],enable_debug=$ax_enable_debug_default) + + # empty mean debug yes + AS_IF([test "x$enable_debug" = "x"], + [enable_debug="yes"]) + + # case of debug + AS_CASE([$enable_debug], + [yes],[ + AC_MSG_RESULT(yes) + CFLAGS="${CFLAGS} -g -O0" + CXXFLAGS="${CXXFLAGS} -g -O0" + FFLAGS="${FFLAGS} -g -O0" + FCFLAGS="${FCFLAGS} -g -O0" + OBJCFLAGS="${OBJCFLAGS} -g -O0" + ], + [info],[ + AC_MSG_RESULT(info) + CFLAGS="${CFLAGS} -g" + CXXFLAGS="${CXXFLAGS} -g" + FFLAGS="${FFLAGS} -g" + FCFLAGS="${FCFLAGS} -g" + OBJCFLAGS="${OBJCFLAGS} -g" + ], + [profile],[ + AC_MSG_RESULT(profile) + CFLAGS="${CFLAGS} -g -pg" + CXXFLAGS="${CXXFLAGS} -g -pg" + FFLAGS="${FFLAGS} -g -pg" + FCFLAGS="${FCFLAGS} -g -pg" + OBJCFLAGS="${OBJCFLAGS} -g -pg" + LDFLAGS="${LDFLAGS} -pg" + ], + [ + AC_MSG_RESULT(no) + dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags + dnl by setting any unset environment flag variables + AS_IF([test "x${CFLAGS+set}" != "xset"], + [CFLAGS=""]) + AS_IF([test "x${CXXFLAGS+set}" != "xset"], + [CXXFLAGS=""]) + AS_IF([test "x${FFLAGS+set}" != "xset"], + [FFLAGS=""]) + AS_IF([test "x${FCFLAGS+set}" != "xset"], + [FCFLAGS=""]) + AS_IF([test "x${OBJCFLAGS+set}" != "xset"], + [OBJCFLAGS=""]) + ]) + + dnl Define various variables if debugging is disabled. + dnl assert.h is a NOP if NDEBUG is defined, so define it by default. + AS_IF([test "x$enable_debug" = "xyes"], + [m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])], + [m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])]) ax_enable_debug=$enable_debug ]) diff -Nru epiphany-browser-3.16.3/m4/ax_code_coverage.m4 epiphany-browser-3.18.0/m4/ax_code_coverage.m4 --- epiphany-browser-3.16.3/m4/ax_code_coverage.m4 2015-07-09 10:25:18.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_code_coverage.m4 2015-09-09 07:43:59.000000000 +0000 @@ -1,3 +1,7 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_code_coverage.html +# =========================================================================== +# # SYNOPSIS # # AX_CODE_COVERAGE() @@ -13,47 +17,87 @@ # corresponds to the value of the --enable-code-coverage option, which # defaults to being disabled. # +# Test also for gcov program and create GCOV variable that could be +# substituted. +# # Note that all optimisation flags in CFLAGS must be disabled when code # coverage is enabled. # # Usage example: +# # configure.ac: -# AX_CODE_COVERAGE +# +# AX_CODE_COVERAGE # # Makefile.am: -# @CODE_COVERAGE_RULES@ -# my_program_LIBS = … $(CODE_COVERAGE_LDFLAGS) … -# my_program_CFLAGS = … $(CODE_COVERAGE_CFLAGS) … -# -# This results in a “check-code-coverage” rule being added to any Makefile.am -# which includes “@CODE_COVERAGE_RULES@” (assuming the module has been -# configured with --enable-code-coverage). Running `make check-code-coverage` -# in that directory will run the module’s test suite (`make check`) and build -# a code coverage report detailing the code which was touched, then print the -# URI for the report. +# +# @CODE_COVERAGE_RULES@ +# my_program_LIBS = ... $(CODE_COVERAGE_LDFLAGS) ... +# my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ... +# +# This results in a "check-code-coverage" rule being added to any +# Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module +# has been configured with --enable-code-coverage). Running `make +# check-code-coverage` in that directory will run the module's test suite +# (`make check`) and build a code coverage report detailing the code which +# was touched, then print the URI for the report. +# +# This code was derived from Makefile.decl in GLib, originally licenced +# under LGPLv2.1+. # # LICENSE # -# Copyright © 2012, 2014 Philip Withnall -# Copyright © 2012 Xan Lopez -# Copyright © 2012 Christian Persch -# Copyright © 2012 Paolo Borelli -# Copyright © 2012 Dan Winship +# Copyright (c) 2012 Philip Withnall +# Copyright (c) 2012 Xan Lopez +# Copyright (c) 2012 Christian Persch +# Copyright (c) 2012 Paolo Borelli +# Copyright (c) 2012 Dan Winship +# Copyright (c) 2015 Bastien ROUCARIES +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or (at +# your option) any later version. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. # -# Derived from Makefile.decl in GLib, originally licenced under LGPLv2.1+. -# This file is licenced under LGPLv2.1+. +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . -#serial 1 +#serial 5 AC_DEFUN([AX_CODE_COVERAGE],[ dnl Check for --enable-code-coverage + AC_REQUIRE([AC_PROG_SED]) + + # allow to override gcov location + AC_ARG_WITH([gcov], + [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov]) + AC_MSG_CHECKING([whether to build with code coverage support]) - AC_ARG_ENABLE([code-coverage], AS_HELP_STRING([--enable-code-coverage], [Whether to enable code coverage support]),, enable_code_coverage=no) + AC_ARG_ENABLE([code-coverage], + AS_HELP_STRING([--enable-code-coverage], + [Whether to enable code coverage support]),, + enable_code_coverage=no) + AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes]) AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage]) AC_MSG_RESULT($enable_code_coverage) AS_IF([ test "$enable_code_coverage" = "yes" ], [ + # check for gcov + AC_CHECK_TOOL([GCOV], + [$_AX_CODE_COVERAGE_GCOV_PROG_WITH], + [:]) + AS_IF([test "X$GCOV" = "X:"], + [AC_MSG_ERROR([gcov is needed to do coverage])]) + AC_SUBST([GCOV]) + dnl Check if gcc is being used AS_IF([ test "$GCC" = "no" ], [ AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage]) @@ -112,8 +156,11 @@ # - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage # reports to be created. (Default: # $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance. +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) # - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance. -# (Default: empty) +# (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) # - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml # instance. (Default: empty) # - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore @@ -126,7 +173,9 @@ CODE_COVERAGE_DIRECTORY ?= $(top_builddir) CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage -CODE_COVERAGE_LCOV_OPTIONS ?= +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) CODE_COVERAGE_GENHTML_OPTIONS ?= CODE_COVERAGE_IGNORE_PATTERN ?= diff -Nru epiphany-browser-3.16.3/m4/ax_compiler_flags_cflags.m4 epiphany-browser-3.18.0/m4/ax_compiler_flags_cflags.m4 --- epiphany-browser-3.16.3/m4/ax_compiler_flags_cflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_compiler_flags_cflags.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,133 @@ +# ============================================================================ +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_cflags.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_CFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the C compiler to VARIABLE, which defaults to +# WARN_CFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the CFLAGS variable for each target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ + AC_REQUIRE([AC_PROG_SED]) + AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + + # Variable names + m4_define(ax_warn_cflags_variable, + [m4_normalize(ifelse([$1],,[WARN_CFLAGS],[$1]))]) + + AC_LANG_PUSH([C]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_cflags variable, and + # Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + # Base flags + AX_APPEND_COMPILE_FLAGS([ dnl + -fno-strict-aliasing dnl + $3 dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_COMPILE_FLAGS([ dnl + -Wall dnl + -Wextra dnl + -Wundef dnl + -Wnested-externs dnl + -Wwrite-strings dnl + -Wpointer-arith dnl + -Wmissing-declarations dnl + -Wmissing-prototypes dnl + -Wstrict-prototypes dnl + -Wredundant-decls dnl + -Wno-unused-parameter dnl + -Wno-missing-field-initializers dnl + -Wdeclaration-after-statement dnl + -Wformat=2 dnl + -Wold-style-definition dnl + -Wcast-align dnl + -Wformat-nonliteral dnl + -Wformat-security dnl + -Wsign-compare dnl + -Wstrict-aliasing dnl + -Wshadow dnl + -Winline dnl + -Wpacked dnl + -Wmissing-format-attribute dnl + -Wmissing-noreturn dnl + -Winit-self dnl + -Wredundant-decls dnl + -Wmissing-include-dirs dnl + -Wunused-but-set-variable dnl + -Warray-bounds dnl + -Wimplicit-function-declaration dnl + -Wreturn-type dnl + -Wswitch-enum dnl + -Wswitch-default dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable) + + AX_APPEND_COMPILE_FLAGS([ dnl + -Wno-suggest-attribute=format dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + ]) + + # In the flags below, when disabling specific flags, always add *both* + # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) + # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, + # which effectively turns that flag back on again as an error. + for flag in $ax_warn_cflags_variable; do + AS_CASE([$flag], + [-Wno-*=*],[], + [-Wno-*],[ + AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], + ax_warn_cflags_variable, + [$ax_compiler_flags_test]) + ]) + done + + AC_LANG_POP([C]) + + # Substitute the variables + AC_SUBST(ax_warn_cflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru epiphany-browser-3.16.3/m4/ax_compiler_flags_gir.m4 epiphany-browser-3.18.0/m4/ax_compiler_flags_gir.m4 --- epiphany-browser-3.16.3/m4/ax_compiler_flags_gir.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_compiler_flags_gir.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the g-ir-scanner (from GObject Introspection) to +# VARIABLE, which defaults to WARN_SCANNERFLAGS. VARIABLE is AC_SUBST-ed +# by this macro, but must be manually added to the SCANNERFLAGS variable +# for each GIR target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_COMPILER_FLAGS_GIR],[ + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + + # Variable names + m4_define(ax_warn_scannerflags_variable, + [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))]) + + # Base flags + AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_FLAG([ dnl + --warn-all dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_scannerflags_variable) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags + AX_APPEND_FLAG([ dnl + --warn-error dnl + ],ax_warn_scannerflags_variable) + ]) + + # Substitute the variables + AC_SUBST(ax_warn_scannerflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru epiphany-browser-3.16.3/m4/ax_compiler_flags_ldflags.m4 epiphany-browser-3.18.0/m4/ax_compiler_flags_ldflags.m4 --- epiphany-browser-3.16.3/m4/ax_compiler_flags_ldflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_compiler_flags_ldflags.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,75 @@ +# ============================================================================= +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the linker to VARIABLE, which defaults to +# WARN_LDFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the LDFLAGS variable for each target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ + AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + + # Variable names + m4_define(ax_warn_ldflags_variable, + [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_ldflags variable, + # and Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + # Base flags + AX_APPEND_COMPILE_FLAGS([ dnl + -Wl,--no-as-needed dnl + $3 dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_COMPILE_FLAGS([$4 $5 $6 $7], + ax_warn_ldflags_variable, + [$ax_compiler_flags_test]) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_COMPILE_FLAGS([ dnl + -Wl,--fatal-warnings dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) + ]) + + # Substitute the variables + AC_SUBST(ax_warn_ldflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru epiphany-browser-3.16.3/m4/ax_compiler_flags.m4 epiphany-browser-3.18.0/m4/ax_compiler_flags.m4 --- epiphany-browser-3.16.3/m4/ax_compiler_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_compiler_flags.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,158 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [IS-RELEASE], [EXTRA-BASE-CFLAGS], [EXTRA-YES-CFLAGS], [UNUSED], [UNUSED], [UNUSED], [EXTRA-BASE-LDFLAGS], [EXTRA-YES-LDFLAGS], [UNUSED], [UNUSED], [UNUSED]) +# +# DESCRIPTION +# +# Check for the presence of an --enable-compile-warnings option to +# configure, defaulting to "error" in normal operation, or "yes" if +# IS-RELEASE is equal to "yes". Return the value in the variable +# $ax_enable_compile_warnings. +# +# Depending on the value of --enable-compile-warnings, different compiler +# warnings are checked to see if they work with the current compiler and, +# if so, are appended to CFLAGS-VARIABLE and LDFLAGS-VARIABLE. This +# allows a consistent set of baseline compiler warnings to be used across +# a code base, irrespective of any warnings enabled locally by individual +# developers. By standardising the warnings used by all developers of a +# project, the project can commit to a zero-warnings policy, using -Werror +# to prevent compilation if new warnings are introduced. This makes +# catching bugs which are flagged by warnings a lot easier. +# +# By providing a consistent --enable-compile-warnings argument across all +# projects using this macro, continuous integration systems can easily be +# configured the same for all projects. Automated systems or build +# systems aimed at beginners may want to pass the --disable-Werror +# argument to unconditionally prevent warnings being fatal. +# +# --enable-compile-warnings can take the values: +# +# * no: Base compiler warnings only; not even -Wall. +# * yes: The above, plus a broad range of useful warnings. +# * error: The above, plus -Werror so that all warnings are fatal. +# Use --disable-Werror to override this and disable fatal +# warnings. +# +# The set of base and enabled flags can be augmented using the +# EXTRA-*-CFLAGS and EXTRA-*-LDFLAGS variables, which are tested and +# appended to the output variable if --enable-compile-warnings is not +# "no". Flags should not be disabled using these arguments, as the entire +# point of AX_COMPILER_FLAGS is to enforce a consistent set of useful +# compiler warnings on code, using warnings which have been chosen for low +# false positive rates. If a compiler emits false positives for a +# warning, a #pragma should be used in the code to disable the warning +# locally. See: +# +# https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas +# +# The EXTRA-* variables should only be used to supply extra warning flags, +# and not general purpose compiler flags, as they are controlled by +# configure options such as --disable-Werror. +# +# IS-RELEASE can be used to disable -Werror when making a release, which +# is useful for those hairy moments when you just want to get the release +# done as quickly as possible. Set it to "yes" to disable -Werror. By +# default, it uses the value of $ax_is_release, so if you are using the +# AX_IS_RELEASE macro, there is no need to pass this parameter. For +# example: +# +# AX_IS_RELEASE([git-directory]) +# AX_COMPILER_FLAGS() +# +# CFLAGS-VARIABLE defaults to WARN_CFLAGS, and LDFLAGS-VARIABLE defaults +# to WARN_LDFLAGS. Both variables are AC_SUBST-ed by this macro, but must +# be manually added to the CFLAGS and LDFLAGS variables for each target in +# the code base. +# +# If C++ language support is enabled with AC_PROG_CXX, which must occur +# before this macro in configure.ac, warning flags for the C++ compiler +# are AC_SUBST-ed as WARN_CXXFLAGS, and must be manually added to the +# CXXFLAGS variables for each target in the code base. EXTRA-*-CFLAGS can +# be used to augment the base and enabled flags. +# +# Warning flags for g-ir-scanner (from GObject Introspection) are +# AC_SUBST-ed as WARN_SCANNERFLAGS. This variable must be manually added +# to the SCANNERFLAGS variable for each GIR target in the code base. If +# extra g-ir-scanner flags need to be enabled, the AX_COMPILER_FLAGS_GIR +# macro must be invoked manually. +# +# AX_COMPILER_FLAGS may add support for other tools in future, in addition +# to the compiler and linker. No extra EXTRA-* variables will be added +# for those tools, and all extra support will still use the single +# --enable-compile-warnings configure option. For finer grained control +# over the flags for individual tools, use AX_COMPILER_FLAGS_CFLAGS, +# AX_COMPILER_FLAGS_LDFLAGS and AX_COMPILER_FLAGS_* for new tools. +# +# The UNUSED variables date from a previous version of this macro, and are +# automatically appended to the preceding non-UNUSED variable. They should +# be left empty in new uses of the macro. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# Copyright (c) 2015 David King +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +# _AX_COMPILER_FLAGS_LANG([LANGNAME]) +m4_defun([_AX_COMPILER_FLAGS_LANG], +[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [], + [m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl + AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl +]) + +AC_DEFUN([AX_COMPILER_FLAGS],[ + # C support is enabled by default. + _AX_COMPILER_FLAGS_LANG([C]) + # Only enable C++ support if AC_PROG_CXX is called. The redefinition of + # AC_PROG_CXX is so that a fatal error is emitted if this macro is called + # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be + # checked. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AX_COMPILER_FLAGS_LANG([CXX])], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AX_COMPILER_FLAGS_LANG([CXX])])]) + AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_LDFLAGS]) + + # Default value for IS-RELEASE is $ax_is_release + ax_compiler_flags_is_release=m4_tolower(m4_normalize(ifelse([$3],, + [$ax_is_release], + [$3]))) + + AC_ARG_ENABLE([compile-warnings], + AS_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@], + [Enable compiler warnings and errors]),, + [AS_IF([test "$ax_compiler_flags_is_release" = "yes"], + [enable_compile_warnings="yes"], + [enable_compile_warnings="error"])]) + AC_ARG_ENABLE([Werror], + AS_HELP_STRING([--disable-Werror], + [Unconditionally make all compiler warnings non-fatal]),, + [enable_Werror=maybe]) + + # Return the user's chosen warning level + AS_IF([test "$enable_Werror" = "no" -a \ + "$enable_compile_warnings" = "error"],[ + enable_compile_warnings="yes" + ]) + + ax_enable_compile_warnings=$enable_compile_warnings + + AX_COMPILER_FLAGS_CFLAGS([$1],[$ax_compiler_flags_is_release], + [$4],[$5 $6 $7 $8]) + m4_ifdef([_AX_COMPILER_FLAGS_LANG_CXX_enabled], + [AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS], + [$ax_compiler_flags_is_release], + [$4],[$5 $6 $7 $8])]) + AX_COMPILER_FLAGS_LDFLAGS([$2],[$ax_compiler_flags_is_release], + [$9],[$10 $11 $12 $13]) + AX_COMPILER_FLAGS_GIR([WARN_SCANNERFLAGS],[$ax_compiler_flags_is_release]) +])dnl AX_COMPILER_FLAGS diff -Nru epiphany-browser-3.16.3/m4/ax_is_release.m4 epiphany-browser-3.18.0/m4/ax_is_release.m4 --- epiphany-browser-3.16.3/m4/ax_is_release.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_is_release.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_is_release.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_IS_RELEASE(POLICY) +# +# DESCRIPTION +# +# Determine whether the code is being configured as a release, or from +# git. Set the ax_is_release variable to 'yes' or 'no'. +# +# If building a release version, it is recommended that the configure +# script disable compiler errors and debug features, by conditionalising +# them on the ax_is_release variable. If building from git, these +# features should be enabled. +# +# The POLICY parameter specifies how ax_is_release is determined. It can +# take the following values: +# +# * git-directory: ax_is_release will be 'no' if a '.git' directory exists +# * minor-version: ax_is_release will be 'no' if the minor version number +# in $PACKAGE_VERSION is odd; this assumes +# $PACKAGE_VERSION follows the 'major.minor.micro' scheme +# * micro-version: ax_is_release will be 'no' if the micro version number +# in $PACKAGE_VERSION is odd; this assumes +# $PACKAGE_VERSION follows the 'major.minor.micro' scheme +# * always: ax_is_release will always be 'yes' +# * never: ax_is_release will always be 'no' +# +# Other policies may be added in future. +# +# LICENSE +# +# Copyright (c) 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +#serial 3 + +AC_DEFUN([AX_IS_RELEASE],[ + AC_BEFORE([AC_INIT],[$0]) + + m4_case([$1], + [git-directory],[ + # $is_release = (.git directory does not exist) + AS_IF([test -d .git],[ax_is_release=no],[ax_is_release=yes]) + ], + [minor-version],[ + # $is_release = ($minor_version is even) + minor_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + AS_IF([test "$(( $minor_version % 2 ))" -ne 0], + [ax_is_release=no],[ax_is_release=yes]) + ], + [micro-version],[ + # $is_release = ($micro_version is even) + micro_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]]*\.[[^.]]*\.\([[^.]]*\).*/\1/'` + AS_IF([test "$(( $micro_version % 2 ))" -ne 0], + [ax_is_release=no],[ax_is_release=yes]) + ], + [always],[ax_is_release=yes], + [never],[ax_is_release=no], + [ + AC_MSG_ERROR([Invalid policy. Valid policies: git-directory, minor-version.]) + ]) +]) diff -Nru epiphany-browser-3.16.3/m4/ax_require_defined.m4 epiphany-browser-3.18.0/m4/ax_require_defined.m4 --- epiphany-browser-3.16.3/m4/ax_require_defined.m4 1970-01-01 00:00:00.000000000 +0000 +++ epiphany-browser-3.18.0/m4/ax_require_defined.m4 2015-09-09 07:43:59.000000000 +0000 @@ -0,0 +1,37 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED diff -Nru epiphany-browser-3.16.3/MAINTAINERS epiphany-browser-3.18.0/MAINTAINERS --- epiphany-browser-3.16.3/MAINTAINERS 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/MAINTAINERS 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -Xan López -Email: xan@gnome.org -Userid: xan diff -Nru epiphany-browser-3.16.3/Makefile.am epiphany-browser-3.18.0/Makefile.am --- epiphany-browser-3.16.3/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -4,22 +4,10 @@ SUBDIRS += tests endif -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -NULL = - -EXTRA_DIST = \ - autogen.sh \ - COPYING.README \ - HACKING \ - MAINTAINERS \ - ChangeLog \ - $(NULL) - DISTCHECK_CONFIGURE_FLAGS = \ --enable-debug -@GNOME_CODE_COVERAGE_RULES@ +@CODE_COVERAGE_RULES@ # Ignore gtk theme cache files on distcheck distuninstallcheck_listfiles = find . -type f -print | grep -v 'icon-theme.cache' @@ -27,7 +15,7 @@ # Build ChangeLog from git history ChangeLog: @if test -f $(top_srcdir)/.git/HEAD; then \ - git log --stat > $@; \ + git log --no-decorate --stat > $@; \ fi dist: ChangeLog diff -Nru epiphany-browser-3.16.3/Makefile.in epiphany-browser-3.18.0/Makefile.in --- epiphany-browser-3.16.3/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,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,14 +89,19 @@ host_triplet = @host@ @ENABLE_TESTS_TRUE@am__append_1 = tests subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in AUTHORS COPYING ChangeLog NEWS README \ - TODO compile config.guess config.sub depcomp install-sh \ - missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -95,6 +110,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 @@ -158,6 +175,16 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = help lib embed src data po doc tests +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing AUTHORS COPYING ChangeLog NEWS \ + README TODO build-aux/compile build-aux/config.guess \ + build-aux/config.sub build-aux/depcomp build-aux/install-sh \ + build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -203,13 +230,12 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -224,7 +250,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -233,17 +258,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -253,8 +275,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -278,9 +298,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -301,11 +319,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -314,6 +328,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -332,6 +348,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -367,6 +384,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -376,16 +394,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = help lib embed src data po doc $(am__append_1) -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -NULL = -EXTRA_DIST = \ - autogen.sh \ - COPYING.README \ - HACKING \ - MAINTAINERS \ - ChangeLog \ - $(NULL) - DISTCHECK_CONFIGURE_FLAGS = \ --enable-debug @@ -416,7 +424,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*) \ @@ -646,15 +653,15 @@ $(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 $(am__post_remove_distdir) @@ -690,17 +697,17 @@ 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 \ @@ -878,13 +885,15 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + -@GNOME_CODE_COVERAGE_RULES@ +@CODE_COVERAGE_RULES@ # Build ChangeLog from git history ChangeLog: @if test -f $(top_srcdir)/.git/HEAD; then \ - git log --stat > $@; \ + git log --no-decorate --stat > $@; \ fi dist: ChangeLog diff -Nru epiphany-browser-3.16.3/missing epiphany-browser-3.18.0/missing --- epiphany-browser-3.16.3/missing 2015-06-17 08:20:04.000000000 +0000 +++ epiphany-browser-3.18.0/missing 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -#! /bin/sh -# Common wrapper for a few potentially missing GNU programs. - -scriptversion=2013-10-28.13; # UTC - -# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Originally written by Fran,cois Pinard , 1996. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try '$0 --help' for more information" - exit 1 -fi - -case $1 in - - --is-lightweight) - # Used by our autoconf macros to check whether the available missing - # script is modern enough. - exit 0 - ;; - - --run) - # Back-compat with the calling convention used by older automake. - shift - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due -to PROGRAM being missing or too old. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - -Supported PROGRAM values: - aclocal autoconf autoheader autom4te automake makeinfo - bison yacc flex lex help2man - -Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and -'g' are ignored when checking the name. - -Send bug reports to ." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: unknown '$1' option" - echo 1>&2 "Try '$0 --help' for more information" - exit 1 - ;; - -esac - -# Run the given program, remember its exit status. -"$@"; st=$? - -# If it succeeded, we are done. -test $st -eq 0 && exit 0 - -# Also exit now if we it failed (or wasn't found), and '--version' was -# passed; such an option is passed most likely to detect whether the -# program is present and works. -case $2 in --version|--help) exit $st;; esac - -# Exit code 63 means version mismatch. This often happens when the user -# tries to use an ancient version of a tool on a file that requires a -# minimum version. -if test $st -eq 63; then - msg="probably too old" -elif test $st -eq 127; then - # Program was missing. - msg="missing on your system" -else - # Program was found and executed, but failed. Give up. - exit $st -fi - -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software - -program_details () -{ - case $1 in - aclocal|automake) - echo "The '$1' program is part of the GNU Automake package:" - echo "<$gnu_software_URL/automake>" - echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/autoconf>" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - autoconf|autom4te|autoheader) - echo "The '$1' program is part of the GNU Autoconf package:" - echo "<$gnu_software_URL/autoconf/>" - echo "It also requires GNU m4 and Perl in order to run:" - echo "<$gnu_software_URL/m4/>" - echo "<$perl_URL>" - ;; - esac -} - -give_advice () -{ - # Normalize program name to check for. - normalized_program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - - printf '%s\n' "'$1' is $msg." - - configure_deps="'configure.ac' or m4 files included by 'configure.ac'" - case $normalized_program in - autoconf*) - echo "You should only need it if you modified 'configure.ac'," - echo "or m4 files included by it." - program_details 'autoconf' - ;; - autoheader*) - echo "You should only need it if you modified 'acconfig.h' or" - echo "$configure_deps." - program_details 'autoheader' - ;; - automake*) - echo "You should only need it if you modified 'Makefile.am' or" - echo "$configure_deps." - program_details 'automake' - ;; - aclocal*) - echo "You should only need it if you modified 'acinclude.m4' or" - echo "$configure_deps." - program_details 'aclocal' - ;; - autom4te*) - echo "You might have modified some maintainer files that require" - echo "the 'autom4te' program to be rebuilt." - program_details 'autom4te' - ;; - bison*|yacc*) - echo "You should only need it if you modified a '.y' file." - echo "You may want to install the GNU Bison package:" - echo "<$gnu_software_URL/bison/>" - ;; - lex*|flex*) - echo "You should only need it if you modified a '.l' file." - echo "You may want to install the Fast Lexical Analyzer package:" - echo "<$flex_URL>" - ;; - help2man*) - echo "You should only need it if you modified a dependency" \ - "of a man page." - echo "You may want to install the GNU Help2man package:" - echo "<$gnu_software_URL/help2man/>" - ;; - makeinfo*) - echo "You should only need it if you modified a '.texi' file, or" - echo "any other file indirectly affecting the aspect of the manual." - echo "You might want to install the Texinfo package:" - echo "<$gnu_software_URL/texinfo/>" - echo "The spurious makeinfo call might also be the consequence of" - echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" - echo "want to install GNU make:" - echo "<$gnu_software_URL/make/>" - ;; - *) - echo "You might have modified some files without having the proper" - echo "tools for further handling them. Check the 'README' file, it" - echo "often tells you about the needed prerequisites for installing" - echo "this package. You may also peek at any GNU archive site, in" - echo "case some other package contains this missing '$1' program." - ;; - esac -} - -give_advice "$1" | sed -e '1s/^/WARNING: /' \ - -e '2,$s/^/ /' >&2 - -# Propagate the correct exit status (expected to be 127 for a program -# not found, 63 for a program that failed due to version mismatch). -exit $st - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru epiphany-browser-3.16.3/NEWS epiphany-browser-3.18.0/NEWS --- epiphany-browser-3.16.3/NEWS 2015-07-09 13:36:54.000000000 +0000 +++ epiphany-browser-3.18.0/NEWS 2015-09-22 07:53:02.000000000 +0000 @@ -1,16 +1,48 @@ =============== -Epiphany 3.16.3 +Epiphany 3.18.0 =============== - - Web applications fixes. - - Fix translations in the search provider. - - Crashers fixed (#747422, #751858) + - Allow opening links in a new incognito window. + - Add option to search selected text in user-preferred search engine. + - Display page titles in tabs tooltips. + - Enable Do Not Track and the ad blocker by default. + - Improvements to the form filler and password saving. + - Many other UI improvements, bug fixes, and memory improvements. + - Updated help and translations. + +================ +Epiphany 3.17.91 +================ + + - Remember passwords for French tax office (#750024) + - Inhibit logout and suspend while downloading files (#339809) + - Display decoded URIs in the UI (#710004) + - Enable Do Not Track and the ad blocker by default (#754273) + - Several code fixes, memory leaks plugged, UI and code improvements. + - Updated translations. + +=============== +Epiphany 3.17.2 +=============== + + - Navigation improvements to web applications. + - Do not leak data in private instances (#751307) + - Fix a critical crasher (#747422) + - Theming fixes for latest Adwaita (#736363) + - Display page titles in tabs tooltips (#752606) + - Code fixes, build system improvements. + - Updated translations. =============== -Epiphany 3.16.2 +Epiphany 3.17.1 =============== + - Allow opening links in a new incognito window (#749454) + - Add option to search selected text in user-preferred search + engine (#663545) + - Theme fixes and improvements (#728874, #746778) - Fix regressions in the form filler (#750842) + - Fixes to internationalization in search provider (#737085) - Other code fixes and minor improvements. - Updated translations. diff -Nru epiphany-browser-3.16.3/po/ar.po epiphany-browser-3.18.0/po/ar.po --- epiphany-browser-3.16.3/po/ar.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/ar.po 2015-09-15 09:09:42.000000000 +0000 @@ -11,10 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: epiphany.HEAD.ar\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=epiphany\n" -"POT-Creation-Date: 2015-04-12 19:56+0200\n" -"PO-Revision-Date: 2015-04-12 19:56+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-14 21:14+0200\n" +"PO-Revision-Date: 2015-09-14 21:19+0200\n" "Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \n" "Language: ar\n" @@ -54,15 +53,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/؟q=%s&t=epiphany&kl=xa-ar" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "إبِفَني" +msgid "GNOME Web" +msgstr "وِب جنوم" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -72,34 +71,39 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"متصفح وب سطح مكتب جنوم، و يتميز بتكامله مع سطح المكتب و واجهة استخدام بديهية " -"تمكنك من التركيز على الصفحات التي تتصفحها." +"متصفح وب جنوم، و يتميز بتكامله مع سطح المكتب و واجهة استخدام بديهية تمكنك من " +"التركيز على الصفحات التي تتصفحها." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "أحيانا ما يشار لمتصفح وب جنوم باسمه، إبفني (Epiphany)." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "الوب" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "متصفّح وب" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "متصفّح الوِب إبِفَني" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "تصفح الوِب" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "وب;متصفح;إنترنت;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "نافذة تصفح خاص جديدة" @@ -214,18 +218,17 @@ msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "نسق شريط الأدوات" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"نسق شريط الأدوات. القيم المسموحة هي \"\" (استعمل نسق جنوم المبدئي), \"both" -"\" (أيقونة و كتابة), \"both-horiz\" (الكتابة بجانب الأيقونة), \"icons\", و " -"\"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -516,19 +519,19 @@ msgid "Installed on:" msgstr "ثُبّت في:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "احذف من المنظور العام" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "الأكثر زيارة" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "احذف من المنظور العام" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "التصفح الخاص" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -537,12 +540,12 @@ "تتصفح الآن خفية. الصفحات التي تشاهدها لن تظهر في تأريخ التصفح و كل " "البيانات المحفوظة ستُمحى عندما تُغلق النافذة. الملفات التي تنزلها ستبقى." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "وضع التخفي يخفي نشاطك فقط عن من يستخدمون هذا الحاسوب." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -557,17 +560,17 @@ msgid "Blank page" msgstr "صفحة فارغة" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "اضغط %s لمغادرة ملء الشاشة" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -920,92 +923,92 @@ msgid "Find next occurrence of the search string" msgstr "ابحث عن التواجد التالي للعبارة" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "ا_حفظ" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_لا تحفظ" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "ا_حفظ" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "هل تريد حفظ كلمة سر ”%s“؟" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "ارفض" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "اسمح" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "تريد الصفحة في %s معرفة مكانك." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "تريد الصفحة في %s عرض تنبيها سطح مكتب." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "يُحمل ”%s“…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "يُحمل…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "أظهر هذا الموقع شهادة تنتمي لموقع آخر." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." msgstr "شهادة هذا الموقع أقدم من أن يوثق بها. راجع التاريخ على تقويم حاسوبك." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "لم تصدر شهادة هذا الموقع من مؤسسة يوثق بها." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "تعذّر معالجة شهادة هذا الموقع. قد تكون تالفة." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." msgstr "فسخت شهادة هذا الموقع المنظمة التي أصدرتها." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "لا يمكن الوثوق في شهادة هذا الموقع لأنها تستخدم تعمية ضعيفة جدًا." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1013,13 +1016,13 @@ "شهادة هذا الموقع سليمة فقط في تواريخ مستقبلية. راجع التاريخ على تقويم حاسوبك." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "قد لا يكون هذا %s الحقيقي." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1029,7 +1032,7 @@ "لغرض خبيث. هناك مشكلة في شهادة هذا الموقع:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1039,27 +1042,27 @@ "هذا الموقع لا يستخدم شهادة موثوقة." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "لن تطلب منك هذا البنوك الحقيقية و المتاجر والمواقع العامة الأخرى." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "غير محدّد" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "مشكلة في تحميل ”%s“" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "تعذّر إظهار هذا الموقع." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:

قد يكون الموقع أُغلق مؤقتًا أو انتقل إلى عنوان جديد. قد ترغب في " "التأكد من أنّ اتصال الإنترنت يعمل جيدا.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "أعِد المحاولة" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "نأسف، ربما حدثت مشكلة." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1090,20 +1093,20 @@ "أعدت تحميل هذه الصفحة. إذا حدث هذا فأبلغ مطوري %s عن هذه " "المشكلة.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "أعِد التحميل مع هذا" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "مشكلة في عرض ”%s“" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "عُطل!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1112,21 +1115,21 @@ "أخرى لمواصلة تصفُّحِك." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "احترس!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "حمِّل مع هذا" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_موافق" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1182,7 +1185,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "كلمة سر %s في استمارة على %s" @@ -1190,7 +1193,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "كلمة سر في استمارة على %s" @@ -1417,7 +1420,7 @@ msgid "_View Certificate…" msgstr "ا_عرض الشهادة…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1428,7 +1431,7 @@ msgstr[4] "بقيت %d ثانية" msgstr[5] "بقيت %d ثانية" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1439,7 +1442,7 @@ msgstr[4] "بقي %d دقيقة" msgstr[5] "بقي %d دقيقة" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1450,7 +1453,7 @@ msgstr[4] "بقي %d ساعة" msgstr[5] "بقي %d ساعة" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1461,7 +1464,7 @@ msgstr[4] "بقيت %d ثانية" msgstr[5] "بقيت %d ثانية" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1472,7 +1475,7 @@ msgstr[4] "بقيت %d ثانية" msgstr[5] "بقيت %d ثانية" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1483,29 +1486,29 @@ msgstr[4] "بقيت %d ثانية" msgstr[5] "بقيت %d ثانية" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "تم" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "عطل أثناء التنزيل: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "ألغِ" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "افتح" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "أظهر في المجلد" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "يبدأ…" @@ -1513,20 +1516,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "ا_مسح" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "تر_اجع" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "أ_عد" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "انقر و انقل هذه الأيقونة لإنشاء وصلة إلى هذه الصفحة" @@ -1552,23 +1555,23 @@ msgid "“%s” Properties" msgstr "خصائص ”%s“" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "ال_تسمية:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "ال_عنوان:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "الموا_ضيع:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "اعرض _كل المواضيع" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1664,7 +1667,7 @@ msgstr "أنشئ موضوعا جديدا" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "افتح في _نافذة جديدة" @@ -1679,7 +1682,7 @@ msgstr "افتح العلامة المختارة في نافذة جديدة" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "افتح في لسان _جديد" @@ -1743,7 +1746,7 @@ msgstr "قص التحديد" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "ا_نسخ" @@ -1804,7 +1807,7 @@ msgstr "أظهر عمود تسمية الصفحة" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "العنوان" @@ -1898,7 +1901,7 @@ msgstr "صدّر العلامات" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "العلامات" @@ -1924,15 +1927,15 @@ msgid "File" msgstr "ملف" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "ا_نسخ العنوان" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "المواضيع" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "الاسم" @@ -1992,8 +1995,7 @@ "removed forever." msgstr "لا يمكن الاسترجاع بعد هذه العملية. ستمحى البيانات التي تختارها نهائيا." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "الكعكات" @@ -2324,11 +2326,11 @@ msgid "Other encodings" msgstr "ترميزات أخرى" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "أأمسح تأريخ التصفح؟" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2403,11 +2405,11 @@ "فشل بدأ التشغيل للخطأ التالي:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "خيارات الوب" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "أغلق اللسان" @@ -2544,142 +2546,151 @@ msgstr "افتح الوصلة في _لسان جديد" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "افتح الوصلة في نافذة تصفح _خاص جديدة" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "ا_حفظ الوصلة ك‍…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "ا_نسخ عنوان الوصلة" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "ا_نسخ عنوان البريد الإلكتروني" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "اعرض ال_صورة في لسان جديد" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "انسخ عنوان ال_صورة" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "ا_حفظ الصورة ك‍…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "اجعلها ال_خلفية" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "افتح في الڤديو في _نافذة جديدة" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "افتح الڤديو في لسان _جديد" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "ا_حفظ الڤديو ك‍…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "ا_نسخ عنوان الڤديو" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "افتح في الصوت في _نافذة جديدة" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "افتح في الصوت لسان _جديد" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "ا_حفظ الصوت ك‍…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "ا_نسخ عنوان الصوت" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "هناك تغييرات في عناصر النموذج غير مرسلة" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "ستخسر تلك المعلومات إذا أغلقت المستند." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "أغلق ال_مستند" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "هناك تنزيلات لم تكتمل في هذه النافذة" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "إذا أغلقت هذه النافذة فستُلغى كل التنزيلات" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "أغلق النافذة وألغِ التنزيلات" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "احفظ ك‍" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "احفظ كتطبيق" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "اطبع" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "علامة" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "ابحث" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "أكبر" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "أصغر" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "للخلف" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "للأمام" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "قرّب" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "_لسان جديد" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "اذهب إلى الأكثر زيارة" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "ابحث في الوِب عن '%s'" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "احفظ الوصلة ك‍" @@ -2804,19 +2815,19 @@ msgid "C_reate" msgstr "أن_شئ" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "اتصل بنا على:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "المساهمون:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "المطورون السابقون:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2833,7 +2844,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "فريق عربآيز للترجمة http://www.arabeyes.org:\n" @@ -2843,15 +2854,15 @@ "خالد حسني\t\n" "عبد الرحيم الفاخوري " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "موقع متصفح وِب جنوم" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "أأفعّل وضع التصفح بالمؤشر؟" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2860,10 +2871,25 @@ "ضغط F7 يفعل أو يعطل وضع التصفح بالمؤشر. تضع هذه الخاصية مؤشرا متحركا في " "صفحات الوب يتيح لك التحرك بلوحة المفاتيح. أتريد تفعيل التصفح بالمؤشر؟" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_فعّل" +#~ msgid "Epiphany" +#~ msgstr "إبِفَني" + +#~ msgid "Toolbar style" +#~ msgstr "نسق شريط الأدوات" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "نسق شريط الأدوات. القيم المسموحة هي \"\" (استعمل نسق جنوم المبدئي), \"both" +#~ "\" (أيقونة و كتابة), \"both-horiz\" (الكتابة بجانب الأيقونة), \"icons\", " +#~ "و \"text\"." + #~ msgid "Show toolbars by default" #~ msgstr "أظهر أشرطة الأدوات مبدئيا" @@ -3450,9 +3476,6 @@ #~ msgid "Go" #~ msgstr "اذهب" -#~ msgid "GNOME Web Browser" -#~ msgstr "متصفّح وِب جنوم" - #~ msgid "GNOME Web Browser options" #~ msgstr "خيارات متصفّح وِب جنوم" diff -Nru epiphany-browser-3.16.3/po/cs.po epiphany-browser-3.18.0/po/cs.po --- epiphany-browser-3.16.3/po/cs.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/cs.po 2015-09-21 08:20:22.000000000 +0000 @@ -17,16 +17,16 @@ "Project-Id-Version: epiphany\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-04 04:39+0000\n" -"PO-Revision-Date: 2015-02-09 00:07+0100\n" -"Last-Translator: Marek Černocký \n" +"POT-Creation-Date: 2015-09-13 15:47+0000\n" +"PO-Revision-Date: 2015-09-13 19:54+0200\n" +"Last-Translator: František Zatloukal \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Poedit 1.8.4\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -56,15 +56,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=cz-cs&kad=cs_CZ" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "WWW GNOME" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -72,37 +72,43 @@ #: ../data/epiphany.appdata.xml.in.h:3 msgid "" -"The web browser for GNOME, featuring tight integration with the desktop and " -"a simple and intuitive user interface that allows you to focus on your web " -"pages." -msgstr "" -"Webový prohlížeč pro pracovní prostředí GNOME, který je s ním těsně " -"integrován a má jednoduché a intuitivní uživatelské rozhraní, díky němuž se " -"můžete soustředit jen na své webové stránky." - -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 -#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +"The web browser for GNOME, featuring tight integration with the desktop and a " +"simple and intuitive user interface that allows you to focus on your web pages. " +"If you’re looking for a simple, clean, beautiful view of the web, this is the " +"browser for you." +msgstr "" +"Webový prohlížeč pro pracovní prostředí GNOME, který je s ním těsně integrován a " +"má jednoduché a intuitivní uživatelské rozhraní, díky němuž se můžete soustředit " +"jen na své webové stránky. Jestliže hledáte jednoduché, čisté a krásné zobrazení " +"webů, je tohle prohlížeč pro vás. " + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "Pro WWW GNOME je často používán kódový název, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 ../src/ephy-main.c:312 +#: ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "WWW" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Prohlížeč WWW" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Prohlížeč WWW Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Prohlížet WWW" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;www;prohlížeč;internet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nové anonymní okno" @@ -139,8 +145,8 @@ "String that will be used as user agent, to identify the browser to the web " "servers." msgstr "" -"Řetězec použitý jako uživatelský agent, říkající stránkám, o jaký prohlížeč " -"se jedná." +"Řetězec použitý jako uživatelský agent, říkající stránkám, o jaký prohlížeč se " +"jedná." #: ../data/org.gnome.epiphany.gschema.xml.h:15 msgid "Automatic downloads" @@ -148,11 +154,11 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:16 msgid "" -"When files cannot be opened by the browser they are automatically downloaded " -"to the download folder and opened with the appropriate application." +"When files cannot be opened by the browser they are automatically downloaded to " +"the download folder and opened with the appropriate application." msgstr "" -"Soubory, které nemohou být otevřeny v prohlížeči, budou automaticky staženy " -"do složky pro stahování a otevřeny příslušnou aplikací." +"Soubory, které nemohou být otevřeny v prohlížeči, budou automaticky staženy do " +"složky pro stahování a otevřeny příslušnou aplikací." #: ../data/org.gnome.epiphany.gschema.xml.h:17 msgid "Force new windows to be opened in tabs" @@ -196,26 +202,24 @@ "'crashed' (the session is only restored if the application crashes) and " "'never' (the homepage is always shown)." msgstr "" -"Udává, kdy se má při spuštění obnovovat předchozí sezení. Povolené hodnoty " -"jsou „always“ (předchozí stav je vždy obnoven), „crashed“ (sezení je " -"obnoveno pouze po pádu aplikace) a „never“ (vždy se zobrazí domovská " -"stránka)." +"Udává, kdy se má při spuštění obnovovat předchozí sezení. Povolené hodnoty jsou " +"„always“ (předchozí stav je vždy obnoven), „crashed“ (sezení je obnoveno pouze " +"po pádu aplikace) a „never“ (vždy se zobrazí domovská stránka)." #: ../data/org.gnome.epiphany.gschema.xml.h:26 msgid "" "Whether to delay loading of tabs that are not immediately visible on session " "restore" msgstr "" -"Zdali odkládat načítání karet, které nejsou po obnovení sezení ihned " -"viditelné" +"Zdali odkládat načítání karet, které nejsou po obnovení sezení ihned viditelné" #: ../data/org.gnome.epiphany.gschema.xml.h:27 msgid "" "When this option is set to true, tabs will not start loading until the user " "switches to them, upon session restore." msgstr "" -"Pokud je tato hodnota pravdivá, karty se po obnovení sezení nezačnou " -"načítat, dokud se na ně uživatel nepřepne." +"Pokud je tato hodnota pravdivá, karty se po obnovení sezení nezačnou načítat, " +"dokud se na ně uživatel nepřepne." #: ../data/org.gnome.epiphany.gschema.xml.h:28 msgid "Process model" @@ -223,28 +227,31 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:29 msgid "" -"This option allows to set the process model used. Use 'shared-secondary-" -"process' to use a single web process shared by all the tabs and 'one-" -"secondary-process-per-web-view' to use a different web process for each tab." -msgstr "" -"Tato volba umožňuje nastavit použitý model zpracování. Zadejte „shared-" -"secondary-process“ pro použití jednoho webového procesu sdíleného všemi " -"kartami nebo „one-secondary-process-per-web-view“ pro použití různých " -"procesů pro každou kartu." +"This option allows to set the process model used. Use 'shared-secondary-process' " +"to use a single web process shared by all the tabs and 'one-secondary-process-" +"per-web-view' to use a different web process for each tab." +msgstr "" +"Tato volba umožňuje nastavit použitý model zpracování. Zadejte „shared-secondary-" +"process“ pro použití jednoho webového procesu sdíleného všemi kartami nebo „one-" +"secondary-process-per-web-view“ pro použití různých procesů pro každou kartu." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Styl nástrojové lišty" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maximální počet webových procesů vytvořených ve stejném okamžiku při použití " +"modelu „one-secondary-process-per-web-view“." #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Styl nástrojové lišty. Povolené hodnoty jsou „both“ (text a ikony), „both-" -"horiz“ (text vedle ikon), „icons“ (pouze ikony) a „text“. Prázdné pole " -"znamená použití nastavení GNOME." +"This option sets a limit to the number of web processes that will be used at the " +"same time for the 'one-secondary-process-per-web-view' model. The default value " +"is '0' and means no limit." +msgstr "" +"Tato volba nastavuje omezení počtu webových procesů, které budou použity ve stejný " +"okamžik pro model „one-secondary-process-per-web-view“. Výchozí hodnota je „0“, " +"což znamená bez omezení." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -255,8 +262,8 @@ "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " "instead." msgstr "" -"[Zavržené] Toto nastavení bylo zavrženo, místo něj použijte „tabs-bar-" -"visibility-policy“." +"[Zavržené] Toto nastavení bylo zavrženo, místo něj použijte „tabs-bar-visibility-" +"policy“." #: ../data/org.gnome.epiphany.gschema.xml.h:34 msgid "Visibility of the downloads window" @@ -267,8 +274,8 @@ "Hide or show the downloads window. When hidden, a notification will be shown " "when new downloads are started." msgstr "" -"Skrývat nebo zobrazovat okno se stahováními. Je-li skryté, při spuštění " -"nového stahování se objeví upozornění." +"Skrývat nebo zobrazovat okno se stahováními. Je-li skryté, při spuštění nového " +"stahování se objeví upozornění." #: ../data/org.gnome.epiphany.gschema.xml.h:36 msgid "The visibility policy for the tabs bar." @@ -276,9 +283,9 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:37 msgid "" -"Controls when the tabs bar is shown. Possible values are 'always' (the tabs " -"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " -"two or more tabs) and 'never' (the tabs bar is never shown)." +"Controls when the tabs bar is shown. Possible values are 'always' (the tabs bar " +"is always shown), 'more-than-one' (the tabs bar is only shown if there's two or " +"more tabs) and 'never' (the tabs bar is never shown)." msgstr "" "Určuje, kdy je lišta karet zobrazena. Možné hodnoty jsou „always“ (lišta je " "zobrazena vždy), „more-than-one“ (lišta je zobrazena, pouze jsou-li otevřeny " @@ -302,10 +309,9 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:42 msgid "" -"A value to be used to override sans-serif desktop font when use-gnome-fonts " -"is set." -msgstr "" -"Toto písmo bude použito jako bezpatkové, je-li „use-gnome-fonts“ použito." +"A value to be used to override sans-serif desktop font when use-gnome-fonts is " +"set." +msgstr "Toto písmo bude použito jako bezpatkové, je-li „use-gnome-fonts“ použito." #: ../data/org.gnome.epiphany.gschema.xml.h:43 msgid "Custom serif font" @@ -313,8 +319,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:44 msgid "" -"A value to be used to override serif desktop font when use-gnome-fonts is " -"set." +"A value to be used to override serif desktop font when use-gnome-fonts is set." msgstr "Toto písmo bude použito jako patkové, je-li „use-gnome-fonts“ použito." #: ../data/org.gnome.epiphany.gschema.xml.h:45 @@ -323,11 +328,10 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:46 msgid "" -"A value to be used to override monospace desktop font when use-gnome-fonts " -"is set." +"A value to be used to override monospace desktop font when use-gnome-fonts is " +"set." msgstr "" -"Toto písmo bude použito jako neproporcionální, je-li „use-gnome-fonts“ " -"použito." +"Toto písmo bude použito jako neproporcionální, je-li „use-gnome-fonts“ použito." #: ../data/org.gnome.epiphany.gschema.xml.h:47 msgid "Use own colors" @@ -366,8 +370,7 @@ msgstr "Výchozí kódování textu" #: ../data/org.gnome.epiphany.gschema.xml.h:56 -msgid "" -"Default encoding. Accepted values are the ones WebKitGTK+ can understand." +msgid "Default encoding. Accepted values are the ones WebKitGTK+ can understand." msgstr "" "Výchozí kódování. Přijatelné hodnoty jsou všechny, kterým rozumí WebKitGTK+." @@ -386,11 +389,11 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:60 msgid "" -"Where to accept cookies from. Possible values are \"always\", \"no-third-" -"party\" and \"never\"." +"Where to accept cookies from. Possible values are \"always\", \"no-third-party\" " +"and \"never\"." msgstr "" -"Odkud mohou být cookies přijímány. Možné hodnoty jsou „always“ (vždy), „no-" -"third-party“ (ne od třetích stran) a „never“ (nikdy)." +"Odkud mohou být cookies přijímány. Možné hodnoty jsou „always“ (vždy), „no-third-" +"party“ (ne od třetích stran) a „never“ (nikdy)." #: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" @@ -411,8 +414,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:64 msgid "" "Allow sites to open new windows using JavaScript (if JavaScript is enabled)." -msgstr "" -"Povolit stránkám otevírat nová okna pomocí JavaScriptu (je-li povolen)." +msgstr "Povolit stránkám otevírat nová okna pomocí JavaScriptu (je-li povolen)." #: ../data/org.gnome.epiphany.gschema.xml.h:65 msgid "Enable Plugins" @@ -444,11 +446,11 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:72 msgid "" -"Whether to tell websites that we do not wish to be tracked. Please note that " -"web pages are not forced to follow this setting." +"Whether to tell websites that we do not wish to be tracked. Please note that web " +"pages are not forced to follow this setting." msgstr "" -"Zdali sdělovat stránkám, že si nepřeji být sledován. Mějte na paměti, že " -"stránky se nemusí tímto nastavením řídit." +"Zdali sdělovat stránkám, že si nepřeji být sledován. Mějte na paměti, že stránky " +"se nemusí tímto nastavením řídit." #: ../data/org.gnome.epiphany.gschema.xml.h:73 msgid "Enable Adblock" @@ -456,10 +458,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:74 msgid "" -"Whether to block the embedded advertisements that web pages might want to " -"show." -msgstr "" -"Zdali blokovat vložené reklamy, které by stránky mohly chtít zobrazovat." +"Whether to block the embedded advertisements that web pages might want to show." +msgstr "Zdali blokovat vložené reklamy, které by stránky mohly chtít zobrazovat." #: ../data/org.gnome.epiphany.gschema.xml.h:75 msgid "The downloads folder" @@ -467,8 +467,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:76 msgid "" -"The path of the folder where to download files to; or \"Downloads\" to use " -"the default downloads folder, or \"Desktop\" to use the desktop folder." +"The path of the folder where to download files to; or \"Downloads\" to use the " +"default downloads folder, or \"Desktop\" to use the desktop folder." msgstr "" "Cesta ke složce, do které se mají stahovat soubory. Též je možno použít " "„Downloads“ (výchozí složka pro stahování) nebo „Desktop“ (pro stahování na " @@ -549,63 +549,60 @@ msgid "Installed on:" msgstr "Instalováno:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Odstranit z přehledu" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Nejnavštěvovanější" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Odstranit z přehledu" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Prohlížení v soukromí" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" -"You are currently browsing incognito. Pages viewed in this mode " -"will not show up in your browsing history and all stored information will be " -"cleared when you close the window. Files you download will be kept." +"You are currently browsing incognito. Pages viewed in this mode will " +"not show up in your browsing history and all stored information will be cleared " +"when you close the window. Files you download will be kept." msgstr "" -"Nyní si prohlížíte www anonymně. Stránky zobrazené v tomto režimu " -"se nebudou zobrazovat v historii a po zavření okna budou vymazány všechny " -"informace uložené během tohoto prohlížení. Soubory, které si stáhnete, " -"zůstanou uchovány." +"Nyní si prohlížíte www anonymně. Stránky zobrazené v tomto režimu se " +"nebudou zobrazovat v historii a po zavření okna budou vymazány všechny informace " +"uložené během tohoto prohlížení. Soubory, které si stáhnete, zůstanou uchovány." -#: ../embed/ephy-about-handler.c:555 -msgid "" -"Incognito mode hides your activity only from people using this computer." +#: ../embed/ephy-about-handler.c:579 +msgid "Incognito mode hides your activity only from people using this computer." msgstr "" -"Anonymní režim skryje vaše činnosti pouze před lidmi používajícími tento " -"počítač." +"Anonymní režim skryje vaše činnosti pouze před lidmi používajícími tento počítač." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " -"internet service provider, your government, other governments, the websites " -"that you visit, and advertisers on these websites may still be tracking you." +"internet service provider, your government, other governments, the websites that " +"you visit, and advertisers on these websites may still be tracking you." msgstr "" -"Anonymní režim neskryje vaši činnost před vaším zaměstnavatelem, pokud jste " -"v práci. Před vaším poskytovatelem internetového připojení, před vaší vládou " -"i cizími vládami, před servery, které navštívíte a reklamní společnosti vás " -"budou na webech pravděpodoně také schopné sledovat." +"Anonymní režim neskryje vaši činnost před vaším zaměstnavatelem, pokud jste v " +"práci. Před vaším poskytovatelem internetového připojení, před vaší vládou i " +"cizími vládami, před servery, které navštívíte a reklamní společnosti vás budou " +"na webech pravděpodoně také schopné sledovat." #. characters #: ../embed/ephy-embed.c:51 msgid "Blank page" msgstr "Prázdná stránka" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Stisknutím %s ukončíte režim na celou obrazovku" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -958,62 +955,59 @@ msgid "Find next occurrence of the search string" msgstr "Hledat následující výskyt hledaného řetězce" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Uložit" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "Neuklá_dat" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Uložit" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Chcete uložit své heslo pro „%s“?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Zakázat" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Povolit" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Stránka %s chce zjistit vaši polohu." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." -msgstr "" -"Stránka %s chce zobrazit upozornění přímo v pracovním prostředí." +msgstr "Stránka %s chce zobrazit upozornění přímo v pracovním prostředí." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Načítá se „%s“…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Načítá se…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 -msgid "" -"This website presented identification that belongs to a different website." -msgstr "" -"Tato webová stránka se prokázala identifikací, která náleží jinému webu." +#: ../embed/ephy-web-view.c:1763 +msgid "This website presented identification that belongs to a different website." +msgstr "Tato webová stránka se prokázala identifikací, která náleží jinému webu." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1022,165 +1016,158 @@ "důvěřovat. Zkontrolujte datum v kalendáři svého počítače." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." -msgstr "" -"Identifikace této webové stránky nebyla vytvořena důvěryhodnou organizací." +msgstr "Identifikace této webové stránky nebyla vytvořena důvěryhodnou organizací." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 -msgid "" -"This website’s identification could not be processed. It may be corrupted." +#: ../embed/ephy-web-view.c:1778 +msgid "This website’s identification could not be processed. It may be corrupted." msgstr "" "Identifikace této webové stránky nemohla být zpracována. Pravděpodobně je " "poškozena." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" -"This website’s identification has been revoked by the trusted organization " -"that issued it." +"This website’s identification has been revoked by the trusted organization that " +"issued it." msgstr "" -"Identifikace této webové stránky byla odvolána důvěryhodnou organizací, " -"která ji vydala." +"Identifikace této webové stránky byla odvolána důvěryhodnou organizací, která ji " +"vydala." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "" -"Identifikaci této webové stránky nelze důvěřovat, protože používá velmi " -"slabé šifrování." +"Identifikaci této webové stránky nelze důvěřovat, protože používá velmi slabé " +"šifrování." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" -"This website’s identification is only valid for future dates. Check the date " -"on your computer’s calendar." +"This website’s identification is only valid for future dates. Check the date on " +"your computer’s calendar." msgstr "" -"Identifikace této webové stránky je platná až v budoucnosti. Zkontrolujte " -"datum v kalendáři svého počítače." +"Identifikace této webové stránky je platná až v budoucnosti. Zkontrolujte datum " +"v kalendáři svého počítače." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Tohle nemusí být skutečné %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" -"When you try to connect securely, websites present identification to prove " -"that your connection has not been maliciously intercepted. There is " -"something wrong with this website’s identification:" -msgstr "" -"Když se pokoušíte o zabezpečené připojení, webové stránky předloží " -"identifikaci, která dokazuje, že spojení nebylo zlomyslně přerušeno. S " -"identifikací této webové stránky je něco špatně:" +"When you try to connect securely, websites present identification to prove that " +"your connection has not been maliciously intercepted. There is something wrong " +"with this website’s identification:" +msgstr "" +"Když se pokoušíte o zabezpečené připojení, webové stránky předloží identifikaci, " +"která dokazuje, že spojení nebylo zlomyslně přerušeno. S identifikací této " +"webové stránky je něco špatně:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" -"A third party may have hijacked your connection. You should continue only if " -"you know there is a good reason why this website does not use trusted " -"identification." -msgstr "" -"Nějaká třetí strana pravděpodobně nabourala vaše připojení. Pokračujte jen " -"pokud znáte dobrý důvod, proč webová stránka nepoužívá důvěryhodnou " -"identifikaci." +"A third party may have hijacked your connection. You should continue only if you " +"know there is a good reason why this website does not use trusted identification." +msgstr "" +"Nějaká třetí strana pravděpodobně nabourala vaše připojení. Pokračujte jen pokud " +"znáte dobrý důvod, proč webová stránka nepoužívá důvěryhodnou identifikaci." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Legitimní banky, obchody a další veřejné stránky vás o tohle žádat nebudou." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Není specifikováno" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problém s načtením „%s“" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Problém! Tuto stránku není možné zobrazit." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" -"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily unavailable or moved to a " -"new address. You may wish to verify that your internet connection is working " -"correctly.

" +"

The site at “%s” seems to be unavailable. The precise error was:

" +"%s

It may be temporarily unavailable or moved to a new address. You " +"may wish to verify that your internet connection is working correctly.

" msgstr "" -"

Web „%s“ se zdá být nedostupný. Přesné chybové hlášení bylo:

" -"%s

Stránka mohla být dočasně vypnuta nebo přesunuta na novou " -"adresu. Nezapomeňte se ujistit, jestli správně funguje vaše připojení k " -"Internetu.

" +"

Web „%s“ se zdá být nedostupný. Přesné chybové hlášení bylo:

%s

Stránka mohla být dočasně vypnuta nebo přesunuta na novou adresu. " +"Nezapomeňte se ujistit, jestli správně funguje vaše připojení k Internetu.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Zkusit znovu" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Vyskytl se problém!" -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" -"

This site may have caused Web to close unexpectedly.

If this " -"happens again, please report the problem to the %s " -"developers.

" +"

This site may have caused Web to close unexpectedly.

If this happens " +"again, please report the problem to the %s developers.

" msgstr "" "

Tato stránka způsobila, že došlo k neočekávanému ukončení prohlížeče.

Pokud se to bude opakovat, nahlaste prosím problém vývojářům projektu " "%s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Přesto načíst znovu" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problém se zobrazením „%s“" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Problém!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." msgstr "" -"Něco se událo nesprávně při zobrazení této stránky. Pro pokračování ji " -"prosím načtěte znovu nebo navštivte jinou stránku." +"Něco se událo nesprávně při zobrazení této stránky. Pro pokračování ji prosím " +"načtěte znovu nebo navštivte jinou stránku." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Pozor!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Přesto načíst" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_Budiž" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1236,7 +1223,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Heslo pro uživatele %s ve formuláři na %s" @@ -1244,7 +1231,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Heslo ve formuláři na %s" @@ -1269,8 +1256,8 @@ #: ../lib/ephy-gui.c:246 msgid "" -"A file with this name already exists and you don't have permission to " -"overwrite it." +"A file with this name already exists and you don't have permission to overwrite " +"it." msgstr "Soubor s tímto názvem již existuje a nemáte oprávnění jej přepsat." #: ../lib/ephy-gui.c:249 @@ -1288,8 +1275,8 @@ #: ../lib/ephy-nss-glue.c:64 msgid "" -"The passwords from the previous version are locked with a master password. " -"If you want to import them, please enter your master password below." +"The passwords from the previous version are locked with a master password. If " +"you want to import them, please enter your master password below." msgstr "" "Hesla z předchozí verze jsou uzamčena hlavním heslem. Pokud chcete, aby byla " "naimportována, zadejte níže hlavní heslo." @@ -1300,8 +1287,8 @@ #: ../lib/ephy-profile-migrator.c:652 msgid "" -"Web 3.6 deprecated this directory and tried migrating this configuration to " -"~/.config/epiphany" +"Web 3.6 deprecated this directory and tried migrating this configuration to ~/." +"config/epiphany" msgstr "" "Tato složka je v aplikace WWW 3.6 zavržena a proto byl učiněn pokus přenést " "nastavení do složky ~/.config/epiphany" @@ -1454,11 +1441,11 @@ #: ../lib/widgets/ephy-certificate-popover.c:113 #, c-format msgid "" -"This web site’s digital identification is not trusted. You may have " -"connected to an attacker pretending to be %s." +"This web site’s digital identification is not trusted. You may have connected to " +"an attacker pretending to be %s." msgstr "" -"Digitální identifikace této webové stránky není důvěryhodná. Pravděpodobně " -"jste se připojili k útočníkovi, který se snaží předstírat, že je %s." +"Digitální identifikace této webové stránky není důvěryhodná. Pravděpodobně jste " +"se připojili k útočníkovi, který se snaží předstírat, že je %s." #. Label in certificate popover when site sends mixed content. #: ../lib/widgets/ephy-certificate-popover.c:124 @@ -1474,7 +1461,7 @@ msgid "_View Certificate…" msgstr "_Zobrazit certifikát…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1482,7 +1469,7 @@ msgstr[1] "zbývají %d sekundy" msgstr[2] "zbývá %d sekund" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1490,7 +1477,7 @@ msgstr[1] "zbývají %d minuty" msgstr[2] "zbývá %d minut" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1498,7 +1485,7 @@ msgstr[1] "zbývají %d hodiny" msgstr[2] "zbývá %d hodin" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1506,7 +1493,7 @@ msgstr[1] "zbývají %d dny" msgstr[2] "zbývá %d dnů" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1514,7 +1501,7 @@ msgstr[1] "zbývají %d týdny" msgstr[2] "zbývá %d týdnů" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1522,29 +1509,29 @@ msgstr[1] "zbývají %d měsíce" msgstr[2] "zbývá %d měsíců" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Dokončeno" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Chyba při stahování: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Zrušit" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1120 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Otevřít" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Zobrazit složku" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Spouští se…" @@ -1552,20 +1539,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "Vy_mazat" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Zpět" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "Zn_ovu" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Odkaz na tuto stránku vytvoříte přetažením této ikony" @@ -1588,25 +1575,24 @@ msgid "“%s” Properties" msgstr "Vlastnosti „%s“" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Nadpis:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Adresa:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "_Témata:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Zobrazit _všechna témata" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 -#: ../src/resources/prefs-dialog.ui.h:40 -#: ../src/resources/prefs-lang-dialog.ui.h:3 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 +#: ../src/resources/prefs-dialog.ui.h:40 ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" msgstr "Přid_at" @@ -1700,7 +1686,7 @@ msgstr "Vytvořit nové téma" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Otevřít v novém _okně" @@ -1712,7 +1698,7 @@ msgstr "Otevřít vybranou záložku v novém okně" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Otevřít v nové _kartě" @@ -1773,7 +1759,7 @@ msgstr "Vyjmout výběr" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopírovat" @@ -1834,7 +1820,7 @@ msgstr "Zobrazit sloupec s nadpisem" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adresa" @@ -1857,8 +1843,8 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:382 msgid "" -"Deleting this topic will cause all its bookmarks to become uncategorized, " -"unless they also belong to other topics. The bookmarks will not be deleted." +"Deleting this topic will cause all its bookmarks to become uncategorized, unless " +"they also belong to other topics. The bookmarks will not be deleted." msgstr "" "Odstranění tohoto tématu způsobí, že jeho záložky, které nepatří do jiných " "témat, nebudou mít kategorii. Záložky nebudou odstraněny." @@ -1903,8 +1889,8 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:555 #, c-format msgid "" -"The bookmarks from “%s” could not be imported because the file is corrupted " -"or of an unsupported type." +"The bookmarks from “%s” could not be imported because the file is corrupted or " +"of an unsupported type." msgstr "" "Záložky z „%s“ nelze importovat, protože soubor je poškozen nebo nemá " "podporovaný typ." @@ -1930,7 +1916,7 @@ msgstr "Exportovat záložky" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Záložky" @@ -1956,15 +1942,15 @@ msgid "File" msgstr "Soubor" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopírovat adresu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Témata" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Nadpis" @@ -1996,8 +1982,8 @@ #: ../src/resources/clear-data-dialog.ui.h:5 msgid "" -"You are about to clear personal data that is stored about the web pages you " -"have visited. Check the types of information that you want to remove:" +"You are about to clear personal data that is stored about the web pages you have " +"visited. Check the types of information that you want to remove:" msgstr "" "Chystáte se vymazat osobní data uložená pro jednotlivé navštívené webové " "stránky. Nejprve vyberte typy informací, které chcete odstranit:" @@ -2020,24 +2006,21 @@ #: ../src/resources/clear-data-dialog.ui.h:10 msgid "" -"You cannot undo this action. The data you are choosing to clear will be " -"removed forever." +"You cannot undo this action. The data you are choosing to clear will be removed " +"forever." msgstr "" "Tuto akci nelze vrátit zpět. Data vybraná k vymazání budou odstraněna trvale." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Cookies" -#: ../src/resources/cookies-dialog.ui.h:2 -#: ../src/resources/history-dialog.ui.h:2 +#: ../src/resources/cookies-dialog.ui.h:2 ../src/resources/history-dialog.ui.h:2 #: ../src/resources/passwords-dialog.ui.h:2 msgid "C_lear All" msgstr "Vy_mazat vše" -#: ../src/resources/cookies-dialog.ui.h:3 -#: ../src/resources/passwords-dialog.ui.h:4 +#: ../src/resources/cookies-dialog.ui.h:3 ../src/resources/passwords-dialog.ui.h:4 msgid "Site" msgstr "Server" @@ -2131,8 +2114,7 @@ msgid "Add _Bookmark" msgstr "Přidat _záložku" -#: ../src/resources/passwords-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:30 +#: ../src/resources/passwords-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:30 msgid "Passwords" msgstr "Hesla" @@ -2357,11 +2339,11 @@ msgid "Other encodings" msgstr "Jiná kódování" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Vymazat historii prohlížení?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2437,11 +2419,11 @@ "Spouštění selhalo kvůli následující chybě:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Možnosti WWW" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Zavřít kartu" @@ -2578,142 +2560,151 @@ msgstr "Otevřít odkaz v nové _kartě" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Otevřít odkaz v a_nonymním okně" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Uložit odkaz jako…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopírovat adresu odkazu" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Kopírovat e-mailovou adresu" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Zobraz_it obrázek v nové kartě" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kopírovat adresu _obrázku" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Uložit obrázek jako…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Nastavit jako _tapetu plochy" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Otevřít video v novém _okně" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Otevřít video v nové kar_tě" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Uložit video jako…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopírovat adresu videa" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Otevřít zvuk v novém _okně" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Otevřít zvuk v nové kar_tě" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Uložit zvuk jako…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopírovat adresu zvuku" -#: ../src/ephy-window.c:466 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "V prvcích formuláře jsou neodeslané změny" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Pokud přesto dokument zavřete, ztratíte tyto informace." -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Zavřít dokument" -#: ../src/ephy-window.c:484 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "V tomto okně probíhá stahování" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Pokud toto okno zavřete, aktivní stahování budou zrušena" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Zavřít okno a zrušit stahování" -#: ../src/ephy-window.c:1122 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Uložit jako" -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Uložit jako aplikaci" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Tisk" -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Záložka" -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Hledat" #. Translators: This refers to text size -#: ../src/ephy-window.c:1139 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Větší" #. Translators: This refers to text size -#: ../src/ephy-window.c:1142 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Menší" -#: ../src/ephy-window.c:1164 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Zpět" -#: ../src/ephy-window.c:1176 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Vpřed" -#: ../src/ephy-window.c:1188 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zvětšení" -#: ../src/ephy-window.c:1197 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nová _karta" -#: ../src/ephy-window.c:1205 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Přejít na nejnavštěvovanější" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Na WWW vyhledat „%s“" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Uložit odkaz jako" @@ -2808,10 +2799,8 @@ #: ../src/window-commands.c:719 msgid "" -"An application with the same name already exists. Replacing it will " -"overwrite it." -msgstr "" -"Aplikace s tímto názvem již existuje. Nahrazením způsobíte její přepsání." +"An application with the same name already exists. Replacing it will overwrite it." +msgstr "Aplikace s tímto názvem již existuje. Nahrazením způsobíte její přepsání." #: ../src/window-commands.c:755 #, c-format @@ -2836,19 +2825,19 @@ msgid "C_reate" msgstr "V_ytvořit" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Kontaktujte nás na:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Přispěvatelé:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Dřívější vývojáři:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2865,7 +2854,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Miloslav Trmač \n" @@ -2877,24 +2866,24 @@ "Marek Černocký \n" "Adam Matoušek " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Stránky prohlížeče WWW" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Povolit režim prohlížení s kurzorem?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " -"cursor in web pages, allowing you to move around with your keyboard. Do you " -"want to enable caret browsing?" +"cursor in web pages, allowing you to move around with your keyboard. Do you want " +"to enable caret browsing?" msgstr "" -"Stisknutím klávesy F7 zapnete nebo vypnete prohlížení s kurzorem. Tato " -"funkce vloží do stránky pohyblivý kurzor umožňující navigaci pomocí " -"klávesnice. Přejete si zapnout prohlížení s kurzorem?" +"Stisknutím klávesy F7 zapnete nebo vypnete prohlížení s kurzorem. Tato funkce " +"vloží do stránky pohyblivý kurzor umožňující navigaci pomocí klávesnice. Přejete " +"si zapnout prohlížení s kurzorem?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Povolit" diff -Nru epiphany-browser-3.16.3/po/da.po epiphany-browser-3.18.0/po/da.po --- epiphany-browser-3.16.3/po/da.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/da.po 2015-09-21 08:20:22.000000000 +0000 @@ -8,6 +8,7 @@ # Marie Lund , 2004-05. # M.P. Rommedahl , 2007 # Kenneth Nielsen , 2007-2014. +# scootergrisen, 2015. # # Oprindeligt fra Galeon, med hjælp fra: # Jonas Koch Bentzen @@ -34,11 +35,10 @@ msgid "" msgstr "" "Project-Id-Version: epiphany\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=epiphany\n" -"POT-Creation-Date: 2015-03-14 19:52+0100\n" -"PO-Revision-Date: 2015-03-14 19:10+0100\n" -"Last-Translator: Kenneth Nielsen \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-20 20:18+0200\n" +"PO-Revision-Date: 2015-09-20 20:06+0200\n" +"Last-Translator: scootergrisen\n" "Language-Team: Dansk \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" -msgstr "Søg på internettet" +msgstr "Søg på nettet" # Jeg kan ikke længere se noget kad-tilvalg Kenneth 2014-03-15 #. Translators: you can use the regions listed in @@ -76,15 +76,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=dk-da" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -94,35 +94,41 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Webbrowseren til GNOME, som er tæt integreret med skrivebordet og har en " "simpel og intuitiv brugergrænseflade, der lader dig fokusere på dine " -"websider." +"websider. Hvis du er på udkig efter en enkel, ren og smuk visning af nettet, " +"er dette den rigtige browser til dig." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web benævnes ofte med sit kodenavn Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" -msgstr "Internetbrowser" +msgstr "Webbrowser" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" -msgstr "Epiphany - internetbrowser" +msgstr "Epiphany - webbrowser" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" -msgstr "Benyt internettet" +msgstr "Gå på nettet" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;browser;internet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nyt inkognitovindue" @@ -191,7 +197,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:20 msgid "Whether to store and prefill passwords in websites." -msgstr "Om adgangskoder på internetsider skal gemmes og udfyldes på forhånd." +msgstr "Om adgangskoder på websteder skal gemmes og udfyldes på forhånd." #: ../data/org.gnome.epiphany.gschema.xml.h:21 msgid "Automatically manage offline status with NetworkManager" @@ -253,18 +259,22 @@ "per faneblad." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Værktøjslinjestil" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maksimalt antal samtidige webprocesser som oprettes ved brug af \"one-" +"secondary-process-per-web-view\"-modellen" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Stil for værktøjslinjer. Tilladte værdier er \"\" (benytter Gnomes " -"standardstil), \"both\" (tekst og ikoner), \"both-horiz\" (tekst ved siden " -"af ikoner), \"ikoner\" og \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Denne indstilling angiver en grænse for antallet af webprocesser, som kan " +"bruges på samme tid med \"one-secondary-process-per-web-view\"-modellen. " +"Standardværdien er \"0\" og betyder ubegrænset." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -376,7 +386,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:52 msgid "Use a custom CSS file to modify websites own CSS." -msgstr "Brug en tilpasset CSS-fil til at modificere hjemmesiders egne CSS'er." +msgstr "Brug en tilpasset CSS-fil til at modificere webstedernes egne CSS'er." #: ../data/org.gnome.epiphany.gschema.xml.h:53 msgid "Enable spell checking" @@ -575,19 +585,19 @@ msgid "Installed on:" msgstr "Installeret den:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Fjern fra oversigt" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Mest besøgte" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Fjern fra oversigt" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privat browsning" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -598,14 +608,14 @@ "information vil blive ryddet, når du lukker vinduet. Filer som du downloader " "vil blive beholdt." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Inkognitotilstand skjuler kun din aktivitet for folk, som bruger denne " "computer." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -620,17 +630,17 @@ msgid "Blank page" msgstr "Tom side" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Tryk %s for at afslutte fuldskærm" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -983,60 +993,60 @@ msgid "Find next occurrence of the search string" msgstr "Find næste optræden af søgeteksten" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Gem" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "Gem _ikke" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Gem" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Ønsker du at gemme din adgangskode for “%s”?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Nægt" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Tillad" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Siden %s ønsker at kende din placering." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Siden %s ønsker at vise skrivebordspåmindelser." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Indlæser “%s”…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Indlæser…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Dette websted har givet identifikation, som tilhører et andet websted." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1045,19 +1055,19 @@ "datoen på din computers kalender." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "Webstedets identifikation er ikke udstedt af en betroet organisation." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" "Webstedets identifikation kunne ikke behandles. Den er muligvis beskadiget." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1066,7 +1076,7 @@ "organisation, som udstedte den." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1075,7 +1085,7 @@ "kryptering." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1084,13 +1094,13 @@ "datoen på din computers kalender." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Dette er muligvis ikke den rigtige %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1101,7 +1111,7 @@ "Der er noget galt med dette websteds identifikation:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1112,29 +1122,29 @@ "bruger betroet identifikation." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Legitime banker, butikker og andre offentlige websteder vil ikke bede dig om " "at gøre dette." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Ingen specificeret" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problem ved indlæsning af “%s”" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Ups! Det var ikke muligt at vise dette websted." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Prøv igen" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Ups! Der er måske opstået et problem." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1166,20 +1176,20 @@ "sker igen, så gør venligst udviklerne af %s opmærksomme på " "problemet.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Genindlæs alligevel" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problem ved visning af “%s”" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Ups!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1188,21 +1198,21 @@ "anden side for at fortsætte." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Pas på!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Indlæs alligevel" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_O.k." #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1219,7 +1229,7 @@ #: ../lib/ephy-file-chooser.c:223 msgid "Web pages" -msgstr "Internetsider" +msgstr "Websider" #: ../lib/ephy-file-chooser.c:234 msgid "Images" @@ -1258,7 +1268,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Adgangskode for %s i en formular på %s" @@ -1266,7 +1276,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Adgangskode i en formular på %s" @@ -1503,71 +1513,71 @@ msgid "_View Certificate…" msgstr "_Vis certifikat…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d sekund tilbage" msgstr[1] "%d sekunder tilbage" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d minut tilbage" msgstr[1] "%d minutter tilbage" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d time tilbage" msgstr[1] "%d timer tilbage" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d dag tilbage" msgstr[1] "%d dage tilbage" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d uge tilbage" msgstr[1] "%d uger tilbage" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d måned tilbage" msgstr[1] "%d måneder tilbage" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Afsluttet" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Fejl ved hentning af: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Afbryd" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Åbn" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Vis i mappe" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Starter…" @@ -1575,20 +1585,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_Ryd" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "For_tryd" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Omgør" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Træk og slip dette ikon for at oprette et link til denne side" @@ -1611,23 +1621,23 @@ msgid "“%s” Properties" msgstr "Egenskaber for “%s”" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Titel:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "A_dresse:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "E_mner:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Vis a_lle emner" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1684,7 +1694,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:75 msgid "Web (RDF)" -msgstr "Internet (RDF)" +msgstr "Web (RDF)" #: ../src/bookmarks/ephy-bookmarks-editor.c:76 msgid "Mozilla (HTML)" @@ -1723,7 +1733,7 @@ msgstr "Opret et nyt emne" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Åbn i nyt _vindue" @@ -1734,7 +1744,7 @@ msgstr "Åbne det valgte bogmærke i et nyt vindue" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Åbn i nyt _faneblad" @@ -1795,7 +1805,7 @@ msgstr "Klip det markerede" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "K_opiér" @@ -1856,7 +1866,7 @@ msgstr "Vis titelkolonnen" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adresse" @@ -1945,14 +1955,14 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:633 msgid "Web bookmarks" -msgstr "Internetbogmærker" +msgstr "Webbogmærker" #: ../src/bookmarks/ephy-bookmarks-editor.c:757 msgid "Export Bookmarks" msgstr "Eksportér bogmærker" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Bogmærker" @@ -1978,15 +1988,15 @@ msgid "File" msgstr "Fil" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopiér adresse" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Emner" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Titel" @@ -2381,13 +2391,13 @@ msgid "Other encodings" msgstr "Andre kodninger" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Ryd navigeringshistorikken?" # "gemt i adresselinjen" virker mere brugervenligt end at sige at # historikken ryddes hvis historikken ryddes -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2464,11 +2474,11 @@ "Starten mislykkedes på grund af følgende fejl:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Webindstillinger" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Luk faneblad" @@ -2605,143 +2615,152 @@ msgstr "Gå til adressen i nyt _faneblad" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Åbn adressen i nyt i_ncognitovindue" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Gem adresse som…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopiér adresse" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Kopiér e-mailadresse" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Vis _billede i nyt faneblad" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kopiér b_illedadresse" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Gem billede som…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Brug som _baggrundsbillede" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Åbn video i nyt _vindue" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Åbn video i nyt _faneblad" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Gem video som…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopiér videoadresse" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Åbn lyd i nyt _vindue" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Åbn lyd i nyt _faneblad" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Gem lyd som…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopiér lydadresse" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Der er ændringer i formularelementer som ikke er blevet sendt" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Hvis du lukker dokumentet alligevel, vil du miste de oplysninger." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Luk _dokument" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Der er igangværende downloads i dette vindue" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Hvis du lukker dette vindue, vil disse downloads blive afbrudt" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Luk vindue og afbryd downloads" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Gem som" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Gem som program" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Udskriv" # udsagnsord -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Bogmærk" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Søg" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Større" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Mindre" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Tilbage" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Frem" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zoom" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nyt fane_blad" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Gå til mest besøgte" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Søg på nettet efter \"%s\"" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Gem fra adresse som" @@ -2865,19 +2884,19 @@ msgid "C_reate" msgstr "_Opret" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Kontakt os på:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Bidragydere:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Tidligere udviklere:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2894,7 +2913,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Jonas Koch Bentzen\n" @@ -2910,15 +2929,15 @@ "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Hjemmesiden for Web" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Aktivér markørbrowsing-tilstand?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2928,10 +2947,25 @@ "flytbar markør på websiderne, som giver dig mulighed for at flytte rundt med " "dit tastatur. Ønsker du at slå markørbrowsing til?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Aktivér" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Værktøjslinjestil" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Stil for værktøjslinjer. Tilladte værdier er \"\" (benytter Gnomes " +#~ "standardstil), \"both\" (tekst og ikoner), \"both-horiz\" (tekst ved " +#~ "siden af ikoner), \"ikoner\" og \"text\"." + #~ msgid "Size of disk cache" #~ msgstr "Størrelse af diskmellemlager" @@ -3532,9 +3566,6 @@ #~ msgid "Go" #~ msgstr "Kør" -#~ msgid "GNOME Web Browser" -#~ msgstr "Gnomes Internetbrowser" - #~ msgid "GNOME Web Browser options" #~ msgstr "Indstillinger for Gnomes Internetbrowser" diff -Nru epiphany-browser-3.16.3/po/de.po epiphany-browser-3.18.0/po/de.po --- epiphany-browser-3.16.3/po/de.po 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/de.po 2015-09-15 09:09:42.000000000 +0000 @@ -19,16 +19,16 @@ "Project-Id-Version: Epiphany master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-17 12:41+0000\n" -"PO-Revision-Date: 2015-03-17 19:39+0100\n" -"Last-Translator: Christian Kirbach \n" +"POT-Creation-Date: 2015-09-07 17:21+0000\n" +"PO-Revision-Date: 2015-09-14 14:28+0200\n" +"Last-Translator: Wolfgang Stoeggl \n" "Language-Team: Deutsch \n" "Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7.4\n" +"X-Generator: Poedit 1.8.4\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -58,15 +58,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany;kl=de-de" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -76,35 +76,42 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Der Internet-Browser für GNOME. Er bietet eine enge Integration in die " "Arbeitsumgebung und eine einfache und intuitive Benutzeroberfläche, die es " -"Ihnen ermöglicht sich auf die Inhalte der Internetseiten zu konzentrieren." +"Ihnen ermöglicht sich auf die Inhalte der Internetseiten zu konzentrieren. " +"Wenn Sie einen einfachen, klaren und wunderschönen Blick auf das Internet " +"haben wollen, dann liegen Sie mit diesem Browser richtig." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web wird häufig auch mit seinem Codenamen, Epiphany, bezeichnet." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Internet" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Internet-Browser" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany Internet-Browser" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Im Internet surfen" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "Netz;Browser;Internet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Neues Inkognito-Fenster öffnen" @@ -242,18 +249,22 @@ "um für jeden Reiter einen anderen Prozess zu verwenden." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Stil der Werkzeugleiste" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maximale Anzahl von Web-Prozessen, die zur gleichen Zeit erstellt werden " +"können, entsprechend den Vorgaben aus »one-secondary-process-per-web-view«" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Stil der Werkzeugleiste. Erlaubte Werte sind »« (den GNOME Standardstil " -"nutzen), »both« (Text und Symbole), »both-horiz« (Texte neben Symbole), " -"»icons« und »text«." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Die Einstellung setzt ein Limit auf die Anzahl der Web-Prozesse, die " +"gleichzeitig entsprechend dem »one-secondary-process-per-web-view« genutzt " +"werden können. Die Standardeinstellung ist »0« und bedeutet ohne Limit." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -570,19 +581,19 @@ msgid "Installed on:" msgstr "Installiert am:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Aus der Übersicht entfernen" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Meistbesucht" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Aus der Übersicht entfernen" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privater Modus" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -593,14 +604,14 @@ "gespeicherten Informationen werden gelöscht, sobald Sie das Fenster " "schließen. Heruntergeladene Dateien werden behalten." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Der Inkognito-Modus verbirgt Ihre Aktivitäten nur vor Personen, die diesen " "Rechner benützen." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -616,17 +627,17 @@ msgid "Blank page" msgstr "Leere Seite" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "%s drücken, um den Vollbildmodus zu verlassen" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -979,38 +990,38 @@ msgid "Find next occurrence of the search string" msgstr "Nächsten Treffer für diese Zeichenkette suchen" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Speichern" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Nicht Speichern" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Speichern" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Sollen Ihre Passwörter für »%s« gespeichert werden?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Ablehnen" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Erlauben" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Die Seite %s möchte Ihren Aufenthaltsort wissen." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "" @@ -1018,17 +1029,17 @@ "anzeigen." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "»%s« wird geladen …" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Laden …" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" @@ -1036,7 +1047,7 @@ "anderen Webseite." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1045,14 +1056,14 @@ "Ihrem Rechner." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Die Identifikation dieser Webseite wurde nicht durch eine vertrauenswürdige " "Organisation bereitgestellt." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1060,7 +1071,7 @@ "könnte beschädigt sein." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1069,7 +1080,7 @@ "vertrauenswürdige Organisation zurückgezogen." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1078,7 +1089,7 @@ "nicht ausreichende Verschlüsselung verwendet." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1087,13 +1098,13 @@ "Überprüfen Sie das Datum auf Ihrem Rechner." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Das scheint nicht die echte Seite von %s zu sein." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1105,7 +1116,7 @@ "gibt ein Problem mit dem Nachweis dieser Webseite:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1116,29 +1127,29 @@ "Identifikation verwendet." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Banken, Geschäfte und andere öffentliche Seiten werden Sie nicht auffordern " "das zu tun." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Nichts angegeben" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Probleme beim Laden von »%s«" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Hoppla, es ist nicht möglich, diese Internetseite zu laden" -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:

Falls das Problem weiterhin besteht, sollten Sie Ihre " "Internetverbindung überprüfen.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Erneut versuchen" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Hoppla, möglicherweise gibt es ein Problem." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1171,20 +1182,20 @@ "dies erneut passiert, melden Sie bitte das Problem den %s-" "Entwicklern.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Trotzdem erneut laden" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problem beim Anzeigen von »%s«" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Hoppla!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1193,21 +1204,21 @@ "besuchen Sie eine andere Seite, um fortzufahren." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Vorsicht!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Trotzdem laden" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1263,7 +1274,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Passwort für %s auf %s" @@ -1271,7 +1282,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Passwort in einem Eingabefeld auf %s" @@ -1506,71 +1517,71 @@ msgid "_View Certificate…" msgstr "Zertifikat _ansehen …" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d Sekunde verbleibend" msgstr[1] "%d Sekunden verbleibend" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d Minute verbleibend" msgstr[1] "%d Minuten verbleibend" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d Stunde verbleibend" msgstr[1] "%d Stunden verbleibend" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d Tag verbleibend" msgstr[1] "%d Tage verbleibend" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d Woche verbleibend" msgstr[1] "%d Wochen verbleibend" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d Monat verbleibend" msgstr[1] "%d Monate verbleibend" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Abgeschlossen" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Fehler beim Herunterladen: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Abbrechen" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Öffnen" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "In Ordner zeigen" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Wird gestartet …" @@ -1578,20 +1589,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_Leeren" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Rückgängig" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Wiederholen" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "" "Ziehen Sie dieses Symbol und legen Sie es ab, um einen Verweis zu dieser " @@ -1615,23 +1626,23 @@ msgid "“%s” Properties" msgstr "Eigenschaften von »%s«" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Titel:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Adresse:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "T_hemen:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "A_lle Themen anzeigen" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1727,7 +1738,7 @@ msgstr "Ein Thema hinzufügen" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "In neuem _Fenster öffnen" @@ -1738,7 +1749,7 @@ msgstr "Das gewählte Lesezeichen in einem neuen Fenster öffnen" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "In neuem _Reiter öffnen" @@ -1799,7 +1810,7 @@ msgstr "Den markierten Text ausschneiden" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopieren" @@ -1860,7 +1871,7 @@ msgstr "Die Titelspalte anzeigen" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adresse" @@ -1957,7 +1968,7 @@ msgstr "Lesezeichen exportieren" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Lesezeichen" @@ -1983,15 +1994,15 @@ msgid "File" msgstr "Datei" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "Adresse _kopieren" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Themen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Titel" @@ -2054,8 +2065,7 @@ "Sie können diesen Schritt nicht rückgängig machen. Daten, die Sie zum " "Löschen auswählen, werden unwiderruflich gelöscht." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Cookies" @@ -2386,11 +2396,11 @@ msgid "Other encodings" msgstr "Weitere Zeichensätze" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Soll die Browser-Chronik geleert werden?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2467,11 +2477,11 @@ "Der Start schlug aus folgendem Grund fehl:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Internet-Optionen" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Reiter schließen" @@ -2608,143 +2618,152 @@ msgstr "Verweis in neuem _Reiter öffnen" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Verweis in neuem _Inkognito-Fenster öffnen" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Verweis _speichern unter …" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Verweisadresse _kopieren" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "E-Mail-Adresse _kopieren" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "_Bild in neuem Reiter anzeigen" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Bil_dadresse kopieren" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Bi_ld speichern unter …" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Als _Hintergrund festlegen" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Video in neuem _Fenster öffnen" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Video in neuem _Reiter öffnen" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Video _speichern unter …" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "Video-Adresse _kopieren" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Audio in neuem _Fenster öffnen" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Audio in neuem _Reiter öffnen" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Audio _speichern unter …" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "Audio-Adresse kopieren" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Einige Änderungen an Formularelementen wurden nicht übertragen" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "" "Falls Sie das Dokument dennoch schließen, gehen diese Informationen verloren." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Dokument schließen" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "In diesem Fenster gibt es aktive Downloads" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Falls Sie dieses Fenster schließen, werden die Downloads abgebrochen" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Fenster schließen und Downloads abbrechen" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Speichern unter" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Als Anwendung speichern" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Drucken" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Lesezeichen" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Suchen" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Größer" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Kleiner" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Zurück" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Vor" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Vergrößerung" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Neuer _Reiter" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Zu Meistbesucht gehen" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Nach »%s« im Internet suchen" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Verweis speichern unter" @@ -2869,19 +2888,19 @@ msgid "C_reate" msgstr "E_rstellen" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Sie erreichen uns unter:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Mitwirkende:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Vorherige Entwickler:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2898,7 +2917,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Christian Neumair \n" @@ -2907,31 +2926,47 @@ "Christian Kirbach \n" "Mario Blättermann \n" "Tobias Endrigkeit \n" -"Benjamin Steinwender " +"Benjamin Steinwender \n" +"Bernd Homuth " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Internet Internetseite" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Soll der Caret-Modus aktiviert werden?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " "want to enable caret browsing?" msgstr "" "Durch Drücken von F7 schalten Sie die Eingabemarke-Navigation an oder aus. " -"Diese Funktion platziert einen bewegliche Eingabemarke in Internetseiten, " -"den Sie mit der Tastatur steuern können. Wollen Sie die Eingabemarke-" -"Navigation einschalten?" +"Diese Funktion platziert eine bewegliche Eingabemarke in Internetseiten, die " +"Sie mit der Tastatur steuern können. Wollen Sie die Eingabemarke-Navigation " +"einschalten?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Aktivieren" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Stil der Werkzeugleiste" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Stil der Werkzeugleiste. Erlaubte Werte sind »« (den GNOME Standardstil " +#~ "nutzen), »both« (Text und Symbole), »both-horiz« (Texte neben Symbole), " +#~ "»icons« und »text«." + #~ msgid "Size of disk cache" #~ msgstr "Größe des Zwischenspeichers" diff -Nru epiphany-browser-3.16.3/po/el.po epiphany-browser-3.18.0/po/el.po --- epiphany-browser-3.16.3/po/el.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/el.po 2015-09-08 11:37:53.000000000 +0000 @@ -35,16 +35,16 @@ "Project-Id-Version: epiphany.gnome-2-26\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-03 21:04+0000\n" -"PO-Revision-Date: 2015-03-04 00:05+0200\n" -"Last-Translator: Efstathios Iosifidis \n" +"POT-Creation-Date: 2015-08-28 15:45+0000\n" +"PO-Revision-Date: 2015-08-29 00:47+0300\n" +"Last-Translator: Tom Tryfonidis \n" "Language-Team: Greek, Modern (1453-) \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Poedit 1.8.4\n" "X-Project-Style: gnome\n" #: ../data/default-bookmarks.rdf.in.h:1 @@ -75,15 +75,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=gr-el" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "Ιστός GNOME" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -93,36 +93,41 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Ο περιηγητής Ιστού του GNOME, ενσωματώνεται στενά με την επιφάνεια εργασίας " "και διαθέτει μια απλή και διαισθητική διεπαφή χρήστη που σας επιτρέπει να " -"εστιάζεσθε στις ιστοσελίδες σας." +"εστιάζεσθε στις ιστοσελίδες σας. Αν ψάχνετε μια απλή, καθαρή και όμορφη " +"προβολή στον Ιστό, τότε αυτός ο περιηγητής είναι για εσάς." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "Ο Ιστός GNOME αναφέρεται συχνά από το κωδικό του όνομα, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Ιστός" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Περιηγητής Ιστού" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Περιηγητής Ιστού Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Περιηγηθείτε στον Ιστό" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "ιστός;περιηγητής;διαδίκτυο;web;browser;internet;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Νέο παράθυρο ανώνυμης περιήγησης" @@ -261,18 +266,22 @@ "διαφορετικές διαδικτυακές διαδικασίες για την κάθε καρτέλα." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Στυλ εργαλειοθήκης" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Μέγιστος αριθμός διαδικτυακών διαδικασιών που δημιουργούνται ταυτόχρονα όταν " +"χρησιμοποιείται το μοντέλο 'one-secondary-process-per-web-view'" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Στυλ εργαλειοθήκης. Έγκυρες τιμές είναι \"\" ( χρήση προεπιλεγμένου στυλ του " -"GNOME), \"both\" (κείμενο και εικονίδια), \"both-horiz\" (κείμενο δίπλα στα " -"εικονίδια), \"icons\" και \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Αυτή η επιλογή ορίζει τον αριθμό των διαδικτυακών διαδικασιών που θα " +"χρησιμοποιηθούν ταυτόχρονα για το μοντέλο 'one-secondary-process-per-web-" +"view'. Η προεπιλεγμένη τιμή είναι '0' και σημαίνει χωρίς όριο." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -590,19 +599,19 @@ msgid "Installed on:" msgstr "Εγκαταστάθηκε:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Αφαίρεση από την επισκόπηση" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Πιο δημοφιλή" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Αφαίρεση από την επισκόπηση" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Ιδιωτική περιήγηση" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -613,14 +622,14 @@ "αποθηκευμένες πληροφορίες θα διαγραφούν όταν κλείσετε το παράθυρο. Ληφθέντα " "αρχεία θα διατηρηθούν." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Η κατάσταση ανώνυμης περιήγησης, αποκρύπτει την δραστηριότητα μόνο από άτομα " "που χρησιμοποιούν αυτόν τον υπολογιστή." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -999,38 +1008,38 @@ msgid "Find next occurrence of the search string" msgstr "Εύρεση επόμενης φοράς που εμφανίσθηκε η συβολοσειρά αναζήτησης" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Αποθήκευση" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "Να μ_ην αποθηκευτεί" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Αποθήκευση" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Θέλετε να αποθηκεύσετε τον κωδικό πρόσβασης για “%s”;" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Να μην επιτρέπεται" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Να επιτρέπεται" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Η σελίδα σε %s επιθυμεί να μάθει την τοποθεσία σας." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "" @@ -1038,17 +1047,17 @@ "εργασίας." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Γίνεται φόρτωση “%s”…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Γίνεται φόρτωση…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" @@ -1056,7 +1065,7 @@ "ιστότοπο." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1065,13 +1074,13 @@ "Ελέγξτε την ημερομηνία στο ημερολόγιο του υπολογιστή σας." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Η ταυτότητα αυτού του ιστότοπου δεν έχει εκδοθεί από έναν έμπιστο οργανισμό." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1079,7 +1088,7 @@ "κατεστραμμένη." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1088,7 +1097,7 @@ "την εξέδωσε." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1097,7 +1106,7 @@ "αδύναμη κρυπτογράφηση." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1106,13 +1115,13 @@ "ημερομηνίες. Ελέγξτε την ημερομηνία στο ημερολόγιο του υπολογιστή σας." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Αυτό μπορεί να μην είναι το πραγματικό %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1123,7 +1132,7 @@ "Υπάρχει ένα σφάλμα με την ταυτοποίηση αυτού του ιστότοπου:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1134,29 +1143,29 @@ "ιστότοπος δεν χρησιμοποιεί έμπιστη ταυτότητα." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Νόμιμοι ιστότοποι τραπεζών, καταστημάτων και άλλοι δημόσιοι ιστότοποι δεν θα " "σας ζητήσουν να το κάνετε αυτό." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Αδιευκρίνιστο" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Πρόβλημα κατά τη φόρτωση του “%s”" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Ώχ! Αδύνατη η εμφάνιση αυτού του ιστότοπου." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Προσπαθήστε ξανά" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Ώχ! Μπορεί να υπάρχει πρόβλημα." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1188,20 +1197,20 @@ "p>

Αν ξανασυμβεί, παρακαλούμε να αναφέρετε το πρόβλημα στους %s προγραμματιστές.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Επαναφόρτωση σε κάθε περίπτωση" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Πρόβλημα εμφάνισης του “%s”" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Ώχ!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1210,21 +1219,21 @@ "επαναφορτώστε ή επισκεφθείτε μια διαφορετική σελίδα για να συνεχίσετε." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Προσέξτε!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Φόρτωση σε κάθε περίπτωση" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_Εντάξει" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1280,7 +1289,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Κωδικός πρόσβασης για %s σε μια φόρμα στο %s" @@ -1288,7 +1297,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Κωδικός πρόσβασης σε μία φόρμα στο %s" @@ -1522,71 +1531,71 @@ msgid "_View Certificate…" msgstr "Προ_βολή πιστοποιητικού..." -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "Απέμεινε %d δευτερόλεπτο" msgstr[1] "Απέμειναν %d δευτερόλεπτα" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "Απέμεινε %d λεπτό" msgstr[1] "Απέμειναν %d λεπτά" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "Απέμεινε %d ώρα" msgstr[1] "Απέμειναν %d ώρες" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "Απέμεινε %d ημέρα" msgstr[1] "Απέμειναν %d ημέρες" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "Απέμεινε %d εβδομάδα" msgstr[1] "Απέμειναν %d εβδομάδες" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "Απέμεινε %d μήνας" msgstr[1] "Απέμειναν %d μήνες" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Ολοκληρώθηκε" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Σφάλμα κατά την λήψη: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Ακύρωση" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1120 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Άνοιγμα" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Προβολή στον φάκελο" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Εκκίνηση…" @@ -1594,20 +1603,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "Ε_κκαθάριση" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "Α_ναίρεση" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "Ε_πανάληψη" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "" "Σύρτε και αφήστε αυτό το εικονίδιο για να δημιουργήσετε έναν σύνδεσμο σε " @@ -1631,23 +1640,23 @@ msgid "“%s” Properties" msgstr "Ιδιότητες “%s”" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Τίτλος:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Διεύθυνση:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Θέ_ματα:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Εμ_φάνιση θεμάτων" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1743,7 +1752,7 @@ msgstr "Δημιουργία νέου θέματος" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Άνοιγμα σε νέο _παράθυρο" @@ -1754,7 +1763,7 @@ msgstr "Άνοιγμα του επιλεγμένου σελιδοδείκτη σε νέο παράθυρο" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Άνοιγμα σε νέα _καρτέλα" @@ -1814,7 +1823,7 @@ msgstr "Αποκοπή της επιλογής" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "Α_ντιγραφή" @@ -1875,7 +1884,7 @@ msgstr "Εμφάνιση της στήλης τίτλων" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Διεύθυνση" @@ -1972,7 +1981,7 @@ msgstr "Εξαγωγή σελιδοδεικτών" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Σελιδοδείκτες" @@ -1998,15 +2007,15 @@ msgid "File" msgstr "Αρχείο" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Αντιγραφή διεύθυνσης" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Θέματα" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Τίτλος" @@ -2402,11 +2411,11 @@ msgid "Other encodings" msgstr "Άλλες κωδικοποιήσεις" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Να καθαρισθεί το ιστορικό επισκέψεων;" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2483,11 +2492,11 @@ "Η εκκίνηση απέτυχε λόγω του παρακάτω σφάλματος:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Επιλογές Ιστού" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Κλείσιμο καρτέλας" @@ -2624,142 +2633,151 @@ msgstr "Άνοιγμα συνδέσμου σε νέα καρ_τέλα" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Άνοιγμα συνδέσμου σε παράθυρο α_νώνυμης περιήγηγης" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Αποθήκευση συνδέσμου ως…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Αν_τιγραφή διεύθυνσης δεσμού" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Αντιγραφή διεύθυνσης αλληλογραφίας" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Προβολή ε_ικόνας σε νέα καρτέλα" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Αντιγραφή διεύθυνσης ε_ικόνας" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Απο_θήκευση εικόνας ως…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Ορισμός ως _ταπετσαρία" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Άνοιγμα σε βίντεο νέο _παράθυρο" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Άνοιγμα βίντεο σε νέα κ_αρτέλα" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Αποθήκευση βίντεο ως…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Αντιγραφή διεύθυνσης βίντεο" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Άνοιγμα ήχου σε νέο _παράθυρο" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Άνοιγμα ήχου σε νέα _καρτέλα" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Αποθήκευση ήχου ως…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Αντιγραφή διεύθυνσης ήχου" -#: ../src/ephy-window.c:466 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Υπάρχουν αλλαγές που δεν έχουν υποβληθεί σε στοιχεία της φόρμας" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Αν κλείσετε το έγγραφο, θα χάσετε τις πληροφορίες." -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Κλείσιμο εγγράφου" -#: ../src/ephy-window.c:484 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Υπάρχουν λήψεις σε εξέλιξη σε αυτό το παράθυρο" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Αν κλείσετε αυτό το παράθυρο, θα ακυρωθούν οι λήψεις" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Κλείσιμο του παραθύρου και ακύρωση των λήψεων" -#: ../src/ephy-window.c:1122 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Αποθήκευση ως" -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Αποθήκευση ως εφαρμογή" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Εκτύπωση" -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Σελιδοδείκτης" -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Αναζήτηση" #. Translators: This refers to text size -#: ../src/ephy-window.c:1139 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Μεγαλύτερα" #. Translators: This refers to text size -#: ../src/ephy-window.c:1142 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Μικρότερα" -#: ../src/ephy-window.c:1164 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Πίσω" -#: ../src/ephy-window.c:1176 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Προώθηση" -#: ../src/ephy-window.c:1188 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Μεγέθυνση" -#: ../src/ephy-window.c:1197 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Νέα _καρτέλα" -#: ../src/ephy-window.c:1205 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Μετάβαση στα πιο δημοφιλή" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Αναζήτηση στον Ιστό για '%s'" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Αποθήκευση συνδέσμου ως" @@ -2883,19 +2901,19 @@ msgid "C_reate" msgstr "Δ_ημιουργία" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Επικοινωνήστε μαζί μας στο:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Συντελεστές:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Προηγούμενοι συντελεστές:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2912,7 +2930,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Ελληνική μεταφραστική ομάδα GNOME\n" @@ -2927,15 +2945,15 @@ "Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα\n" "http://gnome.gr/" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Ιστότοπος της εφαρμογής Ιστός" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Ενεργοποίηση της περιήγησης με δρομέα;" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2946,10 +2964,25 @@ "επιτρέπει να μετακινείσθε σε αυτές με το πληκτρολόγιό σας. Θέλετε να την " "ενεργοποιήσετε τώρα;" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "Ε_νεργοποίηση" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Στυλ εργαλειοθήκης" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Στυλ εργαλειοθήκης. Έγκυρες τιμές είναι \"\" ( χρήση προεπιλεγμένου στυλ " +#~ "του GNOME), \"both\" (κείμενο και εικονίδια), \"both-horiz\" (κείμενο " +#~ "δίπλα στα εικονίδια), \"icons\" και \"text\"." + #~ msgid "Size of disk cache" #~ msgstr "Μέγεθος της κρυφής μνήμης του δίσκου" @@ -3548,9 +3581,6 @@ #~ msgid "Go" #~ msgstr "Μετάβαση" -#~ msgid "GNOME Web Browser" -#~ msgstr "Περιηγητής Ιστοσελίδων του GNOME" - #~ msgid "Downloads will be aborted and logout proceed in %d second." #~ msgid_plural "Downloads will be aborted and logout proceed in %d seconds." #~ msgstr[0] "" diff -Nru epiphany-browser-3.16.3/po/es.po epiphany-browser-3.18.0/po/es.po --- epiphany-browser-3.16.3/po/es.po 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/es.po 2015-09-08 11:37:53.000000000 +0000 @@ -2,4504 +2,4532 @@ # Spanish translation of epiphany. # Copyright © 2003, 2006, 2007, 2008, Free Software Foundation, Inc. # This file is distributed under the same license as the epiphany package. -# +# # Francisco Javier F. Serrador , 2004, 2005, 2006. # Jorge González , 2007, 2008, 2009, 2010, 2011. -# -# Daniel Mustieles , 2010, 2011. , 2012, 2013, 2014, 2015. -# -msgid "" -msgstr "" -"Project-Id-Version: epiphany.master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-08 16:37+0000\n" -"PO-Revision-Date: 2015-03-08 21:14+0100\n" -"Last-Translator: Daniel Mustieles \n" -"Language-Team: Español; Castellano \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.6\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../data/default-bookmarks.rdf.in.h:1 -msgid "Search the web" -msgstr "Buscar en la web" - -#. Translators: you can use the regions listed in -#. https://duckduckgo.com/params to boost a particular region -#. associated with your language. For instance, for translators -#. to Finnish, it might make sense to add kl=fi-fi to the search -#. URL in order to boost results from Finland. Additionally, the -#. 'kad' parameter can be used to specify the locale in which -#. duckduckgo must be translated. So, for a Finnish localized -#. version of duckduckgo that will render results tailored for -#. Finland, the string would be: -#. https://duckduckgo.com/?t=epiphany&kl=fi-fi&kad=fi_FI -#. -#: ../data/default-bookmarks.rdf.in.h:13 -msgid "https://duckduckgo.com/?t=epiphany" -msgstr "https://duckduckgo.com/?t=epiphany" - -#. Translators: you can use the regions listed in -#. https://duckduckgo.com/params to boost a particular region -#. associated with your language. For instance, for translators -#. to Finnish, it might make sense to add kl=fi-fi to the search -#. URL in order to boost results from Finland. Additionally, the -#. 'kad' parameter can be used to specify the locale in which -#. duckduckgo must be translated. For such case, the search url -#. would be -#. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 -#: ../src/ephy-search-provider.c:289 -#, no-c-format -msgid "https://duckduckgo.com/?q=%s&t=epiphany" -msgstr "https://duckduckgo.com/?q=%s&t=epiphany" - -#: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" - -#: ../data/epiphany.appdata.xml.in.h:2 -msgid "Web browser for GNOME" -msgstr "Navegador web para GNOME" - -#: ../data/epiphany.appdata.xml.in.h:3 -msgid "" -"The web browser for GNOME, featuring tight integration with the desktop and " -"a simple and intuitive user interface that allows you to focus on your web " -"pages." -msgstr "" -"El navegador web del escritorio GNOME, que ofrece una estrecha integración " -"con el escritorio y una interfaz de usuario simple e intuitiva que le " -"permite centrarse en sus páginas web." - -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 -#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 -msgid "Web" -msgstr "Web" - -#: ../data/epiphany.desktop.in.in.h:2 -msgid "Web Browser" -msgstr "Navegador web" - -#: ../data/epiphany.desktop.in.in.h:3 -msgid "Epiphany Web Browser" -msgstr "Navegador web Epiphany" - -#: ../data/epiphany.desktop.in.in.h:4 -msgid "Browse the web" -msgstr "Navegue por la web" - -#: ../data/epiphany.desktop.in.in.h:5 -msgid "web;browser;internet;" -msgstr "web;navegador;internet;" - -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" -msgid "New Incognito Window" -msgstr "Ventana nueva de incógnito" - -#: ../data/org.gnome.epiphany.gschema.xml.h:1 -msgid "Browse with caret" -msgstr "Navegar con cursor" - -#. DuckDuckGo is the default search engine. Must exactly match the URL used -#. in the preferences dialog, except this string is surrounded by single quotes -#. and uses & instead of simply &. If the match is not otherwise exact, -#. there will be a spurious, ugly entry in the preferences combo, so please -#. test this. Should ideally also match the default smart bookmark link in -#. default-bookmarks.rdf. See the comment there for region parameters to -#. the URL. -#: ../data/org.gnome.epiphany.gschema.xml.h:10 -#, no-c-format -msgid "'https://duckduckgo.com/?q=%s&t=epiphany'" -msgstr "'https://duckduckgo.com/?q=%s&t=epiphany'" - -#: ../data/org.gnome.epiphany.gschema.xml.h:11 -msgid "URL Search" -msgstr "Búsqueda de URL" - -#: ../data/org.gnome.epiphany.gschema.xml.h:12 -msgid "Search string for keywords entered in the URL bar." -msgstr "" -"Cadena de búsqueda para las palabras clave introducidas en la barra de URL." - -#: ../data/org.gnome.epiphany.gschema.xml.h:13 -msgid "User agent" -msgstr "Agente de usuario" - -#: ../data/org.gnome.epiphany.gschema.xml.h:14 -msgid "" -"String that will be used as user agent, to identify the browser to the web " -"servers." -msgstr "" -"Cadena que usar como agente de usuario («user agent») para identificar el " -"navegador con los servidores web." - -#: ../data/org.gnome.epiphany.gschema.xml.h:15 -msgid "Automatic downloads" -msgstr "Descargas automáticas" - -#: ../data/org.gnome.epiphany.gschema.xml.h:16 -msgid "" -"When files cannot be opened by the browser they are automatically downloaded " -"to the download folder and opened with the appropriate application." -msgstr "" -"Cuando el navegador no pueda abrir los archivos, se descargarán " -"automáticamente a la carpeta de descargas y se abrirán con la aplicación " -"apropiada." - -#: ../data/org.gnome.epiphany.gschema.xml.h:17 -msgid "Force new windows to be opened in tabs" -msgstr "Forzar la apertura de ventanas nuevas en pestañas" - -#: ../data/org.gnome.epiphany.gschema.xml.h:18 -msgid "" -"Force new window requests to be opened in tabs instead of using a new window." -msgstr "" -"Forzar que las peticiones de ventanas nuevas se abran en pestañas en lugar " -"de en nuevas ventanas." - -#: ../data/org.gnome.epiphany.gschema.xml.h:19 -msgid "Remember passwords" -msgstr "Recordar contraseñas" - -#: ../data/org.gnome.epiphany.gschema.xml.h:20 -msgid "Whether to store and prefill passwords in websites." -msgstr "" -"Indica si se deben almacenar y precompletar las contraseñas en los sitios " -"web." - -#: ../data/org.gnome.epiphany.gschema.xml.h:21 -msgid "Automatically manage offline status with NetworkManager" -msgstr "Gestionar automáticamente el estado de desconexión con NetworkManager" - -#: ../data/org.gnome.epiphany.gschema.xml.h:22 -msgid "Enable smooth scrolling" -msgstr "Activar desplazamiento suave" - -#: ../data/org.gnome.epiphany.gschema.xml.h:23 -msgid "Don't use an external application to view page source." -msgstr "No usar una aplicación externa para ver el código fuente de la página." - -#: ../data/org.gnome.epiphany.gschema.xml.h:24 -msgid "Whether to automatically restore the last session" -msgstr "Indica si se debe restaurar automáticamente la última sesión" - -#: ../data/org.gnome.epiphany.gschema.xml.h:25 -msgid "" -"Defines how the session will be restored during startup. Allowed values are " -"'always' (the previous state of the application is always restored), " -"'crashed' (the session is only restored if the application crashes) and " -"'never' (the homepage is always shown)." -msgstr "" -"Define cómo se restaurará la sesión durante el inicio. Los valores " -"permitidos son «always» (siempre se restaura el estado anterior de la " -"aplicación), «crashed» (solo se restaura la sesión si falló la aplicación) y " -"«never» (siempre se muestra la página de inicio)." - -#: ../data/org.gnome.epiphany.gschema.xml.h:26 -msgid "" -"Whether to delay loading of tabs that are not immediately visible on session " -"restore" -msgstr "" -"Indica si se debe retardar la carga de pestañas que no son visibles " -"inmediatamente al restaurar la sesión" - -#: ../data/org.gnome.epiphany.gschema.xml.h:27 -msgid "" -"When this option is set to true, tabs will not start loading until the user " -"switches to them, upon session restore." -msgstr "" -"Si esta opción es cierta, las pestañas no empezarán a cargarse hasta que el " -"usuario la seleccione, al restaurar la sesión." - -#: ../data/org.gnome.epiphany.gschema.xml.h:28 -msgid "Process model" -msgstr "Modelo de proceso" - -#: ../data/org.gnome.epiphany.gschema.xml.h:29 -msgid "" -"This option allows to set the process model used. Use 'shared-secondary-" -"process' to use a single web process shared by all the tabs and 'one-" -"secondary-process-per-web-view' to use a different web process for each tab." -msgstr "" -"Esta opción permite configurar el modelo de proceso usado. Use «shared-" -"secondary-process» para usar un único proceso web compartido por todas las " -"pestañas y «one-secondary-process-per-web-view» para usar un proceso web " -"diferente para cada pestaña." - -#: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Estilo de barra de herramientas" - -#: ../data/org.gnome.epiphany.gschema.xml.h:31 -msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Estilo de la barra de herramientas. Los valores permitidos son «(usar estilo " -"predefinido de GNOME)» «both» (texto e iconos), «both-horiz» (texto junto a " -"los iconos), «icons», y «text»." - -#: ../data/org.gnome.epiphany.gschema.xml.h:32 -msgid "[Deprecated]" -msgstr "[Obsoleto]" - -#: ../data/org.gnome.epiphany.gschema.xml.h:33 -msgid "" -"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " -"instead." -msgstr "" -"[Obsoleto] Esta configuración está obsoleta, use «tabs-bar-visibility-" -"policy» en su lugar." - -#: ../data/org.gnome.epiphany.gschema.xml.h:34 -msgid "Visibility of the downloads window" -msgstr "Visibilidad de la ventana de descargas" - -#: ../data/org.gnome.epiphany.gschema.xml.h:35 -msgid "" -"Hide or show the downloads window. When hidden, a notification will be shown " -"when new downloads are started." -msgstr "" -"Mostrar u ocultar la ventana de descargas. Cuando está oculta, se mostrará " -"una notificación al iniciarse nuevas descargas." - -#: ../data/org.gnome.epiphany.gschema.xml.h:36 -msgid "The visibility policy for the tabs bar." -msgstr "La política de visibilidad para la barra de pestañas." - -#: ../data/org.gnome.epiphany.gschema.xml.h:37 -msgid "" -"Controls when the tabs bar is shown. Possible values are 'always' (the tabs " -"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " -"two or more tabs) and 'never' (the tabs bar is never shown)." -msgstr "" -"Controla cuándo se muestra la barra de pestañas. Los valores posibles son " -"«always» (la barra de pestañas se muestra siempre), «more-than-one» (la " -"barra de pestañas se muestra solo si hay dos o más pestañas) y «never» (no " -"es muestra nunca)." - -#: ../data/org.gnome.epiphany.gschema.xml.h:38 -msgid "Minimum font size" -msgstr "Tamaño mínimo de la tipografía" - -#: ../data/org.gnome.epiphany.gschema.xml.h:39 -msgid "Use GNOME fonts" -msgstr "Usar tipografías de GNOME" - -#: ../data/org.gnome.epiphany.gschema.xml.h:40 -msgid "Use GNOME font settings." -msgstr "Usar tipografías de GNOME." - -#: ../data/org.gnome.epiphany.gschema.xml.h:41 -msgid "Custom sans-serif font" -msgstr "Tipografía Sans Serif personalizada" - -#: ../data/org.gnome.epiphany.gschema.xml.h:42 -msgid "" -"A value to be used to override sans-serif desktop font when use-gnome-fonts " -"is set." -msgstr "" -"El valor que usar para sobrescribir la tipografía Sans Serif del escritorio " -"cuando «use-gnome-fonts» es cierto." - -#: ../data/org.gnome.epiphany.gschema.xml.h:43 -msgid "Custom serif font" -msgstr "Tipografía Serif personalizada" - -#: ../data/org.gnome.epiphany.gschema.xml.h:44 -msgid "" -"A value to be used to override serif desktop font when use-gnome-fonts is " -"set." -msgstr "" -"El valor que usar para sobrescribir la tipografía Serif del escritorio " -"cuando «use-gnome-fonts» es cierto." - -#: ../data/org.gnome.epiphany.gschema.xml.h:45 -msgid "Custom monospace font" -msgstr "Tipografía monoespaciada personalizada" - -#: ../data/org.gnome.epiphany.gschema.xml.h:46 -msgid "" -"A value to be used to override monospace desktop font when use-gnome-fonts " -"is set." -msgstr "" -"El valor que usar para sobrescribir la tipografía monoespaciada del " -"escritorio cuando «use-gnome-fonts» es cierto." - -#: ../data/org.gnome.epiphany.gschema.xml.h:47 -msgid "Use own colors" -msgstr "Usar sus propios colores" - -#: ../data/org.gnome.epiphany.gschema.xml.h:48 -msgid "Use your own colors instead of the colors the page requests." -msgstr "Use sus propios colores en vez de los que la página pide." - -#: ../data/org.gnome.epiphany.gschema.xml.h:49 -msgid "Use own fonts" -msgstr "Usar sus propias tipografías" - -#: ../data/org.gnome.epiphany.gschema.xml.h:50 -msgid "Use your own fonts instead of the fonts the page requests." -msgstr "Use sus propias tipografías en vez de las que la página pida." - -#: ../data/org.gnome.epiphany.gschema.xml.h:51 -msgid "Use a custom CSS" -msgstr "Usar CSS personalizado" - -#: ../data/org.gnome.epiphany.gschema.xml.h:52 -msgid "Use a custom CSS file to modify websites own CSS." -msgstr "Usar un archivo CSS personalizado para el CSS de las páginas web." - -#: ../data/org.gnome.epiphany.gschema.xml.h:53 -msgid "Enable spell checking" -msgstr "Activar corrección ortográfica" - -#: ../data/org.gnome.epiphany.gschema.xml.h:54 -msgid "Spell check any text typed in editable areas." -msgstr "Comprobar la ortografía de cualquier texto escrito en áreas editables." - -#: ../data/org.gnome.epiphany.gschema.xml.h:55 -msgid "Default encoding" -msgstr "Codificación predeterminada" - -#: ../data/org.gnome.epiphany.gschema.xml.h:56 -msgid "" -"Default encoding. Accepted values are the ones WebKitGTK+ can understand." -msgstr "" -"Codificación predeterminada. Los valores aceptados son los que WebKitGTK+ " -"puede entender." - -#: ../data/org.gnome.epiphany.gschema.xml.h:57 -#: ../src/resources/prefs-dialog.ui.h:39 -msgid "Languages" -msgstr "Idiomas" - -#: ../data/org.gnome.epiphany.gschema.xml.h:58 -msgid "Preferred languages, two letter codes." -msgstr "Idiomas preferidos, código de dos letras." - -#: ../data/org.gnome.epiphany.gschema.xml.h:59 -msgid "Cookie accept" -msgstr "Aceptar cookies" - -#: ../data/org.gnome.epiphany.gschema.xml.h:60 -msgid "" -"Where to accept cookies from. Possible values are \"always\", \"no-third-" -"party\" and \"never\"." -msgstr "" -"Indica desde dónde se aceptan cookies. Los valores posibles " -"son .«always» (siempre), «no-third-party» (no de terceras partes) y " -"«never» (nunca)." - -#: ../data/org.gnome.epiphany.gschema.xml.h:61 -msgid "Image animation mode" -msgstr "Modo de animación de imágenes" - -#: ../data/org.gnome.epiphany.gschema.xml.h:62 -msgid "" -"How to present animated images. Possible values are \"normal\", \"once\" and " -"\"disabled\"." -msgstr "" -"Cómo se presentan las imágenes animadas. Los valores posibles son «normal», " -"«once» (una vez) y «disabled» (desactivado)." - -#: ../data/org.gnome.epiphany.gschema.xml.h:63 -msgid "Allow popups" -msgstr "Permitir ventanas emergentes" - -#: ../data/org.gnome.epiphany.gschema.xml.h:64 -msgid "" -"Allow sites to open new windows using JavaScript (if JavaScript is enabled)." -msgstr "" -"Permite a los sitios abrir ventanas nuevas usando JavaScript (si JavaScript " -"está activado)." - -#: ../data/org.gnome.epiphany.gschema.xml.h:65 -msgid "Enable Plugins" -msgstr "Activar complementos" - -#: ../data/org.gnome.epiphany.gschema.xml.h:66 -msgid "Enable JavaScript" -msgstr "Activar JavaScript" - -#: ../data/org.gnome.epiphany.gschema.xml.h:67 -msgid "Enable WebGL" -msgstr "Activar WebGL" - -#: ../data/org.gnome.epiphany.gschema.xml.h:68 -msgid "Whether to enable support for WebGL contexts." -msgstr "Indica si se debe activar el soporte para contextos WebGL." - -#: ../data/org.gnome.epiphany.gschema.xml.h:69 -msgid "Enable WebAudio" -msgstr "Activar WebAudio" - -#: ../data/org.gnome.epiphany.gschema.xml.h:70 -msgid "Whether to enable support for WebAudio." -msgstr "Indica si se debe activar el soporte para WebAudio." - -#: ../data/org.gnome.epiphany.gschema.xml.h:71 -msgid "Do Not Track" -msgstr "No rastrear" - -#: ../data/org.gnome.epiphany.gschema.xml.h:72 -msgid "" -"Whether to tell websites that we do not wish to be tracked. Please note that " -"web pages are not forced to follow this setting." -msgstr "" -"Indica si se debe indicar a los sitios web que no quiere que le rastreen. " -"Tenga en cuenta que las páginas web no están obligadas a respetar esta " -"configuración." - -#: ../data/org.gnome.epiphany.gschema.xml.h:73 -msgid "Enable Adblock" -msgstr "Activar Adblock" - -#: ../data/org.gnome.epiphany.gschema.xml.h:74 -msgid "" -"Whether to block the embedded advertisements that web pages might want to " -"show." -msgstr "" -"Indica si se deben bloquear los anuncios empotrados que las páginas web " -"puedan querer mostrar." - -#: ../data/org.gnome.epiphany.gschema.xml.h:75 -msgid "The downloads folder" -msgstr "La carpeta de descargas" - -#: ../data/org.gnome.epiphany.gschema.xml.h:76 -msgid "" -"The path of the folder where to download files to; or \"Downloads\" to use " -"the default downloads folder, or \"Desktop\" to use the desktop folder." -msgstr "" -"La ruta de la carpeta donde se descargarán los archivos, o \"Descargas\" " -"para usar la carpeta de descargas predeterminada, o \"Desktop\" para usar la " -"carpeta del escritorio." - -#: ../data/org.gnome.epiphany.gschema.xml.h:77 -msgid "Whether to show the title column in the bookmarks window." -msgstr "" -"Indica si debe mostrar la columna de título en la ventana de marcadores." - -#: ../data/org.gnome.epiphany.gschema.xml.h:78 -msgid "Whether to show the address column in the bookmarks window." -msgstr "" -"Indica si debe mostrar la columna de direcciones en la ventana de marcadores." - -#: ../embed/ephy-about-handler.c:139 -msgid "Installed plugins" -msgstr "Complementos instalados" - -#: ../embed/ephy-about-handler.c:140 -msgid "Plugins" -msgstr "Complementos" - -#: ../embed/ephy-about-handler.c:143 -msgid "Plugins are disabled in the preferences" -msgstr "Los complementos están desactivados en las preferencias" - -#: ../embed/ephy-about-handler.c:156 -msgid "Enabled" -msgstr "Activado" - -#. webkit_plugin_get_enabled (plugin) && -#: ../embed/ephy-about-handler.c:156 -msgid "Yes" -msgstr "Sí" - -#: ../embed/ephy-about-handler.c:156 -msgid "No" -msgstr "No" - -#: ../embed/ephy-about-handler.c:157 -msgid "MIME type" -msgstr "Tipo MIME" - -#: ../embed/ephy-about-handler.c:157 -msgid "Description" -msgstr "Descripción" - -#: ../embed/ephy-about-handler.c:157 -msgid "Suffixes" -msgstr "Sufijos" - -#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222 -msgid "Memory usage" -msgstr "Uso de la memoria" - -#: ../embed/ephy-about-handler.c:270 -#, c-format -msgid "Version %s" -msgstr "Versión %s" - -#: ../embed/ephy-about-handler.c:290 -msgid "About Web" -msgstr "Acerca de Web" - -#: ../embed/ephy-about-handler.c:294 -msgid "A simple, clean, beautiful view of the web" -msgstr "Una vista simple, limpia y bonita de la web" - -#: ../embed/ephy-about-handler.c:352 ../embed/ephy-about-handler.c:353 -msgid "Applications" -msgstr "Aplicaciones" - -#: ../embed/ephy-about-handler.c:354 -msgid "List of installed web applications" -msgstr "Lista de las aplicaciones web instaladas" - -#. Note for translators: this refers to the installation date. -#: ../embed/ephy-about-handler.c:370 -msgid "Installed on:" -msgstr "Instalada el:" - -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Quitar de la vista general" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 -msgid "Most Visited" -msgstr "Más visitados" - -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 -msgid "Private Browsing" -msgstr "Navegación privada" - -#: ../embed/ephy-about-handler.c:551 -msgid "" -"You are currently browsing incognito. Pages viewed in this mode " -"will not show up in your browsing history and all stored information will be " -"cleared when you close the window. Files you download will be kept." -msgstr "" -"Actualmente está navegando en modo incógnito. Las páginas que " -"visite en este modo no se mostrarán en el histórico del navegador y toda la " -"información almacenada se limpiará cuando cierre la ventana. Los archivos " -"que descargue se conservarán." - -#: ../embed/ephy-about-handler.c:555 -msgid "" -"Incognito mode hides your activity only from people using this computer." -msgstr "" -"El modo de incógnito oculta su actividad sólo ante la gente que use este " -"mismo equipo." - -#: ../embed/ephy-about-handler.c:557 -msgid "" -"It will not hide your activity from your employer if you are at work. Your " -"internet service provider, your government, other governments, the websites " -"that you visit, and advertisers on these websites may still be tracking you." -msgstr "" -"Esto no ocultará su actividad ante su jefe en el trabajo. Su proveedor de " -"servicios de Internet, su gobierno u otros gobiernos, las páginas web que " -"visite o los anunciantes en dichas páginas pueden seguir rastreándole." - -#. characters -#: ../embed/ephy-embed.c:51 -msgid "Blank page" -msgstr "Página en blanco" - -#: ../embed/ephy-embed.c:542 -#, c-format -msgid "Press %s to exit fullscreen" -msgstr "Pulse %s para salir del modo a pantalla completa" - -#. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 -msgid "ESC" -msgstr "ESC" - -#: ../embed/ephy-embed.c:545 -msgid "F11" -msgstr "F11" - -#: ../embed/ephy-embed-utils.c:65 -#, c-format -msgid "Send an email message to “%s”" -msgstr "Enviar correo-e a la dirección «%s»" - -#: ../embed/ephy-encodings.c:54 -msgid "Arabic (_IBM-864)" -msgstr "Árabe (_IBM-864)" - -#: ../embed/ephy-encodings.c:55 -msgid "Arabic (ISO-_8859-6)" -msgstr "Árabe (ISO-_8859-6)" - -#: ../embed/ephy-encodings.c:56 -msgid "Arabic (_MacArabic)" -msgstr "Árabe (_MacArabic)" - -#: ../embed/ephy-encodings.c:57 -msgid "Arabic (_Windows-1256)" -msgstr "Árabe(_Windows-1256)" - -#: ../embed/ephy-encodings.c:58 -msgid "Baltic (_ISO-8859-13)" -msgstr "Báltico (_ISO-8859-13)" - -#: ../embed/ephy-encodings.c:59 -msgid "Baltic (I_SO-8859-4)" -msgstr "Báltico (I_SO-8859-4)" - -#: ../embed/ephy-encodings.c:60 -msgid "Baltic (_Windows-1257)" -msgstr "Báltico (_Windows-1257)" - -#: ../embed/ephy-encodings.c:61 -msgid "_Armenian (ARMSCII-8)" -msgstr "_Armenio (ARMSCII-8)" - -#: ../embed/ephy-encodings.c:62 -msgid "_Georgian (GEOSTD8)" -msgstr "_Georgiano (GEOSTD8)" - -#: ../embed/ephy-encodings.c:63 -msgid "Central European (_IBM-852)" -msgstr "Centroeuropeo (_IBM-852)" - -#: ../embed/ephy-encodings.c:64 -msgid "Central European (I_SO-8859-2)" -msgstr "Centroeuropeo (I_SO-8859-2)" - -#: ../embed/ephy-encodings.c:65 -msgid "Central European (_MacCE)" -msgstr "Centroeuropeo (_MacCE)" - -#: ../embed/ephy-encodings.c:66 -msgid "Central European (_Windows-1250)" -msgstr "Centroeuropeo (_Windows-1250)" - -#: ../embed/ephy-encodings.c:67 -msgid "Chinese Simplified (_GB18030)" -msgstr "Chino simplificado (_GB18030)" - -#: ../embed/ephy-encodings.c:68 -msgid "Chinese Simplified (G_B2312)" -msgstr "Chino simplificado (G_B2312)" - -#: ../embed/ephy-encodings.c:69 -msgid "Chinese Simplified (GB_K)" -msgstr "Chino simplificado (GB_K)" - -#: ../embed/ephy-encodings.c:70 -msgid "Chinese Simplified (_HZ)" -msgstr "Chino simplificado (_HZ)" - -#: ../embed/ephy-encodings.c:71 -msgid "Chinese Simplified (_ISO-2022-CN)" -msgstr "Chino simplificado (_ISO-2022-CN)" - -#: ../embed/ephy-encodings.c:72 -msgid "Chinese Traditional (Big_5)" -msgstr "Chino tradicional (Big_5)" - -#: ../embed/ephy-encodings.c:73 -msgid "Chinese Traditional (Big5-HK_SCS)" -msgstr "Chino tradicional (Big5-HK_SCS)" - -#: ../embed/ephy-encodings.c:74 -msgid "Chinese Traditional (_EUC-TW)" -msgstr "Chino tradicional (_EUC-TW)" - -#: ../embed/ephy-encodings.c:75 -msgid "Cyrillic (_IBM-855)" -msgstr "Cirílico (_IBM-855)" - -#: ../embed/ephy-encodings.c:76 -msgid "Cyrillic (I_SO-8859-5)" -msgstr "Cirílico (IS_O-8859-5)" - -#: ../embed/ephy-encodings.c:77 -msgid "Cyrillic (IS_O-IR-111)" -msgstr "Cirílico (IS_O-IR-111)" - -#: ../embed/ephy-encodings.c:78 -msgid "Cyrillic (_KOI8-R)" -msgstr "Cirílico (_KOI8-R)" - -#: ../embed/ephy-encodings.c:79 -msgid "Cyrillic (_MacCyrillic)" -msgstr "Cirílico (_MacCyrillic)" - -#: ../embed/ephy-encodings.c:80 -msgid "Cyrillic (_Windows-1251)" -msgstr "Cirílico (_Windows-1251)" - -#: ../embed/ephy-encodings.c:81 -msgid "Cyrillic/_Russian (IBM-866)" -msgstr "Cirílico/_Ruso (IBM-866)" - -#: ../embed/ephy-encodings.c:82 -msgid "Greek (_ISO-8859-7)" -msgstr "Griego (_ISO-8859-7)" - -#: ../embed/ephy-encodings.c:83 -msgid "Greek (_MacGreek)" -msgstr "Griego (_MacGreek)" - -#: ../embed/ephy-encodings.c:84 -msgid "Greek (_Windows-1253)" -msgstr "Griego (_Windows-1253)" - -#: ../embed/ephy-encodings.c:85 -msgid "Gujarati (_MacGujarati)" -msgstr "Gujarati (_MacGujarati)" - -#: ../embed/ephy-encodings.c:86 -msgid "Gurmukhi (Mac_Gurmukhi)" -msgstr "Gurmukhi (Mac_Gurmukhi)" - -#: ../embed/ephy-encodings.c:87 -msgid "Hindi (Mac_Devanagari)" -msgstr "Hindi (Mac_Devanagari)" - -#: ../embed/ephy-encodings.c:88 -msgid "Hebrew (_IBM-862)" -msgstr "Hebreo (_IBM-862)" - -#: ../embed/ephy-encodings.c:89 -msgid "Hebrew (IS_O-8859-8-I)" -msgstr "Hebreo (IS_O-8859-8-I)" - -#: ../embed/ephy-encodings.c:90 -msgid "Hebrew (_MacHebrew)" -msgstr "Hebreo (_MacHebrew)" - -#: ../embed/ephy-encodings.c:91 -msgid "Hebrew (_Windows-1255)" -msgstr "Hebreo (_Windows-1255)" - -#: ../embed/ephy-encodings.c:92 -msgid "_Visual Hebrew (ISO-8859-8)" -msgstr "Hebreo _visual (ISO-8859-8)" - -#: ../embed/ephy-encodings.c:93 -msgid "Japanese (_EUC-JP)" -msgstr "Japonés (_EUC-JP)" - -#: ../embed/ephy-encodings.c:94 -msgid "Japanese (_ISO-2022-JP)" -msgstr "Japonés (_ISO-2022-JP)" - -#: ../embed/ephy-encodings.c:95 -msgid "Japanese (_Shift-JIS)" -msgstr "Japonés (_Shift-JIS)" - -#: ../embed/ephy-encodings.c:96 -msgid "Korean (_EUC-KR)" -msgstr "Coreano (_EUC-KR)" - -#: ../embed/ephy-encodings.c:97 -msgid "Korean (_ISO-2022-KR)" -msgstr "Coreano (_ISO-2022-KR)" - -#: ../embed/ephy-encodings.c:98 -msgid "Korean (_JOHAB)" -msgstr "Coreano (_JOHAB)" - -#: ../embed/ephy-encodings.c:99 -msgid "Korean (_UHC)" -msgstr "Coreano (_UHC)" - -#: ../embed/ephy-encodings.c:100 -msgid "_Celtic (ISO-8859-14)" -msgstr "_Celta (ISO-8859-14)" - -#: ../embed/ephy-encodings.c:101 -msgid "_Icelandic (MacIcelandic)" -msgstr "_Islandés (MacIcelandic)" - -#: ../embed/ephy-encodings.c:102 -msgid "_Nordic (ISO-8859-10)" -msgstr "_Nórdico (ISO-8859-10)" - -#: ../embed/ephy-encodings.c:103 -msgid "_Persian (MacFarsi)" -msgstr "_Persa (MacFarsi)" - -#: ../embed/ephy-encodings.c:104 -msgid "Croatian (Mac_Croatian)" -msgstr "Croata (Mac_Croatian)" - -#: ../embed/ephy-encodings.c:105 -msgid "_Romanian (MacRomanian)" -msgstr "_Rumano (MacRomanian)" - -#: ../embed/ephy-encodings.c:106 -msgid "R_omanian (ISO-8859-16)" -msgstr "R_umano (ISO-8859-16)" - -#: ../embed/ephy-encodings.c:107 -msgid "South _European (ISO-8859-3)" -msgstr "Sur _europeo (ISO-8859-3)" - -#: ../embed/ephy-encodings.c:108 -msgid "Thai (TIS-_620)" -msgstr "Tailandés (TIS-_620)" - -#: ../embed/ephy-encodings.c:109 -msgid "Thai (IS_O-8859-11)" -msgstr "Tailandés (IS_O-8859-11)" - -#: ../embed/ephy-encodings.c:110 -msgid "_Thai (Windows-874)" -msgstr "_Tailandés (Windows-874)" - -#: ../embed/ephy-encodings.c:111 -msgid "Turkish (_IBM-857)" -msgstr "Turco (_IBM-857)" - -#: ../embed/ephy-encodings.c:112 -msgid "Turkish (I_SO-8859-9)" -msgstr "Turco (I_SO-8859-9)" - -#: ../embed/ephy-encodings.c:113 -msgid "Turkish (_MacTurkish)" -msgstr "Turco (_MacTurkish)" - -#: ../embed/ephy-encodings.c:114 -msgid "Turkish (_Windows-1254)" -msgstr "Turco (_Windows-1254)" - -#: ../embed/ephy-encodings.c:115 -msgid "Unicode (UTF-_8)" -msgstr "Unicode (UTF-_8)" - -#: ../embed/ephy-encodings.c:116 -msgid "Cyrillic/Ukrainian (_KOI8-U)" -msgstr "Cirílico/Ucraniano (_KOI8-U)" - -#: ../embed/ephy-encodings.c:117 -msgid "Cyrillic/Ukrainian (Mac_Ukrainian)" -msgstr "Cirílico/Ucraniano (Mac_Ukranian)" - -#: ../embed/ephy-encodings.c:118 -msgid "Vietnamese (_TCVN)" -msgstr "Vietnamita (_TCVN)" - -#: ../embed/ephy-encodings.c:119 -msgid "Vietnamese (_VISCII)" -msgstr "Vietnamita (_VISCII)" - -#: ../embed/ephy-encodings.c:120 -msgid "Vietnamese (V_PS)" -msgstr "Vietnamita (V_PS)" - -#: ../embed/ephy-encodings.c:121 -msgid "Vietnamese (_Windows-1258)" -msgstr "Vietnamita (_Windows-1258)" - -#: ../embed/ephy-encodings.c:122 -msgid "Western (_IBM-850)" -msgstr "Occidental (_IBM-850)" - -#: ../embed/ephy-encodings.c:123 -msgid "Western (_ISO-8859-1)" -msgstr "Occidental (_ISO-8859-1)" - -#: ../embed/ephy-encodings.c:124 -msgid "Western (IS_O-8859-15)" -msgstr "Occidental (IS_O-8859-15)" - -#: ../embed/ephy-encodings.c:125 -msgid "Western (_MacRoman)" -msgstr "Occidental (_MacRoman)" - -#: ../embed/ephy-encodings.c:126 -msgid "Western (_Windows-1252)" -msgstr "Occidental (_Windows-1252)" - -#. The following encodings are so rarely used that we don't want to -#. * pollute the "related" part of the encodings menu with them, so we -#. * set the language group to 0 here. -#. -#: ../embed/ephy-encodings.c:132 -msgid "English (_US-ASCII)" -msgstr "Inglés (_US-ASCII)" - -#: ../embed/ephy-encodings.c:133 -msgid "Unicode (UTF-_16 BE)" -msgstr "Unicode (UTF-_16 BE)" - -#: ../embed/ephy-encodings.c:134 -msgid "Unicode (UTF-1_6 LE)" -msgstr "Unicode (UTF-1_6 LE)" - -#: ../embed/ephy-encodings.c:135 -msgid "Unicode (UTF-_32 BE)" -msgstr "Unicode (UTF-_32 BE)" - -#: ../embed/ephy-encodings.c:136 -msgid "Unicode (UTF-3_2 LE)" -msgstr "Unicode (UTF-3_2 LE)" - -#. Translators: this is the title that an unknown encoding will -#. * be displayed as. -#. -#: ../embed/ephy-encodings.c:218 -#, c-format -msgid "Unknown (%s)" -msgstr "Desconocido (%s)" - -#: ../embed/ephy-find-toolbar.c:104 -msgid "Text not found" -msgstr "Texto no encontrado" - -#: ../embed/ephy-find-toolbar.c:110 -msgid "Search wrapped back to the top" -msgstr "La búsqueda volvió al principio" - -#: ../embed/ephy-find-toolbar.c:451 -msgid "Type to search…" -msgstr "Escribir para buscar…" - -#: ../embed/ephy-find-toolbar.c:457 -msgid "Find previous occurrence of the search string" -msgstr "Busca la aparición anterior de la cadena de búsqueda" - -#: ../embed/ephy-find-toolbar.c:465 -msgid "Find next occurrence of the search string" -msgstr "Busca la siguiente aparición de la cadena de búsqueda" - -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Guardar" - -#: ../embed/ephy-web-view.c:493 -msgid "_Don’t Save" -msgstr "_No guardar" - -#. Translators: The %s the hostname where this is happening. -#. * Example: mail.google.com. -#. -#: ../embed/ephy-web-view.c:504 -#, c-format -msgid "Do you want to save your password for “%s”?" -msgstr "¿Quiere guardar la contraseña para «%s»?" - -#: ../embed/ephy-web-view.c:1416 -msgid "Deny" -msgstr "Denegar" - -#: ../embed/ephy-web-view.c:1417 -msgid "Allow" -msgstr "Permitir" - -#. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 -#, c-format -msgid "The page at %s wants to know your location." -msgstr "La página %s quiere saber su ubicación." - -#. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 -#, c-format -msgid "The page at %s wants to show desktop notifications." -msgstr "" -"La página %s quiere saber mostrar notificaciones en el escritorio." - -#. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 -#, c-format -msgid "Loading “%s”…" -msgstr "Cargando «%s»…" - -#: ../embed/ephy-web-view.c:1521 -msgid "Loading…" -msgstr "Cargando…" - -#. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 -msgid "" -"This website presented identification that belongs to a different website." -msgstr "" -"Este sitio web presenta una identificación que pertenece a un sitio web " -"diferente." - -#. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 -msgid "" -"This website’s identification is too old to trust. Check the date on your " -"computer’s calendar." -msgstr "" -"La identificación de este sitio web es muy antigua para confiar en ella. " -"Compruebe la fecha en el calendario de su equipo." - -#. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 -msgid "This website’s identification was not issued by a trusted organization." -msgstr "" -"La identificación de este sitio web no la ha emitido una organización de " -"confianza." - -#. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 -msgid "" -"This website’s identification could not be processed. It may be corrupted." -msgstr "" -"No se pudo procesar la identificación de este sitio web. Puede que esté " -"corrupta." - -#. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 -msgid "" -"This website’s identification has been revoked by the trusted organization " -"that issued it." -msgstr "" -"La organización que emitió la identificación de este sitio web la ha " -"revocado." - -#. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 -msgid "" -"This website’s identification cannot be trusted because it uses very weak " -"encryption." -msgstr "" -"No se puede confiar en la identificación de este sitio web porque usa un " -"cifrado muy débil." - -#. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 -msgid "" -"This website’s identification is only valid for future dates. Check the date " -"on your computer’s calendar." -msgstr "" -"La identificación de este sitio web sólo es válida para fechas futuras. " -"Compruebe la fecha en el calendario de su equipo." - -#. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 -#, c-format -msgid "This might not be the real %s." -msgstr "Esto puede no ser el %s real." - -#. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 -msgid "" -"When you try to connect securely, websites present identification to prove " -"that your connection has not been maliciously intercepted. There is " -"something wrong with this website’s identification:" -msgstr "" -"Cuando intenta conectarse de manera segura, los sitios web presentan una " -"identificación para probar que su conexión no se ha interceptado " -"maliciosamente. Hay algo erróneo en la identificación de este sitio web:" - -#. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 -msgid "" -"A third party may have hijacked your connection. You should continue only if " -"you know there is a good reason why this website does not use trusted " -"identification." -msgstr "" -"Un tercero puede haber secuestrado su conexión. Sólo debe continuar si sabe " -"que hay una buena razón por la que este sitio no use una conexión confiable." - -#. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 -msgid "" -"Legitimate banks, stores, and other public sites will not ask you to do this." -msgstr "" -"Los bancos legítimos, las tiendas y otros sitios públicos no le pedirán que " -"hagan esto." - -#: ../embed/ephy-web-view.c:1865 -msgid "None specified" -msgstr "Ninguna espacificada" - -#. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 -#, c-format -msgid "Problem loading “%s”" -msgstr "Hubo un problema al cargar «%s»" - -#: ../embed/ephy-web-view.c:1880 -msgid "Oops! Unable to display this website." -msgstr "No se ha podido cargar esta página web." - -#: ../embed/ephy-web-view.c:1881 -#, c-format -msgid "" -"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily unavailable or moved to a " -"new address. You may wish to verify that your internet connection is working " -"correctly.

" -msgstr "" -"

Parece que el sitio web en «%s» no está disponible. El error exacto fue:

%s

Puede que no esté disponible temporalmente o que " -"se haya movido a otra dirección. Puede querer comprobar que su conexión a " -"Internet está funcionando correctamente.

" - -#: ../embed/ephy-web-view.c:1889 -msgid "Try again" -msgstr "Intentarlo de nuevo" - -#: ../embed/ephy-web-view.c:1895 -msgid "Oops! There may be a problem." -msgstr "Es posible que haya un problema." - -#: ../embed/ephy-web-view.c:1896 -#, c-format -msgid "" -"

This site may have caused Web to close unexpectedly.

If this " -"happens again, please report the problem to the %s " -"developers.

" -msgstr "" -"

Este sitio ha hecho que Web se cierre de manera inesperada
Si vuelve " -"a pasar, informe del problema a los desarrolladores de %s." - -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 -msgid "Reload Anyway" -msgstr "Recargar de todas formas" - -#: ../embed/ephy-web-view.c:1905 -#, c-format -msgid "Problem displaying “%s”" -msgstr "Hubo un problema al mostrar «%s»" - -#: ../embed/ephy-web-view.c:1906 -msgid "Oops!" -msgstr "¡Ups!" - -#: ../embed/ephy-web-view.c:1907 -msgid "" -"Something went wrong while displaying this page. Please reload or visit a " -"different page to continue." -msgstr "" -"Algo saló mal al mostrar esta página. Recargue la página o visite una página " -"diferente para continuar." - -#. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 -msgid "Look out!" -msgstr "Esté atento." - -#. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 -msgid "Load Anyway" -msgstr "Cargar de todas formas" - -#: ../embed/ephy-web-view.c:2819 -msgid "_OK" -msgstr "_Aceptar" - -#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 -#: ../src/bookmarks/ephy-bookmarks-editor.c:819 -#: ../src/resources/clear-data-dialog.ui.h:3 -#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 -msgid "_Cancel" -msgstr "_Cancelar" - -#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:9 -msgid "_Open" -msgstr "_Abrir" - -#: ../lib/ephy-file-chooser.c:209 -msgid "All supported types" -msgstr "Todos los tipos soportados" - -#: ../lib/ephy-file-chooser.c:223 -msgid "Web pages" -msgstr "Páginas web" - -#: ../lib/ephy-file-chooser.c:234 -msgid "Images" -msgstr "Imágenes" - -#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:637 -msgid "All files" -msgstr "Todos los archivos" - -#. If we don't have XDG user dirs info, return an educated guess. -#: ../lib/ephy-file-helpers.c:114 ../src/resources/prefs-dialog.ui.h:2 -msgid "Downloads" -msgstr "Descargas" - -#. If we don't have XDG user dirs info, return an educated guess. -#: ../lib/ephy-file-helpers.c:167 -msgid "Desktop" -msgstr "Escritorio" - -#: ../lib/ephy-file-helpers.c:335 -#, c-format -msgid "Could not create a temporary directory in “%s”." -msgstr "No se pudo crear la carpeta temporal en: «%s»." - -#: ../lib/ephy-file-helpers.c:466 -#, c-format -msgid "The file “%s” exists. Please move it out of the way." -msgstr "el archivo «%s» ya existe. Muévalo fuera de la ruta." - -#: ../lib/ephy-file-helpers.c:487 -#, c-format -msgid "Failed to create directory “%s”." -msgstr "Falló al crear la carpeta «%s»." - -#. Translators: The first %s is the username and the second one is the -#. * hostname where this is happening. Example: gnome@gmail.com and -#. * mail.google.com. -#. -#: ../lib/ephy-form-auth-data.c:139 -#, c-format -msgid "Password for %s in a form in %s" -msgstr "Contraseña para %s en un formulario en %s" - -#. Translators: The first %s is the hostname where this is happening. -#. * Example: mail.google.com. -#. -#: ../lib/ephy-form-auth-data.c:145 -#, c-format -msgid "Password in a form in %s" -msgstr "Contraseña para %s en un formulario" - -#: ../lib/ephy-gui.c:206 -#, c-format -msgid "Directory “%s” is not writable" -msgstr "La carpeta «%s» no es escribible" - -#: ../lib/ephy-gui.c:210 -msgid "You do not have permission to create files in this directory." -msgstr "No tiene permiso para crear archivos en esta carpeta." - -#: ../lib/ephy-gui.c:213 -msgid "Directory not Writable" -msgstr "Carpeta no escribible" - -#: ../lib/ephy-gui.c:242 -#, c-format -msgid "Cannot overwrite existing file “%s”" -msgstr "No se puede sobrescribir el archivo «%s»" - -#: ../lib/ephy-gui.c:246 -msgid "" -"A file with this name already exists and you don't have permission to " -"overwrite it." -msgstr "" -"Ya existe un archivo con este nombre y no tiene permiso para sobrescribirlo." - -#: ../lib/ephy-gui.c:249 -msgid "Cannot Overwrite File" -msgstr "No se puede sobrescribir el archivo" - -#: ../lib/ephy-gui.c:307 -#, c-format -msgid "Could not display help: %s" -msgstr "No se pudo mostrar la ayuda: %s" - -#: ../lib/ephy-nss-glue.c:62 -msgid "Master password needed" -msgstr "Se necesita la contraseña maestra" - -#: ../lib/ephy-nss-glue.c:64 -msgid "" -"The passwords from the previous version are locked with a master password. " -"If you want to import them, please enter your master password below." -msgstr "" -"Las contraseñas de la versión anterior están bloqueadas con una contraseña " -"maestra. Si quiere importarlas, introduzca a continuación su contraseña " -"maestra." - -#: ../lib/ephy-profile-migrator.c:100 -msgid "Failed to copy cookies file from Mozilla." -msgstr "Falló al copiar el archivo de «cookies» de Mozilla." - -#: ../lib/ephy-profile-migrator.c:652 -msgid "" -"Web 3.6 deprecated this directory and tried migrating this configuration to " -"~/.config/epiphany" -msgstr "" -"Web 3.6 marcó como obsoleta esta carpeta y migró su configuración a ~/." -"config/epiphany" - -#: ../lib/ephy-profile-migrator.c:1030 -msgid "Executes only the n-th migration step" -msgstr "Ejecuta en n-ésimo paso dela migración" - -#: ../lib/ephy-profile-migrator.c:1032 -msgid "Specifies the required version for the migrator" -msgstr "Especifica la versión requerida por el migrador" - -#: ../lib/ephy-profile-migrator.c:1034 -msgid "Specifies the profile where the migrator should run" -msgstr "Especifica el perfil que debe ejecutar el migrador" - -#: ../lib/ephy-profile-migrator.c:1047 -msgid "Web profile migrator" -msgstr "Migrador de perfiles de Web" - -#: ../lib/ephy-profile-migrator.c:1048 -msgid "Web profile migrator options" -msgstr "Opciones del migrador de perfiles de Web" - -#. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am" -#: ../lib/ephy-time-helpers.c:223 -msgid "Today %I:%M %p" -msgstr "Hoy %H:%M" - -#. Translators: "friendly time" string for the previous day, -#. * strftime format. e.g. "Yesterday 12:34 am" -#. -#: ../lib/ephy-time-helpers.c:236 -msgid "Yesterday %I:%M %p" -msgstr "Ayer %H:%M" - -#. Translators: "friendly time" string for a day in the current week, -#. * strftime format. e.g. "Wed 12:34 am" -#. -#: ../lib/ephy-time-helpers.c:252 -msgid "%a %I:%M %p" -msgstr "%a %H:%M" - -#. Translators: "friendly time" string for a day in the current year, -#. * strftime format. e.g. "Feb 12 12:34 am" -#. -#: ../lib/ephy-time-helpers.c:264 -msgid "%b %d %I:%M %p" -msgstr "%d %b %H:%M" - -#. Translators: "friendly time" string for a day in a different year, -#. * strftime format. e.g. "Feb 12 1997" -#. -#: ../lib/ephy-time-helpers.c:269 -msgid "%b %d %Y" -msgstr "%d %b %Y" - -#. impossible time or broken locale settings -#: ../lib/ephy-time-helpers.c:279 -msgid "Unknown" -msgstr "Desconocido" - -#: ../lib/ephy-zoom.h:45 -msgid "50%" -msgstr "50%" - -#: ../lib/ephy-zoom.h:46 -msgid "75%" -msgstr "75%" - -#: ../lib/ephy-zoom.h:47 -msgid "100%" -msgstr "100%" - -#: ../lib/ephy-zoom.h:48 -msgid "125%" -msgstr "125%" - -#: ../lib/ephy-zoom.h:49 -msgid "150%" -msgstr "150%" - -#: ../lib/ephy-zoom.h:50 -msgid "175%" -msgstr "175%" - -#: ../lib/ephy-zoom.h:51 -msgid "200%" -msgstr "200%" - -#: ../lib/ephy-zoom.h:52 -msgid "300%" -msgstr "300%" - -#: ../lib/ephy-zoom.h:53 -msgid "400%" -msgstr "400%" - -#: ../lib/history/ephy-history-service-hosts-table.c:363 -msgid "Others" -msgstr "Otros" - -#: ../lib/history/ephy-history-service-hosts-table.c:367 -msgid "Local files" -msgstr "Archivos locales" - -#: ../lib/widgets/ephy-certificate-dialog.c:92 -msgid "The certificate does not match this website" -msgstr "El certificado no coincide con este sitio web" - -#: ../lib/widgets/ephy-certificate-dialog.c:95 -msgid "The certificate has expired" -msgstr "El certificado ha caducado" - -#: ../lib/widgets/ephy-certificate-dialog.c:98 -msgid "The signing certificate authority is not known" -msgstr "La autoridad de firma del certificado es desconocida" - -#: ../lib/widgets/ephy-certificate-dialog.c:101 -msgid "The certificate contains errors" -msgstr "El certificado contiene errores" - -#: ../lib/widgets/ephy-certificate-dialog.c:104 -msgid "The certificate has been revoked" -msgstr "El certificado se ha revocado" - -#: ../lib/widgets/ephy-certificate-dialog.c:107 -msgid "The certificate is signed using a weak signature algorithm" -msgstr "El certificado está firmado usando un algoritmo de firma débil" - -#: ../lib/widgets/ephy-certificate-dialog.c:110 -msgid "The certificate activation time is still in the future" -msgstr "La hora de activación del certificado está todavía en el futuro" - -#: ../lib/widgets/ephy-certificate-dialog.c:149 -msgid "The identity of this website has been verified." -msgstr "Se ha verificado la identidad de este sitio web." - -#: ../lib/widgets/ephy-certificate-dialog.c:150 -msgid "The identity of this website has not been verified." -msgstr "No se ha verificado la identidad de este sitio web." - -#. Label when clicking the lock icon on a secure page. %s is the website's hostname. -#: ../lib/widgets/ephy-certificate-popover.c:71 -#, c-format -msgid "You are connected to %s" -msgstr "Está conectado a %s" - -#. Label in certificate popover when site is untrusted. %s is a URL. -#: ../lib/widgets/ephy-certificate-popover.c:113 -#, c-format -msgid "" -"This web site’s digital identification is not trusted. You may have " -"connected to an attacker pretending to be %s." -msgstr "" -"La identificación digital de este sitio web no es de confianza. Es posible " -"que se haya conectado a un atacante que se hace pasar por %s." - -#. Label in certificate popover when site sends mixed content. -#: ../lib/widgets/ephy-certificate-popover.c:124 -msgid "Part of this page is insecure." -msgstr "Parte de esta página no es segura" - -#. Label in certificate popover on secure sites. -#: ../lib/widgets/ephy-certificate-popover.c:130 -msgid "Your connection is secure." -msgstr "Su conexión es segura." - -#: ../lib/widgets/ephy-certificate-popover.c:318 -msgid "_View Certificate…" -msgstr "_Ver certificado…" - -#: ../lib/widgets/ephy-download-widget.c:107 -#, c-format -msgid "%d second left" -msgid_plural "%d seconds left" -msgstr[0] "queda %d segundo" -msgstr[1] "quedan %d segundos" - -#: ../lib/widgets/ephy-download-widget.c:113 -#, c-format -msgid "%d minute left" -msgid_plural "%d minutes left" -msgstr[0] "queda %d minuto" -msgstr[1] "quedan %d minutos" - -#: ../lib/widgets/ephy-download-widget.c:119 -#, c-format -msgid "%d hour left" -msgid_plural "%d hours left" -msgstr[0] "queda %d hora" -msgstr[1] "quedan %d horas" - -#: ../lib/widgets/ephy-download-widget.c:125 -#, c-format -msgid "%d day left" -msgid_plural "%d days left" -msgstr[0] "queda %d día" -msgstr[1] "quedan %d días" - -#: ../lib/widgets/ephy-download-widget.c:131 -#, c-format -msgid "%d week left" -msgid_plural "%d weeks left" -msgstr[0] "queda %d semana" -msgstr[1] "quedan %d semanas" - -#: ../lib/widgets/ephy-download-widget.c:137 -#, c-format -msgid "%d month left" -msgid_plural "%d months left" -msgstr[0] "queda %d mes" -msgstr[1] "quedan %d meses" - -#: ../lib/widgets/ephy-download-widget.c:293 -msgid "Finished" -msgstr "Terminado" - -#: ../lib/widgets/ephy-download-widget.c:309 -#, c-format -msgid "Error downloading: %s" -msgstr "Error al descargar: %s" - -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 -msgid "Cancel" -msgstr "Cancelar" - -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 -#: ../src/window-commands.c:275 -msgid "Open" -msgstr "Abrir" - -#: ../lib/widgets/ephy-download-widget.c:377 -msgid "Show in folder" -msgstr "Mostrar en una carpeta" - -#: ../lib/widgets/ephy-download-widget.c:586 -msgid "Starting…" -msgstr "Iniciando…" - -#. Translators: the mnemonic shouldn't conflict with any of the -#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, -#. * Select All, Input Methods and Insert Unicode control character.) -#. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 -msgid "Cl_ear" -msgstr "_Limpiar" - -#. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 -msgid "_Undo" -msgstr "_Deshacer" - -#: ../lib/widgets/ephy-location-entry.c:632 -msgid "_Redo" -msgstr "_Rehacer" - -#: ../lib/widgets/ephy-location-entry.c:912 -msgid "Drag and drop this icon to create a link to this page" -msgstr "Arrastre y suelte este icono para crear un enlace a esta página" - -#. Translators: This string is used when counting bookmarks that -#. * are similar to each other -#: ../src/bookmarks/ephy-bookmark-properties.c:84 -#, c-format -msgid "%d bookmark is similar" -msgid_plural "%d bookmarks are similar" -msgstr[0] "Hay %d marcador similar" -msgstr[1] "Hay %d marcadores similares" - -#: ../src/bookmarks/ephy-bookmark-properties.c:235 -msgid "Add Bookmark" -msgstr "Añadir marcador" - -#: ../src/bookmarks/ephy-bookmark-properties.c:237 -#, c-format -msgid "“%s” Properties" -msgstr "Propiedades de «%s»" - -#: ../src/bookmarks/ephy-bookmark-properties.c:362 -msgid "_Title:" -msgstr "_Título:" - -#: ../src/bookmarks/ephy-bookmark-properties.c:379 -msgid "A_ddress:" -msgstr "_Dirección:" - -#: ../src/bookmarks/ephy-bookmark-properties.c:391 -msgid "T_opics:" -msgstr "Te_mas:" - -#: ../src/bookmarks/ephy-bookmark-properties.c:414 -msgid "Sho_w all topics" -msgstr "_Mostrar todos los temas" - -#: ../src/bookmarks/ephy-bookmark-properties.c:435 -#: ../src/resources/prefs-dialog.ui.h:40 -#: ../src/resources/prefs-lang-dialog.ui.h:3 -msgid "_Add" -msgstr "_Añadir" - -#: ../src/bookmarks/ephy-bookmarks.c:88 -msgid "Entertainment" -msgstr "Entretenimiento" - -#: ../src/bookmarks/ephy-bookmarks.c:89 -msgid "News" -msgstr "Noticias" - -#: ../src/bookmarks/ephy-bookmarks.c:90 -msgid "Shopping" -msgstr "Compras" - -#: ../src/bookmarks/ephy-bookmarks.c:91 -msgid "Sports" -msgstr "Deportes" - -#: ../src/bookmarks/ephy-bookmarks.c:92 -msgid "Travel" -msgstr "Viajes" - -#: ../src/bookmarks/ephy-bookmarks.c:93 -msgid "Work" -msgstr "Trabajo" - -#. Translators: this topic contains all bookmarks -#: ../src/bookmarks/ephy-bookmarks.c:927 -msgctxt "bookmarks" -msgid "All" -msgstr "Todos" - -#. Translators: this topic contains the not categorized -#. bookmarks -#: ../src/bookmarks/ephy-bookmarks.c:931 -msgctxt "bookmarks" -msgid "Not Categorized" -msgstr "Sin categorizar" - -#. Translators: this is an automatic topic containing local -#. * websites bookmarks autodiscovered with zeroconf. -#: ../src/bookmarks/ephy-bookmarks.c:935 -msgctxt "bookmarks" -msgid "Nearby Sites" -msgstr "Sitios cercanos" - -#: ../src/bookmarks/ephy-bookmarks.c:1150 -#: ../src/bookmarks/ephy-bookmarks-import.c:270 -msgid "Untitled" -msgstr "Sin título" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:75 -msgid "Web (RDF)" -msgstr "Web (RDF)" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:76 -msgid "Mozilla (HTML)" -msgstr "Mozilla (HTML)" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:124 -msgid "Remove from this topic" -msgstr "Quiere quitarlo de este tema" - -#. Toplevel -#: ../src/bookmarks/ephy-bookmarks-editor.c:151 -msgid "_File" -msgstr "_Archivo" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:152 -msgid "_Edit" -msgstr "_Editar" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:153 -msgid "_View" -msgstr "_Ver" - -#. Help. -#: ../src/bookmarks/ephy-bookmarks-editor.c:154 -#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 -msgid "_Help" -msgstr "Ay_uda" - -#. File Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:158 -msgid "_New Topic" -msgstr "Tema _nuevo" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:159 -msgid "Create a new topic" -msgstr "Crear un tema nuevo" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 -msgid "Open in New _Window" -msgid_plural "Open in New _Windows" -msgstr[0] "Abrir en una _ventana nueva" -msgstr[1] "Abrir en _ventanas nuevas" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:162 -msgid "Open the selected bookmark in a new window" -msgstr "Abre el marcador seleccionado en una ventana nueva" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 -msgid "Open in New _Tab" -msgid_plural "Open in New _Tabs" -msgstr[0] "Abrir en una _pestaña nueva" -msgstr[1] "Abrir en _pestañas nuevas" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:165 -msgid "Open the selected bookmark in a new tab" -msgstr "Abre el marcador seleccionado en una pestaña nueva" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:167 -msgid "_Rename…" -msgstr "_Renombrar…" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:168 -msgid "Rename the selected bookmark or topic" -msgstr "Renombra el marcador seleccionado o el tema" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:169 -msgid "_Properties" -msgstr "_Propiedades" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:170 -msgid "View or modify the properties of the selected bookmark" -msgstr "Ver o modificar las propiedades del marcador seleccionado" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:172 -msgid "_Import Bookmarks…" -msgstr "_Importar marcadores…" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:173 -msgid "Import bookmarks from another browser or a bookmarks file" -msgstr "Importar marcadores desde otro navegador o un archivo de marcadores" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:175 -msgid "_Export Bookmarks…" -msgstr "_Exportar marcadores…" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:176 -msgid "Export bookmarks to a file" -msgstr "Exportar marcadores de un archivo" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:112 -msgid "_Close" -msgstr "_Cerrar" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:179 -msgid "Close the bookmarks window" -msgstr "Cerrar la ventana de marcadores" - -#. Edit Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:123 -msgid "Cu_t" -msgstr "Cor_tar" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:184 -msgid "Cut the selection" -msgstr "Corta la selección" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 -msgid "_Copy" -msgstr "_Copiar" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:187 -msgid "Copy the selection" -msgstr "Copiar la selección" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:127 -msgid "_Paste" -msgstr "_Pegar" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:190 -msgid "Paste the clipboard" -msgstr "Pegar del portapapeles" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:192 -#: ../src/resources/history-dialog.ui.h:12 -msgid "_Delete" -msgstr "_Eliminar" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:193 -msgid "Delete the selected bookmark or topic" -msgstr "Eliminar el marcador seleccionado o el tema" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:131 -msgid "Select _All" -msgstr "Seleccionar _todo" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:196 -msgid "Select all bookmarks or text" -msgstr "Seleccionar todos los marcadores o texto" - -#. Help Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:200 -msgid "_Contents" -msgstr "Índ_ice" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:201 -msgid "Display bookmarks help" -msgstr "Mostrar ayuda de los marcadores" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:203 -#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 -msgid "_About" -msgstr "Acerca _de" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:204 -msgid "Display credits for the web browser creators" -msgstr "Mostrar créditos de los creadores del navegador web" - -#. View Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:210 -msgid "_Title" -msgstr "_Título" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:211 -msgid "Show the title column" -msgstr "Mostrar la columna de título" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 -msgid "Address" -msgstr "Dirección" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:213 -msgid "Show the address column" -msgstr "Mostrar la columna de dirección" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:255 -msgid "Type a topic" -msgstr "Escriba un asunto" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:377 -#, c-format -msgid "Delete topic “%s”?" -msgstr "¿Quiere eliminar el tema «%s»?" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:380 -msgid "Delete this topic?" -msgstr "¿Quiere eliminar el tema?" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:382 -msgid "" -"Deleting this topic will cause all its bookmarks to become uncategorized, " -"unless they also belong to other topics. The bookmarks will not be deleted." -msgstr "" -"Al eliminar este tema, todos sus marcadores se convertirán en «Sin " -"categoría», a no ser que pertenezcan a otros temas. Los marcadores no se " -"eliminarán." - -#: ../src/bookmarks/ephy-bookmarks-editor.c:385 -msgid "_Delete Topic" -msgstr "_Eliminar tema" - -#. FIXME: proper i18n after freeze -#: ../src/bookmarks/ephy-bookmarks-editor.c:495 -#: ../src/bookmarks/ephy-bookmarks-editor.c:499 -msgid "Firefox" -msgstr "Firefox" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:504 -#: ../src/bookmarks/ephy-bookmarks-editor.c:508 -msgid "Firebird" -msgstr "Firebird" - -#. Translators: The %s is the name of a Mozilla profile. -#: ../src/bookmarks/ephy-bookmarks-editor.c:513 -#, c-format -msgid "Mozilla “%s” profile" -msgstr "Perfil de «%s» de Mozilla" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:517 -msgid "Galeon" -msgstr "Galeon" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:521 -msgid "Konqueror" -msgstr "Konqueror" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:550 -msgid "Import failed" -msgstr "Ha fallado la importación" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:552 -msgid "Import Failed" -msgstr "Ha fallado la importación" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:555 -#, c-format -msgid "" -"The bookmarks from “%s” could not be imported because the file is corrupted " -"or of an unsupported type." -msgstr "" -"No se pudieron importar los marcadores de «%s» debido a que el archivo está " -"corrompido o es de un tipo no soportado." - -#: ../src/bookmarks/ephy-bookmarks-editor.c:618 -msgid "Import Bookmarks from File" -msgstr "Importar marcadores del archivo" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:625 -msgid "Firefox/Mozilla bookmarks" -msgstr "Marcadores de Firefox/Mozilla" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:629 -msgid "Galeon/Konqueror bookmarks" -msgstr "Marcadores de Galeon/Konqueror" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:633 -msgid "Web bookmarks" -msgstr "Marcadores web" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:757 -msgid "Export Bookmarks" -msgstr "Exportar marcadores" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 -#: ../src/bookmarks/ephy-topic-action.c:217 -msgid "Bookmarks" -msgstr "Marcadores" - -#. Make a format selection combo & label -#: ../src/bookmarks/ephy-bookmarks-editor.c:770 -msgid "File f_ormat:" -msgstr "_Formato de archivo:" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:816 -msgid "Import Bookmarks" -msgstr "Importar marcadores" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:821 -msgid "I_mport" -msgstr "I_mportar" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:837 -msgid "Import bookmarks from:" -msgstr "Importar marcadores de un archivo:" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:857 -msgid "File" -msgstr "Archivo" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 -msgid "_Copy Address" -msgstr "_Copiar dirección" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 -msgid "Topics" -msgstr "Temas" - -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 -msgid "Title" -msgstr "Título" - -#. FIXME !!!! -#: ../src/bookmarks/ephy-open-tabs-action.c:74 -msgid "Open in New _Tabs" -msgstr "Abrir en pestaña_s nuevas" - -#: ../src/bookmarks/ephy-open-tabs-action.c:75 -msgid "Open the bookmarks in this topic in new tabs" -msgstr "Abre los marcadores de este tema en pestañas nuevas" - -#: ../src/bookmarks/ephy-topics-entry.c:330 -#, c-format -msgid "Create topic “%s”" -msgstr "Crear tema «%s»" - -#: ../src/resources/clear-data-dialog.ui.h:1 -msgid "Clear Personal Data" -msgstr "Limpiar datos personales" - -#: ../src/resources/clear-data-dialog.ui.h:2 -msgid "C_lear" -msgstr "_Limpiar" - -#: ../src/resources/clear-data-dialog.ui.h:4 -msgid "Select the personal data you wish to clear" -msgstr "Seleccione los datos personales que quiere limpiar" - -#: ../src/resources/clear-data-dialog.ui.h:5 -msgid "" -"You are about to clear personal data that is stored about the web pages you " -"have visited. Check the types of information that you want to remove:" -msgstr "" -"Está a punto de eliminar datos personales almacenados acerca de páginas web " -"que ha visitado. Marque el tipo de información que quiere eliminar:" - -#: ../src/resources/clear-data-dialog.ui.h:6 -msgid "Coo_kies" -msgstr "Coo_kies" - -#: ../src/resources/clear-data-dialog.ui.h:7 -msgid "Cache and _temporary files" -msgstr "Caché y archivos _temporales" - -#: ../src/resources/clear-data-dialog.ui.h:8 -msgid "Browsing _history" -msgstr "_Histórico de navegación" - -#: ../src/resources/clear-data-dialog.ui.h:9 -msgid "Saved _passwords" -msgstr "Contraseñas _guardadas" - -#: ../src/resources/clear-data-dialog.ui.h:10 -msgid "" -"You cannot undo this action. The data you are choosing to clear will be " -"removed forever." -msgstr "" -"No puede deshacer esta acción. Los datos que está seleccionando para limpiar " -"se perderán para siempre." - -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 -msgid "Cookies" -msgstr "Cookies" - -#: ../src/resources/cookies-dialog.ui.h:2 -#: ../src/resources/history-dialog.ui.h:2 -#: ../src/resources/passwords-dialog.ui.h:2 -msgid "C_lear All" -msgstr "_Limpiar todo" - -#: ../src/resources/cookies-dialog.ui.h:3 -#: ../src/resources/passwords-dialog.ui.h:4 -msgid "Site" -msgstr "Sitio" - -#: ../src/resources/cookies-dialog.ui.h:4 -msgid "Remove" -msgstr "Quitar" - -#: ../src/resources/cookies-dialog.ui.h:5 -msgid "Delete the selected cookies" -msgstr "Eliminar las cookies seleccionadas" - -#: ../src/resources/encoding-dialog.ui.h:1 -msgid "Text Encoding" -msgstr "Codificación del texto" - -#: ../src/resources/encoding-dialog.ui.h:2 ../src/ephy-encoding-menu.c:327 -msgid "_Automatic" -msgstr "_Automático" - -#: ../src/resources/encoding-dialog.ui.h:3 ../src/ephy-encoding-menu.c:328 -msgid "Use the encoding specified by the document" -msgstr "Usar la codificación especificada por el documento" - -#: ../src/resources/encoding-dialog.ui.h:4 -msgid "_Use a different encoding:" -msgstr "_Usar una codificación diferente:" - -#. File actions. -#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:98 -msgid "_New Window" -msgstr "_Ventana nueva" - -#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:100 -msgid "New _Incognito Window" -msgstr "_Ventana nueva de incógnito" - -#: ../src/resources/epiphany-application-menu.ui.h:3 -msgid "Reopen Closed _Tab" -msgstr "_Volver a abrir la pestaña cerrada" - -#. Toplevel -#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:91 -msgid "_Bookmarks" -msgstr "_Marcadores" - -#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:141 -msgid "_History" -msgstr "_Histórico" - -#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:143 -msgid "Pr_eferences" -msgstr "Prefere_ncias" - -#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:114 -msgid "_Quit" -msgstr "_Salir" - -#: ../src/resources/history-dialog.ui.h:1 -msgid "History" -msgstr "Histórico" - -#: ../src/resources/history-dialog.ui.h:3 -msgid "Search history" -msgstr "Histórico de búsqueda" - -#: ../src/resources/history-dialog.ui.h:4 -msgid "Date" -msgstr "Fecha" - -#: ../src/resources/history-dialog.ui.h:5 -msgid "Name" -msgstr "Nombre" - -#: ../src/resources/history-dialog.ui.h:6 -msgid "Location" -msgstr "Ubicación" - -#: ../src/resources/history-dialog.ui.h:7 -msgid "Remove the selected pages from history" -msgstr "Quita las páginas seleccionadas del histórico" - -#: ../src/resources/history-dialog.ui.h:8 -msgid "Open the selected pages in new tabs" -msgstr "Abrir las páginas seleccionadas en pestañas nuevas" - -#: ../src/resources/history-dialog.ui.h:10 -msgid "_Copy Location" -msgstr "Copiar _ubicación" - -#: ../src/resources/history-dialog.ui.h:11 -msgid "Add _Bookmark" -msgstr "Añadir _marcador" - -#: ../src/resources/passwords-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:30 -msgid "Passwords" -msgstr "Contraseñas" - -#: ../src/resources/passwords-dialog.ui.h:3 -msgid "Search passwords" -msgstr "Buscar contraseñas" - -#: ../src/resources/passwords-dialog.ui.h:5 -msgid "User Name" -msgstr "Nombre de usuario" - -#: ../src/resources/passwords-dialog.ui.h:6 -msgid "Password" -msgstr "Contraseña" - -#: ../src/resources/passwords-dialog.ui.h:7 -msgid "Forget the selected passwords" -msgstr "Olvidar las contraseñas seleccionadas" - -#: ../src/resources/passwords-dialog.ui.h:8 -msgid "Reveal all the passwords" -msgstr "Mostrar todas las contraseñas" - -#: ../src/resources/passwords-dialog.ui.h:9 -msgid "_Copy Password" -msgstr "_Copiar contraseña" - -#: ../src/resources/passwords-dialog.ui.h:10 -msgid "C_opy Username" -msgstr "C_opiar nombre de usuario" - -#: ../src/resources/prefs-dialog.ui.h:1 -msgid "Preferences" -msgstr "Preferencias" - -#: ../src/resources/prefs-dialog.ui.h:3 -msgid "_Download folder:" -msgstr "Carpeta de de_scarga:" - -#: ../src/resources/prefs-dialog.ui.h:4 -msgid "A_utomatically open downloaded files" -msgstr "Abrir _automáticamente los archivos descargados" - -#: ../src/resources/prefs-dialog.ui.h:5 -msgid "Search" -msgstr "Buscar" - -#: ../src/resources/prefs-dialog.ui.h:6 -msgid "_Engine:" -msgstr "_Motor:" - -#: ../src/resources/prefs-dialog.ui.h:7 -msgid "Web Content" -msgstr "Contenido web" - -#: ../src/resources/prefs-dialog.ui.h:8 -msgid "Allow popup _windows" -msgstr "Permitir ventanas e_mergentes" - -#: ../src/resources/prefs-dialog.ui.h:9 -msgid "Allow _advertisements" -msgstr "Permitir _anuncios" - -#: ../src/resources/prefs-dialog.ui.h:10 -msgid "Enable _plugins" -msgstr "Activar co_mplementos" - -#: ../src/resources/prefs-dialog.ui.h:11 -msgid "General" -msgstr "General" - -#: ../src/resources/prefs-dialog.ui.h:12 -msgid "Fonts" -msgstr "Tipografías" - -#: ../src/resources/prefs-dialog.ui.h:13 -msgid "_Use system fonts" -msgstr "_Usar tipografías del sistema" - -#: ../src/resources/prefs-dialog.ui.h:14 -msgid "Sans serif font:" -msgstr "Tipografía Sans Serif:" - +# +# Daniel Mustieles , 2010, 2011. , 2012, 2013, 2014, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: epiphany.master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=epiphany&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-08-11 03:44+0000\n" +"PO-Revision-Date: 2015-08-11 \n" +"Last-Translator: Daniel Mustieles \n" +"Language-Team: Spanish \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/default-bookmarks.rdf.in.h:1 +msgid "Search the web" +msgstr "Buscar en la web" + +#. Translators: you can use the regions listed in +#. https://duckduckgo.com/params to boost a particular region +#. associated with your language. For instance, for translators +#. to Finnish, it might make sense to add kl=fi-fi to the search +#. URL in order to boost results from Finland. Additionally, the +#. 'kad' parameter can be used to specify the locale in which +#. duckduckgo must be translated. So, for a Finnish localized +#. version of duckduckgo that will render results tailored for +#. Finland, the string would be: +#. https://duckduckgo.com/?t=epiphany&kl=fi-fi&kad=fi_FI +#. +#: ../data/default-bookmarks.rdf.in.h:13 +msgid "https://duckduckgo.com/?t=epiphany" +msgstr "https://duckduckgo.com/?t=epiphany" + +#. Translators: you can use the regions listed in +#. https://duckduckgo.com/params to boost a particular region +#. associated with your language. For instance, for translators +#. to Finnish, it might make sense to add kl=fi-fi to the search +#. URL in order to boost results from Finland. Additionally, the +#. 'kad' parameter can be used to specify the locale in which +#. duckduckgo must be translated. For such case, the search url +#. would be +#. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 +#: ../src/ephy-search-provider.c:289 +#, no-c-format +msgid "https://duckduckgo.com/?q=%s&t=epiphany" +msgstr "https://duckduckgo.com/?q=%s&t=epiphany" + +#: ../data/epiphany.appdata.xml.in.h:1 +msgid "GNOME Web" +msgstr "GNOME WEB" + +#: ../data/epiphany.appdata.xml.in.h:2 +msgid "Web browser for GNOME" +msgstr "Navegador web para GNOME" + +#: ../data/epiphany.appdata.xml.in.h:3 +msgid "" +"The web browser for GNOME, featuring tight integration with the desktop and " +"a simple and intuitive user interface that allows you to focus on your web " +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." +msgstr "" +"El navegador web de GNOME, que ofrece una estrecha integración con el " +"escritorio y una interfaz de usuario simple e intuitiva que le permite " +"centrarse en sus páginas web. Si está buscando una vista sencilla, limpia y " +"bonita de la web, este es su navegador." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "A menudo se nombra a GNOME Web con su nombre en clave, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 +msgid "Web" +msgstr "Web" + +#: ../data/epiphany.desktop.in.h:2 +msgid "Web Browser" +msgstr "Navegador web" + +#: ../data/epiphany.desktop.in.h:3 +msgid "Epiphany Web Browser" +msgstr "Navegador web Epiphany" + +#: ../data/epiphany.desktop.in.h:4 +msgid "Browse the web" +msgstr "Navegue por la web" + +#: ../data/epiphany.desktop.in.h:5 +msgid "web;browser;internet;" +msgstr "web;navegador;internet;" + +#: ../data/epiphany.desktop.in.h:6 +msgid "New Incognito Window" +msgstr "Ventana nueva de incógnito" + +#: ../data/org.gnome.epiphany.gschema.xml.h:1 +msgid "Browse with caret" +msgstr "Navegar con cursor" + +#. DuckDuckGo is the default search engine. Must exactly match the URL used +#. in the preferences dialog, except this string is surrounded by single quotes +#. and uses & instead of simply &. If the match is not otherwise exact, +#. there will be a spurious, ugly entry in the preferences combo, so please +#. test this. Should ideally also match the default smart bookmark link in +#. default-bookmarks.rdf. See the comment there for region parameters to +#. the URL. +#: ../data/org.gnome.epiphany.gschema.xml.h:10 +#, no-c-format +msgid "'https://duckduckgo.com/?q=%s&t=epiphany'" +msgstr "'https://duckduckgo.com/?q=%s&t=epiphany'" + +#: ../data/org.gnome.epiphany.gschema.xml.h:11 +msgid "URL Search" +msgstr "Búsqueda de URL" + +#: ../data/org.gnome.epiphany.gschema.xml.h:12 +msgid "Search string for keywords entered in the URL bar." +msgstr "" +"Cadena de búsqueda para las palabras clave introducidas en la barra de URL." + +#: ../data/org.gnome.epiphany.gschema.xml.h:13 +msgid "User agent" +msgstr "Agente de usuario" + +#: ../data/org.gnome.epiphany.gschema.xml.h:14 +msgid "" +"String that will be used as user agent, to identify the browser to the web " +"servers." +msgstr "" +"Cadena que usar como agente de usuario («user agent») para identificar el " +"navegador con los servidores web." + +#: ../data/org.gnome.epiphany.gschema.xml.h:15 +msgid "Automatic downloads" +msgstr "Descargas automáticas" + +#: ../data/org.gnome.epiphany.gschema.xml.h:16 +msgid "" +"When files cannot be opened by the browser they are automatically downloaded " +"to the download folder and opened with the appropriate application." +msgstr "" +"Cuando el navegador no pueda abrir los archivos, se descargarán " +"automáticamente a la carpeta de descargas y se abrirán con la aplicación " +"apropiada." + +#: ../data/org.gnome.epiphany.gschema.xml.h:17 +msgid "Force new windows to be opened in tabs" +msgstr "Forzar la apertura de ventanas nuevas en pestañas" + +#: ../data/org.gnome.epiphany.gschema.xml.h:18 +msgid "" +"Force new window requests to be opened in tabs instead of using a new window." +msgstr "" +"Forzar que las peticiones de ventanas nuevas se abran en pestañas en lugar " +"de en nuevas ventanas." + +#: ../data/org.gnome.epiphany.gschema.xml.h:19 +msgid "Remember passwords" +msgstr "Recordar contraseñas" + +#: ../data/org.gnome.epiphany.gschema.xml.h:20 +msgid "Whether to store and prefill passwords in websites." +msgstr "" +"Indica si se deben almacenar y precompletar las contraseñas en los sitios " +"web." + +#: ../data/org.gnome.epiphany.gschema.xml.h:21 +msgid "Automatically manage offline status with NetworkManager" +msgstr "Gestionar automáticamente el estado de desconexión con NetworkManager" + +#: ../data/org.gnome.epiphany.gschema.xml.h:22 +msgid "Enable smooth scrolling" +msgstr "Activar desplazamiento suave" + +#: ../data/org.gnome.epiphany.gschema.xml.h:23 +msgid "Don't use an external application to view page source." +msgstr "No usar una aplicación externa para ver el código fuente de la página." + +#: ../data/org.gnome.epiphany.gschema.xml.h:24 +msgid "Whether to automatically restore the last session" +msgstr "Indica si se debe restaurar automáticamente la última sesión" + +#: ../data/org.gnome.epiphany.gschema.xml.h:25 +msgid "" +"Defines how the session will be restored during startup. Allowed values are " +"'always' (the previous state of the application is always restored), " +"'crashed' (the session is only restored if the application crashes) and " +"'never' (the homepage is always shown)." +msgstr "" +"Define cómo se restaurará la sesión durante el inicio. Los valores " +"permitidos son «always» (siempre se restaura el estado anterior de la " +"aplicación), «crashed» (solo se restaura la sesión si falló la aplicación) y " +"«never» (siempre se muestra la página de inicio)." + +#: ../data/org.gnome.epiphany.gschema.xml.h:26 +msgid "" +"Whether to delay loading of tabs that are not immediately visible on session " +"restore" +msgstr "" +"Indica si se debe retardar la carga de pestañas que no son visibles " +"inmediatamente al restaurar la sesión" + +#: ../data/org.gnome.epiphany.gschema.xml.h:27 +msgid "" +"When this option is set to true, tabs will not start loading until the user " +"switches to them, upon session restore." +msgstr "" +"Si esta opción es cierta, las pestañas no empezarán a cargarse hasta que el " +"usuario la seleccione, al restaurar la sesión." + +#: ../data/org.gnome.epiphany.gschema.xml.h:28 +msgid "Process model" +msgstr "Modelo de proceso" + +#: ../data/org.gnome.epiphany.gschema.xml.h:29 +msgid "" +"This option allows to set the process model used. Use 'shared-secondary-" +"process' to use a single web process shared by all the tabs and 'one-" +"secondary-process-per-web-view' to use a different web process for each tab." +msgstr "" +"Esta opción permite configurar el modelo de proceso usado. Use «shared-" +"secondary-process» para usar un único proceso web compartido por todas las " +"pestañas y «one-secondary-process-per-web-view» para usar un proceso web " +"diferente para cada pestaña." + +#: ../data/org.gnome.epiphany.gschema.xml.h:30 +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Número máximo de procesos web creados al mismo tiempo al usar el modelo «one-" +"secondary-process-per-web-view»" + +#: ../data/org.gnome.epiphany.gschema.xml.h:31 +msgid "" +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Esta opción establece el número límite de procesos web que se usarán al " +"mismo tiempo para el modelo «one-secondary-process-per-web-view». El valor " +"predeterminado es «0» y significa que no hay límite." + +#: ../data/org.gnome.epiphany.gschema.xml.h:32 +msgid "[Deprecated]" +msgstr "[Obsoleto]" + +#: ../data/org.gnome.epiphany.gschema.xml.h:33 +msgid "" +"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " +"instead." +msgstr "" +"[Obsoleto] Esta configuración está obsoleta, use «tabs-bar-visibility-policy» " +"en su lugar." + +#: ../data/org.gnome.epiphany.gschema.xml.h:34 +msgid "Visibility of the downloads window" +msgstr "Visibilidad de la ventana de descargas" + +#: ../data/org.gnome.epiphany.gschema.xml.h:35 +msgid "" +"Hide or show the downloads window. When hidden, a notification will be shown " +"when new downloads are started." +msgstr "" +"Mostrar u ocultar la ventana de descargas. Cuando está oculta, se mostrará " +"una notificación al iniciarse nuevas descargas." + +#: ../data/org.gnome.epiphany.gschema.xml.h:36 +msgid "The visibility policy for the tabs bar." +msgstr "La política de visibilidad para la barra de pestañas." + +#: ../data/org.gnome.epiphany.gschema.xml.h:37 +msgid "" +"Controls when the tabs bar is shown. Possible values are 'always' (the tabs " +"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " +"two or more tabs) and 'never' (the tabs bar is never shown)." +msgstr "" +"Controla cuándo se muestra la barra de pestañas. Los valores posibles son " +"«always» (la barra de pestañas se muestra siempre), «more-than-one» (la barra " +"de pestañas se muestra solo si hay dos o más pestañas) y «never» (no es " +"muestra nunca)." + +#: ../data/org.gnome.epiphany.gschema.xml.h:38 +msgid "Minimum font size" +msgstr "Tamaño mínimo de la tipografía" + +#: ../data/org.gnome.epiphany.gschema.xml.h:39 +msgid "Use GNOME fonts" +msgstr "Usar tipografías de GNOME" + +#: ../data/org.gnome.epiphany.gschema.xml.h:40 +msgid "Use GNOME font settings." +msgstr "Usar tipografías de GNOME." + +#: ../data/org.gnome.epiphany.gschema.xml.h:41 +msgid "Custom sans-serif font" +msgstr "Tipografía Sans Serif personalizada" + +#: ../data/org.gnome.epiphany.gschema.xml.h:42 +msgid "" +"A value to be used to override sans-serif desktop font when use-gnome-fonts " +"is set." +msgstr "" +"El valor que usar para sobrescribir la tipografía Sans Serif del escritorio " +"cuando «use-gnome-fonts» es cierto." + +#: ../data/org.gnome.epiphany.gschema.xml.h:43 +msgid "Custom serif font" +msgstr "Tipografía Serif personalizada" + +#: ../data/org.gnome.epiphany.gschema.xml.h:44 +msgid "" +"A value to be used to override serif desktop font when use-gnome-fonts is " +"set." +msgstr "" +"El valor que usar para sobrescribir la tipografía Serif del escritorio " +"cuando «use-gnome-fonts» es cierto." + +#: ../data/org.gnome.epiphany.gschema.xml.h:45 +msgid "Custom monospace font" +msgstr "Tipografía monoespaciada personalizada" + +#: ../data/org.gnome.epiphany.gschema.xml.h:46 +msgid "" +"A value to be used to override monospace desktop font when use-gnome-fonts " +"is set." +msgstr "" +"El valor que usar para sobrescribir la tipografía monoespaciada del " +"escritorio cuando «use-gnome-fonts» es cierto." + +#: ../data/org.gnome.epiphany.gschema.xml.h:47 +msgid "Use own colors" +msgstr "Usar sus propios colores" + +#: ../data/org.gnome.epiphany.gschema.xml.h:48 +msgid "Use your own colors instead of the colors the page requests." +msgstr "Use sus propios colores en vez de los que la página pide." + +#: ../data/org.gnome.epiphany.gschema.xml.h:49 +msgid "Use own fonts" +msgstr "Usar sus propias tipografías" + +#: ../data/org.gnome.epiphany.gschema.xml.h:50 +msgid "Use your own fonts instead of the fonts the page requests." +msgstr "Use sus propias tipografías en vez de las que la página pida." + +#: ../data/org.gnome.epiphany.gschema.xml.h:51 +msgid "Use a custom CSS" +msgstr "Usar CSS personalizado" + +#: ../data/org.gnome.epiphany.gschema.xml.h:52 +msgid "Use a custom CSS file to modify websites own CSS." +msgstr "Usar un archivo CSS personalizado para el CSS de las páginas web." + +#: ../data/org.gnome.epiphany.gschema.xml.h:53 +msgid "Enable spell checking" +msgstr "Activar corrección ortográfica" + +#: ../data/org.gnome.epiphany.gschema.xml.h:54 +msgid "Spell check any text typed in editable areas." +msgstr "Comprobar la ortografía de cualquier texto escrito en áreas editables." + +#: ../data/org.gnome.epiphany.gschema.xml.h:55 +msgid "Default encoding" +msgstr "Codificación predeterminada" + +#: ../data/org.gnome.epiphany.gschema.xml.h:56 +msgid "" +"Default encoding. Accepted values are the ones WebKitGTK+ can understand." +msgstr "" +"Codificación predeterminada. Los valores aceptados son los que WebKitGTK+ " +"puede entender." + +#: ../data/org.gnome.epiphany.gschema.xml.h:57 +#: ../src/resources/prefs-dialog.ui.h:39 +msgid "Languages" +msgstr "Idiomas" + +#: ../data/org.gnome.epiphany.gschema.xml.h:58 +msgid "Preferred languages, two letter codes." +msgstr "Idiomas preferidos, código de dos letras." + +#: ../data/org.gnome.epiphany.gschema.xml.h:59 +msgid "Cookie accept" +msgstr "Aceptar cookies" + +#: ../data/org.gnome.epiphany.gschema.xml.h:60 +msgid "" +"Where to accept cookies from. Possible values are \"always\", \"no-third-" +"party\" and \"never\"." +msgstr "" +"Indica desde dónde se aceptan cookies. Los valores posibles " +"son .«always» (siempre), «no-third-party» (no de terceras partes) y " +"«never» (nunca)." + +#: ../data/org.gnome.epiphany.gschema.xml.h:61 +msgid "Image animation mode" +msgstr "Modo de animación de imágenes" + +#: ../data/org.gnome.epiphany.gschema.xml.h:62 +msgid "" +"How to present animated images. Possible values are \"normal\", \"once\" and " +"\"disabled\"." +msgstr "" +"Cómo se presentan las imágenes animadas. Los valores posibles son «normal», " +"«once» (una vez) y «disabled» (desactivado)." + +#: ../data/org.gnome.epiphany.gschema.xml.h:63 +msgid "Allow popups" +msgstr "Permitir ventanas emergentes" + +#: ../data/org.gnome.epiphany.gschema.xml.h:64 +msgid "" +"Allow sites to open new windows using JavaScript (if JavaScript is enabled)." +msgstr "" +"Permite a los sitios abrir ventanas nuevas usando JavaScript (si JavaScript " +"está activado)." + +#: ../data/org.gnome.epiphany.gschema.xml.h:65 +msgid "Enable Plugins" +msgstr "Activar complementos" + +#: ../data/org.gnome.epiphany.gschema.xml.h:66 +msgid "Enable JavaScript" +msgstr "Activar JavaScript" + +#: ../data/org.gnome.epiphany.gschema.xml.h:67 +msgid "Enable WebGL" +msgstr "Activar WebGL" + +#: ../data/org.gnome.epiphany.gschema.xml.h:68 +msgid "Whether to enable support for WebGL contexts." +msgstr "Indica si se debe activar el soporte para contextos WebGL." + +#: ../data/org.gnome.epiphany.gschema.xml.h:69 +msgid "Enable WebAudio" +msgstr "Activar WebAudio" + +#: ../data/org.gnome.epiphany.gschema.xml.h:70 +msgid "Whether to enable support for WebAudio." +msgstr "Indica si se debe activar el soporte para WebAudio." + +#: ../data/org.gnome.epiphany.gschema.xml.h:71 +msgid "Do Not Track" +msgstr "No rastrear" + +#: ../data/org.gnome.epiphany.gschema.xml.h:72 +msgid "" +"Whether to tell websites that we do not wish to be tracked. Please note that " +"web pages are not forced to follow this setting." +msgstr "" +"Indica si se debe indicar a los sitios web que no quiere que le rastreen. " +"Tenga en cuenta que las páginas web no están obligadas a respetar esta " +"configuración." + +#: ../data/org.gnome.epiphany.gschema.xml.h:73 +msgid "Enable Adblock" +msgstr "Activar Adblock" + +#: ../data/org.gnome.epiphany.gschema.xml.h:74 +msgid "" +"Whether to block the embedded advertisements that web pages might want to " +"show." +msgstr "" +"Indica si se deben bloquear los anuncios empotrados que las páginas web " +"puedan querer mostrar." + +#: ../data/org.gnome.epiphany.gschema.xml.h:75 +msgid "The downloads folder" +msgstr "La carpeta de descargas" + +#: ../data/org.gnome.epiphany.gschema.xml.h:76 +msgid "" +"The path of the folder where to download files to; or \"Downloads\" to use " +"the default downloads folder, or \"Desktop\" to use the desktop folder." +msgstr "" +"La ruta de la carpeta donde se descargarán los archivos, o \"Descargas\" " +"para usar la carpeta de descargas predeterminada, o \"Desktop\" para usar la " +"carpeta del escritorio." + +#: ../data/org.gnome.epiphany.gschema.xml.h:77 +msgid "Whether to show the title column in the bookmarks window." +msgstr "" +"Indica si debe mostrar la columna de título en la ventana de marcadores." + +#: ../data/org.gnome.epiphany.gschema.xml.h:78 +msgid "Whether to show the address column in the bookmarks window." +msgstr "" +"Indica si debe mostrar la columna de direcciones en la ventana de marcadores." + +#: ../embed/ephy-about-handler.c:139 +msgid "Installed plugins" +msgstr "Complementos instalados" + +#: ../embed/ephy-about-handler.c:140 +msgid "Plugins" +msgstr "Complementos" + +#: ../embed/ephy-about-handler.c:143 +msgid "Plugins are disabled in the preferences" +msgstr "Los complementos están desactivados en las preferencias" + +#: ../embed/ephy-about-handler.c:156 +msgid "Enabled" +msgstr "Activado" + +#. webkit_plugin_get_enabled (plugin) && +#: ../embed/ephy-about-handler.c:156 +msgid "Yes" +msgstr "Sí" + +#: ../embed/ephy-about-handler.c:156 +msgid "No" +msgstr "No" + +#: ../embed/ephy-about-handler.c:157 +msgid "MIME type" +msgstr "Tipo MIME" + +#: ../embed/ephy-about-handler.c:157 +msgid "Description" +msgstr "Descripción" + +#: ../embed/ephy-about-handler.c:157 +msgid "Suffixes" +msgstr "Sufijos" + +#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222 +msgid "Memory usage" +msgstr "Uso de la memoria" + +#: ../embed/ephy-about-handler.c:270 +#, c-format +msgid "Version %s" +msgstr "Versión %s" + +#: ../embed/ephy-about-handler.c:290 +msgid "About Web" +msgstr "Acerca de Web" + +#: ../embed/ephy-about-handler.c:294 +msgid "A simple, clean, beautiful view of the web" +msgstr "Una vista simple, limpia y bonita de la web" + +#: ../embed/ephy-about-handler.c:352 ../embed/ephy-about-handler.c:353 +msgid "Applications" +msgstr "Aplicaciones" + +#: ../embed/ephy-about-handler.c:354 +msgid "List of installed web applications" +msgstr "Lista de las aplicaciones web instaladas" + +#. Note for translators: this refers to the installation date. +#: ../embed/ephy-about-handler.c:370 +msgid "Installed on:" +msgstr "Instalada el:" + +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 +msgid "Most Visited" +msgstr "Más visitados" + +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Quitar de la vista general" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 +msgid "Private Browsing" +msgstr "Navegación privada" + +#: ../embed/ephy-about-handler.c:575 +msgid "" +"You are currently browsing incognito. Pages viewed in this mode " +"will not show up in your browsing history and all stored information will be " +"cleared when you close the window. Files you download will be kept." +msgstr "" +"Actualmente está navegando en modo incógnito. Las páginas que " +"visite en este modo no se mostrarán en el histórico del navegador y toda la " +"información almacenada se limpiará cuando cierre la ventana. Los archivos " +"que descargue se conservarán." + +#: ../embed/ephy-about-handler.c:579 +msgid "" +"Incognito mode hides your activity only from people using this computer." +msgstr "" +"El modo de incógnito oculta su actividad sólo ante la gente que use este " +"mismo equipo." + +#: ../embed/ephy-about-handler.c:581 +msgid "" +"It will not hide your activity from your employer if you are at work. Your " +"internet service provider, your government, other governments, the websites " +"that you visit, and advertisers on these websites may still be tracking you." +msgstr "" +"Esto no ocultará su actividad ante su jefe en el trabajo. Su proveedor de " +"servicios de Internet, su gobierno u otros gobiernos, las páginas web que " +"visite o los anunciantes en dichas páginas pueden seguir rastreándole." + +#. characters +#: ../embed/ephy-embed.c:51 +msgid "Blank page" +msgstr "Página en blanco" + +#: ../embed/ephy-embed.c:542 +#, c-format +msgid "Press %s to exit fullscreen" +msgstr "Pulse %s para salir del modo a pantalla completa" + +#. Translators: 'ESC' and 'F11' are keyboard keys. +#: ../embed/ephy-embed.c:545 +msgid "ESC" +msgstr "ESC" + +#: ../embed/ephy-embed.c:545 +msgid "F11" +msgstr "F11" + +#: ../embed/ephy-embed-utils.c:65 +#, c-format +msgid "Send an email message to “%s”" +msgstr "Enviar correo-e a la dirección «%s»" + +#: ../embed/ephy-encodings.c:54 +msgid "Arabic (_IBM-864)" +msgstr "Árabe (_IBM-864)" + +#: ../embed/ephy-encodings.c:55 +msgid "Arabic (ISO-_8859-6)" +msgstr "Árabe (ISO-_8859-6)" + +#: ../embed/ephy-encodings.c:56 +msgid "Arabic (_MacArabic)" +msgstr "Árabe (_MacArabic)" + +#: ../embed/ephy-encodings.c:57 +msgid "Arabic (_Windows-1256)" +msgstr "Árabe(_Windows-1256)" + +#: ../embed/ephy-encodings.c:58 +msgid "Baltic (_ISO-8859-13)" +msgstr "Báltico (_ISO-8859-13)" + +#: ../embed/ephy-encodings.c:59 +msgid "Baltic (I_SO-8859-4)" +msgstr "Báltico (I_SO-8859-4)" + +#: ../embed/ephy-encodings.c:60 +msgid "Baltic (_Windows-1257)" +msgstr "Báltico (_Windows-1257)" + +#: ../embed/ephy-encodings.c:61 +msgid "_Armenian (ARMSCII-8)" +msgstr "_Armenio (ARMSCII-8)" + +#: ../embed/ephy-encodings.c:62 +msgid "_Georgian (GEOSTD8)" +msgstr "_Georgiano (GEOSTD8)" + +#: ../embed/ephy-encodings.c:63 +msgid "Central European (_IBM-852)" +msgstr "Centroeuropeo (_IBM-852)" + +#: ../embed/ephy-encodings.c:64 +msgid "Central European (I_SO-8859-2)" +msgstr "Centroeuropeo (I_SO-8859-2)" + +#: ../embed/ephy-encodings.c:65 +msgid "Central European (_MacCE)" +msgstr "Centroeuropeo (_MacCE)" + +#: ../embed/ephy-encodings.c:66 +msgid "Central European (_Windows-1250)" +msgstr "Centroeuropeo (_Windows-1250)" + +#: ../embed/ephy-encodings.c:67 +msgid "Chinese Simplified (_GB18030)" +msgstr "Chino simplificado (_GB18030)" + +#: ../embed/ephy-encodings.c:68 +msgid "Chinese Simplified (G_B2312)" +msgstr "Chino simplificado (G_B2312)" + +#: ../embed/ephy-encodings.c:69 +msgid "Chinese Simplified (GB_K)" +msgstr "Chino simplificado (GB_K)" + +#: ../embed/ephy-encodings.c:70 +msgid "Chinese Simplified (_HZ)" +msgstr "Chino simplificado (_HZ)" + +#: ../embed/ephy-encodings.c:71 +msgid "Chinese Simplified (_ISO-2022-CN)" +msgstr "Chino simplificado (_ISO-2022-CN)" + +#: ../embed/ephy-encodings.c:72 +msgid "Chinese Traditional (Big_5)" +msgstr "Chino tradicional (Big_5)" + +#: ../embed/ephy-encodings.c:73 +msgid "Chinese Traditional (Big5-HK_SCS)" +msgstr "Chino tradicional (Big5-HK_SCS)" + +#: ../embed/ephy-encodings.c:74 +msgid "Chinese Traditional (_EUC-TW)" +msgstr "Chino tradicional (_EUC-TW)" + +#: ../embed/ephy-encodings.c:75 +msgid "Cyrillic (_IBM-855)" +msgstr "Cirílico (_IBM-855)" + +#: ../embed/ephy-encodings.c:76 +msgid "Cyrillic (I_SO-8859-5)" +msgstr "Cirílico (IS_O-8859-5)" + +#: ../embed/ephy-encodings.c:77 +msgid "Cyrillic (IS_O-IR-111)" +msgstr "Cirílico (IS_O-IR-111)" + +#: ../embed/ephy-encodings.c:78 +msgid "Cyrillic (_KOI8-R)" +msgstr "Cirílico (_KOI8-R)" + +#: ../embed/ephy-encodings.c:79 +msgid "Cyrillic (_MacCyrillic)" +msgstr "Cirílico (_MacCyrillic)" + +#: ../embed/ephy-encodings.c:80 +msgid "Cyrillic (_Windows-1251)" +msgstr "Cirílico (_Windows-1251)" + +#: ../embed/ephy-encodings.c:81 +msgid "Cyrillic/_Russian (IBM-866)" +msgstr "Cirílico/_Ruso (IBM-866)" + +#: ../embed/ephy-encodings.c:82 +msgid "Greek (_ISO-8859-7)" +msgstr "Griego (_ISO-8859-7)" + +#: ../embed/ephy-encodings.c:83 +msgid "Greek (_MacGreek)" +msgstr "Griego (_MacGreek)" + +#: ../embed/ephy-encodings.c:84 +msgid "Greek (_Windows-1253)" +msgstr "Griego (_Windows-1253)" + +#: ../embed/ephy-encodings.c:85 +msgid "Gujarati (_MacGujarati)" +msgstr "Gujarati (_MacGujarati)" + +#: ../embed/ephy-encodings.c:86 +msgid "Gurmukhi (Mac_Gurmukhi)" +msgstr "Gurmukhi (Mac_Gurmukhi)" + +#: ../embed/ephy-encodings.c:87 +msgid "Hindi (Mac_Devanagari)" +msgstr "Hindi (Mac_Devanagari)" + +#: ../embed/ephy-encodings.c:88 +msgid "Hebrew (_IBM-862)" +msgstr "Hebreo (_IBM-862)" + +#: ../embed/ephy-encodings.c:89 +msgid "Hebrew (IS_O-8859-8-I)" +msgstr "Hebreo (IS_O-8859-8-I)" + +#: ../embed/ephy-encodings.c:90 +msgid "Hebrew (_MacHebrew)" +msgstr "Hebreo (_MacHebrew)" + +#: ../embed/ephy-encodings.c:91 +msgid "Hebrew (_Windows-1255)" +msgstr "Hebreo (_Windows-1255)" + +#: ../embed/ephy-encodings.c:92 +msgid "_Visual Hebrew (ISO-8859-8)" +msgstr "Hebreo _visual (ISO-8859-8)" + +#: ../embed/ephy-encodings.c:93 +msgid "Japanese (_EUC-JP)" +msgstr "Japonés (_EUC-JP)" + +#: ../embed/ephy-encodings.c:94 +msgid "Japanese (_ISO-2022-JP)" +msgstr "Japonés (_ISO-2022-JP)" + +#: ../embed/ephy-encodings.c:95 +msgid "Japanese (_Shift-JIS)" +msgstr "Japonés (_Shift-JIS)" + +#: ../embed/ephy-encodings.c:96 +msgid "Korean (_EUC-KR)" +msgstr "Coreano (_EUC-KR)" + +#: ../embed/ephy-encodings.c:97 +msgid "Korean (_ISO-2022-KR)" +msgstr "Coreano (_ISO-2022-KR)" + +#: ../embed/ephy-encodings.c:98 +msgid "Korean (_JOHAB)" +msgstr "Coreano (_JOHAB)" + +#: ../embed/ephy-encodings.c:99 +msgid "Korean (_UHC)" +msgstr "Coreano (_UHC)" + +#: ../embed/ephy-encodings.c:100 +msgid "_Celtic (ISO-8859-14)" +msgstr "_Celta (ISO-8859-14)" + +#: ../embed/ephy-encodings.c:101 +msgid "_Icelandic (MacIcelandic)" +msgstr "_Islandés (MacIcelandic)" + +#: ../embed/ephy-encodings.c:102 +msgid "_Nordic (ISO-8859-10)" +msgstr "_Nórdico (ISO-8859-10)" + +#: ../embed/ephy-encodings.c:103 +msgid "_Persian (MacFarsi)" +msgstr "_Persa (MacFarsi)" + +#: ../embed/ephy-encodings.c:104 +msgid "Croatian (Mac_Croatian)" +msgstr "Croata (Mac_Croatian)" + +#: ../embed/ephy-encodings.c:105 +msgid "_Romanian (MacRomanian)" +msgstr "_Rumano (MacRomanian)" + +#: ../embed/ephy-encodings.c:106 +msgid "R_omanian (ISO-8859-16)" +msgstr "R_umano (ISO-8859-16)" + +#: ../embed/ephy-encodings.c:107 +msgid "South _European (ISO-8859-3)" +msgstr "Sur _europeo (ISO-8859-3)" + +#: ../embed/ephy-encodings.c:108 +msgid "Thai (TIS-_620)" +msgstr "Tailandés (TIS-_620)" + +#: ../embed/ephy-encodings.c:109 +msgid "Thai (IS_O-8859-11)" +msgstr "Tailandés (IS_O-8859-11)" + +#: ../embed/ephy-encodings.c:110 +msgid "_Thai (Windows-874)" +msgstr "_Tailandés (Windows-874)" + +#: ../embed/ephy-encodings.c:111 +msgid "Turkish (_IBM-857)" +msgstr "Turco (_IBM-857)" + +#: ../embed/ephy-encodings.c:112 +msgid "Turkish (I_SO-8859-9)" +msgstr "Turco (I_SO-8859-9)" + +#: ../embed/ephy-encodings.c:113 +msgid "Turkish (_MacTurkish)" +msgstr "Turco (_MacTurkish)" + +#: ../embed/ephy-encodings.c:114 +msgid "Turkish (_Windows-1254)" +msgstr "Turco (_Windows-1254)" + +#: ../embed/ephy-encodings.c:115 +msgid "Unicode (UTF-_8)" +msgstr "Unicode (UTF-_8)" + +#: ../embed/ephy-encodings.c:116 +msgid "Cyrillic/Ukrainian (_KOI8-U)" +msgstr "Cirílico/Ucraniano (_KOI8-U)" + +#: ../embed/ephy-encodings.c:117 +msgid "Cyrillic/Ukrainian (Mac_Ukrainian)" +msgstr "Cirílico/Ucraniano (Mac_Ukranian)" + +#: ../embed/ephy-encodings.c:118 +msgid "Vietnamese (_TCVN)" +msgstr "Vietnamita (_TCVN)" + +#: ../embed/ephy-encodings.c:119 +msgid "Vietnamese (_VISCII)" +msgstr "Vietnamita (_VISCII)" + +#: ../embed/ephy-encodings.c:120 +msgid "Vietnamese (V_PS)" +msgstr "Vietnamita (V_PS)" + +#: ../embed/ephy-encodings.c:121 +msgid "Vietnamese (_Windows-1258)" +msgstr "Vietnamita (_Windows-1258)" + +#: ../embed/ephy-encodings.c:122 +msgid "Western (_IBM-850)" +msgstr "Occidental (_IBM-850)" + +#: ../embed/ephy-encodings.c:123 +msgid "Western (_ISO-8859-1)" +msgstr "Occidental (_ISO-8859-1)" + +#: ../embed/ephy-encodings.c:124 +msgid "Western (IS_O-8859-15)" +msgstr "Occidental (IS_O-8859-15)" + +#: ../embed/ephy-encodings.c:125 +msgid "Western (_MacRoman)" +msgstr "Occidental (_MacRoman)" + +#: ../embed/ephy-encodings.c:126 +msgid "Western (_Windows-1252)" +msgstr "Occidental (_Windows-1252)" + +#. The following encodings are so rarely used that we don't want to +#. * pollute the "related" part of the encodings menu with them, so we +#. * set the language group to 0 here. +#. +#: ../embed/ephy-encodings.c:132 +msgid "English (_US-ASCII)" +msgstr "Inglés (_US-ASCII)" + +#: ../embed/ephy-encodings.c:133 +msgid "Unicode (UTF-_16 BE)" +msgstr "Unicode (UTF-_16 BE)" + +#: ../embed/ephy-encodings.c:134 +msgid "Unicode (UTF-1_6 LE)" +msgstr "Unicode (UTF-1_6 LE)" + +#: ../embed/ephy-encodings.c:135 +msgid "Unicode (UTF-_32 BE)" +msgstr "Unicode (UTF-_32 BE)" + +#: ../embed/ephy-encodings.c:136 +msgid "Unicode (UTF-3_2 LE)" +msgstr "Unicode (UTF-3_2 LE)" + +#. Translators: this is the title that an unknown encoding will +#. * be displayed as. +#. +#: ../embed/ephy-encodings.c:218 +#, c-format +msgid "Unknown (%s)" +msgstr "Desconocido (%s)" + +#: ../embed/ephy-find-toolbar.c:104 +msgid "Text not found" +msgstr "Texto no encontrado" + +#: ../embed/ephy-find-toolbar.c:110 +msgid "Search wrapped back to the top" +msgstr "La búsqueda volvió al principio" + +#: ../embed/ephy-find-toolbar.c:451 +msgid "Type to search…" +msgstr "Escribir para buscar…" + +#: ../embed/ephy-find-toolbar.c:457 +msgid "Find previous occurrence of the search string" +msgstr "Busca la aparición anterior de la cadena de búsqueda" + +#: ../embed/ephy-find-toolbar.c:465 +msgid "Find next occurrence of the search string" +msgstr "Busca la siguiente aparición de la cadena de búsqueda" + +#: ../embed/ephy-web-view.c:493 +msgid "_Don’t Save" +msgstr "_No guardar" + +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Guardar" + +#. Translators: The %s the hostname where this is happening. +#. * Example: mail.google.com. +#. +#: ../embed/ephy-web-view.c:505 +#, c-format +msgid "Do you want to save your password for “%s”?" +msgstr "¿Quiere guardar la contraseña para «%s»?" + +#: ../embed/ephy-web-view.c:1433 +msgid "Deny" +msgstr "Denegar" + +#: ../embed/ephy-web-view.c:1434 +msgid "Allow" +msgstr "Permitir" + +#. Translators: Geolocation policy for a specific site. +#: ../embed/ephy-web-view.c:1446 +#, c-format +msgid "The page at %s wants to know your location." +msgstr "La página %s quiere saber su ubicación." + +#. Translators: Notification policy for a specific site. +#: ../embed/ephy-web-view.c:1450 +#, c-format +msgid "The page at %s wants to show desktop notifications." +msgstr "" +"La página %s quiere saber mostrar notificaciones en el escritorio." + +#. translators: %s here is the address of the web page +#: ../embed/ephy-web-view.c:1538 +#, c-format +msgid "Loading “%s”…" +msgstr "Cargando «%s»…" + +#: ../embed/ephy-web-view.c:1540 +msgid "Loading…" +msgstr "Cargando…" + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1763 +msgid "" +"This website presented identification that belongs to a different website." +msgstr "" +"Este sitio web presenta una identificación que pertenece a un sitio web " +"diferente." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1768 +msgid "" +"This website’s identification is too old to trust. Check the date on your " +"computer’s calendar." +msgstr "" +"La identificación de este sitio web es muy antigua para confiar en ella. " +"Compruebe la fecha en el calendario de su equipo." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1773 +msgid "This website’s identification was not issued by a trusted organization." +msgstr "" +"La identificación de este sitio web no la ha emitido una organización de " +"confianza." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1778 +msgid "" +"This website’s identification could not be processed. It may be corrupted." +msgstr "" +"No se pudo procesar la identificación de este sitio web. Puede que esté " +"corrupta." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1783 +msgid "" +"This website’s identification has been revoked by the trusted organization " +"that issued it." +msgstr "" +"La organización que emitió la identificación de este sitio web la ha " +"revocado." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1788 +msgid "" +"This website’s identification cannot be trusted because it uses very weak " +"encryption." +msgstr "" +"No se puede confiar en la identificación de este sitio web porque usa un " +"cifrado muy débil." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1793 +msgid "" +"This website’s identification is only valid for future dates. Check the date " +"on your computer’s calendar." +msgstr "" +"La identificación de este sitio web sólo es válida para fechas futuras. " +"Compruebe la fecha en el calendario de su equipo." + +#. Message when a site's TLS certificate is invalid. %s is the site's hostname. +#: ../embed/ephy-web-view.c:1829 +#, c-format +msgid "This might not be the real %s." +msgstr "Esto puede no ser el %s real." + +#. Message when a site's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1834 +msgid "" +"When you try to connect securely, websites present identification to prove " +"that your connection has not been maliciously intercepted. There is " +"something wrong with this website’s identification:" +msgstr "" +"Cuando intenta conectarse de manera segura, los sitios web presentan una " +"identificación para probar que su conexión no se ha interceptado " +"maliciosamente. Hay algo erróneo en la identificación de este sitio web:" + +#. Message when a site's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1840 +msgid "" +"A third party may have hijacked your connection. You should continue only if " +"you know there is a good reason why this website does not use trusted " +"identification." +msgstr "" +"Un tercero puede haber secuestrado su conexión. Sólo debe continuar si sabe " +"que hay una buena razón por la que este sitio no use una conexión confiable." + +#. Good advice from Firefox; displays when a site's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1844 +msgid "" +"Legitimate banks, stores, and other public sites will not ask you to do this." +msgstr "" +"Los bancos legítimos, las tiendas y otros sitios públicos no le pedirán que " +"hagan esto." + +#: ../embed/ephy-web-view.c:1885 +msgid "None specified" +msgstr "Ninguna espacificada" + +#. Page title when a site cannot be loaded. %s is the site's hostname. +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 +#, c-format +msgid "Problem loading “%s”" +msgstr "Hubo un problema al cargar «%s»" + +#: ../embed/ephy-web-view.c:1900 +msgid "Oops! Unable to display this website." +msgstr "No se ha podido cargar esta página web." + +#: ../embed/ephy-web-view.c:1901 +#, c-format +msgid "" +"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily unavailable or moved to a " +"new address. You may wish to verify that your internet connection is working " +"correctly.

" +msgstr "" +"

Parece que el sitio web en «%s» no está disponible. El error exacto fue:

%s

Puede que no esté disponible temporalmente o que " +"se haya movido a otra dirección. Puede querer comprobar que su conexión a " +"Internet está funcionando correctamente.

" + +#: ../embed/ephy-web-view.c:1909 +msgid "Try again" +msgstr "Intentarlo de nuevo" + +#: ../embed/ephy-web-view.c:1915 +msgid "Oops! There may be a problem." +msgstr "Es posible que haya un problema." + +#: ../embed/ephy-web-view.c:1916 +#, c-format +msgid "" +"

This site may have caused Web to close unexpectedly.

If this " +"happens again, please report the problem to the %s " +"developers.

" +msgstr "" +"

Este sitio ha hecho que Web se cierre de manera inesperada
Si vuelve " +"a pasar, informe del problema a los desarrolladores de %s." + +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 +msgid "Reload Anyway" +msgstr "Recargar de todas formas" + +#: ../embed/ephy-web-view.c:1925 +#, c-format +msgid "Problem displaying “%s”" +msgstr "Hubo un problema al mostrar «%s»" + +#: ../embed/ephy-web-view.c:1926 +msgid "Oops!" +msgstr "¡Ups!" + +#: ../embed/ephy-web-view.c:1927 +msgid "" +"Something went wrong while displaying this page. Please reload or visit a " +"different page to continue." +msgstr "" +"Algo saló mal al mostrar esta página. Recargue la página o visite una página " +"diferente para continuar." + +#. Title of error page when a website's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1935 +msgid "Look out!" +msgstr "Esté atento." + +#. Button on error page when a website's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1938 +msgid "Load Anyway" +msgstr "Cargar de todas formas" + +#: ../embed/ephy-web-view.c:2863 +msgid "_OK" +msgstr "_Aceptar" + +#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmarks-editor.c:819 +#: ../src/resources/clear-data-dialog.ui.h:3 +#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 +msgid "_Cancel" +msgstr "_Cancelar" + +#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:9 +msgid "_Open" +msgstr "_Abrir" + +#: ../lib/ephy-file-chooser.c:209 +msgid "All supported types" +msgstr "Todos los tipos soportados" + +#: ../lib/ephy-file-chooser.c:223 +msgid "Web pages" +msgstr "Páginas web" + +#: ../lib/ephy-file-chooser.c:234 +msgid "Images" +msgstr "Imágenes" + +#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:637 +msgid "All files" +msgstr "Todos los archivos" + +#. If we don't have XDG user dirs info, return an educated guess. +#: ../lib/ephy-file-helpers.c:114 ../src/resources/prefs-dialog.ui.h:2 +msgid "Downloads" +msgstr "Descargas" + +#. If we don't have XDG user dirs info, return an educated guess. +#: ../lib/ephy-file-helpers.c:167 +msgid "Desktop" +msgstr "Escritorio" + +#: ../lib/ephy-file-helpers.c:335 +#, c-format +msgid "Could not create a temporary directory in “%s”." +msgstr "No se pudo crear la carpeta temporal en: «%s»." + +#: ../lib/ephy-file-helpers.c:466 +#, c-format +msgid "The file “%s” exists. Please move it out of the way." +msgstr "el archivo «%s» ya existe. Muévalo fuera de la ruta." + +#: ../lib/ephy-file-helpers.c:487 +#, c-format +msgid "Failed to create directory “%s”." +msgstr "Falló al crear la carpeta «%s»." + +#. Translators: The first %s is the username and the second one is the +#. * hostname where this is happening. Example: gnome@gmail.com and +#. * mail.google.com. +#. +#: ../lib/ephy-form-auth-data.c:140 +#, c-format +msgid "Password for %s in a form in %s" +msgstr "Contraseña para %s en un formulario en %s" + +#. Translators: The first %s is the hostname where this is happening. +#. * Example: mail.google.com. +#. +#: ../lib/ephy-form-auth-data.c:146 +#, c-format +msgid "Password in a form in %s" +msgstr "Contraseña para %s en un formulario" + +#: ../lib/ephy-gui.c:206 +#, c-format +msgid "Directory “%s” is not writable" +msgstr "La carpeta «%s» no es escribible" + +#: ../lib/ephy-gui.c:210 +msgid "You do not have permission to create files in this directory." +msgstr "No tiene permiso para crear archivos en esta carpeta." + +#: ../lib/ephy-gui.c:213 +msgid "Directory not Writable" +msgstr "Carpeta no escribible" + +#: ../lib/ephy-gui.c:242 +#, c-format +msgid "Cannot overwrite existing file “%s”" +msgstr "No se puede sobrescribir el archivo «%s»" + +#: ../lib/ephy-gui.c:246 +msgid "" +"A file with this name already exists and you don't have permission to " +"overwrite it." +msgstr "" +"Ya existe un archivo con este nombre y no tiene permiso para sobrescribirlo." + +#: ../lib/ephy-gui.c:249 +msgid "Cannot Overwrite File" +msgstr "No se puede sobrescribir el archivo" + +#: ../lib/ephy-gui.c:307 +#, c-format +msgid "Could not display help: %s" +msgstr "No se pudo mostrar la ayuda: %s" + +#: ../lib/ephy-nss-glue.c:62 +msgid "Master password needed" +msgstr "Se necesita la contraseña maestra" + +#: ../lib/ephy-nss-glue.c:64 +msgid "" +"The passwords from the previous version are locked with a master password. " +"If you want to import them, please enter your master password below." +msgstr "" +"Las contraseñas de la versión anterior están bloqueadas con una contraseña " +"maestra. Si quiere importarlas, introduzca a continuación su contraseña " +"maestra." + +#: ../lib/ephy-profile-migrator.c:100 +msgid "Failed to copy cookies file from Mozilla." +msgstr "Falló al copiar el archivo de «cookies» de Mozilla." + +#: ../lib/ephy-profile-migrator.c:652 +msgid "" +"Web 3.6 deprecated this directory and tried migrating this configuration to " +"~/.config/epiphany" +msgstr "" +"Web 3.6 marcó como obsoleta esta carpeta y migró su configuración a ~/." +"config/epiphany" + +#: ../lib/ephy-profile-migrator.c:1030 +msgid "Executes only the n-th migration step" +msgstr "Ejecuta en n-ésimo paso dela migración" + +#: ../lib/ephy-profile-migrator.c:1032 +msgid "Specifies the required version for the migrator" +msgstr "Especifica la versión requerida por el migrador" + +#: ../lib/ephy-profile-migrator.c:1034 +msgid "Specifies the profile where the migrator should run" +msgstr "Especifica el perfil que debe ejecutar el migrador" + +#: ../lib/ephy-profile-migrator.c:1047 +msgid "Web profile migrator" +msgstr "Migrador de perfiles de Web" + +#: ../lib/ephy-profile-migrator.c:1048 +msgid "Web profile migrator options" +msgstr "Opciones del migrador de perfiles de Web" + +#. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am" +#: ../lib/ephy-time-helpers.c:223 +msgid "Today %I:%M %p" +msgstr "Hoy %H:%M" + +#. Translators: "friendly time" string for the previous day, +#. * strftime format. e.g. "Yesterday 12:34 am" +#. +#: ../lib/ephy-time-helpers.c:236 +msgid "Yesterday %I:%M %p" +msgstr "Ayer %H:%M" + +#. Translators: "friendly time" string for a day in the current week, +#. * strftime format. e.g. "Wed 12:34 am" +#. +#: ../lib/ephy-time-helpers.c:252 +msgid "%a %I:%M %p" +msgstr "%a %H:%M" + +#. Translators: "friendly time" string for a day in the current year, +#. * strftime format. e.g. "Feb 12 12:34 am" +#. +#: ../lib/ephy-time-helpers.c:264 +msgid "%b %d %I:%M %p" +msgstr "%d %b %H:%M" + +#. Translators: "friendly time" string for a day in a different year, +#. * strftime format. e.g. "Feb 12 1997" +#. +#: ../lib/ephy-time-helpers.c:269 +msgid "%b %d %Y" +msgstr "%d %b %Y" + +#. impossible time or broken locale settings +#: ../lib/ephy-time-helpers.c:279 +msgid "Unknown" +msgstr "Desconocido" + +#: ../lib/ephy-zoom.h:45 +msgid "50%" +msgstr "50%" + +#: ../lib/ephy-zoom.h:46 +msgid "75%" +msgstr "75%" + +#: ../lib/ephy-zoom.h:47 +msgid "100%" +msgstr "100%" + +#: ../lib/ephy-zoom.h:48 +msgid "125%" +msgstr "125%" + +#: ../lib/ephy-zoom.h:49 +msgid "150%" +msgstr "150%" + +#: ../lib/ephy-zoom.h:50 +msgid "175%" +msgstr "175%" + +#: ../lib/ephy-zoom.h:51 +msgid "200%" +msgstr "200%" + +#: ../lib/ephy-zoom.h:52 +msgid "300%" +msgstr "300%" + +#: ../lib/ephy-zoom.h:53 +msgid "400%" +msgstr "400%" + +#: ../lib/history/ephy-history-service-hosts-table.c:363 +msgid "Others" +msgstr "Otros" + +#: ../lib/history/ephy-history-service-hosts-table.c:367 +msgid "Local files" +msgstr "Archivos locales" + +#: ../lib/widgets/ephy-certificate-dialog.c:92 +msgid "The certificate does not match this website" +msgstr "El certificado no coincide con este sitio web" + +#: ../lib/widgets/ephy-certificate-dialog.c:95 +msgid "The certificate has expired" +msgstr "El certificado ha caducado" + +#: ../lib/widgets/ephy-certificate-dialog.c:98 +msgid "The signing certificate authority is not known" +msgstr "La autoridad de firma del certificado es desconocida" + +#: ../lib/widgets/ephy-certificate-dialog.c:101 +msgid "The certificate contains errors" +msgstr "El certificado contiene errores" + +#: ../lib/widgets/ephy-certificate-dialog.c:104 +msgid "The certificate has been revoked" +msgstr "El certificado se ha revocado" + +#: ../lib/widgets/ephy-certificate-dialog.c:107 +msgid "The certificate is signed using a weak signature algorithm" +msgstr "El certificado está firmado usando un algoritmo de firma débil" + +#: ../lib/widgets/ephy-certificate-dialog.c:110 +msgid "The certificate activation time is still in the future" +msgstr "La hora de activación del certificado está todavía en el futuro" + +#: ../lib/widgets/ephy-certificate-dialog.c:149 +msgid "The identity of this website has been verified." +msgstr "Se ha verificado la identidad de este sitio web." + +#: ../lib/widgets/ephy-certificate-dialog.c:150 +msgid "The identity of this website has not been verified." +msgstr "No se ha verificado la identidad de este sitio web." + +#. Label when clicking the lock icon on a secure page. %s is the website's hostname. +#: ../lib/widgets/ephy-certificate-popover.c:71 +#, c-format +msgid "You are connected to %s" +msgstr "Está conectado a %s" + +#. Label in certificate popover when site is untrusted. %s is a URL. +#: ../lib/widgets/ephy-certificate-popover.c:113 +#, c-format +msgid "" +"This web site’s digital identification is not trusted. You may have " +"connected to an attacker pretending to be %s." +msgstr "" +"La identificación digital de este sitio web no es de confianza. Es posible " +"que se haya conectado a un atacante que se hace pasar por %s." + +#. Label in certificate popover when site sends mixed content. +#: ../lib/widgets/ephy-certificate-popover.c:124 +msgid "Part of this page is insecure." +msgstr "Parte de esta página no es segura" + +#. Label in certificate popover on secure sites. +#: ../lib/widgets/ephy-certificate-popover.c:130 +msgid "Your connection is secure." +msgstr "Su conexión es segura." + +#: ../lib/widgets/ephy-certificate-popover.c:318 +msgid "_View Certificate…" +msgstr "_Ver certificado…" + +#: ../lib/widgets/ephy-download-widget.c:106 +#, c-format +msgid "%d second left" +msgid_plural "%d seconds left" +msgstr[0] "queda %d segundo" +msgstr[1] "quedan %d segundos" + +#: ../lib/widgets/ephy-download-widget.c:112 +#, c-format +msgid "%d minute left" +msgid_plural "%d minutes left" +msgstr[0] "queda %d minuto" +msgstr[1] "quedan %d minutos" + +#: ../lib/widgets/ephy-download-widget.c:118 +#, c-format +msgid "%d hour left" +msgid_plural "%d hours left" +msgstr[0] "queda %d hora" +msgstr[1] "quedan %d horas" + +#: ../lib/widgets/ephy-download-widget.c:124 +#, c-format +msgid "%d day left" +msgid_plural "%d days left" +msgstr[0] "queda %d día" +msgstr[1] "quedan %d días" + +#: ../lib/widgets/ephy-download-widget.c:130 +#, c-format +msgid "%d week left" +msgid_plural "%d weeks left" +msgstr[0] "queda %d semana" +msgstr[1] "quedan %d semanas" + +#: ../lib/widgets/ephy-download-widget.c:136 +#, c-format +msgid "%d month left" +msgid_plural "%d months left" +msgstr[0] "queda %d mes" +msgstr[1] "quedan %d meses" + +#: ../lib/widgets/ephy-download-widget.c:304 +msgid "Finished" +msgstr "Terminado" + +#: ../lib/widgets/ephy-download-widget.c:320 +#, c-format +msgid "Error downloading: %s" +msgstr "Error al descargar: %s" + +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 +msgid "Cancel" +msgstr "Cancelar" + +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 +#: ../src/window-commands.c:275 +msgid "Open" +msgstr "Abrir" + +#: ../lib/widgets/ephy-download-widget.c:388 +msgid "Show in folder" +msgstr "Mostrar en una carpeta" + +#: ../lib/widgets/ephy-download-widget.c:592 +msgid "Starting…" +msgstr "Iniciando…" + +#. Translators: the mnemonic shouldn't conflict with any of the +#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, +#. * Select All, Input Methods and Insert Unicode control character.) +#. +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 +msgid "Cl_ear" +msgstr "_Limpiar" + +#. Edit actions. +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 +msgid "_Undo" +msgstr "_Deshacer" + +#: ../lib/widgets/ephy-location-entry.c:631 +msgid "_Redo" +msgstr "_Rehacer" + +#: ../lib/widgets/ephy-location-entry.c:911 +msgid "Drag and drop this icon to create a link to this page" +msgstr "Arrastre y suelte este icono para crear un enlace a esta página" + +#. Translators: This string is used when counting bookmarks that +#. * are similar to each other +#: ../src/bookmarks/ephy-bookmark-properties.c:84 +#, c-format +msgid "%d bookmark is similar" +msgid_plural "%d bookmarks are similar" +msgstr[0] "Hay %d marcador similar" +msgstr[1] "Hay %d marcadores similares" + +#: ../src/bookmarks/ephy-bookmark-properties.c:235 +msgid "Add Bookmark" +msgstr "Añadir marcador" + +#: ../src/bookmarks/ephy-bookmark-properties.c:237 +#, c-format +msgid "“%s” Properties" +msgstr "Propiedades de «%s»" + +#: ../src/bookmarks/ephy-bookmark-properties.c:363 +msgid "_Title:" +msgstr "_Título:" + +#: ../src/bookmarks/ephy-bookmark-properties.c:381 +msgid "A_ddress:" +msgstr "_Dirección:" + +#: ../src/bookmarks/ephy-bookmark-properties.c:394 +msgid "T_opics:" +msgstr "Te_mas:" + +#: ../src/bookmarks/ephy-bookmark-properties.c:417 +msgid "Sho_w all topics" +msgstr "_Mostrar todos los temas" + +#: ../src/bookmarks/ephy-bookmark-properties.c:438 +#: ../src/resources/prefs-dialog.ui.h:40 +#: ../src/resources/prefs-lang-dialog.ui.h:3 +msgid "_Add" +msgstr "_Añadir" + +#: ../src/bookmarks/ephy-bookmarks.c:88 +msgid "Entertainment" +msgstr "Entretenimiento" + +#: ../src/bookmarks/ephy-bookmarks.c:89 +msgid "News" +msgstr "Noticias" + +#: ../src/bookmarks/ephy-bookmarks.c:90 +msgid "Shopping" +msgstr "Compras" + +#: ../src/bookmarks/ephy-bookmarks.c:91 +msgid "Sports" +msgstr "Deportes" + +#: ../src/bookmarks/ephy-bookmarks.c:92 +msgid "Travel" +msgstr "Viajes" + +#: ../src/bookmarks/ephy-bookmarks.c:93 +msgid "Work" +msgstr "Trabajo" + +#. Translators: this topic contains all bookmarks +#: ../src/bookmarks/ephy-bookmarks.c:927 +msgctxt "bookmarks" +msgid "All" +msgstr "Todos" + +#. Translators: this topic contains the not categorized +#. bookmarks +#: ../src/bookmarks/ephy-bookmarks.c:931 +msgctxt "bookmarks" +msgid "Not Categorized" +msgstr "Sin categorizar" + +#. Translators: this is an automatic topic containing local +#. * websites bookmarks autodiscovered with zeroconf. +#: ../src/bookmarks/ephy-bookmarks.c:935 +msgctxt "bookmarks" +msgid "Nearby Sites" +msgstr "Sitios cercanos" + +#: ../src/bookmarks/ephy-bookmarks.c:1150 +#: ../src/bookmarks/ephy-bookmarks-import.c:270 +msgid "Untitled" +msgstr "Sin título" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:75 +msgid "Web (RDF)" +msgstr "Web (RDF)" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:76 +msgid "Mozilla (HTML)" +msgstr "Mozilla (HTML)" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:124 +msgid "Remove from this topic" +msgstr "Quiere quitarlo de este tema" + +#. Toplevel +#: ../src/bookmarks/ephy-bookmarks-editor.c:151 +msgid "_File" +msgstr "_Archivo" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:152 +msgid "_Edit" +msgstr "_Editar" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:153 +msgid "_View" +msgstr "_Ver" + +#. Help. +#: ../src/bookmarks/ephy-bookmarks-editor.c:154 +#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 +msgid "_Help" +msgstr "Ay_uda" + +#. File Menu +#: ../src/bookmarks/ephy-bookmarks-editor.c:158 +msgid "_New Topic" +msgstr "Tema _nuevo" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:159 +msgid "Create a new topic" +msgstr "Crear un tema nuevo" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:161 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 +msgid "Open in New _Window" +msgid_plural "Open in New _Windows" +msgstr[0] "Abrir en una _ventana nueva" +msgstr[1] "Abrir en _ventanas nuevas" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +msgid "Open the selected bookmark in a new window" +msgstr "Abre el marcador seleccionado en una ventana nueva" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:164 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 +msgid "Open in New _Tab" +msgid_plural "Open in New _Tabs" +msgstr[0] "Abrir en una _pestaña nueva" +msgstr[1] "Abrir en _pestañas nuevas" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +msgid "Open the selected bookmark in a new tab" +msgstr "Abre el marcador seleccionado en una pestaña nueva" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:167 +msgid "_Rename…" +msgstr "_Renombrar…" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:168 +msgid "Rename the selected bookmark or topic" +msgstr "Renombra el marcador seleccionado o el tema" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:169 +msgid "_Properties" +msgstr "_Propiedades" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:170 +msgid "View or modify the properties of the selected bookmark" +msgstr "Ver o modificar las propiedades del marcador seleccionado" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:172 +msgid "_Import Bookmarks…" +msgstr "_Importar marcadores…" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:173 +msgid "Import bookmarks from another browser or a bookmarks file" +msgstr "Importar marcadores desde otro navegador o un archivo de marcadores" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:175 +msgid "_Export Bookmarks…" +msgstr "_Exportar marcadores…" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:176 +msgid "Export bookmarks to a file" +msgstr "Exportar marcadores de un archivo" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:112 +msgid "_Close" +msgstr "_Cerrar" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:179 +msgid "Close the bookmarks window" +msgstr "Cerrar la ventana de marcadores" + +#. Edit Menu +#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:123 +msgid "Cu_t" +msgstr "Cor_tar" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:184 +msgid "Cut the selection" +msgstr "Corta la selección" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:186 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 +msgid "_Copy" +msgstr "_Copiar" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +msgid "Copy the selection" +msgstr "Copiar la selección" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:127 +msgid "_Paste" +msgstr "_Pegar" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:190 +msgid "Paste the clipboard" +msgstr "Pegar del portapapeles" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:192 +#: ../src/resources/history-dialog.ui.h:12 +msgid "_Delete" +msgstr "_Eliminar" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:193 +msgid "Delete the selected bookmark or topic" +msgstr "Eliminar el marcador seleccionado o el tema" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:131 +msgid "Select _All" +msgstr "Seleccionar _todo" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:196 +msgid "Select all bookmarks or text" +msgstr "Seleccionar todos los marcadores o texto" + +#. Help Menu +#: ../src/bookmarks/ephy-bookmarks-editor.c:200 +msgid "_Contents" +msgstr "Índ_ice" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:201 +msgid "Display bookmarks help" +msgstr "Mostrar ayuda de los marcadores" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:203 +#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 +msgid "_About" +msgstr "Acerca _de" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:204 +msgid "Display credits for the web browser creators" +msgstr "Mostrar créditos de los creadores del navegador web" + +#. View Menu +#: ../src/bookmarks/ephy-bookmarks-editor.c:210 +msgid "_Title" +msgstr "_Título" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:211 +msgid "Show the title column" +msgstr "Mostrar la columna de título" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:212 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 +msgid "Address" +msgstr "Dirección" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +msgid "Show the address column" +msgstr "Mostrar la columna de dirección" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:255 +msgid "Type a topic" +msgstr "Escriba un asunto" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:377 +#, c-format +msgid "Delete topic “%s”?" +msgstr "¿Quiere eliminar el tema «%s»?" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:380 +msgid "Delete this topic?" +msgstr "¿Quiere eliminar el tema?" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:382 +msgid "" +"Deleting this topic will cause all its bookmarks to become uncategorized, " +"unless they also belong to other topics. The bookmarks will not be deleted." +msgstr "" +"Al eliminar este tema, todos sus marcadores se convertirán en «Sin " +"categoría», a no ser que pertenezcan a otros temas. Los marcadores no se " +"eliminarán." + +#: ../src/bookmarks/ephy-bookmarks-editor.c:385 +msgid "_Delete Topic" +msgstr "_Eliminar tema" + +#. FIXME: proper i18n after freeze +#: ../src/bookmarks/ephy-bookmarks-editor.c:495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:499 +msgid "Firefox" +msgstr "Firefox" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:504 +#: ../src/bookmarks/ephy-bookmarks-editor.c:508 +msgid "Firebird" +msgstr "Firebird" + +#. Translators: The %s is the name of a Mozilla profile. +#: ../src/bookmarks/ephy-bookmarks-editor.c:513 +#, c-format +msgid "Mozilla “%s” profile" +msgstr "Perfil de «%s» de Mozilla" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:517 +msgid "Galeon" +msgstr "Galeon" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:521 +msgid "Konqueror" +msgstr "Konqueror" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:550 +msgid "Import failed" +msgstr "Ha fallado la importación" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:552 +msgid "Import Failed" +msgstr "Ha fallado la importación" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:555 +#, c-format +msgid "" +"The bookmarks from “%s” could not be imported because the file is corrupted " +"or of an unsupported type." +msgstr "" +"No se pudieron importar los marcadores de «%s» debido a que el archivo está " +"corrompido o es de un tipo no soportado." + +#: ../src/bookmarks/ephy-bookmarks-editor.c:618 +msgid "Import Bookmarks from File" +msgstr "Importar marcadores del archivo" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:625 +msgid "Firefox/Mozilla bookmarks" +msgstr "Marcadores de Firefox/Mozilla" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:629 +msgid "Galeon/Konqueror bookmarks" +msgstr "Marcadores de Galeon/Konqueror" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:633 +msgid "Web bookmarks" +msgstr "Marcadores web" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:757 +msgid "Export Bookmarks" +msgstr "Exportar marcadores" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:764 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 +#: ../src/bookmarks/ephy-topic-action.c:217 +msgid "Bookmarks" +msgstr "Marcadores" + +#. Make a format selection combo & label +#: ../src/bookmarks/ephy-bookmarks-editor.c:770 +msgid "File f_ormat:" +msgstr "_Formato de archivo:" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:816 +msgid "Import Bookmarks" +msgstr "Importar marcadores" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:821 +msgid "I_mport" +msgstr "I_mportar" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:837 +msgid "Import bookmarks from:" +msgstr "Importar marcadores de un archivo:" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:857 +msgid "File" +msgstr "Archivo" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 +msgid "_Copy Address" +msgstr "_Copiar dirección" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 +msgid "Topics" +msgstr "Temas" + +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +msgid "Title" +msgstr "Título" + +#. FIXME !!!! +#: ../src/bookmarks/ephy-open-tabs-action.c:74 +msgid "Open in New _Tabs" +msgstr "Abrir en pestaña_s nuevas" + +#: ../src/bookmarks/ephy-open-tabs-action.c:75 +msgid "Open the bookmarks in this topic in new tabs" +msgstr "Abre los marcadores de este tema en pestañas nuevas" + +#: ../src/bookmarks/ephy-topics-entry.c:330 +#, c-format +msgid "Create topic “%s”" +msgstr "Crear tema «%s»" + +#: ../src/resources/clear-data-dialog.ui.h:1 +msgid "Clear Personal Data" +msgstr "Limpiar datos personales" + +#: ../src/resources/clear-data-dialog.ui.h:2 +msgid "C_lear" +msgstr "_Limpiar" + +#: ../src/resources/clear-data-dialog.ui.h:4 +msgid "Select the personal data you wish to clear" +msgstr "Seleccione los datos personales que quiere limpiar" + +#: ../src/resources/clear-data-dialog.ui.h:5 +msgid "" +"You are about to clear personal data that is stored about the web pages you " +"have visited. Check the types of information that you want to remove:" +msgstr "" +"Está a punto de eliminar datos personales almacenados acerca de páginas web " +"que ha visitado. Marque el tipo de información que quiere eliminar:" + +#: ../src/resources/clear-data-dialog.ui.h:6 +msgid "Coo_kies" +msgstr "Coo_kies" + +#: ../src/resources/clear-data-dialog.ui.h:7 +msgid "Cache and _temporary files" +msgstr "Caché y archivos _temporales" + +#: ../src/resources/clear-data-dialog.ui.h:8 +msgid "Browsing _history" +msgstr "_Histórico de navegación" + +#: ../src/resources/clear-data-dialog.ui.h:9 +msgid "Saved _passwords" +msgstr "Contraseñas _guardadas" + +#: ../src/resources/clear-data-dialog.ui.h:10 +msgid "" +"You cannot undo this action. The data you are choosing to clear will be " +"removed forever." +msgstr "" +"No puede deshacer esta acción. Los datos que está seleccionando para limpiar " +"se perderán para siempre." + +#: ../src/resources/cookies-dialog.ui.h:1 +#: ../src/resources/prefs-dialog.ui.h:21 +msgid "Cookies" +msgstr "Cookies" + +#: ../src/resources/cookies-dialog.ui.h:2 +#: ../src/resources/history-dialog.ui.h:2 +#: ../src/resources/passwords-dialog.ui.h:2 +msgid "C_lear All" +msgstr "_Limpiar todo" + +#: ../src/resources/cookies-dialog.ui.h:3 +#: ../src/resources/passwords-dialog.ui.h:4 +msgid "Site" +msgstr "Sitio" + +#: ../src/resources/cookies-dialog.ui.h:4 +msgid "Remove" +msgstr "Quitar" + +#: ../src/resources/cookies-dialog.ui.h:5 +msgid "Delete the selected cookies" +msgstr "Eliminar las cookies seleccionadas" + +#: ../src/resources/encoding-dialog.ui.h:1 +msgid "Text Encoding" +msgstr "Codificación del texto" + +#: ../src/resources/encoding-dialog.ui.h:2 ../src/ephy-encoding-menu.c:327 +msgid "_Automatic" +msgstr "_Automático" + +#: ../src/resources/encoding-dialog.ui.h:3 ../src/ephy-encoding-menu.c:328 +msgid "Use the encoding specified by the document" +msgstr "Usar la codificación especificada por el documento" + +#: ../src/resources/encoding-dialog.ui.h:4 +msgid "_Use a different encoding:" +msgstr "_Usar una codificación diferente:" + +#. File actions. +#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:98 +msgid "_New Window" +msgstr "_Ventana nueva" + +#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:100 +msgid "New _Incognito Window" +msgstr "_Ventana nueva de incógnito" + +#: ../src/resources/epiphany-application-menu.ui.h:3 +msgid "Reopen Closed _Tab" +msgstr "_Volver a abrir la pestaña cerrada" + +#. Toplevel +#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:91 +msgid "_Bookmarks" +msgstr "_Marcadores" + +#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:141 +msgid "_History" +msgstr "_Histórico" + +#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:143 +msgid "Pr_eferences" +msgstr "Prefere_ncias" + +#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:114 +msgid "_Quit" +msgstr "_Salir" + +#: ../src/resources/history-dialog.ui.h:1 +msgid "History" +msgstr "Histórico" + +#: ../src/resources/history-dialog.ui.h:3 +msgid "Search history" +msgstr "Histórico de búsqueda" + +#: ../src/resources/history-dialog.ui.h:4 +msgid "Date" +msgstr "Fecha" + +#: ../src/resources/history-dialog.ui.h:5 +msgid "Name" +msgstr "Nombre" + +#: ../src/resources/history-dialog.ui.h:6 +msgid "Location" +msgstr "Ubicación" + +#: ../src/resources/history-dialog.ui.h:7 +msgid "Remove the selected pages from history" +msgstr "Quita las páginas seleccionadas del histórico" + +#: ../src/resources/history-dialog.ui.h:8 +msgid "Open the selected pages in new tabs" +msgstr "Abrir las páginas seleccionadas en pestañas nuevas" + +#: ../src/resources/history-dialog.ui.h:10 +msgid "_Copy Location" +msgstr "Copiar _ubicación" + +#: ../src/resources/history-dialog.ui.h:11 +msgid "Add _Bookmark" +msgstr "Añadir _marcador" + +#: ../src/resources/passwords-dialog.ui.h:1 +#: ../src/resources/prefs-dialog.ui.h:30 +msgid "Passwords" +msgstr "Contraseñas" + +#: ../src/resources/passwords-dialog.ui.h:3 +msgid "Search passwords" +msgstr "Buscar contraseñas" + +#: ../src/resources/passwords-dialog.ui.h:5 +msgid "User Name" +msgstr "Nombre de usuario" + +#: ../src/resources/passwords-dialog.ui.h:6 +msgid "Password" +msgstr "Contraseña" + +#: ../src/resources/passwords-dialog.ui.h:7 +msgid "Forget the selected passwords" +msgstr "Olvidar las contraseñas seleccionadas" + +#: ../src/resources/passwords-dialog.ui.h:8 +msgid "Reveal all the passwords" +msgstr "Mostrar todas las contraseñas" + +#: ../src/resources/passwords-dialog.ui.h:9 +msgid "_Copy Password" +msgstr "_Copiar contraseña" + +#: ../src/resources/passwords-dialog.ui.h:10 +msgid "C_opy Username" +msgstr "C_opiar nombre de usuario" + +#: ../src/resources/prefs-dialog.ui.h:1 +msgid "Preferences" +msgstr "Preferencias" + +#: ../src/resources/prefs-dialog.ui.h:3 +msgid "_Download folder:" +msgstr "Carpeta de de_scarga:" + +#: ../src/resources/prefs-dialog.ui.h:4 +msgid "A_utomatically open downloaded files" +msgstr "Abrir _automáticamente los archivos descargados" + +#: ../src/resources/prefs-dialog.ui.h:5 +msgid "Search" +msgstr "Buscar" + +#: ../src/resources/prefs-dialog.ui.h:6 +msgid "_Engine:" +msgstr "_Motor:" + +#: ../src/resources/prefs-dialog.ui.h:7 +msgid "Web Content" +msgstr "Contenido web" + +#: ../src/resources/prefs-dialog.ui.h:8 +msgid "Allow popup _windows" +msgstr "Permitir ventanas e_mergentes" + +#: ../src/resources/prefs-dialog.ui.h:9 +msgid "Allow _advertisements" +msgstr "Permitir _anuncios" + +#: ../src/resources/prefs-dialog.ui.h:10 +msgid "Enable _plugins" +msgstr "Activar co_mplementos" + +#: ../src/resources/prefs-dialog.ui.h:11 +msgid "General" +msgstr "General" + +#: ../src/resources/prefs-dialog.ui.h:12 +msgid "Fonts" +msgstr "Tipografías" + +#: ../src/resources/prefs-dialog.ui.h:13 +msgid "_Use system fonts" +msgstr "_Usar tipografías del sistema" + +#: ../src/resources/prefs-dialog.ui.h:14 +msgid "Sans serif font:" +msgstr "Tipografía Sans Serif:" + # Esto es de gestión de cookies (serrador) -#: ../src/resources/prefs-dialog.ui.h:15 -msgid "Serif font:" -msgstr "Tipografía Serif:" - -#: ../src/resources/prefs-dialog.ui.h:16 -msgid "Monospace font:" -msgstr "Tipografía monoespaciada:" - -#: ../src/resources/prefs-dialog.ui.h:17 -msgid "Style" -msgstr "Estilo" - -#: ../src/resources/prefs-dialog.ui.h:18 -msgid "Use custom _stylesheet" -msgstr "Usar hoja de _estilos personalizada" - -#: ../src/resources/prefs-dialog.ui.h:19 -msgid "_Edit Stylesheet…" -msgstr "Editar _hoja de estilos…" - -#: ../src/resources/prefs-dialog.ui.h:20 -msgid "Fonts & Style" -msgstr "Tipografías y estilo" - -#: ../src/resources/prefs-dialog.ui.h:22 -msgid "Manage _Cookies…" -msgstr "Gestionar _cookies…" - -#: ../src/resources/prefs-dialog.ui.h:23 -msgid "_Always accept" -msgstr "_Aceptar siempre" - -#: ../src/resources/prefs-dialog.ui.h:24 -msgid "Only _from sites you visit" -msgstr "Sólo desde los sitios que _visita" - -#. Refers to "Only from sites you visit" option under Cookies. -#: ../src/resources/prefs-dialog.ui.h:26 -msgid "For example, not from advertisers on these sites" -msgstr "Por ejemplo, no de publicidad de estos sitios" - -#: ../src/resources/prefs-dialog.ui.h:27 -msgid "_Never accept" -msgstr "_Nunca aceptar" - -#: ../src/resources/prefs-dialog.ui.h:28 -msgid "Tracking" -msgstr "Seguimiento" - -#: ../src/resources/prefs-dialog.ui.h:29 -msgid "_Tell websites I do not want to be tracked" -msgstr "_Indicar a los sitios web que no quiere que le rastreen" - -#: ../src/resources/prefs-dialog.ui.h:31 -msgid "Manage _Passwords…" -msgstr "Gestionar _contraseñas…" - -#: ../src/resources/prefs-dialog.ui.h:32 -msgid "_Remember passwords" -msgstr "_Recordar la contraseñas" - -#: ../src/resources/prefs-dialog.ui.h:33 -msgid "Stored Data" -msgstr "Datos almacenados" - -#: ../src/resources/prefs-dialog.ui.h:34 -msgid "You can clear stored personal data." -msgstr "Puede limpiar los datos personales almacenados." - -#: ../src/resources/prefs-dialog.ui.h:35 -msgid "Cl_ear Personal Data…" -msgstr "Limpiar datos personales…" - -#: ../src/resources/prefs-dialog.ui.h:36 -msgid "Privacy" -msgstr "Privacidad" - -#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-encoding-dialog.c:379 -msgid "Encodings" -msgstr "Codificaciones" - -#: ../src/resources/prefs-dialog.ui.h:38 -msgid "De_fault:" -msgstr "Pre_determinada:" - -#: ../src/resources/prefs-dialog.ui.h:41 -msgid "_Remove" -msgstr "_Quitar" - -#: ../src/resources/prefs-dialog.ui.h:42 -msgid "_Up" -msgstr "_Arriba" - -#: ../src/resources/prefs-dialog.ui.h:43 -msgid "_Down" -msgstr "_Abajo" - -#: ../src/resources/prefs-dialog.ui.h:44 -msgid "Spell checking" -msgstr "Corrección ortográfica" - -#: ../src/resources/prefs-dialog.ui.h:45 -msgid "_Enable spell checking" -msgstr "_Activar corrección ortográfica" - -#: ../src/resources/prefs-dialog.ui.h:46 ../src/prefs-dialog.c:840 -msgid "Language" -msgstr "Idioma" - -#: ../src/resources/prefs-lang-dialog.ui.h:1 -msgid "Add Language" -msgstr "Añadir idioma" - -#: ../src/resources/prefs-lang-dialog.ui.h:4 -msgid "Choose a l_anguage:" -msgstr "Elija un _idioma:" - -#: ../src/ephy-combined-stop-reload-action.c:41 -msgid "Stop" -msgstr "Detener" - -#: ../src/ephy-combined-stop-reload-action.c:42 -msgid "Stop current data transfer" -msgstr "Detener la transferencia de datos actual" - -#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:152 -msgid "_Reload" -msgstr "Re_cargar" - -#: ../src/ephy-combined-stop-reload-action.c:45 -msgid "Display the latest content of the current page" -msgstr "Mostrar el último contenido de la página actual" - -#: ../src/ephy-encoding-menu.c:320 -msgid "_Other…" -msgstr "_Otros…" - -#: ../src/ephy-encoding-menu.c:321 -msgid "Other encodings" -msgstr "Otras codificaciones" - -#: ../src/ephy-history-window.c:253 -msgid "Clear browsing history?" -msgstr "¿Quiere limpiar el histórico de navegación?" - -#: ../src/ephy-history-window.c:257 -msgid "" -"Clearing the browsing history will cause all history links to be permanently " -"deleted." -msgstr "" -"Limpiar del histórico de navegación hará que todos enlaces del histórico se " -"eliminen permanentemente." - -#: ../src/ephy-main.c:76 -msgid "Open a new tab in an existing browser window" -msgstr "Abre una pestaña nueva en una ventana existente del navegador" - -#: ../src/ephy-main.c:78 -msgid "Open a new browser window" -msgstr "Abre una ventana nueva del navegador" - -#: ../src/ephy-main.c:80 -msgid "Import bookmarks from the given file" -msgstr "Importar marcadores desde el archivo dado" - -#: ../src/ephy-main.c:80 ../src/ephy-main.c:82 -msgid "FILE" -msgstr "ARCHIVO" - -#: ../src/ephy-main.c:82 -msgid "Load the given session file" -msgstr "Cargar el archivo de sesiones dado" - -#: ../src/ephy-main.c:84 -msgid "Add a bookmark" -msgstr "Añadir un marcador" - -#: ../src/ephy-main.c:84 -msgid "URL" -msgstr "URL" - -#: ../src/ephy-main.c:86 -msgid "Start a private instance" -msgstr "Iniciar una instancia privada" - -#: ../src/ephy-main.c:88 -msgid "Start an instance in incognito mode" -msgstr "Iniciar una instancia en modo incógnito" - -#: ../src/ephy-main.c:90 -msgid "Start an instance in netbank mode" -msgstr "Iniciar una instancia en modo «netbank»" - -#: ../src/ephy-main.c:92 -msgid "Start the browser in application mode" -msgstr "Iniciar el navegador en modo aplicación" - -#: ../src/ephy-main.c:94 -msgid "Profile directory to use in the private instance" -msgstr "Carpeta de perfiles que usar en la instancia privada" - -#: ../src/ephy-main.c:94 -msgid "DIR" -msgstr "DIR" - -#: ../src/ephy-main.c:96 -msgid "URL …" -msgstr "URL …" - -#: ../src/ephy-main.c:201 -msgid "Could not start Web" -msgstr "No se pudo iniciar Web" - -#: ../src/ephy-main.c:204 -#, c-format -msgid "" -"Startup failed because of the following error:\n" -"%s" -msgstr "" -"El inicio ha fallado debido al siguiente error:\n" -"%s" - -#: ../src/ephy-main.c:315 -msgid "Web options" -msgstr "Opciones de Web" - -#: ../src/ephy-notebook.c:615 -msgid "Close tab" -msgstr "Cerrar pestaña" - -#: ../src/ephy-search-provider.c:201 -#, c-format -msgid "Search the Web for %s" -msgstr "Buscar %s en la web" - -#: ../src/ephy-window.c:102 -msgid "_Open…" -msgstr "_Abrir…" - -#: ../src/ephy-window.c:104 -msgid "Save _As…" -msgstr "Guardar _como…" - -#: ../src/ephy-window.c:106 -msgid "Save As _Web Application…" -msgstr "Guardar como aplicación _web…" - -#: ../src/ephy-window.c:108 -msgid "_Print…" -msgstr "_Imprimir…" - +#: ../src/resources/prefs-dialog.ui.h:15 +msgid "Serif font:" +msgstr "Tipografía Serif:" + +#: ../src/resources/prefs-dialog.ui.h:16 +msgid "Monospace font:" +msgstr "Tipografía monoespaciada:" + +#: ../src/resources/prefs-dialog.ui.h:17 +msgid "Style" +msgstr "Estilo" + +#: ../src/resources/prefs-dialog.ui.h:18 +msgid "Use custom _stylesheet" +msgstr "Usar hoja de _estilos personalizada" + +#: ../src/resources/prefs-dialog.ui.h:19 +msgid "_Edit Stylesheet…" +msgstr "Editar _hoja de estilos…" + +#: ../src/resources/prefs-dialog.ui.h:20 +msgid "Fonts & Style" +msgstr "Tipografías y estilo" + +#: ../src/resources/prefs-dialog.ui.h:22 +msgid "Manage _Cookies…" +msgstr "Gestionar _cookies…" + +#: ../src/resources/prefs-dialog.ui.h:23 +msgid "_Always accept" +msgstr "_Aceptar siempre" + +#: ../src/resources/prefs-dialog.ui.h:24 +msgid "Only _from sites you visit" +msgstr "Sólo desde los sitios que _visita" + +#. Refers to "Only from sites you visit" option under Cookies. +#: ../src/resources/prefs-dialog.ui.h:26 +msgid "For example, not from advertisers on these sites" +msgstr "Por ejemplo, no de publicidad de estos sitios" + +#: ../src/resources/prefs-dialog.ui.h:27 +msgid "_Never accept" +msgstr "_Nunca aceptar" + +#: ../src/resources/prefs-dialog.ui.h:28 +msgid "Tracking" +msgstr "Seguimiento" + +#: ../src/resources/prefs-dialog.ui.h:29 +msgid "_Tell websites I do not want to be tracked" +msgstr "_Indicar a los sitios web que no quiere que le rastreen" + +#: ../src/resources/prefs-dialog.ui.h:31 +msgid "Manage _Passwords…" +msgstr "Gestionar _contraseñas…" + +#: ../src/resources/prefs-dialog.ui.h:32 +msgid "_Remember passwords" +msgstr "_Recordar la contraseñas" + +#: ../src/resources/prefs-dialog.ui.h:33 +msgid "Stored Data" +msgstr "Datos almacenados" + +#: ../src/resources/prefs-dialog.ui.h:34 +msgid "You can clear stored personal data." +msgstr "Puede limpiar los datos personales almacenados." + +#: ../src/resources/prefs-dialog.ui.h:35 +msgid "Cl_ear Personal Data…" +msgstr "Limpiar datos personales…" + +#: ../src/resources/prefs-dialog.ui.h:36 +msgid "Privacy" +msgstr "Privacidad" + +#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-encoding-dialog.c:379 +msgid "Encodings" +msgstr "Codificaciones" + +#: ../src/resources/prefs-dialog.ui.h:38 +msgid "De_fault:" +msgstr "Pre_determinada:" + +#: ../src/resources/prefs-dialog.ui.h:41 +msgid "_Remove" +msgstr "_Quitar" + +#: ../src/resources/prefs-dialog.ui.h:42 +msgid "_Up" +msgstr "_Arriba" + +#: ../src/resources/prefs-dialog.ui.h:43 +msgid "_Down" +msgstr "_Abajo" + +#: ../src/resources/prefs-dialog.ui.h:44 +msgid "Spell checking" +msgstr "Corrección ortográfica" + +#: ../src/resources/prefs-dialog.ui.h:45 +msgid "_Enable spell checking" +msgstr "_Activar corrección ortográfica" + +#: ../src/resources/prefs-dialog.ui.h:46 ../src/prefs-dialog.c:840 +msgid "Language" +msgstr "Idioma" + +#: ../src/resources/prefs-lang-dialog.ui.h:1 +msgid "Add Language" +msgstr "Añadir idioma" + +#: ../src/resources/prefs-lang-dialog.ui.h:4 +msgid "Choose a l_anguage:" +msgstr "Elija un _idioma:" + +#: ../src/ephy-combined-stop-reload-action.c:41 +msgid "Stop" +msgstr "Detener" + +#: ../src/ephy-combined-stop-reload-action.c:42 +msgid "Stop current data transfer" +msgstr "Detener la transferencia de datos actual" + +#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:152 +msgid "_Reload" +msgstr "Re_cargar" + +#: ../src/ephy-combined-stop-reload-action.c:45 +msgid "Display the latest content of the current page" +msgstr "Mostrar el último contenido de la página actual" + +#: ../src/ephy-encoding-menu.c:320 +msgid "_Other…" +msgstr "_Otros…" + +#: ../src/ephy-encoding-menu.c:321 +msgid "Other encodings" +msgstr "Otras codificaciones" + +#: ../src/ephy-history-window.c:254 +msgid "Clear browsing history?" +msgstr "¿Quiere limpiar el histórico de navegación?" + +#: ../src/ephy-history-window.c:258 +msgid "" +"Clearing the browsing history will cause all history links to be permanently " +"deleted." +msgstr "" +"Limpiar del histórico de navegación hará que todos enlaces del histórico se " +"eliminen permanentemente." + +#: ../src/ephy-main.c:76 +msgid "Open a new tab in an existing browser window" +msgstr "Abre una pestaña nueva en una ventana existente del navegador" + +#: ../src/ephy-main.c:78 +msgid "Open a new browser window" +msgstr "Abre una ventana nueva del navegador" + +#: ../src/ephy-main.c:80 +msgid "Import bookmarks from the given file" +msgstr "Importar marcadores desde el archivo dado" + +#: ../src/ephy-main.c:80 ../src/ephy-main.c:82 +msgid "FILE" +msgstr "ARCHIVO" + +#: ../src/ephy-main.c:82 +msgid "Load the given session file" +msgstr "Cargar el archivo de sesiones dado" + +#: ../src/ephy-main.c:84 +msgid "Add a bookmark" +msgstr "Añadir un marcador" + +#: ../src/ephy-main.c:84 +msgid "URL" +msgstr "URL" + +#: ../src/ephy-main.c:86 +msgid "Start a private instance" +msgstr "Iniciar una instancia privada" + +#: ../src/ephy-main.c:88 +msgid "Start an instance in incognito mode" +msgstr "Iniciar una instancia en modo incógnito" + +#: ../src/ephy-main.c:90 +msgid "Start an instance in netbank mode" +msgstr "Iniciar una instancia en modo «netbank»" + +#: ../src/ephy-main.c:92 +msgid "Start the browser in application mode" +msgstr "Iniciar el navegador en modo aplicación" + +#: ../src/ephy-main.c:94 +msgid "Profile directory to use in the private instance" +msgstr "Carpeta de perfiles que usar en la instancia privada" + +#: ../src/ephy-main.c:94 +msgid "DIR" +msgstr "DIR" + +#: ../src/ephy-main.c:96 +msgid "URL …" +msgstr "URL …" + +#: ../src/ephy-main.c:201 +msgid "Could not start Web" +msgstr "No se pudo iniciar Web" + +#: ../src/ephy-main.c:204 +#, c-format +msgid "" +"Startup failed because of the following error:\n" +"%s" +msgstr "" +"El inicio ha fallado debido al siguiente error:\n" +"%s" + +#: ../src/ephy-main.c:313 +msgid "Web options" +msgstr "Opciones de Web" + +#: ../src/ephy-notebook.c:619 +msgid "Close tab" +msgstr "Cerrar pestaña" + +#: ../src/ephy-search-provider.c:201 +#, c-format +msgid "Search the Web for %s" +msgstr "Buscar %s en la web" + +#: ../src/ephy-window.c:102 +msgid "_Open…" +msgstr "_Abrir…" + +#: ../src/ephy-window.c:104 +msgid "Save _As…" +msgstr "Guardar _como…" + +#: ../src/ephy-window.c:106 +msgid "Save As _Web Application…" +msgstr "Guardar como aplicación _web…" + +#: ../src/ephy-window.c:108 +msgid "_Print…" +msgstr "_Imprimir…" + # Añadimos enlace para mantener el léxico igual a Galeon y Mozilla -#: ../src/ephy-window.c:110 -msgid "S_end Link by Email…" -msgstr "_Enviar enlace por correo-e…" - -#: ../src/ephy-window.c:121 -msgid "Re_do" -msgstr "_Rehacer" - -#: ../src/ephy-window.c:133 -msgid "_Find…" -msgstr "_Buscar…" - -#: ../src/ephy-window.c:135 -msgid "Find Ne_xt" -msgstr "Buscar _siguiente" - -#: ../src/ephy-window.c:137 -msgid "Find Pre_vious" -msgstr "Buscar _anterior" - -#: ../src/ephy-window.c:139 -msgid "Edit _Bookmarks" -msgstr "_Editar marcadores" - -#. View actions. -#: ../src/ephy-window.c:148 ../src/ephy-window.c:150 -msgid "_Stop" -msgstr "_Detener" - -#: ../src/ephy-window.c:154 -msgid "Zoom _In" -msgstr "_Ampliar" - -#: ../src/ephy-window.c:156 -msgid "Zoom O_ut" -msgstr "_Reducir" - -#: ../src/ephy-window.c:158 -msgid "_Normal Size" -msgstr "Tamaño n_ormal" - -#: ../src/ephy-window.c:160 -msgid "Text _Encoding" -msgstr "Codificación del te_xto" - -#: ../src/ephy-window.c:161 -msgid "_Page Source" -msgstr "Código _fuente" - -#. Bookmarks actions. -#: ../src/ephy-window.c:166 -msgid "_Add Bookmark…" -msgstr "_Añadir marcador…" - -#. Go actions. -#: ../src/ephy-window.c:171 -msgid "_Location…" -msgstr "Di_rección…" - -#. Tabs actions. -#: ../src/ephy-window.c:176 -msgid "_Previous Tab" -msgstr "Pestaña _anterior" - -#: ../src/ephy-window.c:178 -msgid "_Next Tab" -msgstr "_Siguiente pestaña" - -#: ../src/ephy-window.c:180 -msgid "Move Tab _Left" -msgstr "Mover la pestaña a la _izquierda" - -#: ../src/ephy-window.c:182 -msgid "Move Tab _Right" -msgstr "Mover la pestaña a la de_recha" - -#: ../src/ephy-window.c:184 -msgid "_Detach Tab" -msgstr "_Desprender pestaña" - -#. View actions. -#: ../src/ephy-window.c:199 -msgid "_Downloads Bar" -msgstr "Barra de _descargas" - -#: ../src/ephy-window.c:202 -msgid "_Fullscreen" -msgstr "_Pantalla completa" - -#: ../src/ephy-window.c:204 -msgid "Popup _Windows" -msgstr "Ventanas _emergentes" - -#: ../src/ephy-window.c:206 -msgid "Selection Caret" -msgstr "Cursor de selección" - -#. Document. -#: ../src/ephy-window.c:213 -msgid "Add Boo_kmark…" -msgstr "Añadir _marcador…" - -#. Links. -#: ../src/ephy-window.c:218 -msgid "Open Link in New _Window" -msgstr "Abrir enlace en una _ventana nueva" - -#: ../src/ephy-window.c:220 -msgid "Open Link in New _Tab" -msgstr "Abrir enlace en una pe_staña nueva" - -#: ../src/ephy-window.c:222 -msgid "_Save Link As…" -msgstr "Guardar _enlace como…" - -#: ../src/ephy-window.c:224 -msgid "_Copy Link Address" -msgstr "_Copiar dirección del enlace" - -#: ../src/ephy-window.c:226 -msgid "_Copy E-mail Address" -msgstr "_Copiar dirección de correo-e" - -#. Images. -#: ../src/ephy-window.c:231 -msgid "View _Image in New Tab" -msgstr "Ver _imagen en una pestaña nueva" - -#: ../src/ephy-window.c:233 -msgid "Copy I_mage Address" -msgstr "Copiar dirección de la i_magen" - -#: ../src/ephy-window.c:235 -msgid "_Save Image As…" -msgstr "_Guardar imagen como…" - -#: ../src/ephy-window.c:237 -msgid "Set as _Wallpaper" -msgstr "Establecer como _fondo" - -#. Video. -#: ../src/ephy-window.c:242 -msgid "Open Video in New _Window" -msgstr "Abrir vídeo en una _ventana nueva" - -#: ../src/ephy-window.c:244 -msgid "Open Video in New _Tab" -msgstr "Abrir vídeo en una _pestaña nueva" - -#: ../src/ephy-window.c:246 -msgid "_Save Video As…" -msgstr "Guardar _vídeo como…" - -#: ../src/ephy-window.c:248 -msgid "_Copy Video Address" -msgstr "_Copiar la dirección del vídeo" - -#. Audio. -#: ../src/ephy-window.c:253 -msgid "Open Audio in New _Window" -msgstr "Abrir sonido en una _ventana nueva" - -#: ../src/ephy-window.c:255 -msgid "Open Audio in New _Tab" -msgstr "Abrir sonido en una _pestaña nueva" - -#: ../src/ephy-window.c:257 -msgid "_Save Audio As…" -msgstr "Guardar _sonido como…" - -#: ../src/ephy-window.c:259 -msgid "_Copy Audio Address" -msgstr "_Copiar la dirección del sonido" - -#: ../src/ephy-window.c:467 -msgid "There are unsubmitted changes to form elements" -msgstr "Hay cambios no enviados en los elementos del formulario" - -#: ../src/ephy-window.c:468 -msgid "If you close the document anyway, you will lose that information." -msgstr "Si cierra el documento, perderá esa información." - -#: ../src/ephy-window.c:470 -msgid "Close _Document" -msgstr "Cerrar _documento" - -#: ../src/ephy-window.c:485 -msgid "There are ongoing downloads in this window" -msgstr "Hay descargas en curso en esta ventana" - -#: ../src/ephy-window.c:486 -msgid "If you close this window, the downloads will be cancelled" -msgstr "Si cierra esta ventana, se cancelarán las descargas" - -#: ../src/ephy-window.c:487 -msgid "Close window and cancel downloads" -msgstr "Cerrar la ventana y cancelar las descargas" - -#: ../src/ephy-window.c:1123 -msgid "Save As" -msgstr "Guardar como" - -#: ../src/ephy-window.c:1125 -msgid "Save As Application" -msgstr "Guardar como aplicación" - -#: ../src/ephy-window.c:1127 -msgid "Print" -msgstr "Imprimir" - -#: ../src/ephy-window.c:1129 -msgid "Bookmark" -msgstr "Marcador" - -#: ../src/ephy-window.c:1131 -msgid "Find" -msgstr "Buscar" - -#. Translators: This refers to text size -#: ../src/ephy-window.c:1140 -msgid "Larger" -msgstr "Más grande" - -#. Translators: This refers to text size -#: ../src/ephy-window.c:1143 -msgid "Smaller" -msgstr "Más pequeño" - -#: ../src/ephy-window.c:1165 -msgid "Back" -msgstr "Atrás" - -#: ../src/ephy-window.c:1177 -msgid "Forward" -msgstr "Adelante" - -#: ../src/ephy-window.c:1189 -msgid "Zoom" -msgstr "Ampliación" - -#: ../src/ephy-window.c:1198 -msgid "New _Tab" -msgstr "Pe_staña nueva" - -#: ../src/ephy-window.c:1206 -msgid "Go to most visited" -msgstr "Ir a los más visitados" - -#: ../src/popup-commands.c:229 -msgid "Save Link As" -msgstr "Guardar enlace como" - -#: ../src/popup-commands.c:236 -msgid "Save Image As" -msgstr "Guardar imagen como" - -#: ../src/popup-commands.c:243 -msgid "Save Media As" -msgstr "Abrir medio como" - -#. Translators: the first %s is the language name, and the -#. * second %s is the locale name. Example: -#. * "French (France)" -#. -#: ../src/prefs-dialog.c:553 ../src/prefs-dialog.c:559 -#, c-format -msgctxt "language" -msgid "%s (%s)" -msgstr "%s (%s)" - -#. Translators: this refers to a user-define language code -#. * (one which isn't in our built-in list). -#. -#: ../src/prefs-dialog.c:568 -#, c-format -msgctxt "language" -msgid "User defined (%s)" -msgstr "Definido por el usuario (%s)" - -#: ../src/prefs-dialog.c:590 -#, c-format -msgid "System language (%s)" -msgid_plural "System languages (%s)" -msgstr[0] "Idioma del sistema (%s)" -msgstr[1] "Idiomas del sistema (%s)" - -#: ../src/prefs-dialog.c:923 -msgid "Select a Directory" -msgstr "Seleccione una carpeta" - -#. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1018 -msgid "DuckDuckGo" -msgstr "DuckDuckGo" - -#. For the preferences dialog. Must exactly match the URL -#. * you chose in the gschema, but with & instead of & -#. * If the match is not exact, there will be a spurious, ugly -#. * entry in the preferences combo, so please test this. -#: ../src/prefs-dialog.c:1024 -#, c-format -msgid "https://duckduckgo.com/?q=%s&t=epiphany" -msgstr "https://duckduckgo.com/?q=%s&t=epiphany" - -#. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1026 -msgid "Google" -msgstr "Google" - -#. For the preferences dialog. Consider a regional variant, like google.co.uk -#: ../src/prefs-dialog.c:1029 -#, c-format -msgid "https://google.com/search?q=%s" -msgstr "https://google.com/search?q=%s" - -#. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1031 -msgid "Bing" -msgstr "Bing" - -#. For the preferences dialog. Consider a regional variant, like uk.bing.com -#: ../src/prefs-dialog.c:1034 -#, c-format -msgid "https://www.bing.com/search?q=%s" -msgstr "http://www.bing.com/search?q=%s&cc=es" - -#: ../src/window-commands.c:330 -msgid "Save" -msgstr "Guardar" - -#: ../src/window-commands.c:710 -#, c-format -msgid "A web application named '%s' already exists. Do you want to replace it?" -msgstr "Ya existe una aplicación web con nombre «%s». ¿Quiere reemplazarla?" - -#: ../src/window-commands.c:715 -msgid "Replace" -msgstr "Reemplazar" - -#: ../src/window-commands.c:719 -msgid "" -"An application with the same name already exists. Replacing it will " -"overwrite it." -msgstr "" -"Ya existe una aplicación con el mismo nombre. Reemplazarla la sobrescribirá." - -#: ../src/window-commands.c:755 -#, c-format -msgid "The application '%s' is ready to be used" -msgstr "La aplicación «%s» está lista para usarse" - -#: ../src/window-commands.c:758 -#, c-format -msgid "The application '%s' could not be created" -msgstr "No se pudo crear la aplicación «%s»" - -#: ../src/window-commands.c:766 -msgid "Launch" -msgstr "Lanzar" - -#. Show dialog with icon, title. -#: ../src/window-commands.c:806 -msgid "Create Web Application" -msgstr "Crear una aplicación web" - -#: ../src/window-commands.c:811 -msgid "C_reate" -msgstr "C_rear" - -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 -msgid "Contact us at:" -msgstr "Contacte con nosotros en:" - -#: ../src/window-commands.c:1483 -msgid "Contributors:" -msgstr "Contribuyentes:" - -#: ../src/window-commands.c:1486 -msgid "Past developers:" -msgstr "Desarrolladores anteriores:" - -#: ../src/window-commands.c:1512 -#, c-format -msgid "" -"A simple, clean, beautiful view of the web.\n" -"Powered by WebKit %d.%d.%d" -msgstr "" -"Una vista simple, limpia y bonita de la web.\n" -"Basado en WebKit %d.%d.%d" - -#. Translators: This is a special message that shouldn't be translated -#. * literally. It is used in the about box to give credits to -#. * the translators. -#. * Thus, you should translate it to your name and email address. -#. * You should also include other translators who have contributed to -#. * this translation; in that case, please write each of them on a separate -#. * line seperated by newlines (\n). -#. -#: ../src/window-commands.c:1535 -msgid "translator-credits" -msgstr "" -"Daniel Mustieles , 2011, 2012\n" -"Jorge González , 2007-2010\n" -"Francisco Javier F. Serrador " - -#: ../src/window-commands.c:1538 -msgid "Web Website" -msgstr "Sitio web de Web" - -#: ../src/window-commands.c:1677 -msgid "Enable caret browsing mode?" -msgstr "¿Activar el modo de navegación con cursor?" - -#: ../src/window-commands.c:1680 -msgid "" -"Pressing F7 turns caret browsing on or off. This feature places a moveable " -"cursor in web pages, allowing you to move around with your keyboard. Do you " -"want to enable caret browsing?" -msgstr "" -"Pulsar F7 activa o desactiva el modo de navegación de cursor. Esta " -"característica ubica un cursor movible en las páginas web, permitiéndole " -"moverse con su teclado. ¿Quiere activar el modo de navegación con cursor?" - -#: ../src/window-commands.c:1683 -msgid "_Enable" -msgstr "_Activar" - -#~ msgid "Size of disk cache" -#~ msgstr "Tamaño de la caché de disco" - -#~ msgid "Size of disk cache, in MB." -#~ msgstr "Tamaño de la caché de disco, en MB." - -#~ msgid "Temporary Files" -#~ msgstr "Archivos temporales" - -#~ msgid "_Disk space:" -#~ msgstr "Espacio en el _disco:" - -#~ msgid "MB" -#~ msgstr "MiB" - -#~ msgid "" -#~ "This web site’s identification uses very weak encryption. It has probably " -#~ "been forged." -#~ msgstr "" -#~ "La identificación de este sitio web usa un cifrado muy débil. " -#~ "Probablemente se haya forzado." - -#~ msgid "" -#~ "This web site’s identification time-travelled from the future. Check the " -#~ "date on your computer’s calendar." -#~ msgstr "" -#~ "La identificación de este sitio web ha viajado en el futuro. Compruebe la " -#~ "fecha en el calendario de su equipo." - -#~ msgid "http://duckduckgo.com/?q=%s&t=epiphany" -#~ msgstr "" -#~ "http://duckduckgo.com/?q=%s&t=epiphany&kl=es-es&kad=es_ES" - -#~ msgid "St_art Animation" -#~ msgstr "_Iniciar animación" - -#~ msgid "St_op Animation" -#~ msgstr "_Detener animación" - -#~ msgid "%d _Similar" -#~ msgid_plural "%d _Similar" -#~ msgstr[0] "%d _similar" -#~ msgstr[1] "%d _similares" - -#~ msgid "_Unify With %d Identical Bookmark" -#~ msgid_plural "_Unify With %d Identical Bookmarks" -#~ msgstr[0] "_Unificar con %d marcador idéntico" -#~ msgstr[1] "_Unificar con %d marcadores idénticos" - -#~ msgid "Show “%s”" -#~ msgstr "Mostrar «%s»" - -#~ msgid "Clear History" -#~ msgstr "Limpiar histórico" - -#~ msgid "History pages time range" -#~ msgstr "Rango de tiempo de búsqueda por el histórico" - -#~ msgid "Whether to show the title column in the history window." -#~ msgstr "" -#~ "Indica si debe mostrar la columna de título en la ventana del histórico." - -#~ msgid "Whether to show the address column in the history window." -#~ msgstr "" -#~ "Indica si debe mostrar la columna de direcciones en la ventana del " -#~ "histórico." - -#~ msgid "Whether to show the date-time column in the history window." -#~ msgstr "" -#~ "Indica si debe mostrar la columna de fecha/hora en la ventana del " -#~ "histórico." - -#~ msgid "All sites" -#~ msgstr "Todos los sitios" - -#~ msgid "Sites" -#~ msgstr "Sitios" - -#~ msgid "Open the selected history link in a new window" -#~ msgstr "Abrir el enlace histórico seleccionado en una ventana nueva" - -#~ msgid "Open the selected history link in a new tab" -#~ msgstr "Abrir el enlace histórico seleccionado en una pestaña nueva" - -#~ msgid "Bookmark the selected history link" -#~ msgstr "Marcar el enlace histórico seleccionado" - -#~ msgid "Close the history window" -#~ msgstr "Cerrar la ventana del histórico" - -#~ msgid "Delete the selected history link" -#~ msgstr "Eliminar el enlace histórico seleccionado" - -#~ msgid "Select all history links or text" -#~ msgstr "Seleccione todos los enlaces del histórico o texto" - -#~ msgid "Clear _History" -#~ msgstr "Limpiar _histórico" - -#~ msgid "Clear your browsing history" -#~ msgstr "Limpiar su histórico de navegación" - -#~ msgid "Display history help" -#~ msgstr "Muestra la ayuda del histórico" - -#~ msgid "_Address" -#~ msgstr "_Dirección" - -#~ msgid "_Date and Time" -#~ msgstr "Fecha y _hora" - -#~ msgid "Show the date and time column" -#~ msgstr "Mostrar las columnas de título y fecha" - -#~ msgid "Last 30 minutes" -#~ msgstr "Últimos 30 minutos" - -#~ msgid "Today" -#~ msgstr "Hoy" - -#~ msgid "Last %d day" -#~ msgid_plural "Last %d days" -#~ msgstr[0] "Último día" -#~ msgstr[1] "Últimos %d días" - -#~ msgid "All history" -#~ msgstr "Todo el histórico" - -#~ msgid "Show toolbars by default" -#~ msgstr "Mostrar barras de herramientas de forma predeterminada" - -#~ msgid "%u:%02u hour left" -#~ msgid_plural "%u:%02u hours left" -#~ msgstr[0] "queda %u:%02u hora" -#~ msgstr[1] "quedan %u:%02u horas" - -#~ msgid "_Automatic" -#~ msgstr "_Automática" - -#~ msgid "Show Passwords" -#~ msgstr "Mostrar contraseñas" - -#~ msgid "Oops! Error loading %s" -#~ msgstr "Error al cargar %s" - -#~ msgid "" -#~ "Oops! This site might have caused the web browser to close unexpectedly" -#~ msgstr "" -#~ "El sitio puede haber causado que Epiphany se cerrase inesperadamente" - -#~ msgid "Oops! Something went wrong displaying %s" -#~ msgstr "Algo salió mal al mostrar %s" - -#~ msgid "_Open Link" -#~ msgstr "_Abrir enlace" - -#~ msgid "_Download Link" -#~ msgstr "_Descargar enlace" - -#~ msgid "_Bookmark Link…" -#~ msgstr "Añadir _marcador…" - -#~ msgid "_Use Image As Background" -#~ msgstr "_Utilizar esta imagen como fondo" - -#~ msgid "Download Link" -#~ msgstr "Descargar enlace" - -#~ msgid "" -#~ "Web is free software; you can redistribute it and/or modify it under the " -#~ "terms of the GNU General Public License as published by the Free Software " -#~ "Foundation; either version 2 of the License, or (at your option) any " -#~ "later version." -#~ msgstr "" -#~ "Web es software libre, puede redistribuirlo y/o modificarlo bajo los " -#~ "términos de la Licencia Pública General GNU tal como se publica por la " -#~ "Free Software Foundation; ya sea en la versión 2 de la Licencia, o (a su " -#~ "opción) cualquier versión posterior." - -#~ msgid "" -#~ "The GNOME Web Browser is distributed in the hope that it will be useful, " -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of " -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " -#~ "Public License for more details." -#~ msgstr "" -#~ "El Navegador web de GNOME se distribuye con la esperanza de que le sea " -#~ "útil, pero SIN NINGUNA GARANTÍA; sin incluso la garantía implícita de " -#~ "MERCANTILIDAD o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia " -#~ "Pública General de GNU para más detalles." - -#~ msgid "" -#~ "You should have received a copy of the GNU General Public License along " -#~ "with the GNOME Web Browser; if not, write to the Free Software " -#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " -#~ "02110-1301 USA" -#~ msgstr "" -#~ "Debería haber recibido una copia de la Licencia Pública General GNU junto " -#~ "con el Navegador web de GNOME; si no, escriba a la Free Software " -#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 " -#~ "USA" - -#~ msgid "Use GNOME desktop wide font configuration." -#~ msgstr "Usar la configuración global de tipografías de GNOME." - -#~ msgid "Cookie Name" -#~ msgstr "Nombre de la cookie" - -#~ msgid "Not now" -#~ msgstr "Ahora no" - -#~ msgid "Store password" -#~ msgstr "Almacenar contraseña" - -#~ msgid "" -#~ "Would you like to store the password for %s in %s?" -#~ msgstr "" -#~ "¿Quiere almacenar la contraseña para %s en %s?" - -#~ msgid "Epiphany (RDF)" -#~ msgstr "Epiphany (RDF)" - -#~ msgid "Epiphany bookmarks" -#~ msgstr "Marcadores de Epiphany" - -#~ msgid "Start the application without opening windows" -#~ msgstr "Iniciar la aplicación sin abrir ventanas" - -#~ msgid "_Personal Data" -#~ msgstr "_Datos personales" - -#~ msgid "Cookie properties" -#~ msgstr "Propiedades de cookies" - -#~ msgid "Content:" -#~ msgstr "Contenido:" - -#~ msgid "Path:" -#~ msgstr "Ruta:" - +#: ../src/ephy-window.c:110 +msgid "S_end Link by Email…" +msgstr "_Enviar enlace por correo-e…" + +#: ../src/ephy-window.c:121 +msgid "Re_do" +msgstr "_Rehacer" + +#: ../src/ephy-window.c:133 +msgid "_Find…" +msgstr "_Buscar…" + +#: ../src/ephy-window.c:135 +msgid "Find Ne_xt" +msgstr "Buscar _siguiente" + +#: ../src/ephy-window.c:137 +msgid "Find Pre_vious" +msgstr "Buscar _anterior" + +#: ../src/ephy-window.c:139 +msgid "Edit _Bookmarks" +msgstr "_Editar marcadores" + +#. View actions. +#: ../src/ephy-window.c:148 ../src/ephy-window.c:150 +msgid "_Stop" +msgstr "_Detener" + +#: ../src/ephy-window.c:154 +msgid "Zoom _In" +msgstr "_Ampliar" + +#: ../src/ephy-window.c:156 +msgid "Zoom O_ut" +msgstr "_Reducir" + +#: ../src/ephy-window.c:158 +msgid "_Normal Size" +msgstr "Tamaño n_ormal" + +#: ../src/ephy-window.c:160 +msgid "Text _Encoding" +msgstr "Codificación del te_xto" + +#: ../src/ephy-window.c:161 +msgid "_Page Source" +msgstr "Código _fuente" + +#. Bookmarks actions. +#: ../src/ephy-window.c:166 +msgid "_Add Bookmark…" +msgstr "_Añadir marcador…" + +#. Go actions. +#: ../src/ephy-window.c:171 +msgid "_Location…" +msgstr "Di_rección…" + +#. Tabs actions. +#: ../src/ephy-window.c:176 +msgid "_Previous Tab" +msgstr "Pestaña _anterior" + +#: ../src/ephy-window.c:178 +msgid "_Next Tab" +msgstr "_Siguiente pestaña" + +#: ../src/ephy-window.c:180 +msgid "Move Tab _Left" +msgstr "Mover la pestaña a la _izquierda" + +#: ../src/ephy-window.c:182 +msgid "Move Tab _Right" +msgstr "Mover la pestaña a la de_recha" + +#: ../src/ephy-window.c:184 +msgid "_Detach Tab" +msgstr "_Desprender pestaña" + +#. View actions. +#: ../src/ephy-window.c:199 +msgid "_Downloads Bar" +msgstr "Barra de _descargas" + +#: ../src/ephy-window.c:202 +msgid "_Fullscreen" +msgstr "_Pantalla completa" + +#: ../src/ephy-window.c:204 +msgid "Popup _Windows" +msgstr "Ventanas _emergentes" + +#: ../src/ephy-window.c:206 +msgid "Selection Caret" +msgstr "Cursor de selección" + +#. Document. +#: ../src/ephy-window.c:213 +msgid "Add Boo_kmark…" +msgstr "Añadir _marcador…" + +#. Links. +#: ../src/ephy-window.c:218 +msgid "Open Link in New _Window" +msgstr "Abrir enlace en una _ventana nueva" + +#: ../src/ephy-window.c:220 +msgid "Open Link in New _Tab" +msgstr "Abrir enlace en una pe_staña nueva" + +#: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Abrir enlace en una ventana de i_ncógnito" + +#: ../src/ephy-window.c:224 +msgid "_Save Link As…" +msgstr "Guardar _enlace como…" + +#: ../src/ephy-window.c:226 +msgid "_Copy Link Address" +msgstr "_Copiar dirección del enlace" + +#: ../src/ephy-window.c:228 +msgid "_Copy E-mail Address" +msgstr "_Copiar dirección de correo-e" + +#. Images. +#: ../src/ephy-window.c:233 +msgid "View _Image in New Tab" +msgstr "Ver _imagen en una pestaña nueva" + +#: ../src/ephy-window.c:235 +msgid "Copy I_mage Address" +msgstr "Copiar dirección de la i_magen" + +#: ../src/ephy-window.c:237 +msgid "_Save Image As…" +msgstr "_Guardar imagen como…" + +#: ../src/ephy-window.c:239 +msgid "Set as _Wallpaper" +msgstr "Establecer como _fondo" + +#. Video. +#: ../src/ephy-window.c:244 +msgid "Open Video in New _Window" +msgstr "Abrir vídeo en una _ventana nueva" + +#: ../src/ephy-window.c:246 +msgid "Open Video in New _Tab" +msgstr "Abrir vídeo en una _pestaña nueva" + +#: ../src/ephy-window.c:248 +msgid "_Save Video As…" +msgstr "Guardar _vídeo como…" + +#: ../src/ephy-window.c:250 +msgid "_Copy Video Address" +msgstr "_Copiar la dirección del vídeo" + +#. Audio. +#: ../src/ephy-window.c:255 +msgid "Open Audio in New _Window" +msgstr "Abrir sonido en una _ventana nueva" + +#: ../src/ephy-window.c:257 +msgid "Open Audio in New _Tab" +msgstr "Abrir sonido en una _pestaña nueva" + +#: ../src/ephy-window.c:259 +msgid "_Save Audio As…" +msgstr "Guardar _sonido como…" + +#: ../src/ephy-window.c:261 +msgid "_Copy Audio Address" +msgstr "_Copiar la dirección del sonido" + +#: ../src/ephy-window.c:473 +msgid "There are unsubmitted changes to form elements" +msgstr "Hay cambios no enviados en los elementos del formulario" + +#: ../src/ephy-window.c:474 +msgid "If you close the document anyway, you will lose that information." +msgstr "Si cierra el documento, perderá esa información." + +#: ../src/ephy-window.c:476 +msgid "Close _Document" +msgstr "Cerrar _documento" + +#: ../src/ephy-window.c:491 +msgid "There are ongoing downloads in this window" +msgstr "Hay descargas en curso en esta ventana" + +#: ../src/ephy-window.c:492 +msgid "If you close this window, the downloads will be cancelled" +msgstr "Si cierra esta ventana, se cancelarán las descargas" + +#: ../src/ephy-window.c:493 +msgid "Close window and cancel downloads" +msgstr "Cerrar la ventana y cancelar las descargas" + +#: ../src/ephy-window.c:1132 +msgid "Save As" +msgstr "Guardar como" + +#: ../src/ephy-window.c:1134 +msgid "Save As Application" +msgstr "Guardar como aplicación" + +#: ../src/ephy-window.c:1136 +msgid "Print" +msgstr "Imprimir" + +#: ../src/ephy-window.c:1138 +msgid "Bookmark" +msgstr "Marcador" + +#: ../src/ephy-window.c:1140 +msgid "Find" +msgstr "Buscar" + +#. Translators: This refers to text size +#: ../src/ephy-window.c:1149 +msgid "Larger" +msgstr "Más grande" + +#. Translators: This refers to text size +#: ../src/ephy-window.c:1152 +msgid "Smaller" +msgstr "Más pequeño" + +#: ../src/ephy-window.c:1174 +msgid "Back" +msgstr "Atrás" + +#: ../src/ephy-window.c:1186 +msgid "Forward" +msgstr "Adelante" + +#: ../src/ephy-window.c:1198 +msgid "Zoom" +msgstr "Ampliación" + +#: ../src/ephy-window.c:1207 +msgid "New _Tab" +msgstr "Pe_staña nueva" + +#: ../src/ephy-window.c:1215 +msgid "Go to most visited" +msgstr "Ir a los más visitados" + +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Buscar «%s» en la web" + +#: ../src/popup-commands.c:229 +msgid "Save Link As" +msgstr "Guardar enlace como" + +#: ../src/popup-commands.c:236 +msgid "Save Image As" +msgstr "Guardar imagen como" + +#: ../src/popup-commands.c:243 +msgid "Save Media As" +msgstr "Abrir medio como" + +#. Translators: the first %s is the language name, and the +#. * second %s is the locale name. Example: +#. * "French (France)" +#. +#: ../src/prefs-dialog.c:553 ../src/prefs-dialog.c:559 +#, c-format +msgctxt "language" +msgid "%s (%s)" +msgstr "%s (%s)" + +#. Translators: this refers to a user-define language code +#. * (one which isn't in our built-in list). +#. +#: ../src/prefs-dialog.c:568 +#, c-format +msgctxt "language" +msgid "User defined (%s)" +msgstr "Definido por el usuario (%s)" + +#: ../src/prefs-dialog.c:590 +#, c-format +msgid "System language (%s)" +msgid_plural "System languages (%s)" +msgstr[0] "Idioma del sistema (%s)" +msgstr[1] "Idiomas del sistema (%s)" + +#: ../src/prefs-dialog.c:923 +msgid "Select a Directory" +msgstr "Seleccione una carpeta" + +#. Search engine option in the preferences dialog +#: ../src/prefs-dialog.c:1018 +msgid "DuckDuckGo" +msgstr "DuckDuckGo" + +#. For the preferences dialog. Must exactly match the URL +#. * you chose in the gschema, but with & instead of & +#. * If the match is not exact, there will be a spurious, ugly +#. * entry in the preferences combo, so please test this. +#: ../src/prefs-dialog.c:1024 +#, c-format +msgid "https://duckduckgo.com/?q=%s&t=epiphany" +msgstr "https://duckduckgo.com/?q=%s&t=epiphany" + +#. Search engine option in the preferences dialog +#: ../src/prefs-dialog.c:1026 +msgid "Google" +msgstr "Google" + +#. For the preferences dialog. Consider a regional variant, like google.co.uk +#: ../src/prefs-dialog.c:1029 +#, c-format +msgid "https://google.com/search?q=%s" +msgstr "https://google.com/search?q=%s" + +#. Search engine option in the preferences dialog +#: ../src/prefs-dialog.c:1031 +msgid "Bing" +msgstr "Bing" + +#. For the preferences dialog. Consider a regional variant, like uk.bing.com +#: ../src/prefs-dialog.c:1034 +#, c-format +msgid "https://www.bing.com/search?q=%s" +msgstr "http://www.bing.com/search?q=%s&cc=es" + +#: ../src/window-commands.c:330 +msgid "Save" +msgstr "Guardar" + +#: ../src/window-commands.c:710 +#, c-format +msgid "A web application named '%s' already exists. Do you want to replace it?" +msgstr "Ya existe una aplicación web con nombre «%s». ¿Quiere reemplazarla?" + +#: ../src/window-commands.c:715 +msgid "Replace" +msgstr "Reemplazar" + +#: ../src/window-commands.c:719 +msgid "" +"An application with the same name already exists. Replacing it will " +"overwrite it." +msgstr "" +"Ya existe una aplicación con el mismo nombre. Reemplazarla la sobrescribirá." + +#: ../src/window-commands.c:755 +#, c-format +msgid "The application '%s' is ready to be used" +msgstr "La aplicación «%s» está lista para usarse" + +#: ../src/window-commands.c:758 +#, c-format +msgid "The application '%s' could not be created" +msgstr "No se pudo crear la aplicación «%s»" + +#: ../src/window-commands.c:766 +msgid "Launch" +msgstr "Lanzar" + +#. Show dialog with icon, title. +#: ../src/window-commands.c:806 +msgid "Create Web Application" +msgstr "Crear una aplicación web" + +#: ../src/window-commands.c:811 +msgid "C_reate" +msgstr "C_rear" + +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 +msgid "Contact us at:" +msgstr "Contacte con nosotros en:" + +#: ../src/window-commands.c:1481 +msgid "Contributors:" +msgstr "Contribuyentes:" + +#: ../src/window-commands.c:1484 +msgid "Past developers:" +msgstr "Desarrolladores anteriores:" + +#: ../src/window-commands.c:1510 +#, c-format +msgid "" +"A simple, clean, beautiful view of the web.\n" +"Powered by WebKit %d.%d.%d" +msgstr "" +"Una vista simple, limpia y bonita de la web.\n" +"Basado en WebKit %d.%d.%d" + +#. Translators: This is a special message that shouldn't be translated +#. * literally. It is used in the about box to give credits to +#. * the translators. +#. * Thus, you should translate it to your name and email address. +#. * You should also include other translators who have contributed to +#. * this translation; in that case, please write each of them on a separate +#. * line seperated by newlines (\n). +#. +#: ../src/window-commands.c:1533 +msgid "translator-credits" +msgstr "" +"Daniel Mustieles , 2011, 2012\n" +"Jorge González , 2007-2010\n" +"Francisco Javier F. Serrador " + +#: ../src/window-commands.c:1536 +msgid "Web Website" +msgstr "Sitio web de Web" + +#: ../src/window-commands.c:1675 +msgid "Enable caret browsing mode?" +msgstr "¿Activar el modo de navegación con cursor?" + +#: ../src/window-commands.c:1678 +msgid "" +"Pressing F7 turns caret browsing on or off. This feature places a moveable " +"cursor in web pages, allowing you to move around with your keyboard. Do you " +"want to enable caret browsing?" +msgstr "" +"Pulsar F7 activa o desactiva el modo de navegación de cursor. Esta " +"característica ubica un cursor movible en las páginas web, permitiéndole " +"moverse con su teclado. ¿Quiere activar el modo de navegación con cursor?" + +#: ../src/window-commands.c:1681 +msgid "_Enable" +msgstr "_Activar" + +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Estilo de barra de herramientas" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Estilo de la barra de herramientas. Los valores permitidos son «(usar " +#~ "estilo predefinido de GNOME)» «both» (texto e iconos), «both-horiz» (texto " +#~ "junto a los iconos), «icons», y «text»." + +#~ msgid "Size of disk cache" +#~ msgstr "Tamaño de la caché de disco" + +#~ msgid "Size of disk cache, in MB." +#~ msgstr "Tamaño de la caché de disco, en MB." + +#~ msgid "Temporary Files" +#~ msgstr "Archivos temporales" + +#~ msgid "_Disk space:" +#~ msgstr "Espacio en el _disco:" + +#~ msgid "MB" +#~ msgstr "MiB" + +#~ msgid "" +#~ "This web site’s identification uses very weak encryption. It has probably " +#~ "been forged." +#~ msgstr "" +#~ "La identificación de este sitio web usa un cifrado muy débil. " +#~ "Probablemente se haya forzado." + +#~ msgid "" +#~ "This web site’s identification time-travelled from the future. Check the " +#~ "date on your computer’s calendar." +#~ msgstr "" +#~ "La identificación de este sitio web ha viajado en el futuro. Compruebe la " +#~ "fecha en el calendario de su equipo." + +#~ msgid "http://duckduckgo.com/?q=%s&t=epiphany" +#~ msgstr "" +#~ "http://duckduckgo.com/?q=%s&t=epiphany&kl=es-es&kad=es_ES" + +#~ msgid "St_art Animation" +#~ msgstr "_Iniciar animación" + +#~ msgid "St_op Animation" +#~ msgstr "_Detener animación" + +#~ msgid "%d _Similar" +#~ msgid_plural "%d _Similar" +#~ msgstr[0] "%d _similar" +#~ msgstr[1] "%d _similares" + +#~ msgid "_Unify With %d Identical Bookmark" +#~ msgid_plural "_Unify With %d Identical Bookmarks" +#~ msgstr[0] "_Unificar con %d marcador idéntico" +#~ msgstr[1] "_Unificar con %d marcadores idénticos" + +#~ msgid "Show “%s”" +#~ msgstr "Mostrar «%s»" + +#~ msgid "Clear History" +#~ msgstr "Limpiar histórico" + +#~ msgid "History pages time range" +#~ msgstr "Rango de tiempo de búsqueda por el histórico" + +#~ msgid "Whether to show the title column in the history window." +#~ msgstr "" +#~ "Indica si debe mostrar la columna de título en la ventana del histórico." + +#~ msgid "Whether to show the address column in the history window." +#~ msgstr "" +#~ "Indica si debe mostrar la columna de direcciones en la ventana del " +#~ "histórico." + +#~ msgid "Whether to show the date-time column in the history window." +#~ msgstr "" +#~ "Indica si debe mostrar la columna de fecha/hora en la ventana del " +#~ "histórico." + +#~ msgid "All sites" +#~ msgstr "Todos los sitios" + +#~ msgid "Sites" +#~ msgstr "Sitios" + +#~ msgid "Open the selected history link in a new window" +#~ msgstr "Abrir el enlace histórico seleccionado en una ventana nueva" + +#~ msgid "Open the selected history link in a new tab" +#~ msgstr "Abrir el enlace histórico seleccionado en una pestaña nueva" + +#~ msgid "Bookmark the selected history link" +#~ msgstr "Marcar el enlace histórico seleccionado" + +#~ msgid "Close the history window" +#~ msgstr "Cerrar la ventana del histórico" + +#~ msgid "Delete the selected history link" +#~ msgstr "Eliminar el enlace histórico seleccionado" + +#~ msgid "Select all history links or text" +#~ msgstr "Seleccione todos los enlaces del histórico o texto" + +#~ msgid "Clear _History" +#~ msgstr "Limpiar _histórico" + +#~ msgid "Clear your browsing history" +#~ msgstr "Limpiar su histórico de navegación" + +#~ msgid "Display history help" +#~ msgstr "Muestra la ayuda del histórico" + +#~ msgid "_Address" +#~ msgstr "_Dirección" + +#~ msgid "_Date and Time" +#~ msgstr "Fecha y _hora" + +#~ msgid "Show the date and time column" +#~ msgstr "Mostrar las columnas de título y fecha" + +#~ msgid "Last 30 minutes" +#~ msgstr "Últimos 30 minutos" + +#~ msgid "Today" +#~ msgstr "Hoy" + +#~ msgid "Last %d day" +#~ msgid_plural "Last %d days" +#~ msgstr[0] "Último día" +#~ msgstr[1] "Últimos %d días" + +#~ msgid "All history" +#~ msgstr "Todo el histórico" + +#~ msgid "Show toolbars by default" +#~ msgstr "Mostrar barras de herramientas de forma predeterminada" + +#~ msgid "%u:%02u hour left" +#~ msgid_plural "%u:%02u hours left" +#~ msgstr[0] "queda %u:%02u hora" +#~ msgstr[1] "quedan %u:%02u horas" + +#~ msgid "_Automatic" +#~ msgstr "_Automática" + +#~ msgid "Show Passwords" +#~ msgstr "Mostrar contraseñas" + +#~ msgid "Oops! Error loading %s" +#~ msgstr "Error al cargar %s" + +#~ msgid "" +#~ "Oops! This site might have caused the web browser to close unexpectedly" +#~ msgstr "" +#~ "El sitio puede haber causado que Epiphany se cerrase inesperadamente" + +#~ msgid "Oops! Something went wrong displaying %s" +#~ msgstr "Algo salió mal al mostrar %s" + +#~ msgid "_Open Link" +#~ msgstr "_Abrir enlace" + +#~ msgid "_Download Link" +#~ msgstr "_Descargar enlace" + +#~ msgid "_Bookmark Link…" +#~ msgstr "Añadir _marcador…" + +#~ msgid "_Use Image As Background" +#~ msgstr "_Utilizar esta imagen como fondo" + +#~ msgid "Download Link" +#~ msgstr "Descargar enlace" + +#~ msgid "" +#~ "Web is free software; you can redistribute it and/or modify it under the " +#~ "terms of the GNU General Public License as published by the Free Software " +#~ "Foundation; either version 2 of the License, or (at your option) any " +#~ "later version." +#~ msgstr "" +#~ "Web es software libre, puede redistribuirlo y/o modificarlo bajo los " +#~ "términos de la Licencia Pública General GNU tal como se publica por la " +#~ "Free Software Foundation; ya sea en la versión 2 de la Licencia, o (a su " +#~ "opción) cualquier versión posterior." + +#~ msgid "" +#~ "The GNOME Web Browser is distributed in the hope that it will be useful, " +#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of " +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " +#~ "Public License for more details." +#~ msgstr "" +#~ "El Navegador web de GNOME se distribuye con la esperanza de que le sea " +#~ "útil, pero SIN NINGUNA GARANTÍA; sin incluso la garantía implícita de " +#~ "MERCANTILIDAD o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia " +#~ "Pública General de GNU para más detalles." + +#~ msgid "" +#~ "You should have received a copy of the GNU General Public License along " +#~ "with the GNOME Web Browser; if not, write to the Free Software " +#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-" +#~ "1301 USA" +#~ msgstr "" +#~ "Debería haber recibido una copia de la Licencia Pública General GNU junto " +#~ "con el Navegador web de GNOME; si no, escriba a la Free Software " +#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 " +#~ "USA" + +#~ msgid "Use GNOME desktop wide font configuration." +#~ msgstr "Usar la configuración global de tipografías de GNOME." + +#~ msgid "Cookie Name" +#~ msgstr "Nombre de la cookie" + +#~ msgid "Not now" +#~ msgstr "Ahora no" + +#~ msgid "Store password" +#~ msgstr "Almacenar contraseña" + +#~ msgid "" +#~ "Would you like to store the password for %s in %s?" +#~ msgstr "" +#~ "¿Quiere almacenar la contraseña para %s en %s?" + +#~ msgid "Epiphany (RDF)" +#~ msgstr "Epiphany (RDF)" + +#~ msgid "Epiphany bookmarks" +#~ msgstr "Marcadores de Epiphany" + +#~ msgid "Start the application without opening windows" +#~ msgstr "Iniciar la aplicación sin abrir ventanas" + +#~ msgid "_Personal Data" +#~ msgstr "_Datos personales" + +#~ msgid "Cookie properties" +#~ msgstr "Propiedades de cookies" + +#~ msgid "Content:" +#~ msgstr "Contenido:" + +#~ msgid "Path:" +#~ msgstr "Ruta:" + # Esto es de gestión de cookies (serrador) -#~ msgid "Send for:" -#~ msgstr "Enviar para:" - -#~ msgid "Expires:" -#~ msgstr "Caduca:" - -#~ msgid "Personal Data" -#~ msgstr "Datos personales" - -#~ msgid "Inspect _Element" -#~ msgstr "Inspeccionar _elemento" - -#~ msgid "C_ookies" -#~ msgstr "C_ookies" - -#~ msgid "Hi_story" -#~ msgstr "_Histórico" - -#~ msgid "Encrypted connections only" -#~ msgstr "Sólo conexiones cifradas" - -#~ msgid "Any type of connection" -#~ msgstr "Cualquier tipo de conexión" - -#~ msgid "End of current session" -#~ msgstr "Fin de la sesión actual" - -#~ msgid "Domain" -#~ msgstr "Dominio" - -#~ msgid "Host" -#~ msgstr "Host" - -#~ msgid "User Password" -#~ msgstr "Contraseña de usuario" - -#~ msgid "http://www.google.com" -#~ msgstr "http://www.google.es" - -#~ msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" -#~ msgstr "http://www.google.es/search?q=%s" - -#~ msgid "Web Inspector" -#~ msgstr "Inspector web" - -#~ msgid "Epiphany can't be used now. Initialization failed." -#~ msgstr "Epiphany no se puede usar ahora. Falló la inicialización." - -#~ msgid "%s Files" -#~ msgstr "%s archivos" - -#~ msgid "_Work Offline" -#~ msgstr "_Trabajar desconectado" - -#~ msgid "" -#~ "Middle click to open the web page pointed to by the currently selected " -#~ "text" -#~ msgstr "" -#~ "Pulse el botón central del ratón para abrir la dirección a la que apunta " -#~ "en este momento el texto seleccionado" - -#~ msgid "" -#~ "Middle clicking on the main view pane will open the web page pointed to " -#~ "by the currently selected text." -#~ msgstr "" -#~ "Al pulsar el botón central del ratón en el panel principal de abrirá la " -#~ "dirección apuntada por el texto seleccionado en ese momento." - -#~ msgid "Wrapped" -#~ msgstr "Desde el inicio" - -#~ msgid "Find links:" -#~ msgstr "Buscar enlaces:" - -#~ msgid "Find:" -#~ msgstr "Buscar:" - -#~ msgid "_Case sensitive" -#~ msgstr "Sensible a _capitalización" - -#~ msgid "Find Previous" -#~ msgstr "Buscar anterior" - -#~ msgid "Find Next" -#~ msgstr "Buscar siguiente" - -#~ msgid "Launch the bookmarks editor" -#~ msgstr "Lanzar el editor de marcadores" - -#~ msgid "_Larger Text" -#~ msgstr "Texto más gra_nde" - -#~ msgid "S_maller Text" -#~ msgstr "Texto más peque_ño" - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "El archivo no es un archivo .desktop válido" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "No se reconoce la versión «%s» del archivo desktop" - -#~ msgid "Starting %s" -#~ msgstr "Iniciando %s" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "La aplicación no acepta documentos en la línea de comandos" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Opción de lanzamiento no reconocida: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "No se pueden pasar los URI de documentos a entradas de escritorio " -#~ "Type=Link" - -#~ msgid "Not a launchable item" -#~ msgstr "No es un elemento lanzable" - -#~ msgid "Active extensions" -#~ msgstr "Activar extensiones" - -#~ msgid "Lists the active extensions." -#~ msgstr "Lista las extensiones activas." - -#~ msgid "Enable Java_Script" -#~ msgstr "Activar Java_Script" - -#~ msgid "_Extensions" -#~ msgstr "_Extensiones" - -#~ msgid "" -#~ "Lets you view web pages and find information on the internet.\n" -#~ "Powered by WebKit %d.%d.%d" -#~ msgstr "" -#~ "Le permite ver páginas web y encontrar información en Internet.\n" -#~ "Basado en WebKit %d.%d.%d" - -#~ msgctxt "file type" -#~ msgid "Unknown" -#~ msgstr "Desconocido" - -#~ msgid "Leave Fullscreen" -#~ msgstr "Salir del modo a pantalla completa" - -#~ msgid "Always show the tab bar" -#~ msgstr "Mostrar siempre la barra de pestañas" - -#~ msgid "Show the tab bar also when there is only one tab open." -#~ msgstr "" -#~ "Mostrar la barra de pestañas también cuando sólo hay una pestaña abierta." - -#~ msgid "All" -#~ msgstr "Todo" - -#~ msgid "Disable connection to session manager" -#~ msgstr "Desactivar la conexión con el gestor de sesiones" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Especificar el archivo que contiene la configuración guardada" - -#~ msgid "Specify session management ID" -#~ msgstr "Especifique el ID de gestión de la sesión" - -#~ msgid "ID" -#~ msgstr "ID" - -#~ msgid "Session management options:" -#~ msgstr "Opciones de gestión de la sesión:" - -#~ msgid "Show session management options" -#~ msgstr "Mostrar las opciones de gestión de la sesión" - -#~ msgid "Downloads will be aborted and logout proceed in %d second." -#~ msgid_plural "Downloads will be aborted and logout proceed in %d seconds." -#~ msgstr[0] "" -#~ "Las descargas se abortarán y se procederá a la salida en %d segundo." -#~ msgstr[1] "" -#~ "Las descargas se abortarán y se procederá a la salida en %d segundos." - -#~ msgid "Abort pending downloads?" -#~ msgstr "¿Desea abortar las descargas pendientes?" - -#~ msgid "" -#~ "There are still downloads pending. If you log out, they will be aborted " -#~ "and lost." -#~ msgstr "" -#~ "Aún hay descargas pendientes. Si sale de la sesión, se abortarán y se " -#~ "perderán." - -#~ msgid "_Cancel Logout" -#~ msgstr "_Cancelar salida" - -#~ msgid "_Abort Downloads" -#~ msgstr "_Abortar descargas" - -#~ msgid "_Don't recover" -#~ msgstr "No _recuperar" - -#~ msgid "_Recover session" -#~ msgstr "Recuperar _sesión" - -#~ msgid "Do you want to recover the previous browser windows and tabs?" -#~ msgstr "¿Quiere recuperar las ventanas y pestañas de navegación anteriores?" - -#~ msgid "Update bookmark “%s”?" -#~ msgstr "¿Quiere actualizar el marcador «%s»?" - -#~ msgid "The bookmarked page has moved to “%s”." -#~ msgstr "La página marcada se ha movido a «%s»." - -#~ msgid "_Update" -#~ msgstr "_Actualizar" - -#~ msgid "Update Bookmark?" -#~ msgstr "¿Quiere actualizar el marcador?" - -#~ msgid "Ever" -#~ msgstr "Alguna vez" - -#~ msgid "Browse and organize your bookmarks" -#~ msgstr "Examine y organice sus marcadores" - -#~ msgid "Epiphany Web Bookmarks" -#~ msgstr "Marcadores web de Epiphany" - -#~ msgid "Popup Windows" -#~ msgstr "Ventanas emergentes" - -#~ msgid "Address Entry" -#~ msgstr "Entrada de dirección" - -#~ msgid "Certificate _Hierarchy" -#~ msgstr "_Jerarquía de certificados" - -#~ msgid "Common Name:" -#~ msgstr "Nombre común:" - -#~ msgid "Details" -#~ msgstr "Detalles" - -#~ msgid "Expires On:" -#~ msgstr "Expira el:" - -#~ msgid "Field _Value" -#~ msgstr "_Valor del campo" - -#~ msgid "Fingerprints" -#~ msgstr "Huellas digitales" - -#~ msgid "Issued By" -#~ msgstr "Emitido por" - -#~ msgid "Issued On:" -#~ msgstr "Emitido el:" - -#~ msgid "Issued To" -#~ msgstr "Emitido a" - -#~ msgid "MD5 Fingerprint:" -#~ msgstr "Huella MD5:" - -#~ msgid "Organization:" -#~ msgstr "Organización:" - -#~ msgid "Organizational Unit:" -#~ msgstr "Unidad organizativa:" - -#~ msgid "SHA1 Fingerprint:" -#~ msgstr "Huella SHA1:" - -#~ msgid "Serial Number:" -#~ msgstr "Número de serie:" - -#~ msgid "Validity" -#~ msgstr "Validez" - -#~ msgid "label" -#~ msgstr "etiqueta" - -#~ msgid "Sign Text" -#~ msgstr "Firmar texto" - -#~ msgid "" -#~ "To confirm that you want to sign the above text, choose a certificate to " -#~ "sign the text with and enter its password below." -#~ msgstr "" -#~ "Para confirmar que quiere firmar el texto de encima, elija un certificado " -#~ "con el que firmarlo e introduzca la contraseña del certificado abajo." - -#~ msgid "_Certificate:" -#~ msgstr "Cer_tificado:" - -#~ msgid "As laid out on the _screen" -#~ msgstr "Tal como se distribuyan en la _pantalla" - -#~ msgid "Background" -#~ msgstr "Fondo" - -#~ msgid "Footers" -#~ msgstr "Pie de página" - -#~ msgid "Frames" -#~ msgstr "Marcos" - -#~ msgid "Headers" -#~ msgstr "Cabeceras" - -#~ msgid "O_nly the selected frame" -#~ msgstr "_Sólo el marco seleccionado" - -#~ msgid "P_age title" -#~ msgstr "_Título de página" - -#~ msgid "Page _numbers" -#~ msgstr "Nú_meros de página" - -#~ msgid "Print background c_olors" -#~ msgstr "Imprimir _colores del fondo" - -#~ msgid "Print background i_mages" -#~ msgstr "Imprimir _imágenes del fondo" - -#~ msgid "_Date" -#~ msgstr "_Fecha" - -#~ msgid "_Each frame separately" -#~ msgstr "_Cada marco por separado" - -#~ msgid "_Page address" -#~ msgstr "Dirección de la _página" - -#~ msgid "GNOME Web Browser" -#~ msgstr "Navegador web de GNOME" - -#~ msgid "GNOME Web Browser options" -#~ msgstr "Opciones del navegador web de GNOME" - -#~ msgid "T_ools" -#~ msgstr "_Herramientas" - -#~ msgid "_Toolbars" -#~ msgstr "Barra de _herramientas" - -#~ msgid "Open a file" -#~ msgstr "Abrir un archivo" - -#~ msgid "Save the current page" -#~ msgstr "Guardar la página actual" - -#~ msgid "Save the current page as a Web Application" -#~ msgstr "Guardar la página actual como una aplicación web" - -#~ msgid "Page Set_up" -#~ msgstr "Config_uración de página" - -#~ msgid "Setup the page settings for printing" -#~ msgstr "Configurar las opciones de impresión" - -#~ msgid "Print Pre_view" -#~ msgstr "Vista p_revia de impresión" - -#~ msgid "Print preview" -#~ msgstr "Vista previa de impresión" - -#~ msgid "Print the current page" -#~ msgstr "Imprime la página actual" - -#~ msgid "Send a link of the current page" -#~ msgstr "Envía un enlace apuntando a la página actual" - -#~ msgid "Close this tab" -#~ msgstr "Cierra esta pestaña" - -#~ msgid "Undo the last action" -#~ msgstr "Deshace la última acción" - -#~ msgid "Redo the last undone action" -#~ msgstr "Rehace la última acción deshecha" - -#~ msgid "Paste clipboard" -#~ msgstr "Pegar del portapapeles" - -#~ msgid "Delete text" -#~ msgstr "Borrar texto" - -#~ msgid "Select the entire page" -#~ msgstr "Selecciona la página completa" - -#~ msgid "Find a word or phrase in the page" -#~ msgstr "Buscar una palabra o frase en la página" - -#~ msgid "Find next occurrence of the word or phrase" -#~ msgstr "Busca la siguiente aparición de la palabra o frase" - -#~ msgid "Find previous occurrence of the word or phrase" -#~ msgstr "Busca la aparición anterior de la palabra o frase" - -#~ msgid "Increase the text size" -#~ msgstr "Aumentar el tamaño del texto" - -#~ msgid "Decrease the text size" -#~ msgstr "Reducir el tamaño del texto" - -#~ msgid "Use the normal text size" -#~ msgstr "Usar el tamaño de texto normal" - -#~ msgid "Change the text encoding" -#~ msgstr "Cambiar la codificación del texto" - -#~ msgid "View the source code of the page" -#~ msgstr "Ver el código fuente de la página" - -#~ msgid "Add a bookmark for the current page" -#~ msgstr "Añadir un marcador para la página actual" - -#~ msgid "Go to a specified location" -#~ msgstr "Ir a una dirección especificada" - -#~ msgid "Activate previous tab" -#~ msgstr "Activar pestaña anterior" - -#~ msgid "Activate next tab" -#~ msgstr "Activar siguiente pestaña" - -#~ msgid "Move current tab to left" -#~ msgstr "Mover la pestaña actual a la izquierda" - -#~ msgid "Move current tab to right" -#~ msgstr "Mover la pestaña actual a la derecha" - -#~ msgid "Detach current tab" -#~ msgstr "Desprender la pestaña actual" - -#~ msgid "Switch to offline mode" -#~ msgstr "Cambiar a modo desconectado" - -#~ msgid "Show the active downloads for this window" -#~ msgstr "Mostrar las descargas activas para esta ventana" - -#~ msgid "Show or hide unrequested popup windows from this site" -#~ msgstr "" -#~ "Mostrar u ocultar ventanas emergentes no solicitadas desde este sitio" - -#~ msgid "Show Only _This Frame" -#~ msgstr "Mostrar sólo este _marco" - -#~ msgid "Show only this frame in this window" -#~ msgstr "Muestra sólo este marco en esta ventana" - -#~ msgid "Open link in this window" -#~ msgstr "Abre el enlace en esta ventana" - -#~ msgid "Open link in a new window" -#~ msgstr "Abre el enlace en una ventana nueva" - -#~ msgid "Open link in a new tab" -#~ msgstr "Abre el enlace en una pestaña nueva" - -#~ msgid "Save link with a different name" -#~ msgstr "Guardar enlace con un nombre diferente" - +#~ msgid "Send for:" +#~ msgstr "Enviar para:" + +#~ msgid "Expires:" +#~ msgstr "Caduca:" + +#~ msgid "Personal Data" +#~ msgstr "Datos personales" + +#~ msgid "Inspect _Element" +#~ msgstr "Inspeccionar _elemento" + +#~ msgid "C_ookies" +#~ msgstr "C_ookies" + +#~ msgid "Hi_story" +#~ msgstr "_Histórico" + +#~ msgid "Encrypted connections only" +#~ msgstr "Sólo conexiones cifradas" + +#~ msgid "Any type of connection" +#~ msgstr "Cualquier tipo de conexión" + +#~ msgid "End of current session" +#~ msgstr "Fin de la sesión actual" + +#~ msgid "Domain" +#~ msgstr "Dominio" + +#~ msgid "Host" +#~ msgstr "Host" + +#~ msgid "User Password" +#~ msgstr "Contraseña de usuario" + +#~ msgid "http://www.google.com" +#~ msgstr "http://www.google.es" + +#~ msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" +#~ msgstr "http://www.google.es/search?q=%s" + +#~ msgid "Web Inspector" +#~ msgstr "Inspector web" + +#~ msgid "Epiphany can't be used now. Initialization failed." +#~ msgstr "Epiphany no se puede usar ahora. Falló la inicialización." + +#~ msgid "%s Files" +#~ msgstr "%s archivos" + +#~ msgid "_Work Offline" +#~ msgstr "_Trabajar desconectado" + +#~ msgid "" +#~ "Middle click to open the web page pointed to by the currently selected " +#~ "text" +#~ msgstr "" +#~ "Pulse el botón central del ratón para abrir la dirección a la que apunta " +#~ "en este momento el texto seleccionado" + +#~ msgid "" +#~ "Middle clicking on the main view pane will open the web page pointed to " +#~ "by the currently selected text." +#~ msgstr "" +#~ "Al pulsar el botón central del ratón en el panel principal de abrirá la " +#~ "dirección apuntada por el texto seleccionado en ese momento." + +#~ msgid "Wrapped" +#~ msgstr "Desde el inicio" + +#~ msgid "Find links:" +#~ msgstr "Buscar enlaces:" + +#~ msgid "Find:" +#~ msgstr "Buscar:" + +#~ msgid "_Case sensitive" +#~ msgstr "Sensible a _capitalización" + +#~ msgid "Find Previous" +#~ msgstr "Buscar anterior" + +#~ msgid "Find Next" +#~ msgstr "Buscar siguiente" + +#~ msgid "Launch the bookmarks editor" +#~ msgstr "Lanzar el editor de marcadores" + +#~ msgid "_Larger Text" +#~ msgstr "Texto más gra_nde" + +#~ msgid "S_maller Text" +#~ msgstr "Texto más peque_ño" + +#~ msgid "File is not a valid .desktop file" +#~ msgstr "El archivo no es un archivo .desktop válido" + +#~ msgid "Unrecognized desktop file Version '%s'" +#~ msgstr "No se reconoce la versión «%s» del archivo desktop" + +#~ msgid "Starting %s" +#~ msgstr "Iniciando %s" + +#~ msgid "Application does not accept documents on command line" +#~ msgstr "La aplicación no acepta documentos en la línea de comandos" + +#~ msgid "Unrecognized launch option: %d" +#~ msgstr "Opción de lanzamiento no reconocida: %d" + +#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +#~ msgstr "" +#~ "No se pueden pasar los URI de documentos a entradas de escritorio " +#~ "Type=Link" + +#~ msgid "Not a launchable item" +#~ msgstr "No es un elemento lanzable" + +#~ msgid "Active extensions" +#~ msgstr "Activar extensiones" + +#~ msgid "Lists the active extensions." +#~ msgstr "Lista las extensiones activas." + +#~ msgid "Enable Java_Script" +#~ msgstr "Activar Java_Script" + +#~ msgid "_Extensions" +#~ msgstr "_Extensiones" + +#~ msgid "" +#~ "Lets you view web pages and find information on the internet.\n" +#~ "Powered by WebKit %d.%d.%d" +#~ msgstr "" +#~ "Le permite ver páginas web y encontrar información en Internet.\n" +#~ "Basado en WebKit %d.%d.%d" + +#~ msgctxt "file type" +#~ msgid "Unknown" +#~ msgstr "Desconocido" + +#~ msgid "Leave Fullscreen" +#~ msgstr "Salir del modo a pantalla completa" + +#~ msgid "Always show the tab bar" +#~ msgstr "Mostrar siempre la barra de pestañas" + +#~ msgid "Show the tab bar also when there is only one tab open." +#~ msgstr "" +#~ "Mostrar la barra de pestañas también cuando sólo hay una pestaña abierta." + +#~ msgid "All" +#~ msgstr "Todo" + +#~ msgid "Disable connection to session manager" +#~ msgstr "Desactivar la conexión con el gestor de sesiones" + +#~ msgid "Specify file containing saved configuration" +#~ msgstr "Especificar el archivo que contiene la configuración guardada" + +#~ msgid "Specify session management ID" +#~ msgstr "Especifique el ID de gestión de la sesión" + +#~ msgid "ID" +#~ msgstr "ID" + +#~ msgid "Session management options:" +#~ msgstr "Opciones de gestión de la sesión:" + +#~ msgid "Show session management options" +#~ msgstr "Mostrar las opciones de gestión de la sesión" + +#~ msgid "Downloads will be aborted and logout proceed in %d second." +#~ msgid_plural "Downloads will be aborted and logout proceed in %d seconds." +#~ msgstr[0] "" +#~ "Las descargas se abortarán y se procederá a la salida en %d segundo." +#~ msgstr[1] "" +#~ "Las descargas se abortarán y se procederá a la salida en %d segundos." + +#~ msgid "Abort pending downloads?" +#~ msgstr "¿Desea abortar las descargas pendientes?" + +#~ msgid "" +#~ "There are still downloads pending. If you log out, they will be aborted " +#~ "and lost." +#~ msgstr "" +#~ "Aún hay descargas pendientes. Si sale de la sesión, se abortarán y se " +#~ "perderán." + +#~ msgid "_Cancel Logout" +#~ msgstr "_Cancelar salida" + +#~ msgid "_Abort Downloads" +#~ msgstr "_Abortar descargas" + +#~ msgid "_Don't recover" +#~ msgstr "No _recuperar" + +#~ msgid "_Recover session" +#~ msgstr "Recuperar _sesión" + +#~ msgid "Do you want to recover the previous browser windows and tabs?" +#~ msgstr "¿Quiere recuperar las ventanas y pestañas de navegación anteriores?" + +#~ msgid "Update bookmark “%s”?" +#~ msgstr "¿Quiere actualizar el marcador «%s»?" + +#~ msgid "The bookmarked page has moved to “%s”." +#~ msgstr "La página marcada se ha movido a «%s»." + +#~ msgid "_Update" +#~ msgstr "_Actualizar" + +#~ msgid "Update Bookmark?" +#~ msgstr "¿Quiere actualizar el marcador?" + +#~ msgid "Ever" +#~ msgstr "Alguna vez" + +#~ msgid "Browse and organize your bookmarks" +#~ msgstr "Examine y organice sus marcadores" + +#~ msgid "Epiphany Web Bookmarks" +#~ msgstr "Marcadores web de Epiphany" + +#~ msgid "Popup Windows" +#~ msgstr "Ventanas emergentes" + +#~ msgid "Address Entry" +#~ msgstr "Entrada de dirección" + +#~ msgid "Certificate _Hierarchy" +#~ msgstr "_Jerarquía de certificados" + +#~ msgid "Common Name:" +#~ msgstr "Nombre común:" + +#~ msgid "Details" +#~ msgstr "Detalles" + +#~ msgid "Expires On:" +#~ msgstr "Expira el:" + +#~ msgid "Field _Value" +#~ msgstr "_Valor del campo" + +#~ msgid "Fingerprints" +#~ msgstr "Huellas digitales" + +#~ msgid "Issued By" +#~ msgstr "Emitido por" + +#~ msgid "Issued On:" +#~ msgstr "Emitido el:" + +#~ msgid "Issued To" +#~ msgstr "Emitido a" + +#~ msgid "MD5 Fingerprint:" +#~ msgstr "Huella MD5:" + +#~ msgid "Organization:" +#~ msgstr "Organización:" + +#~ msgid "Organizational Unit:" +#~ msgstr "Unidad organizativa:" + +#~ msgid "SHA1 Fingerprint:" +#~ msgstr "Huella SHA1:" + +#~ msgid "Serial Number:" +#~ msgstr "Número de serie:" + +#~ msgid "Validity" +#~ msgstr "Validez" + +#~ msgid "label" +#~ msgstr "etiqueta" + +#~ msgid "Sign Text" +#~ msgstr "Firmar texto" + +#~ msgid "" +#~ "To confirm that you want to sign the above text, choose a certificate to " +#~ "sign the text with and enter its password below." +#~ msgstr "" +#~ "Para confirmar que quiere firmar el texto de encima, elija un certificado " +#~ "con el que firmarlo e introduzca la contraseña del certificado abajo." + +#~ msgid "_Certificate:" +#~ msgstr "Cer_tificado:" + +#~ msgid "As laid out on the _screen" +#~ msgstr "Tal como se distribuyan en la _pantalla" + +#~ msgid "Background" +#~ msgstr "Fondo" + +#~ msgid "Footers" +#~ msgstr "Pie de página" + +#~ msgid "Frames" +#~ msgstr "Marcos" + +#~ msgid "Headers" +#~ msgstr "Cabeceras" + +#~ msgid "O_nly the selected frame" +#~ msgstr "_Sólo el marco seleccionado" + +#~ msgid "P_age title" +#~ msgstr "_Título de página" + +#~ msgid "Page _numbers" +#~ msgstr "Nú_meros de página" + +#~ msgid "Print background c_olors" +#~ msgstr "Imprimir _colores del fondo" + +#~ msgid "Print background i_mages" +#~ msgstr "Imprimir _imágenes del fondo" + +#~ msgid "_Date" +#~ msgstr "_Fecha" + +#~ msgid "_Each frame separately" +#~ msgstr "_Cada marco por separado" + +#~ msgid "_Page address" +#~ msgstr "Dirección de la _página" + +#~ msgid "GNOME Web Browser options" +#~ msgstr "Opciones del navegador web de GNOME" + +#~ msgid "T_ools" +#~ msgstr "_Herramientas" + +#~ msgid "_Toolbars" +#~ msgstr "Barra de _herramientas" + +#~ msgid "Open a file" +#~ msgstr "Abrir un archivo" + +#~ msgid "Save the current page" +#~ msgstr "Guardar la página actual" + +#~ msgid "Save the current page as a Web Application" +#~ msgstr "Guardar la página actual como una aplicación web" + +#~ msgid "Page Set_up" +#~ msgstr "Config_uración de página" + +#~ msgid "Setup the page settings for printing" +#~ msgstr "Configurar las opciones de impresión" + +#~ msgid "Print Pre_view" +#~ msgstr "Vista p_revia de impresión" + +#~ msgid "Print preview" +#~ msgstr "Vista previa de impresión" + +#~ msgid "Print the current page" +#~ msgstr "Imprime la página actual" + +#~ msgid "Send a link of the current page" +#~ msgstr "Envía un enlace apuntando a la página actual" + +#~ msgid "Close this tab" +#~ msgstr "Cierra esta pestaña" + +#~ msgid "Undo the last action" +#~ msgstr "Deshace la última acción" + +#~ msgid "Redo the last undone action" +#~ msgstr "Rehace la última acción deshecha" + +#~ msgid "Paste clipboard" +#~ msgstr "Pegar del portapapeles" + +#~ msgid "Delete text" +#~ msgstr "Borrar texto" + +#~ msgid "Select the entire page" +#~ msgstr "Selecciona la página completa" + +#~ msgid "Find a word or phrase in the page" +#~ msgstr "Buscar una palabra o frase en la página" + +#~ msgid "Find next occurrence of the word or phrase" +#~ msgstr "Busca la siguiente aparición de la palabra o frase" + +#~ msgid "Find previous occurrence of the word or phrase" +#~ msgstr "Busca la aparición anterior de la palabra o frase" + +#~ msgid "Increase the text size" +#~ msgstr "Aumentar el tamaño del texto" + +#~ msgid "Decrease the text size" +#~ msgstr "Reducir el tamaño del texto" + +#~ msgid "Use the normal text size" +#~ msgstr "Usar el tamaño de texto normal" + +#~ msgid "Change the text encoding" +#~ msgstr "Cambiar la codificación del texto" + +#~ msgid "View the source code of the page" +#~ msgstr "Ver el código fuente de la página" + +#~ msgid "Add a bookmark for the current page" +#~ msgstr "Añadir un marcador para la página actual" + +#~ msgid "Go to a specified location" +#~ msgstr "Ir a una dirección especificada" + +#~ msgid "Activate previous tab" +#~ msgstr "Activar pestaña anterior" + +#~ msgid "Activate next tab" +#~ msgstr "Activar siguiente pestaña" + +#~ msgid "Move current tab to left" +#~ msgstr "Mover la pestaña actual a la izquierda" + +#~ msgid "Move current tab to right" +#~ msgstr "Mover la pestaña actual a la derecha" + +#~ msgid "Detach current tab" +#~ msgstr "Desprender la pestaña actual" + +#~ msgid "Switch to offline mode" +#~ msgstr "Cambiar a modo desconectado" + +#~ msgid "Show the active downloads for this window" +#~ msgstr "Mostrar las descargas activas para esta ventana" + +#~ msgid "Show or hide unrequested popup windows from this site" +#~ msgstr "" +#~ "Mostrar u ocultar ventanas emergentes no solicitadas desde este sitio" + +#~ msgid "Show Only _This Frame" +#~ msgstr "Mostrar sólo este _marco" + +#~ msgid "Show only this frame in this window" +#~ msgstr "Muestra sólo este marco en esta ventana" + +#~ msgid "Open link in this window" +#~ msgstr "Abre el enlace en esta ventana" + +#~ msgid "Open link in a new window" +#~ msgstr "Abre el enlace en una ventana nueva" + +#~ msgid "Open link in a new tab" +#~ msgstr "Abre el enlace en una pestaña nueva" + +#~ msgid "Save link with a different name" +#~ msgstr "Guardar enlace con un nombre diferente" + # Añadimos enlace para mantener el léxico igual a Galeon y Mozilla -#~ msgid "_Send Email…" -#~ msgstr "_Enviar correo-e…" - -#~ msgid "Go to the previous visited page" -#~ msgstr "Ir a la página visitada anterior" - -#~ msgid "Enter a web address to open, or a phrase to search for" -#~ msgstr "Introduzca una dirección web para abrir, o una frase para buscar" - -#~ msgid "Adjust the text size" -#~ msgstr "Ajustar el tamaño del texto" - -#~ msgid "Open a new tab" -#~ msgstr "Abrir una pestaña nueva" - -#~ msgid "Insecure" -#~ msgstr "Inseguro" - -#~ msgid "Broken" -#~ msgstr "Roto" - -#~ msgid "Low" -#~ msgstr "Bajo" - -#~ msgid "High" -#~ msgstr "Alto" - -#~ msgid "Security level: %s" -#~ msgstr "Nivel de seguridad %s" - -#~ msgid "Open image “%s”" -#~ msgstr "Abrir la imagen «%s»" - -#~ msgid "Use as desktop background “%s”" -#~ msgstr "Utilizar «%s» como fondo del escritorio" - -#~ msgid "Save image “%s”" -#~ msgstr "Guardar imagen «%s»" - -#~ msgid "Copy image address “%s”" -#~ msgstr "Copiar dirección de la imagen «%s»" - -#~ msgid "Send email to address “%s”" -#~ msgstr "Enviar correo-e a la dirección «%s»" - -#~ msgid "Copy email address “%s”" -#~ msgstr "Copiar dirección de correo-e «%s»" - -#~ msgid "Bookmark link “%s”" -#~ msgstr "Crear marcador con el enlace «%s»" - -#~ msgid "Copy link's address “%s”" -#~ msgstr "Copiar dirección del enlace de «%s»" - -#~ msgid "P_ersonal Data" -#~ msgstr "Dat_os personales" - -#~ msgid "View and remove cookies and passwords" -#~ msgstr "Ver y eliminar cookies y contraseñas" - -#~ msgid "P_references" -#~ msgstr "Prefere_ncias" - -#~ msgid "Configure the web browser" -#~ msgstr "Configurar el navegador de web" - -#~ msgid "Page _Security Information" -#~ msgstr "Información de _seguridad de la página" - -#~ msgid "Display security information for the web page" -#~ msgstr "Mostrar información de seguridad para la página web" - -#~ msgid "Open the bookmarks window" -#~ msgstr "Abrir la ventana de marcadores" - -#~ msgid "Open the history window" -#~ msgstr "Abrir la ventana del histórico" - -#~ msgid "Display web browser help" -#~ msgstr "Mostrar ayuda del navegador" - -#~ msgid "Open a new window" -#~ msgstr "Abrir una ventana nueva" - -#~ msgid "Go" -#~ msgstr "Ir" - -#~ msgid "_Hide Toolbars" -#~ msgstr "_Ocultar barras de herramientas" - -#~ msgid "Show or hide toolbar" -#~ msgstr "Muestra u oculta la barra de herramientas" - -#~ msgid "Men_ubar" -#~ msgstr "Barra de me_nú" - -#~ msgid "Go up one level" -#~ msgstr "Subir un nivel" - -#~ msgid "_Home" -#~ msgstr "_Inicio" - -#~ msgid "Go to the home page" -#~ msgstr "Ir página inicial" - -#~ msgid "Home page" -#~ msgstr "Página inicial" - -#~ msgid "Set to Current _Page" -#~ msgstr "Establecer a la página ac_tual" - -#~ msgid "Set to _Blank Page" -#~ msgstr "Definir a página en _blanco" - -#~ msgid "_Address:" -#~ msgstr "_Dirección:" - -#~ msgid "" -#~ "CA Certificates file we should use was not found, all SSL sites will be " -#~ "considered to have a broken certificate." -#~ msgstr "" -#~ "No se encontró el archivo de certificados CA que se debería usar, se " -#~ "considerará que todos los sitios con certificado SSL lo tienen roto." - -#~ msgid "Show “_%s”" -#~ msgstr "Mostrar «_%s»" - -#~ msgid "_Move on Toolbar" -#~ msgstr "_Mover en la barra de herramientas" - -#~ msgid "Move the selected item on the toolbar" -#~ msgstr "Mueve el elemento seleccionado en la barra de herramientas" - -#~ msgid "_Delete Toolbar" -#~ msgstr "_Borrar barra de herramientas" - -#~ msgid "Separator" -#~ msgstr "Separador" - -#~ msgid "%s:" -#~ msgstr "%s:" - -#~ msgid "Executes the script “%s”" -#~ msgstr "Ejecuta el script «%s»" - -#~ msgid "_Show on Toolbar" -#~ msgstr "_Mostrar en la barra de herramientas" - -#~ msgid "Show the selected bookmark on a toolbar" -#~ msgstr "Muestra el marcador seleccionado en una barra de herramientas" - -#~ msgid "Show properties for this bookmark" -#~ msgstr "Muestra las propiedades para este marcador" - -#~ msgid "Open this bookmark in a new tab" -#~ msgstr "Abre este marcador en una pestaña nueva" - -#~ msgid "Open this bookmark in a new window" -#~ msgstr "Abre este marcador en una ventana nueva" - -#~ msgid "Related" -#~ msgstr "Relacionado" - -#~ msgid "Topic" -#~ msgstr "Tema" - -#~ msgid "Switch to this tab" -#~ msgstr "Cambiar a esta pestaña" - -#~ msgid "Forward history" -#~ msgstr "Avanzar por el histórico" - -#~ msgid "List of upper levels" -#~ msgstr "Lista de los niveles superiores" - -#~ msgid "Go to the address entered in the address entry" -#~ msgstr "Ir a la dirección introducida" - -#~ msgctxt "toolbar style" -#~ msgid "Default" -#~ msgstr "Predeterminado" - -#~ msgctxt "toolbar style" -#~ msgid "Text below icons" -#~ msgstr "Texto debajo de los iconos" - -#~ msgctxt "toolbar style" -#~ msgid "Text beside icons" -#~ msgstr "Texto junto a los iconos" - -#~ msgctxt "toolbar style" -#~ msgid "Icons only" -#~ msgstr "Sólo iconos" - -#~ msgctxt "toolbar style" -#~ msgid "Text only" -#~ msgstr "Sólo texto" - -#~ msgid "Toolbar Editor" -#~ msgstr "Editor de la barra de herramientas" - -#~ msgid "Toolbar _button labels:" -#~ msgstr "Etiquetas de los _botones de la barra:" - -#~ msgid "_Add a New Toolbar" -#~ msgstr "_Añadir una barra de herramientas nueva" - -#~ msgid "_Go" -#~ msgstr "_Ir" - -#~ msgid "_Tabs" -#~ msgstr "Pestaña_s" - -#~ msgid "Certificate_s" -#~ msgstr "Cer_tificados" - -#~ msgid "_Customize Toolbars…" -#~ msgstr "_Personalizar barras de herramientas…" - -#~ msgid "Customize toolbars" -#~ msgstr "Personalizar barras de herramientas" - -#~ msgid "Icon" -#~ msgstr "Icono" - -#~| msgid "_Delete" -#~ msgid "Delete?" -#~ msgstr "¿Eliminar?" - -#~ msgid "Fingerprints" -#~ msgstr "Huellas" - -#~ msgid "Issued By" -#~ msgstr "Emitido por" - -#~ msgid "Issued To" -#~ msgstr "Emitido a" - -#~ msgid "Cookies" -#~ msgstr "Cookies" - -#~ msgid "Downloads" -#~ msgstr "Descargas" - -#~ msgid "Encodings" -#~ msgstr "Codificaciones" - -#~ msgid "Fonts" -#~ msgstr "Tipografías" - -#~ msgid "Home page" -#~ msgstr "Página inicial" - -#~ msgid "Languages" -#~ msgstr "Idiomas" - -#~ msgid "Passwords" -#~ msgstr "Contraseñas" - -#~ msgid "Style" -#~ msgstr "Estilo" - -#~ msgid "Temporary Files" -#~ msgstr "Archivos temporales" - -#~ msgid "_Show Downloads" -#~ msgstr "_Mostrar descargas" - -#~ msgid "%u:%02u.%02u" -#~ msgstr "%u:%02u.%02u" - -#~ msgid "%02u.%02u" -#~ msgstr "%02u.%02u" - -#~ msgid "_Pause" -#~ msgstr "_Pausa" - -#~ msgid "_Resume" -#~ msgstr "_Continuar" - -#~ msgid "" -#~ "%s\n" -#~ "%s of %s" -#~ msgstr "" -#~ "%s\n" -#~ "%s de %s" - -#~ msgid "%d download" -#~ msgid_plural "%d downloads" -#~ msgstr[0] "%d descarga" -#~ msgstr[1] "%d descargas" - -#~ msgctxt "download status" -#~ msgid "Unknown" -#~ msgstr "Desconocido" - -#~ msgctxt "download status" -#~ msgid "Failed" -#~ msgstr "Falló" - -#~ msgid "%" -#~ msgstr "%" - -#~ msgid "Remaining" -#~ msgstr "Restantes" - -#~ msgid "Download this potentially unsafe file?" -#~ msgstr "¿Descargar este archivo potencialmente inseguro?" - -#~ msgid "" -#~ "File Type: “%s”.\n" -#~ "\n" -#~ "It is unsafe to open “%s” as it could potentially damage your documents " -#~ "or invade your privacy. You can download it instead." -#~ msgstr "" -#~ "Tipo de archivo: «%s».\n" -#~ "\n" -#~ "No es seguro abrir «%s» ya que potencialmente podría dañar sus documentos " -#~ "o invadir su privacidad. En su lugar, puede descargarlo." - -#~ msgid "Open this file?" -#~ msgstr "¿Abrir este archivo?" - -#~ msgid "" -#~ "File Type: “%s”.\n" -#~ "\n" -#~ "You can open “%s” using “%s” or save it." -#~ msgstr "" -#~ "Tipo de archivo: «%s».\n" -#~ "\n" -#~ "Puede abrir «%s» usando «%s» o guardarlo." - -#~ msgid "Download this file?" -#~ msgstr "¿Descargar este archivo?" - -#~ msgid "" -#~ "File Type: “%s”.\n" -#~ "\n" -#~ "You have no application able to open “%s”. You can download it instead." -#~ msgstr "" -#~ "Tipo de archivo: «%s».\n" -#~ "\n" -#~ "No tiene ninguna aplicación capaz de abrir «%s». En su lugar, puede " -#~ "descargarlo." - -#~ msgid "" -#~ "A list of protocols to be considered safe in addition to the default, " -#~ "when disable_unsafe_protocols is enabled." -#~ msgstr "" -#~ "Una lista de protocolos considerada segura además de los predeterminados, " -#~ "cuando se activa \"disable_unsafe_protocols\"." - -#~ msgid "Additional safe protocols" -#~ msgstr "Protocolos seguros adicionales" - -#~ msgid "Disable JavaScript chrome control" -#~ msgstr "Desactivar el control chrome JavaScript" - -#~ msgid "Disable JavaScript's control over window chrome." -#~ msgstr "Desactivar el control de JavaScript sobre la ventana chrome." - -#~ msgid "" -#~ "Disable all historical information by disabling back and forward " -#~ "navigation, not allowing the history dialog and hiding the most used " -#~ "bookmarks list." -#~ msgstr "" -#~ "Desactiva toda la información histórica desactivando la navegación hacia " -#~ "atrás y hacia adelante, no permitiendo el diálogo histórico y ocultando " -#~ "la lista de marcadores más usados." - -#~ msgid "Disable arbitrary URLs" -#~ msgstr "Desactivar URL arbitrarios" - -#~ msgid "Disable bookmark editing" -#~ msgstr "Desactivar edición de marcadores" - -#~ msgid "Disable history" -#~ msgstr "Desactivar histórico" - -#~ msgid "Disable the user's ability to add or edit bookmarks." -#~ msgstr "Desactiva la capacidad del usuario para añadir o editar marcadores." - -#~ msgid "Disable the user's ability to edit toolbars." -#~ msgstr "" -#~ "Desactiva la capacidad del usuario de editar barras de herramientas." - -#~ msgid "Disable the user's ability to type in a URL to Epiphany." -#~ msgstr "Desactiva la capacidad del usuario de teclear un URL en Epiphany." - -#~ msgid "Disable toolbar editing" -#~ msgstr "Desactivar edición de barras de herramientas" - -#~ msgid "Disable unsafe protocols" -#~ msgstr "Desactivar protocolos no seguros" - -#~ msgid "" -#~ "Disables loading of content from unsafe protocols. Safe protocols are " -#~ "http and https." -#~ msgstr "" -#~ "Desactivar la carga de contenido desde protocolos no seguros. Los " -#~ "protocolos seguros son http y https." - -#~ msgid "Epiphany cannot quit" -#~ msgstr "Epiphany no puede salir" - -#~ msgid "Hide the menubar by default." -#~ msgstr "Ocultar la barra de menú de forma predeterminada." - -#~ msgid "Lock in fullscreen mode" -#~ msgstr "Bloquear en modo a pantalla completa" - -#~ msgid "Locks Epiphany in fullscreen mode." -#~ msgstr "Bloquea Epiphany en modo a pantalla completa." - -#~ msgid "User is not allowed to close Epiphany" -#~ msgstr "El usuario no tiene permitido cerrar Epiphany" - -#~ msgid "Address of the user's home page." -#~ msgstr "Dirección de la página de inicio del usuario." - -#~ msgid "" -#~ "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-" -#~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", " -#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", " -#~ "\"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", " -#~ "\"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", " -#~ "\"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", " -#~ "\"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", " -#~ "\"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", " -#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", " -#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", " -#~ "\"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", " -#~ "\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", " -#~ "\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", " -#~ "\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari" -#~ "\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi" -#~ "\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-" -#~ "romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", " -#~ "\"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"." -#~ msgstr "" -#~ "Codificación predeterminada. Los valores aceptados son : \"armscii-8\", " -#~ "\"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", " -#~ "\"GB2312\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", \"IBM852\", " -#~ "\"IBM855\", \"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN" -#~ "\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", " -#~ "\"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", " -#~ "\"ISO-8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", " -#~ "\"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", " -#~ "\"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", " -#~ "\"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", " -#~ "\"windows-874\", \"windows-1250\", \"windows-1251\", \"windows-1252\", " -#~ "\"windows-1253\", \"windows-1254\", \"windows-1255\", \"windows-1256\", " -#~ "\"windows-1257\", \"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", " -#~ "\"x-mac-arabic\", \"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", " -#~ "\"x-mac-devanagari\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati" -#~ "\", \"x-mac-gurmukhi\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-" -#~ "roman\", \"x-mac-romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-" -#~ "user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" y \"x-windows-949\"." - -#~ msgid "Enable Web Inspector" -#~ msgstr "Activar el inspector web" - -#~ msgid "How to print frames" -#~ msgstr "Cómo imprimir marcos" - -#~ msgid "" -#~ "How to print pages containing frames. Allowed values are \"normal\", " -#~ "\"separately\" and \"selected\"." -#~ msgstr "" -#~ "Cómo se imprimen las páginas que contienen marcos. Los valores posibles " -#~ "son \"normal\", «separately» (por separado) y \"selected" -#~ "\" (seleccionados)." - -#~ msgid "ISO-8859-1" -#~ msgstr "ISO-8859-1" - -#~ msgid "Show bookmarks bar by default" -#~ msgstr "Mostrar la barra de marcadores de forma predeterminada" - -#~ msgid "Show statusbar by default" -#~ msgstr "Mostrar de forma predeterminada la barra de estado" - -#~ msgid "" -#~ "Show the history pages visited \"ever\", \"last_two_days\", " -#~ "\"last_three_days\", \"today\"." -#~ msgstr "" -#~ "Mostrar las páginas del histórico visitadas \"ever\" (siempre), " -#~ "\"last_two_days\" (últimos dos días), \"last_three_days\" (últimos tres " -#~ "días), \"today\" (hoy)." - -#~ msgid "The bookmark information shown in the editor view" -#~ msgstr "La información de los marcadores mostrada en la vista del editor" - -#~ msgid "" -#~ "The bookmark information shown in the editor view. Valid values in the " -#~ "list are \"address\" and \"title\"." -#~ msgstr "" -#~ "La información de los marcadores mostrada en la vista del editor. Los " -#~ "nombres válidos en la lista son \"address\" (dirección) y \"title" -#~ "\" (título)." - -#~ msgid "The currently selected fonts language" -#~ msgstr "El idioma seleccionado para la tipografía" - -#~ msgid "" -#~ "The currently selected fonts language. Valid values are \"ar\" (arabic), " -#~ "\"x-baltic\" (baltic languages), \"x-central-euro\" (central european " -#~ "languages), \"x-cyrillic\" (languages written with cyrillic alphabet), " -#~ "\"el\" (greek), \"he\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-" -#~ "CN\" (simplified chinese), \"th\" (thai), \"zh-TW\" (traditional " -#~ "chinese), \"tr\" (turkish), \"x-unicode\" (other languages), \"x-western" -#~ "\" (languages written in latin script), \"x-tamil\" (tamil) and \"x-" -#~ "devanagari\" (devanagari)." -#~ msgstr "" -#~ "El idioma de las tipografías actualmente seleccionadas. Los valores " -#~ "válidos son \"ar\" (árabe), \"x-baltic\" (idiomas bálticos), \"x-central-" -#~ "euro\" (idiomas centro-europeos), \"x-cyrillic\" (idiomas escritos con el " -#~ "alfabeto cirílico), \"el\" (griego), \"he\" (hebreo), \"ja\" (japonés), " -#~ "\"ko\" (coreano), \"zn-CN\" (chino simplificado), \"th\" (tailandés), " -#~ "\"zh-TW\" (chino tradicional), \"tr\" (turco), \"x-unicode\" (otros " -#~ "idiomas), \"x-western\" (idiomas con escritura latina), \"x-tamil" -#~ "\" (tamil) y \"x-devanagari\" (devanagari)." - -#~ msgid "The page information shown in the history view" -#~ msgstr "La información de la página mostrada en la vista del histórico" - -#~ msgid "" -#~ "The page information shown in the history view. Valid values in the list " -#~ "are \"ViewTitle\", \"ViewAddress\" and \"ViewDateTime\"." -#~ msgstr "" -#~ "La información de la página mostrada en la vista del histórico. Los " -#~ "valores válidos en la lista son «VerTítulo», «VerDirección» y " -#~ "«VerFechaHora»." - -#~ msgid "Whether to print the background color" -#~ msgstr "Indica si debe imprimir el color del fondo" - -#~ msgid "Whether to print the background images" -#~ msgstr "Indica si debe imprimir las imágenes del fondo" - -#~ msgid "Whether to print the page numbers (x of total) in the footer" -#~ msgstr "" -#~ "Indica si debe imprimir los números de páginas (x de total) en el pie de " -#~ "página" - -#~ msgid "x-western" -#~ msgstr "x-western" - -#~ msgid "Web Development" -#~ msgstr "Desarrollo web" - -#~ msgid "Let web pages specify their own _fonts" -#~ msgstr "Permitir a las páginas web especificar sus propias _tipografías" - -#~ msgid "Let web pages specify their own c_olors" -#~ msgstr "Permitir a las páginas web especificar sus propios c_olores" - -#~ msgid "_Minimum size:" -#~ msgstr "Tamaño _mínimo:" - -#~ msgid "The file “%s” has been downloaded." -#~ msgstr "Se ha descargado el archivo «%s»." - -#~ msgid "Download finished" -#~ msgstr "Descarga finalizada" - -#~ msgid "The file “%s” has been added to the downloads queue." -#~ msgstr "Se ha añadido el archivo «%s» a la cola de descargas." - -#~ msgid "Download started" -#~ msgstr "Descarga iniciada" - -#~ msgid "A problem occurred while loading %s" -#~ msgstr "Ocurrió un problema al cargar %s" - -#~ msgid "" -#~ "GConf error:\n" -#~ " %s" -#~ msgstr "" -#~ "Error de GConf:\n" -#~ " %s" - -#~ msgid "Failed to read latest migration marker, aborting profile migration." -#~ msgstr "" -#~ "Falló al leer el último marcador de migración, abortando la migración del " -#~ "perfil." - -#~ msgid "Show only the title column" -#~ msgstr "Mostrar sólo la columna de título" - -#~ msgid "T_itle and Address" -#~ msgstr "Título y _dirección" - -#~ msgid "Show both the title and address columns" -#~ msgstr "Mostrar ambas columnas de título y dirección" - -#~ msgid "Default font type" -#~ msgstr "Tipografía predeterminada" - -#~ msgid "Default font type. Possible values are \"serif\" and \"sans-serif\"." -#~ msgstr "" -#~ "Tipografía predeterminada. Los valores posibles son \"serif\" y \"sans-" -#~ "serif\"." - -#~ msgid "_Save As..." -#~ msgstr "Guardar _como…" - -#~ msgid "Sidebar extension required" -#~ msgstr "Se requiere la extensión de la barra lateral" - -#~ msgid "Sidebar Extension Required" -#~ msgstr "Se requiere la extensión de la barra lateral" - -#~ msgid "The link you clicked needs the sidebar extension to be installed." -#~ msgstr "" -#~ "El enlace que pulsó necesita la extensión de la barra lateral para " -#~ "instalarse." - -#~ msgid "St_atusbar" -#~ msgstr "Barra de _estado" - -#~ msgid "Show or hide statusbar" -#~ msgstr "Muestra u oculta la barra de estado" - -#~ msgid "Use s_mooth scrolling" -#~ msgstr "Activar desplazamiento _suave" - -#~ msgid "In keyboard selection mode, press F7 to exit" -#~ msgstr "En el modo de selección del teclado, pulse F7 para salir" - -#~ msgid "%d hidden popup window" -#~ msgid_plural "%d hidden popup windows" -#~ msgstr[0] "%d ventana emergente oculta" -#~ msgstr[1] "%d ventanas emergentes ocultas" - -#~ msgid "Redirecting to “%s”…" -#~ msgstr "Redireccionando a «%s»…" - -#~ msgid "Transferring data from “%s”…" -#~ msgstr "Transfiriendo datos desde «%s»…" - -#~ msgid "Waiting for authorization from “%s”…" -#~ msgstr "Esperando autorización de «%s»…" - -#~ msgid "" -#~ "Epiphany appears to have exited unexpectedly the last time it was run. " -#~ "You can recover the opened windows and tabs." -#~ msgstr "" -#~ "Epiphany parece haber salido de forma inesperada la última vez que se " -#~ "ejecutó. Puede recuperar las ventanas y pestañas que estaban abiertas." - -#~ msgid "Crash Recovery" -#~ msgstr "Recuperación de cuelgue" - -#~ msgid "Enable _Java" -#~ msgstr "Activar _Java" - -#~ msgid "First" -#~ msgstr "Primero" - -#~ msgid "Go to the first page" -#~ msgstr "Ir a la primera página" - -#~ msgid "Last" -#~ msgstr "Último" - -#~ msgid "Go to the last page" -#~ msgstr "Ir a la última página" - -#~ msgid "Previous" -#~ msgstr "Anterior" - -#~ msgid "Go to the previous page" -#~ msgstr "Ir a la página anterior" - -#~ msgid "Next" -#~ msgstr "Siguiente" - -#~ msgid "Go to next page" -#~ msgstr "Ir a la siguiente página" - -#~ msgid "Close" -#~ msgstr "Cerrar" - -#~ msgid "Close print preview" -#~ msgstr "Cerrar vista previa de impresión" - -#~ msgid "File Type:|Unknown" -#~ msgstr "Desconocido" - -#~ msgid "_Domain:" -#~ msgstr "_Dominio:" - -#~ msgid "_New password:" -#~ msgstr "_Contraseña nueva:" - -#~ msgid "Con_firm password:" -#~ msgstr "Con_firmar contraseña:" - -#~ msgid "Password quality:" -#~ msgstr "Calidad de la contraseña:" - -#~ msgid "Do not remember this password" -#~ msgstr "No recordar esta contraseña" - -#~ msgid "_Remember password for this session" -#~ msgstr "_Recordar la contraseña para esta sesión" - -#~ msgid "Save password in _keyring" -#~ msgstr "Guardar contraseña en el _depósito de claves" - -#~ msgid "The encoding autodetector. Empty string means autodetect is off" -#~ msgstr "" -#~ "El auto-detector de codificación. La cadena vacía indica que la auto-" -#~ "detección está inhabilitada" - -#~ msgid "" -#~ "The encoding autodetector. Valid entries are \"\" (autodetectors off), " -#~ "\"cjk_parallel_state_machine\" (autodetect east asian encodings), " -#~ "\"ja_parallel_state_machine\" (autodetect japanese encodings), " -#~ "\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob" -#~ "\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian " -#~ "encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), " -#~ "\"zhcn_parallel_state_machine\" (autodetect simplified chinese " -#~ "encodings), \"zhtw_parallel_state_machine\" (autodetect traditional " -#~ "chinese encodings) and \"universal_charset_detector\" (autodetect most " -#~ "encodings)." -#~ msgstr "" -#~ "El auto-detector de codificación de caracteres. Las entradas válidas son " -#~ "\"\" (cadena vacía, auto-detectores inhabilitados), " -#~ "\"cjk_parallel_state_machine\" (auto-detección de codificaciones de Asia " -#~ "del este), \"ja_parallel_state_machine\" (auto-detección de " -#~ "codificaciones japonesas), \"ko_parallel_state_machine\" (auto-detección " -#~ "de codificaciones coreanas), \"ruprob\" (auto-detección de codificaciones " -#~ "rusas), \"ukprob\" (auto-detección de codificaciones ucranianas), " -#~ "\"zh_parallel_state_machine\"(auto-detección de codificaciones chinas), " -#~ "\"zhcn_parallel_state_machine\" (auto-detección de chino simplificado) y " -#~ "\"zhtw_parallel_state_machine\"(auto-detección de codificaciones en chino " -#~ "tradicional) y \"universal_charset_detector\" (auto-detección de la " -#~ "mayoría de las codificaciones)." - -#~ msgid "Au_todetect:" -#~ msgstr "Au_todetectar:" - -#~ msgid "download status|Unknown" -#~ msgstr "Desconocido" - -#~ msgid "download status|Failed" -#~ msgstr "Falló" - -#~ msgid "autodetectors|Off" -#~ msgstr "Desactivados" - -#~ msgid "automatically detect ... character encodings|Chinese" -#~ msgstr "Chino" - -#~ msgid "automatically detect ... character encodings|Simplified Chinese" -#~ msgstr "Chino simplificado" - -#~ msgid "automatically detect ... character encodings|Traditional Chinese" -#~ msgstr "Chino tradicional" - -#~ msgid "automatically detect ... character encodings|East Asian" -#~ msgstr "Asia del este" - -#~ msgid "automatically detect ... character encodings|Japanese" -#~ msgstr "Japonés" - -#~ msgid "automatically detect ... character encodings|Korean" -#~ msgstr "Coreano" - -#~ msgid "automatically detect ... character encodings|Russian" -#~ msgstr "Ruso" - -#~ msgid "automatically detect ... character encodings|Universal" -#~ msgstr "Universal" - -#~ msgid "automatically detect ... character encodings|Ukrainian" -#~ msgstr "Ucraniano" - -#~ msgid "select fonts for|Arabic" -#~ msgstr "Árabe" - -#~ msgid "select fonts for|Baltic" -#~ msgstr "Báltico" - -#~ msgid "select fonts for|Central European" -#~ msgstr "Centroeuropeo" - -#~ msgid "select fonts for|Cyrillic" -#~ msgstr "Cirílico" - -#~ msgid "select fonts for|Devanagari" -#~ msgstr "Devanagari" - -#~ msgid "select fonts for|Greek" -#~ msgstr "Griego" - -#~ msgid "select fonts for|Hebrew" -#~ msgstr "Hebreo" - -#~ msgid "select fonts for|Japanese" -#~ msgstr "Japonés" - -#~ msgid "select fonts for|Korean" -#~ msgstr "Coreano" - -#~ msgid "select fonts for|Simplified Chinese" -#~ msgstr "Chino simplificado" - -#~ msgid "select fonts for|Tamil" -#~ msgstr "Tamil" - -#~ msgid "select fonts for|Thai" -#~ msgstr "Tailandés" - -#~ msgid "select fonts for|Traditional Chinese" -#~ msgstr "Chino tradicional" - -#~ msgid "select fonts for|Traditional Chinese (Hong Kong)" -#~ msgstr "Chino tradicional (Hong Kong)" - -#~ msgid "select fonts for|Turkish" -#~ msgstr "Turco" - -#~ msgid "select fonts for|Armenian" -#~ msgstr "Armenio" - -#~ msgid "select fonts for|Bengali" -#~ msgstr "Bengalí" - -#~ msgid "select fonts for|Unified Canadian Syllabics" -#~ msgstr "Silábico unificado canadiense" - -#~ msgid "select fonts for|Ethiopic" -#~ msgstr "Etíope" - -#~ msgid "select fonts for|Georgian" -#~ msgstr "Georgiano" - -#~ msgid "select fonts for|Gujarati" -#~ msgstr "Gujarati" - -#~ msgid "select fonts for|Gurmukhi" -#~ msgstr "Gurmukhi" - -#~ msgid "select fonts for|Khmer" -#~ msgstr "Khmer" - -#~ msgid "select fonts for|Malayalam" -#~ msgstr "Malayalam" - -#~ msgid "select fonts for|Western" -#~ msgstr "Occidental" - -#~ msgid "select fonts for|Other Scripts" -#~ msgstr "Otras escrituras" - -#~ msgid "bookmarks|All" -#~ msgstr "Todos" - -#~ msgid "toolbar style|Default" -#~ msgstr "Predeterminado" - -#~ msgid "Opening %s" -#~ msgstr "Abriendo %s" - -#~ msgid "Opening %d Item" -#~ msgid_plural "Opening %d Items" -#~ msgstr[0] "Abriendo %d elemento" -#~ msgstr[1] "Abriendo %d elementos" - -#~ msgid "Unsafe protocol." -#~ msgstr "Protocolo inseguro." - -#~ msgid "" -#~ "The address has not been loaded, because it refers to an unsafe protocol " -#~ "and thereby presents a security risk to your system." -#~ msgstr "" -#~ "La dirección no se ha cargado, porque se refiere a un protocolo inseguro " -#~ "y por consiguiente presenta un riesgo de seguridad para su sistema." - -#~ msgid "No address found." -#~ msgstr "No se encontró ninguna dirección." - -#~ msgid "No web address could be found in this file." -#~ msgstr "No se pudo encontrar ninguna dirección web en este archivo." - -#~ msgid "Epiphany Desktop File Plugin" -#~ msgstr "Complemento de archivo de escritorio de Epiphany" - -#~ msgid "" -#~ "This plugin handles “.desktop” and “.url” files containing web links." -#~ msgstr "" -#~ "Este complemento manipula los archivos «.desktop» y «.url» que contienen " -#~ "enlaces web." +#~ msgid "_Send Email…" +#~ msgstr "_Enviar correo-e…" + +#~ msgid "Go to the previous visited page" +#~ msgstr "Ir a la página visitada anterior" + +#~ msgid "Enter a web address to open, or a phrase to search for" +#~ msgstr "Introduzca una dirección web para abrir, o una frase para buscar" + +#~ msgid "Adjust the text size" +#~ msgstr "Ajustar el tamaño del texto" + +#~ msgid "Open a new tab" +#~ msgstr "Abrir una pestaña nueva" + +#~ msgid "Insecure" +#~ msgstr "Inseguro" + +#~ msgid "Broken" +#~ msgstr "Roto" + +#~ msgid "Low" +#~ msgstr "Bajo" + +#~ msgid "High" +#~ msgstr "Alto" + +#~ msgid "Security level: %s" +#~ msgstr "Nivel de seguridad %s" + +#~ msgid "Open image “%s”" +#~ msgstr "Abrir la imagen «%s»" + +#~ msgid "Use as desktop background “%s”" +#~ msgstr "Utilizar «%s» como fondo del escritorio" + +#~ msgid "Save image “%s”" +#~ msgstr "Guardar imagen «%s»" + +#~ msgid "Copy image address “%s”" +#~ msgstr "Copiar dirección de la imagen «%s»" + +#~ msgid "Send email to address “%s”" +#~ msgstr "Enviar correo-e a la dirección «%s»" + +#~ msgid "Copy email address “%s”" +#~ msgstr "Copiar dirección de correo-e «%s»" + +#~ msgid "Bookmark link “%s”" +#~ msgstr "Crear marcador con el enlace «%s»" + +#~ msgid "Copy link's address “%s”" +#~ msgstr "Copiar dirección del enlace de «%s»" + +#~ msgid "P_ersonal Data" +#~ msgstr "Dat_os personales" + +#~ msgid "View and remove cookies and passwords" +#~ msgstr "Ver y eliminar cookies y contraseñas" + +#~ msgid "P_references" +#~ msgstr "Prefere_ncias" + +#~ msgid "Configure the web browser" +#~ msgstr "Configurar el navegador de web" + +#~ msgid "Page _Security Information" +#~ msgstr "Información de _seguridad de la página" + +#~ msgid "Display security information for the web page" +#~ msgstr "Mostrar información de seguridad para la página web" + +#~ msgid "Open the bookmarks window" +#~ msgstr "Abrir la ventana de marcadores" + +#~ msgid "Open the history window" +#~ msgstr "Abrir la ventana del histórico" + +#~ msgid "Display web browser help" +#~ msgstr "Mostrar ayuda del navegador" + +#~ msgid "Open a new window" +#~ msgstr "Abrir una ventana nueva" + +#~ msgid "Go" +#~ msgstr "Ir" + +#~ msgid "_Hide Toolbars" +#~ msgstr "_Ocultar barras de herramientas" + +#~ msgid "Show or hide toolbar" +#~ msgstr "Muestra u oculta la barra de herramientas" + +#~ msgid "Men_ubar" +#~ msgstr "Barra de me_nú" + +#~ msgid "Go up one level" +#~ msgstr "Subir un nivel" + +#~ msgid "_Home" +#~ msgstr "_Inicio" + +#~ msgid "Go to the home page" +#~ msgstr "Ir página inicial" + +#~ msgid "Home page" +#~ msgstr "Página inicial" + +#~ msgid "Set to Current _Page" +#~ msgstr "Establecer a la página ac_tual" + +#~ msgid "Set to _Blank Page" +#~ msgstr "Definir a página en _blanco" + +#~ msgid "_Address:" +#~ msgstr "_Dirección:" + +#~ msgid "" +#~ "CA Certificates file we should use was not found, all SSL sites will be " +#~ "considered to have a broken certificate." +#~ msgstr "" +#~ "No se encontró el archivo de certificados CA que se debería usar, se " +#~ "considerará que todos los sitios con certificado SSL lo tienen roto." + +#~ msgid "Show “_%s”" +#~ msgstr "Mostrar «_%s»" + +#~ msgid "_Move on Toolbar" +#~ msgstr "_Mover en la barra de herramientas" + +#~ msgid "Move the selected item on the toolbar" +#~ msgstr "Mueve el elemento seleccionado en la barra de herramientas" + +#~ msgid "_Delete Toolbar" +#~ msgstr "_Borrar barra de herramientas" + +#~ msgid "Separator" +#~ msgstr "Separador" + +#~ msgid "%s:" +#~ msgstr "%s:" + +#~ msgid "Executes the script “%s”" +#~ msgstr "Ejecuta el script «%s»" + +#~ msgid "_Show on Toolbar" +#~ msgstr "_Mostrar en la barra de herramientas" + +#~ msgid "Show the selected bookmark on a toolbar" +#~ msgstr "Muestra el marcador seleccionado en una barra de herramientas" + +#~ msgid "Show properties for this bookmark" +#~ msgstr "Muestra las propiedades para este marcador" + +#~ msgid "Open this bookmark in a new tab" +#~ msgstr "Abre este marcador en una pestaña nueva" + +#~ msgid "Open this bookmark in a new window" +#~ msgstr "Abre este marcador en una ventana nueva" + +#~ msgid "Related" +#~ msgstr "Relacionado" + +#~ msgid "Topic" +#~ msgstr "Tema" + +#~ msgid "Switch to this tab" +#~ msgstr "Cambiar a esta pestaña" + +#~ msgid "Forward history" +#~ msgstr "Avanzar por el histórico" + +#~ msgid "List of upper levels" +#~ msgstr "Lista de los niveles superiores" + +#~ msgid "Go to the address entered in the address entry" +#~ msgstr "Ir a la dirección introducida" + +#~ msgctxt "toolbar style" +#~ msgid "Default" +#~ msgstr "Predeterminado" + +#~ msgctxt "toolbar style" +#~ msgid "Text below icons" +#~ msgstr "Texto debajo de los iconos" + +#~ msgctxt "toolbar style" +#~ msgid "Text beside icons" +#~ msgstr "Texto junto a los iconos" + +#~ msgctxt "toolbar style" +#~ msgid "Icons only" +#~ msgstr "Sólo iconos" + +#~ msgctxt "toolbar style" +#~ msgid "Text only" +#~ msgstr "Sólo texto" + +#~ msgid "Toolbar Editor" +#~ msgstr "Editor de la barra de herramientas" + +#~ msgid "Toolbar _button labels:" +#~ msgstr "Etiquetas de los _botones de la barra:" + +#~ msgid "_Add a New Toolbar" +#~ msgstr "_Añadir una barra de herramientas nueva" + +#~ msgid "_Go" +#~ msgstr "_Ir" + +#~ msgid "_Tabs" +#~ msgstr "Pestaña_s" + +#~ msgid "Certificate_s" +#~ msgstr "Cer_tificados" + +#~ msgid "_Customize Toolbars…" +#~ msgstr "_Personalizar barras de herramientas…" + +#~ msgid "Customize toolbars" +#~ msgstr "Personalizar barras de herramientas" + +#~ msgid "Icon" +#~ msgstr "Icono" + +#~| msgid "_Delete" +#~ msgid "Delete?" +#~ msgstr "¿Eliminar?" + +#~ msgid "Fingerprints" +#~ msgstr "Huellas" + +#~ msgid "Issued By" +#~ msgstr "Emitido por" + +#~ msgid "Issued To" +#~ msgstr "Emitido a" + +#~ msgid "Cookies" +#~ msgstr "Cookies" + +#~ msgid "Downloads" +#~ msgstr "Descargas" + +#~ msgid "Encodings" +#~ msgstr "Codificaciones" + +#~ msgid "Fonts" +#~ msgstr "Tipografías" + +#~ msgid "Home page" +#~ msgstr "Página inicial" + +#~ msgid "Languages" +#~ msgstr "Idiomas" + +#~ msgid "Passwords" +#~ msgstr "Contraseñas" + +#~ msgid "Style" +#~ msgstr "Estilo" + +#~ msgid "Temporary Files" +#~ msgstr "Archivos temporales" + +#~ msgid "_Show Downloads" +#~ msgstr "_Mostrar descargas" + +#~ msgid "%u:%02u.%02u" +#~ msgstr "%u:%02u.%02u" + +#~ msgid "%02u.%02u" +#~ msgstr "%02u.%02u" + +#~ msgid "_Pause" +#~ msgstr "_Pausa" + +#~ msgid "_Resume" +#~ msgstr "_Continuar" + +#~ msgid "" +#~ "%s\n" +#~ "%s of %s" +#~ msgstr "" +#~ "%s\n" +#~ "%s de %s" + +#~ msgid "%d download" +#~ msgid_plural "%d downloads" +#~ msgstr[0] "%d descarga" +#~ msgstr[1] "%d descargas" + +#~ msgctxt "download status" +#~ msgid "Unknown" +#~ msgstr "Desconocido" + +#~ msgctxt "download status" +#~ msgid "Failed" +#~ msgstr "Falló" + +#~ msgid "%" +#~ msgstr "%" + +#~ msgid "Remaining" +#~ msgstr "Restantes" + +#~ msgid "Download this potentially unsafe file?" +#~ msgstr "¿Descargar este archivo potencialmente inseguro?" + +#~ msgid "" +#~ "File Type: “%s”.\n" +#~ "\n" +#~ "It is unsafe to open “%s” as it could potentially damage your documents " +#~ "or invade your privacy. You can download it instead." +#~ msgstr "" +#~ "Tipo de archivo: «%s».\n" +#~ "\n" +#~ "No es seguro abrir «%s» ya que potencialmente podría dañar sus documentos " +#~ "o invadir su privacidad. En su lugar, puede descargarlo." + +#~ msgid "Open this file?" +#~ msgstr "¿Abrir este archivo?" + +#~ msgid "" +#~ "File Type: “%s”.\n" +#~ "\n" +#~ "You can open “%s” using “%s” or save it." +#~ msgstr "" +#~ "Tipo de archivo: «%s».\n" +#~ "\n" +#~ "Puede abrir «%s» usando «%s» o guardarlo." + +#~ msgid "Download this file?" +#~ msgstr "¿Descargar este archivo?" + +#~ msgid "" +#~ "File Type: “%s”.\n" +#~ "\n" +#~ "You have no application able to open “%s”. You can download it instead." +#~ msgstr "" +#~ "Tipo de archivo: «%s».\n" +#~ "\n" +#~ "No tiene ninguna aplicación capaz de abrir «%s». En su lugar, puede " +#~ "descargarlo." + +#~ msgid "" +#~ "A list of protocols to be considered safe in addition to the default, " +#~ "when disable_unsafe_protocols is enabled." +#~ msgstr "" +#~ "Una lista de protocolos considerada segura además de los predeterminados, " +#~ "cuando se activa \"disable_unsafe_protocols\"." + +#~ msgid "Additional safe protocols" +#~ msgstr "Protocolos seguros adicionales" + +#~ msgid "Disable JavaScript chrome control" +#~ msgstr "Desactivar el control chrome JavaScript" + +#~ msgid "Disable JavaScript's control over window chrome." +#~ msgstr "Desactivar el control de JavaScript sobre la ventana chrome." + +#~ msgid "" +#~ "Disable all historical information by disabling back and forward " +#~ "navigation, not allowing the history dialog and hiding the most used " +#~ "bookmarks list." +#~ msgstr "" +#~ "Desactiva toda la información histórica desactivando la navegación hacia " +#~ "atrás y hacia adelante, no permitiendo el diálogo histórico y ocultando " +#~ "la lista de marcadores más usados." + +#~ msgid "Disable arbitrary URLs" +#~ msgstr "Desactivar URL arbitrarios" + +#~ msgid "Disable bookmark editing" +#~ msgstr "Desactivar edición de marcadores" + +#~ msgid "Disable history" +#~ msgstr "Desactivar histórico" + +#~ msgid "Disable the user's ability to add or edit bookmarks." +#~ msgstr "Desactiva la capacidad del usuario para añadir o editar marcadores." + +#~ msgid "Disable the user's ability to edit toolbars." +#~ msgstr "" +#~ "Desactiva la capacidad del usuario de editar barras de herramientas." + +#~ msgid "Disable the user's ability to type in a URL to Epiphany." +#~ msgstr "Desactiva la capacidad del usuario de teclear un URL en Epiphany." + +#~ msgid "Disable toolbar editing" +#~ msgstr "Desactivar edición de barras de herramientas" + +#~ msgid "Disable unsafe protocols" +#~ msgstr "Desactivar protocolos no seguros" + +#~ msgid "" +#~ "Disables loading of content from unsafe protocols. Safe protocols are " +#~ "http and https." +#~ msgstr "" +#~ "Desactivar la carga de contenido desde protocolos no seguros. Los " +#~ "protocolos seguros son http y https." + +#~ msgid "Epiphany cannot quit" +#~ msgstr "Epiphany no puede salir" + +#~ msgid "Hide the menubar by default." +#~ msgstr "Ocultar la barra de menú de forma predeterminada." + +#~ msgid "Lock in fullscreen mode" +#~ msgstr "Bloquear en modo a pantalla completa" + +#~ msgid "Locks Epiphany in fullscreen mode." +#~ msgstr "Bloquea Epiphany en modo a pantalla completa." + +#~ msgid "User is not allowed to close Epiphany" +#~ msgstr "El usuario no tiene permitido cerrar Epiphany" + +#~ msgid "Address of the user's home page." +#~ msgstr "Dirección de la página de inicio del usuario." + +#~ msgid "" +#~ "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-" +#~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", " +#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862" +#~ "\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-" +#~ "KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", " +#~ "\"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-" +#~ "8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-" +#~ "13\", \"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", " +#~ "\"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", " +#~ "\"VISCII\", \"windows-874\", \"windows-1250\", \"windows-1251\", " +#~ "\"windows-1252\", \"windows-1253\", \"windows-1254\", \"windows-1255\", " +#~ "\"windows-1256\", \"windows-1257\", \"windows-1258\", \"x-euc-tw\", \"x-" +#~ "gbk\", \"x-johab\", \"x-mac-arabic\", \"x-mac-ce\", \"x-mac-croatian\", " +#~ "\"x-mac-cyrillic\", \"x-mac-devanagari\", \"x-mac-farsi\", \"x-mac-greek" +#~ "\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-hebrew\", \"x-mac-" +#~ "icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-mac-turkish\", \"x-" +#~ "mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" " +#~ "and \"x-windows-949\"." +#~ msgstr "" +#~ "Codificación predeterminada. Los valores aceptados son : \"armscii-8\", " +#~ "\"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312" +#~ "\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", " +#~ "\"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-" +#~ "2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3" +#~ "\", \"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", \"ISO-" +#~ "8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11" +#~ "\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", " +#~ "\"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-" +#~ "7\", \"UTF-8\", \"VISCII\", \"windows-874\", \"windows-1250\", \"windows-" +#~ "1251\", \"windows-1252\", \"windows-1253\", \"windows-1254\", \"windows-" +#~ "1255\", \"windows-1256\", \"windows-1257\", \"windows-1258\", \"x-euc-tw" +#~ "\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", \"x-mac-ce\", \"x-mac-" +#~ "croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari\", \"x-mac-farsi\", " +#~ "\"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-hebrew" +#~ "\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-mac-" +#~ "turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712\", " +#~ "\"x-viet-vps\" y \"x-windows-949\"." + +#~ msgid "Enable Web Inspector" +#~ msgstr "Activar el inspector web" + +#~ msgid "How to print frames" +#~ msgstr "Cómo imprimir marcos" + +#~ msgid "" +#~ "How to print pages containing frames. Allowed values are \"normal\", " +#~ "\"separately\" and \"selected\"." +#~ msgstr "" +#~ "Cómo se imprimen las páginas que contienen marcos. Los valores posibles " +#~ "son \"normal\", «separately» (por separado) y \"selected\" (seleccionados)." + +#~ msgid "ISO-8859-1" +#~ msgstr "ISO-8859-1" + +#~ msgid "Show bookmarks bar by default" +#~ msgstr "Mostrar la barra de marcadores de forma predeterminada" + +#~ msgid "Show statusbar by default" +#~ msgstr "Mostrar de forma predeterminada la barra de estado" + +#~ msgid "" +#~ "Show the history pages visited \"ever\", \"last_two_days\", " +#~ "\"last_three_days\", \"today\"." +#~ msgstr "" +#~ "Mostrar las páginas del histórico visitadas \"ever\" (siempre), " +#~ "\"last_two_days\" (últimos dos días), \"last_three_days\" (últimos tres " +#~ "días), \"today\" (hoy)." + +#~ msgid "The bookmark information shown in the editor view" +#~ msgstr "La información de los marcadores mostrada en la vista del editor" + +#~ msgid "" +#~ "The bookmark information shown in the editor view. Valid values in the " +#~ "list are \"address\" and \"title\"." +#~ msgstr "" +#~ "La información de los marcadores mostrada en la vista del editor. Los " +#~ "nombres válidos en la lista son \"address\" (dirección) y \"title" +#~ "\" (título)." + +#~ msgid "The currently selected fonts language" +#~ msgstr "El idioma seleccionado para la tipografía" + +#~ msgid "" +#~ "The currently selected fonts language. Valid values are \"ar\" (arabic), " +#~ "\"x-baltic\" (baltic languages), \"x-central-euro\" (central european " +#~ "languages), \"x-cyrillic\" (languages written with cyrillic alphabet), " +#~ "\"el\" (greek), \"he\" (hebrew), \"ja\" (japanese), \"ko\" (korean), \"zh-" +#~ "CN\" (simplified chinese), \"th\" (thai), \"zh-TW\" (traditional " +#~ "chinese), \"tr\" (turkish), \"x-unicode\" (other languages), \"x-western" +#~ "\" (languages written in latin script), \"x-tamil\" (tamil) and \"x-" +#~ "devanagari\" (devanagari)." +#~ msgstr "" +#~ "El idioma de las tipografías actualmente seleccionadas. Los valores " +#~ "válidos son \"ar\" (árabe), \"x-baltic\" (idiomas bálticos), \"x-central-" +#~ "euro\" (idiomas centro-europeos), \"x-cyrillic\" (idiomas escritos con el " +#~ "alfabeto cirílico), \"el\" (griego), \"he\" (hebreo), \"ja\" (japonés), " +#~ "\"ko\" (coreano), \"zn-CN\" (chino simplificado), \"th\" (tailandés), " +#~ "\"zh-TW\" (chino tradicional), \"tr\" (turco), \"x-unicode\" (otros " +#~ "idiomas), \"x-western\" (idiomas con escritura latina), \"x-tamil" +#~ "\" (tamil) y \"x-devanagari\" (devanagari)." + +#~ msgid "The page information shown in the history view" +#~ msgstr "La información de la página mostrada en la vista del histórico" + +#~ msgid "" +#~ "The page information shown in the history view. Valid values in the list " +#~ "are \"ViewTitle\", \"ViewAddress\" and \"ViewDateTime\"." +#~ msgstr "" +#~ "La información de la página mostrada en la vista del histórico. Los " +#~ "valores válidos en la lista son «VerTítulo», «VerDirección» y «VerFechaHora»." + +#~ msgid "Whether to print the background color" +#~ msgstr "Indica si debe imprimir el color del fondo" + +#~ msgid "Whether to print the background images" +#~ msgstr "Indica si debe imprimir las imágenes del fondo" + +#~ msgid "Whether to print the page numbers (x of total) in the footer" +#~ msgstr "" +#~ "Indica si debe imprimir los números de páginas (x de total) en el pie de " +#~ "página" + +#~ msgid "x-western" +#~ msgstr "x-western" + +#~ msgid "Web Development" +#~ msgstr "Desarrollo web" + +#~ msgid "Let web pages specify their own _fonts" +#~ msgstr "Permitir a las páginas web especificar sus propias _tipografías" + +#~ msgid "Let web pages specify their own c_olors" +#~ msgstr "Permitir a las páginas web especificar sus propios c_olores" + +#~ msgid "_Minimum size:" +#~ msgstr "Tamaño _mínimo:" + +#~ msgid "The file “%s” has been downloaded." +#~ msgstr "Se ha descargado el archivo «%s»." + +#~ msgid "Download finished" +#~ msgstr "Descarga finalizada" + +#~ msgid "The file “%s” has been added to the downloads queue." +#~ msgstr "Se ha añadido el archivo «%s» a la cola de descargas." + +#~ msgid "Download started" +#~ msgstr "Descarga iniciada" + +#~ msgid "A problem occurred while loading %s" +#~ msgstr "Ocurrió un problema al cargar %s" + +#~ msgid "" +#~ "GConf error:\n" +#~ " %s" +#~ msgstr "" +#~ "Error de GConf:\n" +#~ " %s" + +#~ msgid "Failed to read latest migration marker, aborting profile migration." +#~ msgstr "" +#~ "Falló al leer el último marcador de migración, abortando la migración del " +#~ "perfil." + +#~ msgid "Show only the title column" +#~ msgstr "Mostrar sólo la columna de título" + +#~ msgid "T_itle and Address" +#~ msgstr "Título y _dirección" + +#~ msgid "Show both the title and address columns" +#~ msgstr "Mostrar ambas columnas de título y dirección" + +#~ msgid "Default font type" +#~ msgstr "Tipografía predeterminada" + +#~ msgid "Default font type. Possible values are \"serif\" and \"sans-serif\"." +#~ msgstr "" +#~ "Tipografía predeterminada. Los valores posibles son \"serif\" y \"sans-" +#~ "serif\"." + +#~ msgid "_Save As..." +#~ msgstr "Guardar _como…" + +#~ msgid "Sidebar extension required" +#~ msgstr "Se requiere la extensión de la barra lateral" + +#~ msgid "Sidebar Extension Required" +#~ msgstr "Se requiere la extensión de la barra lateral" + +#~ msgid "The link you clicked needs the sidebar extension to be installed." +#~ msgstr "" +#~ "El enlace que pulsó necesita la extensión de la barra lateral para " +#~ "instalarse." + +#~ msgid "St_atusbar" +#~ msgstr "Barra de _estado" + +#~ msgid "Show or hide statusbar" +#~ msgstr "Muestra u oculta la barra de estado" + +#~ msgid "Use s_mooth scrolling" +#~ msgstr "Activar desplazamiento _suave" + +#~ msgid "In keyboard selection mode, press F7 to exit" +#~ msgstr "En el modo de selección del teclado, pulse F7 para salir" + +#~ msgid "%d hidden popup window" +#~ msgid_plural "%d hidden popup windows" +#~ msgstr[0] "%d ventana emergente oculta" +#~ msgstr[1] "%d ventanas emergentes ocultas" + +#~ msgid "Redirecting to “%s”…" +#~ msgstr "Redireccionando a «%s»…" + +#~ msgid "Transferring data from “%s”…" +#~ msgstr "Transfiriendo datos desde «%s»…" + +#~ msgid "Waiting for authorization from “%s”…" +#~ msgstr "Esperando autorización de «%s»…" + +#~ msgid "" +#~ "Epiphany appears to have exited unexpectedly the last time it was run. " +#~ "You can recover the opened windows and tabs." +#~ msgstr "" +#~ "Epiphany parece haber salido de forma inesperada la última vez que se " +#~ "ejecutó. Puede recuperar las ventanas y pestañas que estaban abiertas." + +#~ msgid "Crash Recovery" +#~ msgstr "Recuperación de cuelgue" + +#~ msgid "Enable _Java" +#~ msgstr "Activar _Java" + +#~ msgid "First" +#~ msgstr "Primero" + +#~ msgid "Go to the first page" +#~ msgstr "Ir a la primera página" + +#~ msgid "Last" +#~ msgstr "Último" + +#~ msgid "Go to the last page" +#~ msgstr "Ir a la última página" + +#~ msgid "Previous" +#~ msgstr "Anterior" + +#~ msgid "Go to the previous page" +#~ msgstr "Ir a la página anterior" + +#~ msgid "Next" +#~ msgstr "Siguiente" + +#~ msgid "Go to next page" +#~ msgstr "Ir a la siguiente página" + +#~ msgid "Close" +#~ msgstr "Cerrar" + +#~ msgid "Close print preview" +#~ msgstr "Cerrar vista previa de impresión" + +#~ msgid "File Type:|Unknown" +#~ msgstr "Desconocido" + +#~ msgid "_Domain:" +#~ msgstr "_Dominio:" + +#~ msgid "_New password:" +#~ msgstr "_Contraseña nueva:" + +#~ msgid "Con_firm password:" +#~ msgstr "Con_firmar contraseña:" + +#~ msgid "Password quality:" +#~ msgstr "Calidad de la contraseña:" + +#~ msgid "Do not remember this password" +#~ msgstr "No recordar esta contraseña" + +#~ msgid "_Remember password for this session" +#~ msgstr "_Recordar la contraseña para esta sesión" + +#~ msgid "Save password in _keyring" +#~ msgstr "Guardar contraseña en el _depósito de claves" + +#~ msgid "The encoding autodetector. Empty string means autodetect is off" +#~ msgstr "" +#~ "El auto-detector de codificación. La cadena vacía indica que la auto-" +#~ "detección está inhabilitada" + +#~ msgid "" +#~ "The encoding autodetector. Valid entries are \"\" (autodetectors off), " +#~ "\"cjk_parallel_state_machine\" (autodetect east asian encodings), " +#~ "\"ja_parallel_state_machine\" (autodetect japanese encodings), " +#~ "\"ko_parallel_state_machine\" (autodetect korean encodings), \"ruprob" +#~ "\" (autodetect russian encodings), \"ukprob\" (autodetect ukrainian " +#~ "encodings), \"zh_parallel_state_machine\" (autodetect chinese encodings), " +#~ "\"zhcn_parallel_state_machine\" (autodetect simplified chinese " +#~ "encodings), \"zhtw_parallel_state_machine\" (autodetect traditional " +#~ "chinese encodings) and \"universal_charset_detector\" (autodetect most " +#~ "encodings)." +#~ msgstr "" +#~ "El auto-detector de codificación de caracteres. Las entradas válidas son " +#~ "\"\" (cadena vacía, auto-detectores inhabilitados), " +#~ "\"cjk_parallel_state_machine\" (auto-detección de codificaciones de Asia " +#~ "del este), \"ja_parallel_state_machine\" (auto-detección de " +#~ "codificaciones japonesas), \"ko_parallel_state_machine\" (auto-detección " +#~ "de codificaciones coreanas), \"ruprob\" (auto-detección de codificaciones " +#~ "rusas), \"ukprob\" (auto-detección de codificaciones ucranianas), " +#~ "\"zh_parallel_state_machine\"(auto-detección de codificaciones chinas), " +#~ "\"zhcn_parallel_state_machine\" (auto-detección de chino simplificado) y " +#~ "\"zhtw_parallel_state_machine\"(auto-detección de codificaciones en chino " +#~ "tradicional) y \"universal_charset_detector\" (auto-detección de la " +#~ "mayoría de las codificaciones)." + +#~ msgid "Au_todetect:" +#~ msgstr "Au_todetectar:" + +#~ msgid "download status|Unknown" +#~ msgstr "Desconocido" + +#~ msgid "download status|Failed" +#~ msgstr "Falló" + +#~ msgid "autodetectors|Off" +#~ msgstr "Desactivados" + +#~ msgid "automatically detect ... character encodings|Chinese" +#~ msgstr "Chino" + +#~ msgid "automatically detect ... character encodings|Simplified Chinese" +#~ msgstr "Chino simplificado" + +#~ msgid "automatically detect ... character encodings|Traditional Chinese" +#~ msgstr "Chino tradicional" + +#~ msgid "automatically detect ... character encodings|East Asian" +#~ msgstr "Asia del este" + +#~ msgid "automatically detect ... character encodings|Japanese" +#~ msgstr "Japonés" + +#~ msgid "automatically detect ... character encodings|Korean" +#~ msgstr "Coreano" + +#~ msgid "automatically detect ... character encodings|Russian" +#~ msgstr "Ruso" + +#~ msgid "automatically detect ... character encodings|Universal" +#~ msgstr "Universal" + +#~ msgid "automatically detect ... character encodings|Ukrainian" +#~ msgstr "Ucraniano" + +#~ msgid "select fonts for|Arabic" +#~ msgstr "Árabe" + +#~ msgid "select fonts for|Baltic" +#~ msgstr "Báltico" + +#~ msgid "select fonts for|Central European" +#~ msgstr "Centroeuropeo" + +#~ msgid "select fonts for|Cyrillic" +#~ msgstr "Cirílico" + +#~ msgid "select fonts for|Devanagari" +#~ msgstr "Devanagari" + +#~ msgid "select fonts for|Greek" +#~ msgstr "Griego" + +#~ msgid "select fonts for|Hebrew" +#~ msgstr "Hebreo" + +#~ msgid "select fonts for|Japanese" +#~ msgstr "Japonés" + +#~ msgid "select fonts for|Korean" +#~ msgstr "Coreano" + +#~ msgid "select fonts for|Simplified Chinese" +#~ msgstr "Chino simplificado" + +#~ msgid "select fonts for|Tamil" +#~ msgstr "Tamil" + +#~ msgid "select fonts for|Thai" +#~ msgstr "Tailandés" + +#~ msgid "select fonts for|Traditional Chinese" +#~ msgstr "Chino tradicional" + +#~ msgid "select fonts for|Traditional Chinese (Hong Kong)" +#~ msgstr "Chino tradicional (Hong Kong)" + +#~ msgid "select fonts for|Turkish" +#~ msgstr "Turco" + +#~ msgid "select fonts for|Armenian" +#~ msgstr "Armenio" + +#~ msgid "select fonts for|Bengali" +#~ msgstr "Bengalí" + +#~ msgid "select fonts for|Unified Canadian Syllabics" +#~ msgstr "Silábico unificado canadiense" + +#~ msgid "select fonts for|Ethiopic" +#~ msgstr "Etíope" + +#~ msgid "select fonts for|Georgian" +#~ msgstr "Georgiano" + +#~ msgid "select fonts for|Gujarati" +#~ msgstr "Gujarati" + +#~ msgid "select fonts for|Gurmukhi" +#~ msgstr "Gurmukhi" + +#~ msgid "select fonts for|Khmer" +#~ msgstr "Khmer" + +#~ msgid "select fonts for|Malayalam" +#~ msgstr "Malayalam" + +#~ msgid "select fonts for|Western" +#~ msgstr "Occidental" + +#~ msgid "select fonts for|Other Scripts" +#~ msgstr "Otras escrituras" + +#~ msgid "bookmarks|All" +#~ msgstr "Todos" + +#~ msgid "toolbar style|Default" +#~ msgstr "Predeterminado" + +#~ msgid "Opening %s" +#~ msgstr "Abriendo %s" + +#~ msgid "Opening %d Item" +#~ msgid_plural "Opening %d Items" +#~ msgstr[0] "Abriendo %d elemento" +#~ msgstr[1] "Abriendo %d elementos" + +#~ msgid "Unsafe protocol." +#~ msgstr "Protocolo inseguro." + +#~ msgid "" +#~ "The address has not been loaded, because it refers to an unsafe protocol " +#~ "and thereby presents a security risk to your system." +#~ msgstr "" +#~ "La dirección no se ha cargado, porque se refiere a un protocolo inseguro " +#~ "y por consiguiente presenta un riesgo de seguridad para su sistema." + +#~ msgid "No address found." +#~ msgstr "No se encontró ninguna dirección." + +#~ msgid "No web address could be found in this file." +#~ msgstr "No se pudo encontrar ninguna dirección web en este archivo." + +#~ msgid "Epiphany Desktop File Plugin" +#~ msgstr "Complemento de archivo de escritorio de Epiphany" + +#~ msgid "" +#~ "This plugin handles “.desktop” and “.url” files containing web links." +#~ msgstr "" +#~ "Este complemento manipula los archivos «.desktop» y «.url» que contienen " +#~ "enlaces web." diff -Nru epiphany-browser-3.16.3/po/fi.po epiphany-browser-3.18.0/po/fi.po --- epiphany-browser-3.16.3/po/fi.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/fi.po 2015-09-11 08:43:26.000000000 +0000 @@ -18,8 +18,8 @@ "Project-Id-Version: epiphany\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-03 16:38+0000\n" -"PO-Revision-Date: 2015-03-03 20:58+0200\n" +"POT-Creation-Date: 2015-09-05 15:46+0000\n" +"PO-Revision-Date: 2015-09-05 19:48+0300\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: suomi \n" "Language: fi\n" @@ -58,51 +58,68 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "Gnomen verkkoselain" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" -msgstr "Verkkoselain Gnomelle" +msgstr "Selain Gnomelle" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." +msgstr "" +"Selain Gnome-työpöydälle, jonka selkeän käyttöliittymän avustuksella pystyt " +"keskittyä tärkeimpään, eli sivujen sisältöön. Jos etsit helppokäyttöistä ja " +"selkeää selainta, löysit sen juuri." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." msgstr "" -"Nettiselain Gnome-työpöydälle, jonka selkeän käyttöliittymän avustuksella " -"pystyt keskittyä tärkeimpään, eli sivujen sisältöön." +"Gnomen verkkoselaimesta käytetään usein myös sen alkuperäistä nimeä; " +"Epiphany." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Verkko" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "WWW-selain" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany-selain" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Selaa verkkosivuja" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;browser;internet;netti;selain;" +#: ../data/epiphany.desktop.in.h:6 +#| msgid "New _Incognito Window" +msgid "New Incognito Window" +msgstr "Uusi incognito-ikkuna" + #: ../data/org.gnome.epiphany.gschema.xml.h:1 msgid "Browse with caret" msgstr "Selaa kohdistinselaustilassa" @@ -165,7 +182,6 @@ msgstr "Muista salasanat" #: ../data/org.gnome.epiphany.gschema.xml.h:20 -#| msgid "Whether to store and prefill passwords in web sites." msgid "Whether to store and prefill passwords in websites." msgstr "" "Tallennetaanko sivustojen salasanat ja käytetäänkö salasanakenttien " @@ -225,18 +241,17 @@ msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Työkalupalkin tyyli" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Työkalupalkin tyyli. Sallitut arvot ovat \"\" (käytä Gnomen oletustyyliä), " -"\"both\" (teksti ja kuvakkeet), \"both-horiz\" (text kuvakkeiden vieressä), " -"\"icons\", ja \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -529,19 +544,19 @@ msgid "Installed on:" msgstr "Asennettu:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Poista yleisnäkymästä" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Useimmin vieraillut" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Poista yleisnäkymästä" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Yksityinen selaus" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -551,18 +566,14 @@ "sivut eivät näy selaushistoriassa, ja kaikki selaukseen liittyvät tiedot " "katoavat sulkiessasi selainikkunan. Lataamasi tiedostot säilyvät." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Incognito-tila piilottaa tekemisesi vain muilta tämän tietokoneen " "käyttäjiltä." -#: ../embed/ephy-about-handler.c:557 -#| msgid "" -#| "Incognito mode will not hide your activity from your employer, your " -#| "Internet Service Provider, your government, or the websites that you " -#| "visit." +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -576,17 +587,17 @@ msgid "Blank page" msgstr "Tyhjä sivu" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Paina %s poistuaksesi koko näytön tilasta" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -939,67 +950,60 @@ msgid "Find next occurrence of the search string" msgstr "Etsi haettavan merkkijonon seuraava esiintymä" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Tallenna" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Älä tallenna" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Tallenna" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Haluatko tallentaa salasanasi sivustolle \"%s\"?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Älä salli" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Salli" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Sivu %s haluaa tietää sijaintisi." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format -#| msgid "The page at %s wants to know your location." msgid "The page at %s wants to show desktop notifications." msgstr "Sivu %s haluaa näyttää työpöytäilmoituksia." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Ladataan ”%s”…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Ladataan…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 -#| msgid "" -#| "This web site presented identification that belongs to a different web " -#| "site." +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Tämä verkkosivusto esitti toiselle sivustolle kuuluvan tunnisteen." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 -#| msgid "" -#| "This web site’s identification is only valid for future dates. Check the " -#| "date on your computer’s calendar." +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1008,29 +1012,20 @@ "Varmista, että tietokoneesi aika ja päivä ovat oikein." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 -#| msgid "" -#| "This web site’s identification has been revoked by the trusted " -#| "organization that issued it." +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Tämän sivuston tunnistetta ei myönnetty luotetun organisaation toimesta." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 -#| msgid "" -#| "This web site’s identification could not be processed. It may be " -#| "corrupted." +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" "Tämän sivuston tunnistetta ei voitu käsitellä. Tunniste saattaa olla rikki." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 -#| msgid "" -#| "This web site’s identification has been revoked by the trusted " -#| "organization that issued it." +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1038,10 +1033,7 @@ "Tämän sivuston tunniste on kumottu tunnisteen myöntäneen tahon toimesta." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 -#| msgid "" -#| "This web site’s identification could not be processed. It may be " -#| "corrupted." +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1050,10 +1042,7 @@ "salausta." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 -#| msgid "" -#| "This web site’s identification is only valid for future dates. Check the " -#| "date on your computer’s calendar." +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1062,17 +1051,13 @@ "tietokoneesi aika ja päivä ovat oikein." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Tämä ei välttämättä ole oikea %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 -#| msgid "" -#| "When you try to connect securely, web sites present identification to " -#| "prove that your connection has not been maliciously intercepted. There is " -#| "something wrong with this site’s identification:" +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1083,11 +1068,7 @@ "tunnistautumisessa on jotakin vialla:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 -#| msgid "" -#| "A third party may have hijacked your connection. You should continue only " -#| "if you know there is a good reason why this site does not use trusted " -#| "identification." +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1097,29 +1078,29 @@ "hyvän syyn, miksi tämä sivusto ei käytä luotettua tunnistusta." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Oikeat pankit, kaupat ja muut julkiset sivustot eivät pyydä sinua tekemään " "tätä." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Ei määritetty" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Virhe ladatessa “%s”" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Oho! Tämän sivun esittäminen epäonnistui" -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Yritä uudelleen" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Oho! Mahdollinen ongelma." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1151,20 +1132,20 @@ "p>

Selain saattaa sulkeutua uudestaan, kun sivu ladataan uudelleen. Jos " "näin tapahtuu, raportoi vika %s-kehittäjille.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Päivitä silti" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Virhe näyttäessä “%s”" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Hups!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1173,21 +1154,21 @@ "toiselle sivulle jatkaaksesi." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Varo!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Lataa silti" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1243,7 +1224,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Käyttäjän %s salasana lomakkeelle sivustolla %s" @@ -1251,7 +1232,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Salasana lomakkeessa sivustolla %s" @@ -1483,71 +1464,71 @@ msgid "_View Certificate…" msgstr "_Nä_ytä varmenne…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d sekunti jäljellä" msgstr[1] "%d sekuntia jäljellä" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d minuutti jäljellä" msgstr[1] "%d minuuttia jäljellä" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d tunti jäljellä" msgstr[1] "%d tuntia jäljellä" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d päivä jäljellä" msgstr[1] "%d päivää jäljellä" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d viikko jäljellä" msgstr[1] "%d viikkoa jäljellä" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d kuukausi jäljellä" msgstr[1] "%d kuukautta jäljellä" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Valmis" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Virhe ladattaessa: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Peru" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1120 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Avaa" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Näytä kansiossa" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Käynnistetään…" @@ -1555,20 +1536,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "T_yhjennä" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Kumoa" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Tee uudelleen" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Vedä ja pudota tämä kuvake tehdäksesi tähän sivuun osoittavan linkin" @@ -1582,7 +1563,6 @@ msgstr[1] "%d kirjanmerkkiä on samankaltaisia" #: ../src/bookmarks/ephy-bookmark-properties.c:235 -#| msgid "Add _Bookmark" msgid "Add Bookmark" msgstr "Lisää kirjanmerkki" @@ -1591,23 +1571,23 @@ msgid "“%s” Properties" msgstr "”%s” ominaisuudet" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Otsikko:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Osoite:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "_Aiheet:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Näy_tä kaikki aiheet" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1703,7 +1683,7 @@ msgstr "Luo uusi aihe" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Avaa uudessa _ikkunassa" @@ -1714,7 +1694,7 @@ msgstr "Avaa valittu kirjanmerkki uuteen ikkunaan" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Avaa uusissa _välilehdissä" @@ -1774,7 +1754,7 @@ msgstr "Leikkaa valinta" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopioi" @@ -1835,7 +1815,7 @@ msgstr "Näytä otsikkosarake" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Osoite" @@ -1932,7 +1912,7 @@ msgstr "Tuo kirjanmerkit" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Kirjanmerkit" @@ -1958,15 +1938,15 @@ msgid "File" msgstr "Tiedosto" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopioi osoite" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Aiheet" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Otsikko" @@ -2244,7 +2224,6 @@ msgstr "Fontit ja tyylit" #: ../src/resources/prefs-dialog.ui.h:22 -#| msgid "Manage _Cookies" msgid "Manage _Cookies…" msgstr "Hallitse eväst_eitä…" @@ -2270,12 +2249,10 @@ msgstr "Seuranta" #: ../src/resources/prefs-dialog.ui.h:29 -#| msgid "_Tell web sites I do not want to be tracked" msgid "_Tell websites I do not want to be tracked" msgstr "_Pyydä sivustoja olemaan seuraamatta minua" #: ../src/resources/prefs-dialog.ui.h:31 -#| msgid "Manage _Passwords" msgid "Manage _Passwords…" msgstr "H_allitse salasanoja…" @@ -2292,7 +2269,6 @@ msgstr "Voit poistaa tallennetut henkilökohtaiset tiedot." #: ../src/resources/prefs-dialog.ui.h:35 -#| msgid "Clear Personal Data" msgid "Cl_ear Personal Data…" msgstr "Tyhjennä yksityiset tiedot…" @@ -2364,11 +2340,11 @@ msgid "Other encodings" msgstr "Muut merkistöt" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Tyhjennä sivuhistoria?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2445,11 +2421,11 @@ "Käynnistys ei onnistunut seuraavan virheen takia:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Verkkoasetukset" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Sulje välilehti" @@ -2586,142 +2562,153 @@ msgstr "Avaa linkki uudessa _välilehdessä" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Avaa linkki uudessa in_cognito-ikkunassa" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Tallenna linkki _nimellä…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopioi linkin osoite" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "Kopioi s_ähköpostiosoite" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Näytä _kuva uudessa välilehdessä" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kopioi kuvan _osoite" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Tallenna kuva nimellä…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Aseta ta_ustakuvaksi" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Avaa video uuteen _ikkunaan" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Avaa video uuteen _välilehteen" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Tallenna video nimellä…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopioi videon osoite" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Avaa ääni uudessa _ikkunassa" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Avaa ääni uudessa _välilehdessä" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Tallenna äänitiedosto nimellä…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopioi äänen osoite" -#: ../src/ephy-window.c:466 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Lähettämättömän lomakkeen kenttiä on muutettu" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Jos suljet asiakirjan tästä huolimatta, menetät nämä tiedot." -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Sulje asiakirja" -#: ../src/ephy-window.c:484 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Tässä ikkunassa on latauksia meneillään" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Jos suljet tämän ikkunan, lataukset perutaan" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Sulje ikkuna ja peru lataukset" -#: ../src/ephy-window.c:1122 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Tallenna nimellä" -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Tallenna sovelluksena" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Tulosta" -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Kirjanmerkki" -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Etsi" #. Translators: This refers to text size -#: ../src/ephy-window.c:1139 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Suurempi" #. Translators: This refers to text size -#: ../src/ephy-window.c:1142 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Pienempi" -#: ../src/ephy-window.c:1164 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Edellinen" -#: ../src/ephy-window.c:1176 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Seuraava" -#: ../src/ephy-window.c:1188 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Mittakaava" -#: ../src/ephy-window.c:1197 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Uusi _välilehti" -#: ../src/ephy-window.c:1205 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Siirry useimmin vierailtuihin" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Etsi verkosta '%s'" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Tallenna linkki _nimellä" @@ -2843,19 +2830,19 @@ msgid "C_reate" msgstr "_Luo" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Ota yhteyttä osoitteessa:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Avustajat:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Aikaisemmat kehittäjät:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2872,7 +2859,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Jiri Grönroos, 2012-2015\n" @@ -2882,15 +2869,15 @@ "\n" "https://l10n.gnome.org/teams/fi/" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Gnomen verkkoselaimen sivusto" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Käytetäänkö kohdistinselaintilaa?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2900,10 +2887,25 @@ "käytöstä. Näin sivuille asetetaan liikuteltava kursori, jonka avulla sivulla " "on mahdollista liikkua. Haluatko ottaa nuolilla liikkumisen käyttöön?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Käytä" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Työkalupalkin tyyli" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Työkalupalkin tyyli. Sallitut arvot ovat \"\" (käytä Gnomen " +#~ "oletustyyliä), \"both\" (teksti ja kuvakkeet), \"both-horiz\" (text " +#~ "kuvakkeiden vieressä), \"icons\", ja \"text\"." + #~ msgid "Size of disk cache" #~ msgstr "Levyvälimuistin koko" diff -Nru epiphany-browser-3.16.3/po/fr.po epiphany-browser-3.18.0/po/fr.po --- epiphany-browser-3.16.3/po/fr.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/fr.po 2015-09-15 09:09:42.000000000 +0000 @@ -28,23 +28,23 @@ # Alain Lojewski , 2013-2015. # naybnet , 2014. # Alexandre Franke , 2014. -# Guillaume Bernard , 2014, 2015. +# Guillaume Bernard , 2014-2015. +# Erwan Georget , 2015. # msgid "" msgstr "" "Project-Id-Version: epiphany master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-05 04:38+0000\n" -"PO-Revision-Date: 2015-03-09 09:00+0100\n" -"Last-Translator: Guillaume Bernard \n" +"POT-Creation-Date: 2015-09-07 11:08+0000\n" +"PO-Revision-Date: 2015-09-07 13:19+0200\n" +"Last-Translator: Erwan Georget \n" "Language-Team: français \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Gtranslator 2.91.6\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -75,15 +75,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=fr-fr" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -93,35 +93,41 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Le navigateur Web de GNOME, profitant d'une intégration poussée avec le " "bureau et d'une interface utilisateur simple et intuitive qui vous permet de " -"vous concentrer sur les pages Web." +"vous concentrer sur les pages Web. Si vous cherchez une vue du Web qui soit " +"simple, propre et belle, c'est le navigateur qu'il vous faut." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web est souvent appelé par son nom de code, Epiphany." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Navigateur Web" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Navigateur Web Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Parcourir le Web" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;navigateur;internet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nouvelle fenêtre privée" @@ -261,18 +267,23 @@ "différent pour chaque onglet." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Style des barres d'outils" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Nombre maximum de processus web créés au même moment lors de l'utilisation " +"du modèle « un-processus-secondaire-par-vue-web »" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Style de la barre d'outils. Les valeurs autorisées sont «  » (utilise le " -"thème par défaut de GNOME), « both » (textes et icônes), « both-" -"horiz» (textes en dessous des icônes), « icons » et « text »." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Cette option indique la limite du nombre de processus web qui seront " +"utilisés en même temps lors de l'utilisation du modèle « un-processus-" +"secondaire-par-vue-web ». La valeur par défaut est « 0 », ce qui signifie " +"une absence de limite." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -425,7 +436,8 @@ "Where to accept cookies from. Possible values are \"always\", \"no-third-" "party\" and \"never\"." msgstr "" -"Acceptation des cookies. Les valeurs autorisées sont : « toujours », « sauf les cookies tiers » et « jamais »." +"Acceptation des cookies. Les valeurs autorisées sont : « toujours », « sauf " +"les cookies tiers » et « jamais »." #: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" @@ -588,19 +600,19 @@ msgid "Installed on:" msgstr "Installé le :" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Enlever de la vue d'ensemble" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Les plus visités" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Enlever de la vue d'ensemble" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Navigation privée" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -611,36 +623,40 @@ "toute information en mémoire sera détruite à la fermeture de la fenêtre. Les " "fichiers téléchargés seront conservés." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" -"Le mode incognito masque votre activité seulement aux autres utilisateurs de cet ordinateur." +"Le mode incognito masque votre activité seulement aux autres utilisateurs de " +"cet ordinateur." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " "that you visit, and advertisers on these websites may still be tracking you." msgstr "" -"Il ne masque pas votre activité à votre employeur si vous êtes au travail. Votre fournisseur d'accès à Internet, votre gouvernement, d'autres gouvernements, les sites Web que vous visitez et les publicitaires sur ces sites Web pourront toujours vous pister." +"Il ne masque pas votre activité à votre employeur si vous êtes au travail. " +"Votre fournisseur d'accès à Internet, votre gouvernement, d'autres " +"gouvernements, les sites Web que vous visitez et les publicitaires sur ces " +"sites Web pourront toujours vous pister." #. characters #: ../embed/ephy-embed.c:51 msgid "Blank page" msgstr "Page vierge" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Appuyez sur %s pour quitter le mode plein écran" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "Échap" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -993,55 +1009,56 @@ msgid "Find next occurrence of the search string" msgstr "Recherche la prochaine occurrence de la chaîne" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Enregistrer" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Ne pas enregistrer" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Enregistrer" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Voulez-vous enregistrer votre mot de passe pour « %s » ?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Interdire" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Autoriser" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "La page à %s demande votre localisation." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "" -"La page à l'adresse %s désire pouvoir afficher des notifications sur votre bureau." +"La page à l'adresse %s désire pouvoir afficher des notifications sur " +"votre bureau." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Chargement de « %s »…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Chargement…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" @@ -1049,7 +1066,7 @@ "site Web différent." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1058,14 +1075,14 @@ "fiables. Vérifiez la date sur votre ordinateur." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Les données d'identification de ce site Web n'ont pas été délivrées par une " "organisation de confiance." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1073,7 +1090,7 @@ "Elles peuvent être corrompues." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1082,15 +1099,16 @@ "l'organisation de confiance qui les a délivrées." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "" -"Les données d'identification de ce site Web ne sont pas fiables car elles utilisent un chiffrement faible." +"Les données d'identification de ce site Web ne sont pas fiables car elles " +"utilisent un chiffrement faible." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1099,13 +1117,13 @@ "future période. Vérifiez la date sur votre ordinateur." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Il se pourrait que ce ne soit pas le vrai %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1117,7 +1135,7 @@ "qui ne va pas dans les données d'identification de ce site :" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1128,29 +1146,29 @@ "identification fiable." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Les banques ou commerces légitimes et autres sites publics ne vous " "demanderont pas de faire ceci." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Aucune indication" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problème de chargement de « %s »…" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Oups ! Impossible d'afficher ce site Web" -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Essayer à nouveau" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Oups ! Il se peut qu'il y ait un problème." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1182,20 +1200,20 @@ "cela se reproduit, veuillez rapporter le problème aux développeurs " "%s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Recharger quand même" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problème d'affichage de « %s »" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Oups !" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1204,21 +1222,21 @@ "recharger ou visiter une page différente pour continuer." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Attention !" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Charger quand même" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1274,7 +1292,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Le mot de passe de %s dans un formulaire dans %s" @@ -1282,7 +1300,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Le mot de passe dans un formulaire dans %s" @@ -1515,71 +1533,71 @@ msgid "_View Certificate…" msgstr "_Voir le certificat…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "encore %d seconde" msgstr[1] "encore %d secondes" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "encore %d minute" msgstr[1] "encore %d minutes" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "encore %d heure" msgstr[1] "encore %d heures" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "encore %d jour" msgstr[1] "encore %d jours" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "encore %d semaine" msgstr[1] "encore %d semaines" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "encore %d mois" msgstr[1] "encore %d mois" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Terminé" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Erreur de téléchargement : %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Annuler" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Ouvrir" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Montrer dans son dossier" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Démarrage…" @@ -1587,20 +1605,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "E_ffacer" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "A_nnuler" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Rétablir" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Glissez et déposez cette icône pour créer un lien vers cette page" @@ -1622,23 +1640,23 @@ msgid "“%s” Properties" msgstr "Propriétés de « %s »" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Titre :" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "A_dresse :" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "_Sujets :" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "A_fficher tous les sujets" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1734,7 +1752,7 @@ msgstr "Créer un nouveau sujet" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Ouvrir dans une _nouvelle fenêtre" @@ -1745,7 +1763,7 @@ msgstr "Ouvre le signet sélectionné dans une nouvelle fenêtre" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Ouvrir dans un nouvel ongle_t" @@ -1806,7 +1824,7 @@ msgstr "Coupe la sélection" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Copier" @@ -1868,7 +1886,7 @@ msgstr "Affiche la colonne du titre" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adresse" @@ -1965,7 +1983,7 @@ msgstr "Exporter les signets" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Signets" @@ -1991,15 +2009,15 @@ msgid "File" msgstr "Fichier" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Copier l'adresse" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Sujets" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Titre" @@ -2395,11 +2413,11 @@ msgid "Other encodings" msgstr "Autres codages" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Effacer l'historique de navigation ?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2476,11 +2494,11 @@ "Le démarrage a échoué suite à l'erreur suivante :\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Options de Web" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Fermer l'onglet" @@ -2617,143 +2635,152 @@ msgstr "Ouvrir dans un nouvel ongle_t" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Ouvrir le lien dans une fenêtre i_ncognito" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Enregistrer le lien sous…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Copier l'adresse du lien" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Copier l'adresse courriel" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Afficher l'_image dans un nouvel onglet" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Copier l'adresse de l'i_mage" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Enregistrer l'image _sous…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Définir comme p_apier peint" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Ouvrir la vidéo dans une _nouvelle fenêtre" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Ouvrir la vidéo dans un nouvel ongle_t" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Enregistrer la vidéo sous…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Copier l'adresse de la vidéo" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Ouvrir l'audio dans une _nouvelle fenêtre" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Ouvrir l'audio dans un nouvel ongle_t" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Enregistrer l'audio sous…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Copier l'adresse de l'audio" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "" "Certaines modifications des éléments du formulaire n'ont pas été envoyées" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Si vous fermez malgré tout le document, vous perdrez ces informations." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Fermer le document" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Des téléchargements sont en cours dans cette fenêtre" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Si vous fermez cette fenêtre, les téléchargements seront annulés" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Fermer la fenêtre et annuler les téléchargements" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Enregistrer sous" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Enregistrer en tant qu'application" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Imprimer" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Signet" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Rechercher" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Plus grand" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Plus petit" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Précédent" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Suivant" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zoom" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nouvel ongle_t" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Aller aux plus visitées." +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Rechercher « %s » sur le Web" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Enregistrer le lien sous" @@ -2878,19 +2905,19 @@ msgid "C_reate" msgstr "C_réer" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Contactez-nous à :" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Contributeurs :" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Anciens développeurs :" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2907,7 +2934,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Christophe Fergeau \n" @@ -2934,15 +2961,15 @@ "Alain Lojewski \n" "Guillaume Bernard " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Site Web de Web" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Activer le mode de navigation au curseur ?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2953,10 +2980,25 @@ "permettant de vous déplacer avec votre clavier. Voulez-vous activer le mode " "de navigation au curseur ?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Activer" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Style des barres d'outils" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Style de la barre d'outils. Les valeurs autorisées sont «  » (utilise le " +#~ "thème par défaut de GNOME), « both » (textes et icônes), « both-" +#~ "horiz» (textes en dessous des icônes), « icons » et « text »." + #~ msgid "Size of disk cache" #~ msgstr "Taille du cache du disque" diff -Nru epiphany-browser-3.16.3/po/gl.po epiphany-browser-3.18.0/po/gl.po --- epiphany-browser-3.16.3/po/gl.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/gl.po 2015-09-08 11:37:53.000000000 +0000 @@ -12,22 +12,20 @@ # Fran Diéguez , 2009, 2010, 2011, 2012. # Leandro Regueiro , 2012. # Fran Dieguez , 2012, 2013, 2014, 2015. -# msgid "" msgstr "" "Project-Id-Version: epiphany-master-po-gl-47333.merged\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=epiphany\n" -"POT-Creation-Date: 2015-03-03 23:30+0100\n" -"PO-Revision-Date: 2015-03-03 23:30+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-25 16:25+0200\n" +"PO-Revision-Date: 2015-08-25 16:27+0200\n" "Last-Translator: Fran Dieguez \n" -"Language-Team: Galician <>\n" +"Language-Team: gnome-l10n-gl@gnome.org\n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" #: ../data/default-bookmarks.rdf.in.h:1 @@ -58,53 +56,58 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" -msgstr "Navegador web de GNOME" +msgstr "Navegador web para GNOME" #: ../data/epiphany.appdata.xml.in.h:3 msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "O navegador web para GNOME conta cunha grande integración co escritorio e " "unha interface de usuario simple e intuitiva que lle permite enfocarse nas " "súas páxinas web." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web é normalmente chamado polo seu nome en código, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Navegador web" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Navegador web Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Navegar pola web" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;navegador;internet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nova xanela Incógnito" @@ -237,18 +240,22 @@ "web por cada lapela." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Estilo da barra de ferramentas" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Número máximo de procesos web creados ao mesmo tempo ao usar o modelo «one-" +"secondary-process-per-web-view»" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Estilo da barra de ferramentas. Os valores permitidos son \"\" (usar o " -"estilo predefinido do GNOME), «both» (texto e iconas), «both-horiz» (texto " -"ao lado das iconas), «icons» e «text»." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Esta opción estabelece o límite no número de procesos web que poderán ser " +"usados ao mesmo tempo para o modelo «one-secondary-process-per-web-view». O " +"valor por omisión é «0» e significa sen límite." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -562,19 +569,19 @@ msgid "Installed on:" msgstr "Activado o:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Eliminar da vista previa" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Máis visitadas" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Eliminar da vista previa" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Navegación privada" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -584,14 +591,14 @@ "neste modo non se mostrarán no historial de navegación e toda a información " "será limpada cando peche a xanela. Os ficheiros que descargue manteranse." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "O modo incógnito ocultalle a súa actividade a outras persoas usando este " "computador." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -970,54 +977,54 @@ msgid "Find next occurrence of the search string" msgstr "Busca a seguinte aparición da cadea de busca" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Gardar" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Non gardar" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Gardar" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Desexa gardar o seu contrasinal para «%s»?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Denegar" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Permitir" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "A páxina %s quere saber a súa localización." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "A páxina en %s quere mostrar notificacións de escritorio" #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Cargando «%s»…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Cargando…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" @@ -1025,7 +1032,7 @@ "distinto." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1034,14 +1041,14 @@ "Comprobe a data no calendario do seu computador." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "A identificación deste sitio web non foi creada por unha organización " "confiábel." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1049,7 +1056,7 @@ "corrompida." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1057,7 +1064,7 @@ "A identificación deste sitio web foi revocada pola organización que a creou." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1066,7 +1073,7 @@ "débil." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1075,13 +1082,13 @@ "a data do seu computador." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Isto podería non ser real %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1092,7 +1099,7 @@ "maliciosa. Hai algo incorrecto coa identificación deste sitio:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1103,29 +1110,29 @@ "identificación confiábel." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Os bancos, tendas e outros sitios públicos lexítimos non lle preguntarán por " "isto." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Non especificado" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problema ao cargar «%s»" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Recoiro! Non foi posíbel mostrar esta páxina web." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Tentar de novo" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Recoiro! Pode haber un problema." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1157,20 +1164,20 @@ "isto volve a pasar, informe do problema aos desenvolvedores de %s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Recargar de todos modos" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problema ao mostrar «%s»" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Oops!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1179,21 +1186,21 @@ "páxina distinta para continuar." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Coidado!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Cargar de todos modos" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_Aceptar" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1249,7 +1256,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Os contrasinais para %s nun formulario en %s" @@ -1257,7 +1264,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "O contrasinal nun formulario en %s" @@ -1488,71 +1495,71 @@ msgid "_View Certificate…" msgstr "_Ver certificado…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "queda %d segundo" msgstr[1] "quedan %d segundos" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "queda %d minuto" msgstr[1] "quedan %d minutos" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "queda %d hora" msgstr[1] "quedan %d horas" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "queda %d día" msgstr[1] "quedan %d días" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "queda %d semanas" msgstr[1] "quedan %d semanas" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "queda %d mes" msgstr[1] "quedan %d meses" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Rematado" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Produciuse un erro ao descargar: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Cancelar" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1120 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Abrir" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Mostrar no cartafol" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Iniciando…" @@ -1560,20 +1567,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "Limp_ar" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Desfacer" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Refacer" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Arrastrar e soltar esta icona para crear unha ligazón a esta páxina" @@ -1595,23 +1602,23 @@ msgid "“%s” Properties" msgstr "«%s» propiedades" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Título:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "En_derezo:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Te_mas:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Mostra_r todos os temas" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1707,7 +1714,7 @@ msgstr "Crear un tema novo" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Abrir nunha _xanela nova" @@ -1718,7 +1725,7 @@ msgstr "Abrir o marcador seleccionado nunha xanela nova" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Abrir nunha _lapela nova" @@ -1778,7 +1785,7 @@ msgstr "Cortar a selección" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Copiar" @@ -1839,7 +1846,7 @@ msgstr "Mostrar a columna de título" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Enderezo" @@ -1936,7 +1943,7 @@ msgstr "Exportar marcadores" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Marcadores" @@ -1962,15 +1969,15 @@ msgid "File" msgstr "Ficheiro" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Copiar o enderezo" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Temas" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Título" @@ -2032,8 +2039,7 @@ "Non pode desfacer esta acción. Os datos que está escollendo para limpar " "eliminarase para sempre." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Cookies" @@ -2364,11 +2370,11 @@ msgid "Other encodings" msgstr "Outras codificacións" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Quere limpar o historial de navegación?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2445,11 +2451,11 @@ "O inicio fallou polo seguinte erro:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Opcións de Web" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Pechar a lapela" @@ -2586,142 +2592,151 @@ msgstr "Abrir ligazón nunha _lapela nova" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Abrir a ligazón nunha xanela de i_ncógnito" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Gardar a ligazón como…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Copiar o enderezo da ligazón" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Copiar enderezo de correo" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Ver _imaxe nunha lapela nova" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Copiar o enderezo da i_maxe" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Gardar a imaxe como…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Definir como _fondo do escritorio" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Abrir vídeo nunha nova _xanela" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Abrir vídeo nunha _lapela nova" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Gardar vídeo como…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Copiar enderezo do vídeo" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Abrir audio nunha _xanela nova" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Abrir audio nunha _lapela nova" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Gardar audio como…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Copiar enderezo do audio" -#: ../src/ephy-window.c:466 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Hai cambios non enviados nos elementos do formulario" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Se pecha o documento perderá esa información." -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Pechar o documento" -#: ../src/ephy-window.c:484 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Hai descargas en curso nesta xanela" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Se pecha esta xanela, cancelaranse as descargas" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Pechar a xanela e cancelar as descargas" -#: ../src/ephy-window.c:1122 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Gardar como" -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Gardar como aplicativo" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Imprimir" -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Marcador" -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Buscar" #. Translators: This refers to text size -#: ../src/ephy-window.c:1139 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Máis grande" #. Translators: This refers to text size -#: ../src/ephy-window.c:1142 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Máis pequeno" -#: ../src/ephy-window.c:1164 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Atrás" -#: ../src/ephy-window.c:1176 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Adiante" -#: ../src/ephy-window.c:1188 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zoom" -#: ../src/ephy-window.c:1197 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "_Lapela nova" -#: ../src/ephy-window.c:1205 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Ir á máis visitada" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Busca no web por «%s»" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Gardar a ligazón como" @@ -2842,19 +2857,19 @@ msgid "C_reate" msgstr "C_rear" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Contacte con nós en:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Colaboradores:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Desenvolvedores anteriores:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2871,7 +2886,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Leandro Regueiro , 2012.\n" @@ -2887,15 +2902,15 @@ "Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas\n" "colaborar connosco, podes atopar máis información en http://www.trasno.net" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Sitio web de Web" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Quere activar o modo de navegación co cursor?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2906,10 +2921,25 @@ "web, permitíndolle moverse co seu teclado. Quere activar o modo de " "navegación con cursor?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Activar" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Estilo da barra de ferramentas" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Estilo da barra de ferramentas. Os valores permitidos son \"\" (usar o " +#~ "estilo predefinido do GNOME), «both» (texto e iconas), «both-" +#~ "horiz» (texto ao lado das iconas), «icons» e «text»." + #~ msgid "Size of disk cache" #~ msgstr "Tamaño da caché do disco" @@ -3472,9 +3502,6 @@ #~ msgid "Address Entry" #~ msgstr "Entrada de enderezo" -#~ msgid "GNOME Web Browser" -#~ msgstr "Navegador web do GNOME" - #~ msgid "GNOME Web Browser options" #~ msgstr "Opcións do navegador web de GNOME" diff -Nru epiphany-browser-3.16.3/po/he.po epiphany-browser-3.18.0/po/he.po --- epiphany-browser-3.16.3/po/he.po 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/he.po 2015-09-08 11:37:53.000000000 +0000 @@ -10,10 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: epiphany.HEAD.he\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=epiphany\n" -"POT-Creation-Date: 2015-03-03 23:08+0200\n" -"PO-Revision-Date: 2015-03-03 23:08+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-30 10:58+0300\n" +"PO-Revision-Date: 2015-08-30 10:58+0300\n" "Last-Translator: Yosef Or Boczko \n" "Language-Team: עברית <>\n" "Language: he\n" @@ -21,7 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n>2||n==0) ? 1 : 2;\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -51,15 +50,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=il-he&kad=he_IL" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "דפדפן האינטרנט של GNOME" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -69,34 +68,40 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "דפדפן האינטרנט עבור GNOME, הכולל שילוב הדוק עם שולחן העבודה וממשק משתמש " -"פשוט המאפשר לך להתמקד בדפי האינטרנט שלך." +"פשוט המאפשר לך להתמקד בדפי האינטרנט שלך. אם חיפשת תצוגה פשוטה, נקייה ויפה של " +"האינטרנט, דפדפן זה עבורך." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "דפדפן GNOME מכונה לעתים קרובות בשם הקוד שלו, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "דפדפן" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "דפדפן אינטרנט" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" -msgstr "דפדפן Epiphany" +msgstr "דפדפן האינטרנט Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "גלישה ברשת" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "דפדפן;רשת;אינטרנט;מרשתת;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "חלון גלישת סתר חדש" @@ -226,18 +231,22 @@ "secondary-process-per-web-view' to use a different web process for each tab." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Toolbar style" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -545,19 +554,19 @@ msgid "Installed on:" msgstr "הותקן בתאריך:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "הסרה מהסקירה" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "הנצפים ביותר" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "הסרה מהסקירה" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "גלישה פרטית" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -567,12 +576,12 @@ "בהיסטוריית הגלישה שלך וכל הפרטים שנשמרים יימחקו עם סגירת החלון. קבצים שהורדת " "יישמרו." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "מצב גלישת סתר מסתיר את הפעילות שלך רק מאנשים המשתמשים במחשב זה." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -950,60 +959,60 @@ msgid "Find next occurrence of the search string" msgstr "חיפוש המופע הבא של המילה או הביטוי" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_שמירה" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_לא לשמור" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_שמירה" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "האם ברצונך לשמור ססמה עבור „%s”?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "דחייה" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "אישור" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "העמוד בכתובת %s מעוניין לדעת את מיקומך." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "העמוד בכתובת %s מבקש להציג התרעות על שולחן העבודה." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "‏„%s“ בטעינה…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "בטעינה…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "אתר אינטרנט זה מציג מזהה השייך לאתר אינטרנט אחר." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1012,25 +1021,25 @@ "המחשב שלך." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "מזהה אתר אינטרנט זה לא הונפק על ידי מנפיק מהימן." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "מזהה אתר אינטרנט זה לא ניתן לעיבוד. יתכן והוא פגום." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." msgstr "מזהה אתר אינטרנט זה נשלל על ידי הארגון המהימן שהנפיק אותו." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1038,7 +1047,7 @@ "לא ניתן לבטוח במזהה אתר אינטרנט זה כיוון שהוא עושה שימוש בהצפנה חלשה מאוד." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1047,13 +1056,13 @@ "של המחשב שלך." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "יתכן ואתר זה מתחזה ל־%s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1063,7 +1072,7 @@ "שלך לא יורט בזדון. מזהה אתר אינטרנט אינו תקין:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1073,27 +1082,27 @@ "בגללה אתר זה לא משתמש במזהה מהימן." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "בנקים חוקיים, חנויות ואתרים ציבוריים נוספים לא יבקשו ממך לעשות זאת." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "לא צוינה" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "בעיה בטעינת „%s”" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "אופס! לא ניתן להציג אתר זה." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:בהחלט יתכן כי האתר אינו זמין באופן זמני או שהועבר לכתובת חדשה. מומלץ לוודא " "כי חיבור האינטרנט פועל כראוי.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "ניסיון חוזר" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "אופס! יתכן ויש בעיה." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1123,20 +1132,20 @@ "

יתכן ואתר זה גרם לדפדפן להסגר באופן בלתי צפוי.

אם זה קורה שוב נא " "לדווח על התקלה למפתחי %s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "לטעון מחדש בכל זאת" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "בעיה בהצגת „%s”" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "אופס!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1144,21 +1153,21 @@ "משהו השתבש במהלך ההצגה של עמוד זה. נא לרענן או לבקר בעמוד אחר כדי להמשיך." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "זהירות!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "לטעון בכל זאת" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_אישור" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1214,7 +1223,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "ססמה עבור %s תצורת %s" @@ -1222,7 +1231,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "ססמה בטופס שב־%s" @@ -1450,7 +1459,7 @@ msgid "_View Certificate…" msgstr "_הצגת אישור…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1458,7 +1467,7 @@ msgstr[1] "נותרו %d שניות" msgstr[2] "נותרו שתי שניות" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1466,7 +1475,7 @@ msgstr[1] "נותרו %d דקות" msgstr[2] "נותרו שתי דקות" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1474,7 +1483,7 @@ msgstr[1] "נותרו %d שעות" msgstr[2] "נותרו שעתיים" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1482,7 +1491,7 @@ msgstr[1] "נותרו %d ימים" msgstr[2] "נותרו יומיים" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1490,7 +1499,7 @@ msgstr[1] "נותרו %d שבועות" msgstr[2] "נותרו שבועיים" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1498,29 +1507,29 @@ msgstr[1] "נותרו %d חודשים" msgstr[2] "נותרו חודשיים" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "הסתיימה" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "שגיאה בהורדה: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "ביטול" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1120 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "פתיחה" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "הצגה בתיקייה" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "הפעלה…" @@ -1528,20 +1537,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_ניקוי" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "בי_טול פעולה" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_ביצוע שוב" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "יש לגרור ולשחרר סמל זה כדי ליצור קישור לדף זה" @@ -1564,23 +1573,23 @@ msgid "“%s” Properties" msgstr "מאפייני „%s“" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_כותרת:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_כתובת:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "_נושאים:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "הצגת _כל הנושאים" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1676,7 +1685,7 @@ msgstr "יצירת נושא חדש" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "פתיחה ב_חלון חדש" @@ -1688,7 +1697,7 @@ msgstr "פתיחת הסימנייה הנבחרת בחלון חדש" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "פתיחה ב_לשונית חדשה" @@ -1749,7 +1758,7 @@ msgstr "גזירת הבחירה" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_העתקה" @@ -1810,7 +1819,7 @@ msgstr "הצגת עמודת הכותרת" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "כתובת" @@ -1905,7 +1914,7 @@ msgstr "יצוא סימניות" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "סימניות" @@ -1931,15 +1940,15 @@ msgid "File" msgstr "קובץ" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "ה_עתקת הכתובת" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "נושאים" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "כותרת" @@ -1999,8 +2008,7 @@ "removed forever." msgstr "לא ניתן לבטל פעולה זו. המידע שייבחר לפינוי יימחק לצמיתות." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "עוגיות" @@ -2332,11 +2340,11 @@ msgid "Other encodings" msgstr "קידודים אחרים" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "האם לנקות את היסטוריית הדפדוף?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2411,11 +2419,11 @@ "Startup failed because of the following error:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Web options" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "סגירת הלשונית" @@ -2552,142 +2560,151 @@ msgstr "פתיחת הקישור ב_לשונית חדשה" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "פתיחת הקישור בחלון גלישת _סתר חדש" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_שמירת הקישור בשם…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "ה_עתקת כתובת הקישור" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "העתקת כתובת _דוא״ל" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "הצגת ת_מונה בלשונית חדשה" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "ה_עתקת כתובת התמונה" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "שמירת התמונה ב_שם…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "הגדרה כ_רקע שולחן העבודה" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "פתיחה סרטון ב_חלון חדש" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "פתיחה סרטון ב_לשונית חדשה" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_שמירת סרטון בשם…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "ה_עתקת כתובת הסרטון" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "פתיחה שמע ב_חלון חדש" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "פתיחה שמע ב_לשונית חדשה" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_שמירת שמע בשם…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "ה_עתקת כתובת השמע" -#: ../src/ephy-window.c:466 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "ישנם שינויים שלא נשלחו" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "אם המסמך ייסגר בכל זאת, המידע הזה יאבד." -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "סגירת ה_מסמך" -#: ../src/ephy-window.c:484 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "ישנן הורדות פעילות בחלון זה" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "אם חלון זה ייסגר על ידיך, ההורדות יבוטלו" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "סגירת החלון וביטול ההורדות" -#: ../src/ephy-window.c:1122 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "שמירה בשם" -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "שמירה כיישום" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "הדפסה" -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "סימנייה" -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "חיפוש" #. Translators: This refers to text size -#: ../src/ephy-window.c:1139 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "גדול יותר" #. Translators: This refers to text size -#: ../src/ephy-window.c:1142 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "קטן יותר" -#: ../src/ephy-window.c:1164 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "אחורה" -#: ../src/ephy-window.c:1176 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "קדימה" -#: ../src/ephy-window.c:1188 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "תקריב" -#: ../src/ephy-window.c:1197 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "ל_שונית חדשה" -#: ../src/ephy-window.c:1205 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "מעבר לנצפים ביותר" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "חיפוש באינטרנט עבור ׳%s׳" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "שמירת הקישור בשם" @@ -2809,19 +2826,19 @@ msgid "C_reate" msgstr "י_צירה" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "ניתן ליצור אתנו קשר דרך:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "תורמים:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "מפתחים בעבר:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2838,7 +2855,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "רועי קרשטיין \n" @@ -2850,15 +2867,15 @@ "מיזם תרגום GNOME לעברית:\n" "‏http://gnome-il.berlios.de" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "אתר אינטרנט בדפדפן" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "האם לאפשר מצב ניווט באמצעות סמן?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2868,10 +2885,25 @@ "באתרי אינטרנט המאפשר לך לנווט באמצעות המקלדת. האם ברצונך להפעיל גלישה " "באמצעות סמן?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "ה_פעלה" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Toolbar style" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." + #~ msgid "Size of disk cache" #~ msgstr "Size of disk cache" @@ -3437,9 +3469,6 @@ #~ msgid "_Download" #~ msgstr "הו_רדה" -#~ msgid "GNOME Web Browser" -#~ msgstr "דפדפן האינטרנט של GNOME" - #~ msgid "GNOME Web Browser options" #~ msgstr "GNOME Web Browser options" diff -Nru epiphany-browser-3.16.3/po/hu.po epiphany-browser-3.18.0/po/hu.po --- epiphany-browser-3.16.3/po/hu.po 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/hu.po 2015-09-08 11:37:53.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: epiphany master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-05 16:39+0000\n" -"PO-Revision-Date: 2015-03-06 00:12+0100\n" +"POT-Creation-Date: 2015-08-31 03:45+0000\n" +"PO-Revision-Date: 2015-08-31 17:39+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -52,15 +52,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=hu-hu&kad=hu_HU" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -70,36 +70,41 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"A webböngésző a GNOME asztalhoz, amely szorosan integrálódik az asztalba és " -"egy egyszerű és intuitív felhasználói felület, amely lehetővé teszi a " -"weboldalakra való összpontosítást." +"A webböngésző a GNOME-hoz, amely szorosan integrálódik az asztalba és egy " +"egyszerű és intuitív felhasználói felület, amely lehetővé teszi a " +"weboldalakra való összpontosítást. Ha a web egyszerű, letisztult, gyönyörű " +"nézetét keresi, akkor ez az ön böngészője." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "A GNOME Webre gyakran annak kódnevével, Epiphany néven hivatkoznak." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Webböngésző" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany webböngésző" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "A világháló böngészése" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;böngésző;internet;net;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Új inkognitóablak" @@ -231,18 +236,22 @@ "view” - külön webfolyamat használata minden laphoz." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Eszköztár stílusa" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Azonos időben létrehozott webfolyamatok legnagyobb száma a " +"„one-secondary-process-per-web-view” modell használatakor" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Az eszköztár stílusa. A lehetséges értékek: „” (a GNOME alapértelmezett " -"stílusának használata) „both” (szöveg és ikonok), „both-horiz” (szöveg az " -"ikonok mellett), „icons” (ikonok), és „text” (szöveg)." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Ez a beállítás egy korlátot állít be azon webfolyamatok számához, amelyek " +"ugyanabban az időben lesznek használva a „one-secondary-process-per-web-view” " +"modellnél. Az alapértelmezett érték „0”, és azt jelenti, hogy nincs korlát." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -550,19 +559,19 @@ msgid "Installed on:" msgstr "Telepítve ekkor:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Eltávolítás az áttekintésből" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Leggyakrabban látogatott" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Eltávolítás az áttekintésből" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privát böngészés" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -573,14 +582,14 @@ "információ törlésre kerül az ablak bezárásakor. A letöltött fájlok meg " "lesznek tartva." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Az inkognitó mód csak az ezt a számítógépet használó emberek elől rejti el a " "tevékenységét." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -959,40 +968,40 @@ msgid "Find next occurrence of the search string" msgstr "A szó vagy kifejezés következő előfordulása az oldalon" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "M_entés" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Ne mentse" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "M_entés" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Szeretné elmenteni a jelszavát a(z) „%s” weboldalhoz?" # FF-másolás :) -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Titok" # FF-másolás :) -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Megosztás" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "%s tudni szeretné az Ön tartózkodási helyét." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "" @@ -1000,17 +1009,17 @@ "megjeleníteni." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "„%s” betöltése…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Betöltés…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" @@ -1018,7 +1027,7 @@ "tartozik." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1027,14 +1036,14 @@ "dátumot a számítógépe naptárában." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Ennek a weboldalnak az azonosítóját nem egy megbízható szervezet bocsájtotta " "ki." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1042,7 +1051,7 @@ "lehet." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1051,7 +1060,7 @@ "amely kibocsájtotta azt." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1060,7 +1069,7 @@ "titkosítást használ." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1069,13 +1078,13 @@ "Ellenőrizze a dátumot a számítógépe naptárában." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Ez nem biztos, hogy a valódi %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1087,7 +1096,7 @@ "azonosítójával:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1098,29 +1107,29 @@ "megbízható azonosítóját." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "A törvényes bankok, boltok és egyéb nyilvános oldalak nem fogják arra kérni, " "hogy ezt tegye." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Nincs megadva" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Hiba a(z) „%s” betöltése közben" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Jaj! A weboldal tartalma nem jeleníthető meg." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Próbálja újra" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Jaj! Hiba történhetett." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1152,20 +1161,20 @@ "újra megtörténik, akkor jelentse a problémát a(z) %s " "fejlesztőinek.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Betöltés mindenképp" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "A(z) „%s” megjelenítése közben probléma lépett fel" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Hopp!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1174,21 +1183,21 @@ "másik oldalt a folytatáshoz." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Vigyázzon!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Betöltés mindenképp" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1244,7 +1253,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "%s jelszava az űrlapon a(z) %s helyen" @@ -1252,7 +1261,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Jelszó egy űrlapon a(z) %s helyen" @@ -1482,71 +1491,71 @@ msgid "_View Certificate…" msgstr "_Tanúsítvány megtekintése…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d másodperc van hátra" msgstr[1] "%d másodperc van hátra" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d perc van hátra" msgstr[1] "%d perc van hátra" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d óra van hátra" msgstr[1] "%d óra van hátra" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d nap van hátra" msgstr[1] "%d nap van hátra" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d hét van hátra" msgstr[1] "%d hét van hátra" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d hónap van hátra" msgstr[1] "%d hónap van hátra" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Befejeződött" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Hiba a letöltéskor: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Mégse" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Megnyitás" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Megjelenítés a mappában" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Indítás…" @@ -1554,20 +1563,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_Törlés" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Visszavonás" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "Új_ra" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "" "Húzza és ejtse ezt az ikont egy erre az oldalra mutató link létrehozásához" @@ -1590,23 +1599,23 @@ msgid "“%s” Properties" msgstr "„%s” tulajdonságai" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Cím:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Webcím:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Téma_körök:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Min_den témakör megjelenítése" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1702,7 +1711,7 @@ msgstr "Új témakör létrehozása" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Megnyitás új _ablakban" @@ -1713,7 +1722,7 @@ msgstr "A kijelölt könyvjelző megnyitása új ablakban" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Megnyi_tás új lapon" @@ -1774,7 +1783,7 @@ msgstr "A kijelölés kivágása" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Másolás" @@ -1835,7 +1844,7 @@ msgstr "A cím oszlop megjelenítése" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Webcím" @@ -1932,7 +1941,7 @@ msgstr "Könyvjelzők exportálása" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Könyvjelzők" @@ -1958,15 +1967,15 @@ msgid "File" msgstr "Fájl" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Cím másolása" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Témakörök" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Cím" @@ -2361,11 +2370,11 @@ msgid "Other encodings" msgstr "Egyéb kódolások" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Törli az előzményeket?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2442,11 +2451,11 @@ "Az indítás a következő hiba miatt meghiúsult:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Web beállításai" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Lap bezárása" @@ -2583,142 +2592,151 @@ msgstr "Hivatkozás megnyitása új _lapon" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Hivatkozás megnyitása i_nkognitó ablakban" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Hivatkozás _mentése másként…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Hivatkozás _címének másolása" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "E-_mail cím másolása" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "_Kép megtekintése új lapon" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kép címé_nek másolása" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Ké_p mentése másként…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Beállítás _háttérképként" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Videó megnyitása új _ablakban" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Videó megnyitása új _lapon" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Videó _mentése másként…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "Videó _címének másolása" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Hang megnyitás új _ablakban" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Hang megnyitása új _lapon" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Hang _mentése másként…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "Hang _címének másolása" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Még vannak elküldetlen változtatások az űrlap elemein" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Ha mindenképp bezárja ezt a dokumentumot, elveszti ezt az információt." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Dokumentum bezárása" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Az ablakban letöltések vannak folyamatban" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Ha bezárja ezt az ablakot, akkor a letöltések megszakadnak" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Ablak bezárása, és letöltések megszakítása" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Mentés másként" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Mentés alkalmazásként…" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Nyomtatás" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Könyvjelző" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Keresés" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Nagyobb" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Kisebb" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Vissza" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Előre" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Nagyítás" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Új _lap" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Ugrás a legtöbbször meglátogatottra" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "„%s” keresése a világhálón" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Hivatkozás mentése másként" @@ -2840,19 +2858,19 @@ msgid "C_reate" msgstr "_Létrehozás" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Lépjen velünk kapcsolatba:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Hozzájárultak:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Korábbi fejlesztők:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2869,7 +2887,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Dvornik László \n" @@ -2878,15 +2896,15 @@ "Meskó Balázs \n" "Tímár András " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "A Web webhelye" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Engedélyezi a kurzoros böngészést?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2896,10 +2914,25 @@ "szolgáltatás egy mozgatható kurzort helyez el a weboldalakon, lehetővé téve " "a billentyűzettel való mozgást. Be szeretné kapcsolni a kurzoros böngészést?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Engedélyezés" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Eszköztár stílusa" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Az eszköztár stílusa. A lehetséges értékek: „” (a GNOME alapértelmezett " +#~ "stílusának használata) „both” (szöveg és ikonok), „both-horiz” (szöveg az " +#~ "ikonok mellett), „icons” (ikonok), és „text” (szöveg)." + #~ msgid "Size of disk cache" #~ msgstr "Lemezes gyorsítótár mérete" diff -Nru epiphany-browser-3.16.3/po/id.po epiphany-browser-3.18.0/po/id.po --- epiphany-browser-3.16.3/po/id.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/id.po 2015-09-08 11:37:53.000000000 +0000 @@ -12,8 +12,8 @@ "Project-Id-Version: epiphany master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-23 16:39+0000\n" -"PO-Revision-Date: 2015-03-24 11:21+0700\n" +"POT-Creation-Date: 2015-09-01 03:45+0000\n" +"PO-Revision-Date: 2015-09-01 15:56+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -21,7 +21,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.7.1\n" +"X-Generator: Poedit 1.6.10\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -51,15 +51,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -69,35 +69,41 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Peramban web bagi GNOME, dengan fitur integrasi ketat dengan desktop dan " "antar muka yang sederhana dan intuitif yang memungkinkan Anda berfokus pada " -"halaman-halaman web Anda." +"halaman-halaman web Anda. Bila Anda mencari tampilan sederhana, bersih, dan " +"cantik dari web, ini adalah peramban untuk Anda." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web sering diacu memakai nama kodenya, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Peramban Web" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Peramban Web Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Jelajahi web" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;peramban;internet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Jendela Penyamaran Baru" @@ -226,18 +232,22 @@ "web yang berbeda bagi setiap tab." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Gaya bilah perkakas" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Cacah maksimum proses web yang dibuat secara bersamaan ketika memakai model " +"'one-secondary-process-per-web-view'" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Gaya bilah perkakas. Nilai yang diizinkan adalah \"\" (memakai gaya baku " -"GNOME), \"both\" (teks dan ikon), \"both-horiz\" (teks di samping ikon), " -"\"icons\" (ikon saja), dan \"text\" (teks saja)." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Opsi ini menata batas cacah proses web yang akan dipakai pada saat bersamaan " +"bagi model 'one-secondary-process-per-web-view'. Nilai baku '0' yang berarti " +"tanpa batas." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -549,19 +559,19 @@ msgid "Installed on:" msgstr "Dipasang pada:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Hapus dari ringkasan" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Sering Dikunjungi" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Hapus dari ringkasan" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Meramban Pribadi" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -572,14 +582,14 @@ "yang disimpan akan dibersihkan ketika Anda menutup jendela. Berkas yang " "diunduh akan dipertahankan." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Mode menyamar hanya menyembunyikan aktivitas Anda dari orang yang memakai " "komputer ini." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -595,17 +605,17 @@ msgid "Blank page" msgstr "Halaman kosong" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Tekan %s untuk keluar dari layar penuh" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -958,60 +968,60 @@ msgid "Find next occurrence of the search string" msgstr "Cari lagi kata yang dikehendaki" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Simpan" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Jangan Simpan" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Simpan" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Apakah Anda ingin menyimpan sandi Anda untuk \"%s\"?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Tolak" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Izinkan" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Halaman pada %s ingin tahu lokasi Anda." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Halaman pada %s ingin menampilkan pemberitahuan desktop." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Memuat \"%s\"…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Memuat…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Situs web ini menyajikan identifikasi milik situs web lain." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1020,19 +1030,19 @@ "pada kalender komputer Anda." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Identifikasi situs web ini tidak diterbitkan oleh organisasi yang terpercaya." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "Identifikasi situs web ini tak dapat diproses. Mungkin itu rusak." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1041,7 +1051,7 @@ "menerbitkannya." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1050,7 +1060,7 @@ "sangat lemah." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1059,13 +1069,13 @@ "tanggal pada kalender komputer Anda." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Ini mungkin bukan %s yang sebenarnya." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1076,7 +1086,7 @@ "jahat. Ada sesuatu yang salah dengan identifikasi situs web ini:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1087,29 +1097,29 @@ "identifikasi yang terpercaya." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Bank, toko, dan situs publik lain yang sah tak akan meminta Anda melakukan " "hal ini." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Tak dinyatakan apapun" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Masalah saat memuat \"%s\"" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Ups! Tak mungkin menampilkan situs web ini." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Coba lagi" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Ups! Mungkin ada masalah." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1141,20 +1151,20 @@ "ini terjadi lagi, mohon laporkan masalah ke para pengembang %s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Muat Ulang Saja" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Masalah saat menampilkan \"%s\"" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Ups!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1163,21 +1173,21 @@ "atau kunjungi halaman lain untuk melanjutkan." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Awas!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Muat Saja" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1233,7 +1243,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Sandi bagi %s dalam suatu formulir dalam %s" @@ -1241,7 +1251,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Sandi dalam suatu formulir di %s" @@ -1473,65 +1483,65 @@ msgid "_View Certificate…" msgstr "Lihat Serti_fikat..." -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d detik tersisa" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d menit tersisa" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d jam tersisa" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d hari tersisa" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d minggu tersisa" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d bulan tersisa" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Selesai" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Galat mengunduh: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Batal" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Buka" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Tampilkan dalam folder" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Memulai…" @@ -1539,20 +1549,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "B_ersihkan" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Batal" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "Jadi _Lagi" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Seret dan jatuhkan icon ini untuk membuat sambungan ke halaman ini" @@ -1573,23 +1583,23 @@ msgid "“%s” Properties" msgstr "Properti \"%s\"" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Judul:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Alamat:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "To_pik:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Tampil_kan seluruh topik" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1685,7 +1695,7 @@ msgstr "Buat topik baru" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Buka di _Jendela Baru" @@ -1695,7 +1705,7 @@ msgstr "Buka alamat terpilih dalam jendela baru" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Buka Dalam _Tab Baru" @@ -1754,7 +1764,7 @@ msgstr "Potong pilihan" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Salin" @@ -1815,7 +1825,7 @@ msgstr "Tampilkan kolom judul" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Alamat" @@ -1912,7 +1922,7 @@ msgstr "Ekspor Alamat" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Buku Alamat" @@ -1938,15 +1948,15 @@ msgid "File" msgstr "Berkas" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Salin Alamat" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Topik" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Judul" @@ -2342,11 +2352,11 @@ msgid "Other encodings" msgstr "Pengodean lainnya" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Kosongkan riwayat perambanan?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2423,11 +2433,11 @@ "Memulai gagal karena kesalahn berikut:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Opsi web" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Tutup tab" @@ -2564,142 +2574,151 @@ msgstr "Buka Taut dalam _Tab baru" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Buka Taut dalam _Jendela Inkognito" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Simpan Taut Sebagai…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Salin Alamat Taut" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Salin Alamat Surel" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Tilik C_itra dalam Tab Baru" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Salin Alamat Ga_mbar" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Simpan Gambar Sebagai…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Jadikan Gambar _Latar" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Buka Video di _Jendela Baru" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Buka Video dalam _Tab Baru" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Simpan Video Sebagai..." -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Salin Alamat Video" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Buka Audio dalam _Jendela Baru" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Buka Audio dalam _Tab Baru" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Simpan Audio Sebagai..." -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Salin Alamat Audio" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Ada perubahan yang belum dikirimkan ke bagian formulir" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Jika Anda menutup dokumen, Anda akan kehilangan informasi." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Tutup _Dokumen" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Ada pengunduhan sedang berlangsung di jendela ini" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Bila Anda menutup jendela ini, pengunduhan akan dibatalkan" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Tutup jendela dan batalkan pengunduhan" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Simpan sebagai" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Simpan Sebagai Aplikasi" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Cetak" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Alamat" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Cari" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Lebih Besar" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Lebih Kecil" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Mundur" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Maju" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Perbesar" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "_Tab Baru" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Menuju yang sering dikunjungi" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Cari '%s' di Web" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Simpan Sambungan Sebagai" @@ -2819,19 +2838,19 @@ msgid "C_reate" msgstr "_Buat" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Hubungi:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Kontributor:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Pengembang yang lalu:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2848,7 +2867,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Tunggul Arif Siswoyo , 2003\n" @@ -2857,15 +2876,15 @@ "Dirgita , 2011, 2012\n" "Andika Triwidada , 2011-2015" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Situs Web" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Aktifkan mode karet?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2876,6 +2895,6 @@ "memungkinkan Anda berpindah-pindah dengan papan tik Anda. Apakah Anda ingin " "mengaktifkan meramban dengan karet?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Aktifkan" diff -Nru epiphany-browser-3.16.3/po/it.po epiphany-browser-3.18.0/po/it.po --- epiphany-browser-3.16.3/po/it.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/it.po 2015-09-08 11:37:53.000000000 +0000 @@ -7,11 +7,11 @@ # msgid "" msgstr "" -"Project-Id-Version: epiphany 3.14\n" +"Project-Id-Version: epiphany 3.18\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-21 04:38+0000\n" -"PO-Revision-Date: 2015-03-24 10:52+0100\n" +"POT-Creation-Date: 2015-08-30 03:45+0000\n" +"PO-Revision-Date: 2015-08-31 11:33+0200\n" "Last-Translator: Gianvito Cavasoli \n" "Language-Team: Italiano \n" "Language: \n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -49,53 +49,64 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=it-it" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "Browser web per GNOME" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Il browser web per GNOME, con una stretta integrazione con il desktop e una " "semplice e intuitiva interfaccia utente che consente di concentrarsi sulle " -"pagine web." +"pagine web. Se si è alla ricerca di una semplice, pulita e bella " +"visualizzazione del web, questo è il browser per voi." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "" +"Spesso si fa riferimento a GNOME Web con il suo nome in codice, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Browser web" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Browser web Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Esplora il web" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;browser;internet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nuova finestra in incognito" @@ -232,18 +243,22 @@ "processo web per ogni scheda." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Stile barra degli strumenti" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Numero massimo di processi web creati in contemporanea quando si usa il " +"modello \"one-secondary-process-per-web-view\"" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Stile barra degli strumenti. I valori consentiti sono \"\" (usa lo stile " -"predefinito di GNOME), \"both\" (testo e icone), \"both-oriz\" (testo sotto " -"le icone), \"icons\" e \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Questa opzione imposta un limite al numero di processi web che saranno usati " +"contemporaneamente per il modello \"one-secondary-process-per-web-view\". Il " +"valore predefinito è \"0\" e indica nessun limite." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -556,19 +571,19 @@ msgid "Installed on:" msgstr "Installata il:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Rimuove dalla panoramica" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Più visitati" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Rimuove dalla panoramica" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Navigazione privata" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -579,14 +594,14 @@ "informazioni memorizzate andranno perse alla chiusura della finestra. I file " "scaricati saranno conservati." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "La modalità incognito nasconde la propria attività solo da persone che usano " "questo computer." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -965,54 +980,54 @@ msgid "Find next occurrence of the search string" msgstr "Trova la successiva occorrenza della stringa di ricerca" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Salva" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Non salvare" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Salva" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Salvare la password per «%s»?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Nega" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Consenti" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "La pagina su %s vuole conoscere la posizione dell'utente." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "La pagina su %s vuole mostrare delle notifiche sul desktop." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Caricamento di «%s»…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Caricamento…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" @@ -1020,7 +1035,7 @@ "differente sito web." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1029,14 +1044,14 @@ "attendibile. Verificare la data sul calendario del computer." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "L'identificazione di questo sito web non è stata emanata da " "un'organizzazione fidata." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1044,7 +1059,7 @@ "essere corrotta." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1053,7 +1068,7 @@ "fidata che l'ha emanata." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1062,7 +1077,7 @@ "una crittografia molto debole." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1071,13 +1086,13 @@ "Verificare la data sul calendario del computer." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Questo potrebbe non essere il vero %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1089,7 +1104,7 @@ "di questo sito:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1100,29 +1115,29 @@ "attendibile." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Banche, negozi e altri siti pubblici autentici non chiederanno di fare " "questo." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Nessuno specificato" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Si è verificato un problema nel caricamento di «%s»" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Poffarbacco! Impossibile mostrare questo sito web." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Riprova" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Poffarbacco! Si è verificato un problema." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1154,20 +1169,20 @@ "dell'applicazione.

Se questo accade di nuovo, segnalare il problema " "agli sviluppatori di %s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Ricarica comunque" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Si è verificato un problema nel mostrare «%s»" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Poffarbacco!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1176,21 +1191,21 @@ "continuare, ricaricare o visitare una pagina differente." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Attenzione" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Carica comunque" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1247,7 +1262,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Password di %s in un modulo di %s" @@ -1255,7 +1270,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Password in un modulo di %s" @@ -1489,71 +1504,71 @@ msgid "_View Certificate…" msgstr "_Visualizza certificato…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d secondo al termine" msgstr[1] "%d secondi al termine" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d minuto al termine" msgstr[1] "%d minuti al termine" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d ora al termine" msgstr[1] "%d ore al termine" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d giorno al termine" msgstr[1] "%d giorni al termine" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d settimana al termine" msgstr[1] "%d settimane al termine" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d mese al termine" msgstr[1] "%d mesi al termine" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Terminato" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Si è verificato un errore nello scaricamento: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Annulla" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Apri" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Mostra nella cartella" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Avvio…" @@ -1561,20 +1576,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "Pu_lisci" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Annulla" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Ripeti" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Trascinare questa icona per creare un collegamento a questa pagina" @@ -1596,24 +1611,24 @@ msgid "“%s” Properties" msgstr "Proprietà di «%s»" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Titolo:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "In_dirizzo:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Arg_omenti:" # cambiato acceleratore per collisione -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "_Mostra tutti gli argomenti" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1709,7 +1724,7 @@ msgstr "Crea un nuovo argomento" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Apri in una nuova _finestra" @@ -1721,7 +1736,7 @@ msgstr "Apre il segnalibro selezionato in una nuova finestra" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Apri in una nuova sc_heda" @@ -1781,7 +1796,7 @@ msgstr "Taglia la selezione" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Copia" @@ -1842,7 +1857,7 @@ msgstr "Mostra la colonna del titolo" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Indirizzo" @@ -1876,7 +1891,6 @@ msgid "_Delete Topic" msgstr "Eli_mina argomento" -#. FIXME: proper i18n after freeze #: ../src/bookmarks/ephy-bookmarks-editor.c:495 #: ../src/bookmarks/ephy-bookmarks-editor.c:499 msgid "Firefox" @@ -1939,7 +1953,7 @@ msgstr "Esporta segnalibri" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Segnalibri" @@ -1965,19 +1979,18 @@ msgid "File" msgstr "File" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Copia indirizzo" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Argomenti" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Titolo" -#. FIXME !!!! #: ../src/bookmarks/ephy-open-tabs-action.c:74 msgid "Open in New _Tabs" msgstr "Apri in nuove sc_hede" @@ -2375,11 +2388,11 @@ msgid "Other encodings" msgstr "Altre codifiche" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Pulire la cronologia della navigazione?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2456,11 +2469,11 @@ "Avvio non riuscito a causa del seguente errore:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Opzioni di Web" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Chiudi scheda" @@ -2607,144 +2620,155 @@ msgstr "Apri collegamento in una nuova sc_heda" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Apri collegamento nella finestra in i_ncognito" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Sa_lva collegamento come…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Copia indirizzo collegamento" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Copia indirizzo email" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Visualizza _immagine in una nuova scheda" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Copia indirizzo i_mmagine" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Sa_lva immagine come…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Imposta come _sfondo" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Apri video in una nuova _finestra" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Apri video in una nuova sc_heda" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Sa_lva video come…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Copia indirizzo video" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Apri audio in una nuova _finestra" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Apri audio in una nuova sc_heda" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Sa_lva audio come…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Copia indirizzo audio" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Modifiche non inviate in alcuni elementi del modulo" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Chiudendo il documento, tali informazioni verranno perse." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Chiudi _documento" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Ci sono scaricamenti in corso in questa finestra" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Se si chiude questa finestra gli scaricamenti saranno annullati" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Chiudi la finestra e annulla gli scaricamenti" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Salva come" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Salva come applicazione" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Stampa" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Segnalibro" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Trova" # [NdT] è l'icona con la lente di ingrandimento e il '+' dentro #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Aumenta" # [NdT] è l'icona con la lente di ingrandimento e il '-' dentro #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Riduci" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Indietro" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Avanti" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Ingrandimento" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nuova sc_heda" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Va ai più visitati" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Cerca nel web per «%s»" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Salva collegamento come" @@ -2867,19 +2891,19 @@ msgid "C_reate" msgstr "C_rea" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Contattateci a:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Collaboratori:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Sviluppatori precedenti:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2896,7 +2920,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Alessandro Costantino, \n" @@ -2905,15 +2929,15 @@ "\n" "...e un ringraziamento ai revisori del Translation Project." -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Sito web di Web" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Abilitare la modalità di navigazione con cursore?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2923,6 +2947,6 @@ "funzionalità posiziona un cursore mobile nelle pagine web, permettendo lo " "spostamento per mezzo della tastiera. Abilitare la navigazione con cursore?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Abilita" diff -Nru epiphany-browser-3.16.3/po/kk.po epiphany-browser-3.18.0/po/kk.po --- epiphany-browser-3.16.3/po/kk.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/kk.po 2015-09-08 11:37:53.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: epiphany master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-14 04:37+0000\n" -"PO-Revision-Date: 2015-03-14 20:23+0500\n" +"POT-Creation-Date: 2015-09-04 15:45+0000\n" +"PO-Revision-Date: 2015-09-04 22:35+0500\n" "Last-Translator: Baurzhan Muftakhidinov \n" "Language-Team: Kazakh \n" "Language: kk\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.7.3\n" +"X-Generator: Poedit 1.8.4\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -47,15 +47,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -65,33 +65,37 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." +msgstr "" + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." msgstr "" -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Веб" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Веб браузері" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany веб браузері" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Интернетті шолу" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "веб;браузер;интернет;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "_New Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "" @@ -204,14 +208,16 @@ msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Қ_алыпты көрінісі" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." msgstr "" #: ../data/org.gnome.epiphany.gschema.xml.h:32 @@ -495,31 +501,31 @@ msgid "Installed on:" msgstr "Орнатылған:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Көбірек қаралатын" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " "cleared when you close the window. Files you download will be kept." msgstr "" -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -531,17 +537,17 @@ msgid "Blank page" msgstr "" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -894,105 +900,105 @@ msgid "Find next occurrence of the search string" msgstr "Ізделетін мәтіннің келесі кездесуін табу" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Сақтау" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Сақтау" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Тыйым салу" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Рұқсат ету" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "" #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "" #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "“%s” жүктеу…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Жүктеу..." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." msgstr "" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." msgstr "" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." msgstr "" #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1000,7 +1006,7 @@ msgstr "" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1008,27 +1014,27 @@ msgstr "" #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "Шын банктар, дүкендер, және басқа да сайттар сізден осыны сұрамайды." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "" -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" msgstr "" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Қайталап көру" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "" -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1053,41 +1059,41 @@ "developers.

" msgstr "" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Әттеген-ай!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." msgstr "" #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_ОК" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1143,7 +1149,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "" @@ -1151,7 +1157,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "" @@ -1375,65 +1381,65 @@ msgid "_View Certificate…" msgstr "" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d секунд қалды" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d минут қалды" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d сағат қалды" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d күн қалды" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d апта қалды" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d ай қалды" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Дайын" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Жүктеп алу қатесі: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Бас тарту" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Ашу" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Бумада көрсету" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Бастау..." @@ -1441,20 +1447,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "Та_зарту" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "Бол_дырмау" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "Қай_талау" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "" @@ -1475,23 +1481,23 @@ msgid "“%s” Properties" msgstr "" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "А_тауы:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1587,7 +1593,7 @@ msgstr "" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Жаңа тере_зеде ашу" @@ -1597,7 +1603,7 @@ msgstr "" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Жаңа бе_тте ашу" @@ -1656,7 +1662,7 @@ msgstr "Ерекшелеуді қиып алу" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Көшіріп алу" @@ -1717,7 +1723,7 @@ msgstr "" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Мекенжайы" @@ -1809,7 +1815,7 @@ msgstr "" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Бетбелгілер" @@ -1835,15 +1841,15 @@ msgid "File" msgstr "Файл" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Тақырыптар" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Үндеу" @@ -2146,7 +2152,6 @@ msgstr "" #: ../src/resources/prefs-dialog.ui.h:31 -#| msgid "Passwords" msgid "Manage _Passwords…" msgstr "" @@ -2234,11 +2239,11 @@ msgid "Other encodings" msgstr "Басқа кодтаулар" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Шолулар тарихын тазарту керек пе?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2311,11 +2316,11 @@ "%s" msgstr "" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Бетті жабу" @@ -2452,142 +2457,154 @@ msgstr "" #: ../src/ephy-window.c:222 -msgid "_Save Link As…" +#| msgid "Open in New _Window" +#| msgid_plural "Open in New _Windows" +msgid "Open Link in I_ncognito Window" msgstr "" #: ../src/ephy-window.c:224 +msgid "_Save Link As…" +msgstr "" + +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Сілтеме адр_есін көшіру" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "Эл. пошта адр_есін көшіру" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Суретті қалайша сақтау…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Тү_сқағаз ретінде орналастыру" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "" -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Құ_жатты жабу" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Қалайша сақтау" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Қолданба ретінде сақтау" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Баспаға шығару" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Бетбелгі" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Іздеу" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Үлкенірек" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Кішірек" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Артқа" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Алға" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Масштабтау" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Жаңа _бет" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Көбірек қаралатындарға өту" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the web" +msgid "Search the Web for '%s'" +msgstr "" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Сілтемені қалайша сақтау" @@ -2711,19 +2728,19 @@ msgid "C_reate" msgstr "Ж_асау" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Үлесін қосқандар:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2738,29 +2755,35 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "Baurzhan Muftakhidinov " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " "want to enable caret browsing?" msgstr "" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "Іск_е қосу" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Қ_алыпты көрінісі" + #~ msgid "Temporary Files" #~ msgstr "Уақытша файлдар" diff -Nru epiphany-browser-3.16.3/po/ko.po epiphany-browser-3.18.0/po/ko.po --- epiphany-browser-3.16.3/po/ko.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/ko.po 2015-09-08 11:37:53.000000000 +0000 @@ -17,16 +17,16 @@ "Project-Id-Version: epiphany\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-11 16:39+0000\n" -"PO-Revision-Date: 2015-03-12 02:22+0900\n" +"POT-Creation-Date: 2015-09-02 06:17+0000\n" +"PO-Revision-Date: 2015-09-02 19:37+0900\n" "Last-Translator: ChangSeok Oh \n" "Language-Team: GNOME Korea \n" -"Language: Korean\n" +"Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.7.5\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -56,15 +56,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=kr-kr&kad=ko_KR" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "에피퍼니" +msgid "GNOME Web" +msgstr "그놈 웹" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -74,34 +74,40 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"그놈 데스크톱 웹브라우저. 데스크톱과 잘 연동하며, 간단하고 직관적인 인터페이" -"스 때문에 웹 페이지에 집중할 수 있습니다." +"그놈 웹브라우저. 데스크톱과 잘 연동하며, 간단하고 직관적인 인터페이스 때문에 " +"웹 페이지에 집중할 수 있습니다. 만약 간단하고, 명료하며, 아름다운 웹탐색기를 " +"찾고 있다면, 이것이 당신에게 꼭 맞는 브라우저입니다." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "그놈 웹은 종종 에피퍼니라는 코드 네임으로도 불립니다." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "웹" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "웹 브라우저" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "에피퍼니 웹 브라우저" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "웹을 돌아 다닙니다" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;웹;browser;브라우저;internet;인터넷;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "새 익명 창" @@ -227,17 +233,22 @@ "세요." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "도구 모음 스타일" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"'one-secondary-process-per-web-view' 모델을 사용할 때 동시에 만들 수 있는 웹 " +"프로세스의 최대 수" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"도구 모음 스타일. 사용 가능한 값은 \"\"(그놈 기본 스타일 사용), \"both\"(텍스" -"트 및 아이콘), \"both-horiz\"(텍스트 옆에 아이콘), \"icons\", \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"이 옵션은 'one-secondary-process-per-web-view' 모델일 때 동시에 사용할 수 있" +"는 웹 프로세스의 수를 제한합니다. 기본값은 '0'이고, 이는 제한 없음을 의미합니" +"다." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -538,19 +549,19 @@ msgid "Installed on:" msgstr "설치 날짜:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "미리보기에서 제거" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "자주 방문" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "미리보기에서 제거" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "개인 정보 보호 브라우징" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -560,12 +571,12 @@ "저 기록에 나타나지 않고 저장한 정보는 창을 닫을 때 지워집니다. 다운로드한 파" "일은 유지될 것 입니다." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "익명 모드는 이 컴퓨터를 사용하는 사람으로부터 당신의 활동을 숨깁니다." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -573,25 +584,25 @@ msgstr "" "만약 당신이 직장에 있다면 당신의 활동은 당신의 고용주로부터 숨겨지지 않을 것" "입니다. 이러한 웹사이트에서 당신의 인터넷 서비스 제공자, 정부, 또 다른 정부, " -"당신이 방문한 웹사이트 그리고 광고업자들은 여전히 당신을 추척하고 있을지 모릅" -"니다." +"당신이 방문한 웹사이트 그리고 광고업자는 여전히 당신을 추척하고 있을지 모릅니" +"다." #. characters #: ../embed/ephy-embed.c:51 msgid "Blank page" msgstr "빈 페이지" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "전체 화면을 나가려면 %s 키를 누르십시오" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -944,60 +955,60 @@ msgid "Find next occurrence of the search string" msgstr "다음에 나타난 단어나 문장을 찾습니다" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "저장(_S)" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "저장 안함(_D)" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "저장(_S)" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "%s의 암호를 저장하시겠습니까?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "거절" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "허용" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "%s의 페이지에서 현재 위치를 알고 싶어합니다." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "%s의 페이지에서 데스크톱 알림을 보여주고 싶어합니다." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "“%s” 페이지를 읽는 중입니다…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "읽는 중입니다…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "이 웹사이트는 다른 웹사이트의 신분증을 제시했습니다." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1006,20 +1017,20 @@ "를 확인하세요." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "이 웹사이트의 신분증은 신뢰할 수 있는 기관으로부터 발행된 것이 아닙니다." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" "이 웹사이트의 신분증은 처리할 수 없습니다. 아마도 손상되었을 수 있습니다." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1027,14 +1038,14 @@ "이 웹사이트의 신분증은 이것을 발행한 신뢰할 수 있는 기관이 파기했습니다." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "이 웹사이트의 신분증은 매우 약한 암호화를 사용해서 신뢰할 수 없습니다." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1043,13 +1054,13 @@ "짜를 확인하세요." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "진짜 %s이(가) 아닐 수 있습니다." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1060,7 +1071,7 @@ "있습니다:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1071,29 +1082,29 @@ "하세요." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "정상적인 은행과 상점 그리고 다른 공공 사이트는 당신이 이것을 하도록 요청하지 " "않습니다." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "지정하지 않음" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "“%s” 문제를 읽는 중입니다." -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "앗! 이 웹사이트를 표시할 수 없습니다." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:

%s

웹 사이트가 일시적으로 중단되어 있거나 다른 주소" "로 옮겼을 수도 있습니다. 인터넷 연결이 올바른지 확인하십시오.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "다시 시도" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "앗! 문제가 발생했습니다." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1123,20 +1134,20 @@ "

브라우저가 갑자기 닫혔을 경우에 이 페이지가 나타납니다.

이 페이지가 " "다시 나타날 경우, 문제를 %s 개발자에게 알려 주십시오.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "그래도 다시 읽어들이기" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "“%s”을(를) 표시하는 중 문제가 발생했습니다." -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "앗!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1145,21 +1156,21 @@ "지를 방문하십시오." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "조심하세요!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "그래도 읽어들이기" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "확인(_O)" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1216,7 +1227,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "%s의 암호, 호스트 %s" @@ -1224,7 +1235,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "%s안의 폼의 암호" @@ -1454,65 +1465,65 @@ msgid "_View Certificate…" msgstr "인증서 보기(_V)…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d초 남음" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d분 남음" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d시간 남음" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d초 남음" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d초 남음" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d달 남음" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "완료" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "다운로드에 오류가 발생했습니다: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "취소" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "열기" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "도구 모음에 보이기" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "시작하는 중…" @@ -1520,20 +1531,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "지우기(_E)" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "실행 취소(_U)" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "다시 실행(_R)" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "이 페이지의 링크를 만드려면 이 아이콘을 끌어 놓으십시오" @@ -1554,23 +1565,23 @@ msgid "“%s” Properties" msgstr "“%s” 속성" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "제목(_T):" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "주소(_D):" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "주제(_O):" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "모든 주제 보이기(_W)" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1666,7 +1677,7 @@ msgstr "새 주제를 만듭니다" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "새 창에서 열기(_W)" @@ -1676,7 +1687,7 @@ msgstr "선택한 책갈피를 새 창에서 엽니다" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "새 탭에서 열기(_T)" @@ -1735,7 +1746,7 @@ msgstr "선택한 것을 잘라냅니다" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "복사(_C)" @@ -1796,7 +1807,7 @@ msgstr "제목 열 표시" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "주소" @@ -1892,7 +1903,7 @@ msgstr "책갈피 내보내기" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "책갈피" @@ -1918,15 +1929,15 @@ msgid "File" msgstr "파일" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "주소 복사(_C)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "주제" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "제목" @@ -2319,11 +2330,11 @@ msgid "Other encodings" msgstr "그 외 인코딩" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "방문 기록을 비우시겠습니까?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2400,11 +2411,11 @@ "다음의 오류 때문에 시작할 수 없습니다:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "웹 옵션" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "탭을 닫습니다" @@ -2542,143 +2553,152 @@ msgstr "링크 새 탭에서 열기(_T)" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "링크 익명 창에서 열기(_N)" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "링크 다른 이름으로 저장(_S)…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "링크 주소 복사(_C)" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "전자메일 주소 복사(_C)" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "새 탭에서 그림 보기(_I)" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "그림 주소 복사(_M)" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "그림 다른 이름으로 저장(_S)…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "바탕화면으로 설정(_W)" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "새 창에서 비디오 열기(_W)" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "새 탭에서 비디오 열기(_T)" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "비디오를 다른 이름으로 저장(_S)…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "비디오 주소 복사(_C)" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "새 창에서 오디오 열기(_W)" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "새 탭에서 오디오 열기(_T)" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "오디오를 다른 이름으로 저장(_S)…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "오디오 주소 복사(_C)" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "바뀐 내용중에 제출하지 않은 폼이 있습니다." -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "그래도 지금 문서를 닫으면, 해당 정보를 잃어버립니다." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "문서 닫기(_D)" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "이 창에 진행 중인 다운로드가 있습니다" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "이 창을 닫으면 다운로드를 취소합니다." -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "창 닫기 및 다운로드 취소" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "다른 이름으로 저장" # 웹 애플리케이션 -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "애플리케이션으로 저장" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "인쇄" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "책갈피" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "찾기" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "크게" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "작게" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "뒤로" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "앞으로" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "확대" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "새 탭(_T)" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "자주 방문 페이지로 이동" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "웹에서 '%s' 검색" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "링크 다른 이름으로 저장" @@ -2803,19 +2823,19 @@ msgid "C_reate" msgstr "만들기(_R)" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "연락처:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "도움 주신 분:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "이전 개발자:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2832,22 +2852,22 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "차영호 \n" "류창우 \n" "오창석 " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "웹 홈페이지" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "캐릿 브라우징 모드를 사용하시겠습니까?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2857,10 +2877,25 @@ "서 움직일 수 있는 커서를 표시하므로, 커서를 이용해 이동할 수 있습니다. 캐릿 " "브라우징 모드를 사용하시겠습니까?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "사용(_E)" +#~ msgid "Epiphany" +#~ msgstr "에피퍼니" + +#~ msgid "Toolbar style" +#~ msgstr "도구 모음 스타일" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "도구 모음 스타일. 사용 가능한 값은 \"\"(그놈 기본 스타일 사용), \"both" +#~ "\"(텍스트 및 아이콘), \"both-horiz\"(텍스트 옆에 아이콘), \"icons\", " +#~ "\"text\"." + #~ msgid "Size of disk cache" #~ msgstr "디스크 캐시 크기" diff -Nru epiphany-browser-3.16.3/po/lt.po epiphany-browser-3.18.0/po/lt.po --- epiphany-browser-3.16.3/po/lt.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/lt.po 2015-09-08 11:37:53.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: lt\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-08 16:37+0000\n" -"PO-Revision-Date: 2015-03-08 19:22+0200\n" +"POT-Creation-Date: 2015-09-07 03:45+0000\n" +"PO-Revision-Date: 2015-09-07 14:07+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: lt\n" @@ -21,7 +21,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -51,54 +51,63 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME žiniatinklis" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "Žiniatinklio naršyklė GNOME aplinkai" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"GNOME darbastalio žiniatinklio naršyklė su tampria integracija su " -"darbastaliu ir paprasta bei intuityvia naudotojo sąsaja, kuri leidžia " -"susitelkti ties jūsų žiniatinkliais." +"GNOME žiniatinklio naršyklė su tampria integracija su darbastaliu ir " +"paprasta bei intuityvia naudotojo sąsaja, kuri leidžia susitelkti ties jūsų " +"žiniatinkliais. Jei ieškote paprastos, neapkrautos bei gražios žiniatinklio " +"vaizdavimo programos, tai naršyklė jums." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME žiniatinklis dažnai vadinamas jo kodiniu pavadinimu - Epiphany." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Žiniatinklis" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Žiniatinklio naršyklė" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Žiniatinklio naršyklė Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Naršyti žiniatinklį" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "žiniatinklis;naršyklė;internetas;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Naujas incognito langas" @@ -225,18 +234,22 @@ "žiniatinklio procesams kiekvienai kortelei." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Įrankių juostos stilius" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Didžiausias sukuriamų žiniatinklio procesų skaičius tuo pat metu naudojant " +"„one-secondary-process-per-web-view“ modelį" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Įrankių juostos stilius. Galimos reikšmės yra „“ (naudoti GNOME numatytąjį " -"stilių), „both“ (tekstas ir piktogramos), „both-horiz“ (tekstas šalia " -"piktogramų), „icons“ ir „text“." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Šis nustatymas nustato žiniatinklio procesų skaičiaus ribą, kuri bus " +"naudojama „one-secondary-process-per-web-view“ modeliui. Numatytoji reikšmė " +"yra „0“ ir reiškia neribojimą." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -546,19 +559,19 @@ msgid "Installed on:" msgstr "Įdiegimo vieta:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Pašalinti iš apžvalgos" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Dažniausiai lankyti" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Pašalinti iš apžvalgos" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privatusis naršymas" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -568,14 +581,14 @@ "rodomi naršymo istorijoje ir visa įrašyta informacija bus išvalyta, kai " "užversite langą. Parsiųsti failai bus palikti." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Inkognito veiksena slepia jūsų veiklą tik nuo žmonių, naudojančių šį " "kompiuterį." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -590,17 +603,17 @@ msgid "Blank page" msgstr "Tuščias puslapis" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Spauskite %s išėjimui iš viso ekrano veiksenos" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -953,60 +966,60 @@ msgid "Find next occurrence of the search string" msgstr "Rasti kitą žodžio arba frazės pasikartojimą" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "Į_rašyti" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Neįrašyti" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "Į_rašyti" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Ar norite įrašyti savo „%s“ slaptažodį?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Drausti" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Leisti" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Tinklapis %s nori žinotų jūsų buvimo vietą." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Tinklapis %s nori rodyti darbastalio pranešimus." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Įkeliama „%s“…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Įkeliama…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Šis tinklapis pateikė identifikaciją, kuri priklauso kitam tinklapiui." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1015,19 +1028,19 @@ "kompiuterio datą." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "Šio tinklapio identifikacijos neišdavė patikima organizacija." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" "Šio tinklapio identifikacijos nepavyko apdoroti. Ji gali būti sugadinta." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1035,7 +1048,7 @@ "Šio tinklapio identifikacija buvo atšaukta ją išdavusios organizacijos." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1043,7 +1056,7 @@ "Šio tinklapio identifikacija nepatikima, nes naudoja labai silpną šifravimą." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1052,13 +1065,13 @@ "kalendorių." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Tai gali būti netikras %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1069,7 +1082,7 @@ "tinklapio identifikacija:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1080,28 +1093,28 @@ "identifikacijos." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Legalūs bankai, parduotuvės ir kiti vieši tinklapiai jūsų to neprašytų." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Joks nenurodytas" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problema įkeliant „%s“" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Oi! Nepavyko parodyti šio tinklalapio." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Bandyti dar kartą" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Oi! Atrodo yra problema." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1133,20 +1146,20 @@ "

Jeigu tai pasikartos, praneškite apie šią problemą %s kūrėjams.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Vis tiek įkelti dar kartą" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Kilo problema parodant „%s“" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Oi!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1155,21 +1168,21 @@ "kitą tinklapį, jei norite tęsti." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Atsargiai!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Vistiek žiūrėti" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_Gerai" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1225,7 +1238,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "%s slaptažodis %s formoje" @@ -1233,7 +1246,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "%s slaptažodis formoje" @@ -1465,7 +1478,7 @@ msgid "_View Certificate…" msgstr "_Rodyti liudijimą…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1473,7 +1486,7 @@ msgstr[1] "Liko %d sekundės" msgstr[2] "Liko %d sekundžių" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1481,7 +1494,7 @@ msgstr[1] "Liko %d minutės" msgstr[2] "Liko %d minučių" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1489,7 +1502,7 @@ msgstr[1] "Liko %d valandos" msgstr[2] "Liko %d valandų" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1497,7 +1510,7 @@ msgstr[1] "Liko %d dienos" msgstr[2] "Liko %d dienų" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1505,7 +1518,7 @@ msgstr[1] "Liko %d savaitės" msgstr[2] "Liko %d savaičių" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1513,29 +1526,29 @@ msgstr[1] "Liko %d mėnesiai" msgstr[2] "Liko %d mėnesių" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Baigta" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Klaida parsiunčiant %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Atmesti" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Atverti" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Rodyti aplanke" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Pradedama..." @@ -1543,20 +1556,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "Išva_lyti" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Atšaukti" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "Paka_rtoti" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "" "Norėdami sukurti nuorodą į šį puslapį, užtempkite ir paleiskite šią " @@ -1581,23 +1594,23 @@ msgid "“%s” Properties" msgstr "„%s“ savybės" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Antraštė:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "A_dresas:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Tem_os:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Ro_dyti visas temas" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1693,7 +1706,7 @@ msgstr "Sukurti naują temą" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Atverti naujame _lange" @@ -1705,7 +1718,7 @@ msgstr "Atverti pasirinktą žymelę naujame lange" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Atverti naujoje _kortelėje" @@ -1766,7 +1779,7 @@ msgstr "Iškirpti pažymėjimą" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopijuoti" @@ -1827,7 +1840,7 @@ msgstr "Rodyti antraštės stulpelį" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adresas" @@ -1924,7 +1937,7 @@ msgstr "Eksportuoti žymeles" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Žymelės" @@ -1950,15 +1963,15 @@ msgid "File" msgstr "Failas" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopijuoti adresą" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Temos" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Antraštė" @@ -2353,11 +2366,11 @@ msgid "Other encodings" msgstr "Kitos koduotės" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Išvalyti naršymo retrospektyvą?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2434,11 +2447,11 @@ "Nepavyko paleisti dėl šios klaidos:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Žiniatinklio nustatymai" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Užverti kortelę" @@ -2575,142 +2588,153 @@ msgstr "Atverti nuorodą naujoje _kortelėje" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Atverti nuorodą i_nkognito lange" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Į_rašyti nuorodą kaip…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopijuoti nuorodos adresą" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Kopijuoti el. pašto adresą" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Rodyti pave_ikslėlį naujoje kortelėje" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kopi_juoti paveikslėlio adresą" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Į_rašyti paveikslėlį kaip…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Nustatyti kaip _foną" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Atverti vaizdo įrašą naujame _lange" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Atverti vaizdo įrašą naujoje _kortelėje" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Į_rašyti vaizdo įrašą taip…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopijuoti vaizdo įrašo adresą" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Atverti garso įrašą naujame _lange" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Atverti garso įrašą naujoje _kortelėje" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Į_rašyti garso įrašą taip…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopijuoti garso įrašą adresą" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Formų elementuose yra dar nepateiktų pakeitimų." -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Jeigu vis tiek uždarysite dokumentą, prarasite šią informaciją." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Užverti _dokumentą" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Šiame lange yra aktyvių parsiuntimų" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Jei užversite langą, parsiuntimai bus atmesti" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Užverti langą ir atmesti parsiuntimus" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Įrašyti kaip" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Įrašyti kaip programą" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Spausdinti" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Žymelė" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Rasti" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Didesnis" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Mažesnis" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Atgal" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Pirmyn" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Mastelis" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nauja kor_telė" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Eiti į dažniausiai lankytus" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Ieškoti internete „%s“" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Įrašyti nuorodą taip" @@ -2832,19 +2856,19 @@ msgid "C_reate" msgstr "Suku_rti" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Susisiekite su mumis:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Prisidėjo:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Ankstesnieji kūrėjai:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2861,7 +2885,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "išvertė:\n" @@ -2869,15 +2893,15 @@ "Žygimantas Beručka ,\n" "Justina Klingaitė " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Žiniatinklio naršyklės svetainė" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Įjungti naršymą naudojant rodyklių klavišus?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2887,10 +2911,25 @@ "puslapiuose stumdomą žymiklį, leidžiantį jums judėti naudojant klaviatūrą. " "Ar norite dabar įjungti naršymą naudojant rodyklių klavišus?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Įjungti" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Įrankių juostos stilius" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Įrankių juostos stilius. Galimos reikšmės yra „“ (naudoti GNOME " +#~ "numatytąjį stilių), „both“ (tekstas ir piktogramos), „both-" +#~ "horiz“ (tekstas šalia piktogramų), „icons“ ir „text“." + #~ msgid "Size of disk cache" #~ msgstr "Disko podėlio dydis" diff -Nru epiphany-browser-3.16.3/po/lv.po epiphany-browser-3.18.0/po/lv.po --- epiphany-browser-3.16.3/po/lv.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/lv.po 2015-09-21 08:20:22.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: lv\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-04-03 03:42+0000\n" -"PO-Revision-Date: 2015-04-03 20:13+0300\n" +"POT-Creation-Date: 2015-09-16 03:47+0000\n" +"PO-Revision-Date: 2015-09-16 14:44+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -53,54 +53,63 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=lv-lv" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME tīmeklis" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "Tīmekļa pārlūks GNOME videi" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Tīmekļa pārlūks GNOME darbvirsmai, kas ir integrēts darbvirsmā, ar vienkāršu " "un intuitīvu lietotāja saskarni, kas ļauj vairāk pievērst uzmanību tīmekļa " -"lapām." +"lapām. Ja meklējat vienkāršu, tīru un skaistu skatu uz tīmekli, šis pārlūks " +"ir domāts jums." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME tīmekli dažkārt dēvē arī par Epiphany, kas ir tā koda nosaukums." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Tīmeklis" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Tīmekļa pārlūks" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany tīmekļa pārlūks" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Pārlūkot tīmekli" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "tīmeklis;pārlūks;internets;web;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Jauns inkognito logs" @@ -166,7 +175,6 @@ msgstr "Atcerēties paroles" #: ../data/org.gnome.epiphany.gschema.xml.h:20 -#| msgid "Whether to store and prefill passwords in web sites." msgid "Whether to store and prefill passwords in websites." msgstr "Vai saglabāt un automātiski aizpildīt paroles tīmekļa vietnēs." @@ -228,18 +236,22 @@ "procesu." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Rīkjoslu stils" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maksimālais vienlaicīgi veidojamais tīmekļa procesu skaits, izmantojot " +"“one-secondary-process-per-web-view” modeli" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Rīkjoslu stils. Atļautās vērtības ir \"\" (lietot GNOME noklusēto stilu), " -"\"both\" (teksts un ikonas), \"both-horiz\" (teksts blakus ikonām), \"icons" -"\" un \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Šī opcija iestata limitu tīmekļa procesu skaitam, kas tiks izmantoti " +"vienlaicīgi “one-secondary-process-per-web-view” modelim. Noklusējuma vērtība " +"ir “0”, kas nozīmē, ka nav limitu." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -382,15 +394,12 @@ msgstr "Pieņemt sīkdatnes" #: ../data/org.gnome.epiphany.gschema.xml.h:60 -#| msgid "" -#| "Where to accept cookies from. Possible values are \"anywhere\", \"current " -#| "site\" and \"nowhere\"." msgid "" "Where to accept cookies from. Possible values are \"always\", \"no-third-" "party\" and \"never\"." msgstr "" -"No kurienes pieņemt sīkdatnes. Iespējamās vērtības ir \"always\", " -"\"no-third-party\" un \"never\"." +"No kurienes pieņemt sīkdatnes. Iespējamās vērtības ir \"always\", \"no-third-" +"party\" un \"never\"." #: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" @@ -547,19 +556,19 @@ msgid "Installed on:" msgstr "Instalēts:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Izņemt no pārskata" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Biežāk apmeklētās" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Izņemt no pārskata" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privātā pārlūkošana" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -569,26 +578,21 @@ "lapas neparādīsies pārlūkošanas vēsturē un visa uzglabātā informācija tiks " "izdzēsta līdz ar loga aizvēršanu. Jūsu lejupielādētās datnes tiks paturētas." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Inkognito režīms slēpj jūsu aktivitātes no citiem cilvēkiem, kas izmanto šo " "datoru." -#: ../embed/ephy-about-handler.c:557 -#| msgid "" -#| "Incognito mode will not hide your activity from your employer, your " -#| "Internet Service Provider, your government, or the websites that you " -#| "visit." +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " "that you visit, and advertisers on these websites may still be tracking you." msgstr "" "Incognito režīms nevarēs paslēpt jūsu darbības no jūsu darba devēja, ja esat " -"darbā. " -"Interneta pakalpojumu sniedzējs, valdība vai tīmekļa vietnes, kuras " +"darbā. Interneta pakalpojumu sniedzējs, valdība vai tīmekļa vietnes, kuras " "apmeklējat, vēl aizvien varēs jūs izsekot." #. characters @@ -596,17 +600,17 @@ msgid "Blank page" msgstr "Tukša lapa" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Spiediet %s, lai pamestu pilnekrānu" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "Esc" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -959,69 +963,61 @@ msgid "Find next occurrence of the search string" msgstr "Meklēt nākamo meklētās virknes parādīšanos" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Saglabāt" - #: ../embed/ephy-web-view.c:493 -#| msgid "_Don't Update" msgid "_Don’t Save" msgstr "_Nesaglabāt" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Saglabāt" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Vai vēlaties saglabāt savu “%s” paroli?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Liegt" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Atļaut" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Vietnes %s lapa vēlas zināt jūsu atrašanās vietu." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format -#| msgid "The page at %s wants to know your location." msgid "The page at %s wants to show desktop notifications." msgstr "Vietnes %s lapa vēlas jums parādīt darbvirsmas paziņojumus." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Ielādē “%s”..." -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Ielādē..." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 -#| msgid "" -#| "This web site presented identification that belongs to a different web " -#| "site." +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "" "Šī tīmekļa vietne sniedza identifikāciju, kas pieder citai tīmekļa vietnei." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 -#| msgid "" -#| "This web site’s identification is too old to trust. Check the date on " -#| "your computer’s calendar." +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1030,17 +1026,12 @@ "sava datora kalendāra datumu." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 -#| msgid "" -#| "This web site’s identification was not issued by a trusted organization." +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "Šīs tīmekļa vietnes identifikāciju neizdeva uzticama institūcija." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 -#| msgid "" -#| "This web site’s identification could not be processed. It may be " -#| "corrupted." +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1048,10 +1039,7 @@ "bojāta." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 -#| msgid "" -#| "This web site’s identification has been revoked by the trusted " -#| "organization that issued it." +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1059,10 +1047,7 @@ "Šīs tīmekļa vietnes identifikāciju atsauca institūcija, kura to ir izdevusi." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 -#| msgid "" -#| "This web site’s identification cannot be trusted because it uses very " -#| "weak encryption." +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1071,10 +1056,7 @@ "šifrēšanu." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 -#| msgid "" -#| "This web site’s identification is only valid for future dates. Check the " -#| "date on your computer’s calendar." +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1083,17 +1065,13 @@ "datumu sava datora kalendārā." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Šis varētu nebūt īstais %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 -#| msgid "" -#| "When you try to connect securely, web sites present identification to " -#| "prove that your connection has not been maliciously intercepted. There is " -#| "something wrong with this site’s identification:" +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1104,11 +1082,7 @@ "šīs vietnes identifikāciju:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 -#| msgid "" -#| "A third party may have hijacked your connection. You should continue only " -#| "if you know there is a good reason why this site does not use trusted " -#| "identification." +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1119,28 +1093,28 @@ "neizmanto uzticamu identifikāciju." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Likumīgas bankas, veikali un citas publiskās vietnes jums neprasīs to darīt." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Nav norādīts" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problēma, ielādējot “%s”" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Vai! Neizdevās parādīt šo tīmekļa vietni." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:

Tā varētu būt uz laiku atslēgta vai pārvietota uz citu adresi. " "Neaizmirstiet pārbaudīt, vai jūsu interneta savienojums darbojas pareizi.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Mēģināt vēlreiz" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Ak vai! Gadījās problēma." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1171,20 +1145,20 @@ "atkal atkārtojas, lūdzu, ziņojiet par problēmu %s " "izstrādātājiem.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Tomēr ielādēt atkal" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problēma, attēlojot “%s”" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Ak vai!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1193,21 +1167,21 @@ "apmeklējiet citu lapu, lai turpinātu." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Uzmanies!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Tomēr ielādēt" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_Labi" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1263,7 +1237,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "%s parole formā vietnē %s " @@ -1271,7 +1245,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Parole formā vietnē %s" @@ -1502,7 +1476,7 @@ msgid "_View Certificate…" msgstr "_Skatīt sertifikātu…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1510,7 +1484,7 @@ msgstr[1] "Atlikušas %d sekundes" msgstr[2] "Atlikušas %d sekundes" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1518,7 +1492,7 @@ msgstr[1] "Atlikušas %d minūtes" msgstr[2] "Atlikušas %d minūtes" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1526,7 +1500,7 @@ msgstr[1] "Atlikušas %d stundas" msgstr[2] "Atlikušas %d stundas" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1534,7 +1508,7 @@ msgstr[1] "Atlikušas %d dienas" msgstr[2] "Atlikušas %d dienas" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1542,7 +1516,7 @@ msgstr[1] "Atlikušas %d nedēļas" msgstr[2] "Atlikušas %d nedēļas" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1550,29 +1524,29 @@ msgstr[1] "Atlikuši %d mēneši" msgstr[2] "Atlikuši %d mēneši" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Pabeigts" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Kļūda lejupielādējot: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Atcelt" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Atvērt" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Rādīt mapē" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Uzsāk…" @@ -1580,20 +1554,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "N_otīrīt" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Atsaukt" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "Ata_tsaukt" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Velciet un nometiet šo ikonu, lai izveidotu saiti uz šo lapu" @@ -1608,7 +1582,6 @@ msgstr[2] "Ir %d līdzīgu grāmatzīmju" #: ../src/bookmarks/ephy-bookmark-properties.c:235 -#| msgid "Add _Bookmark" msgid "Add Bookmark" msgstr "Pievienot grāmatzīmi" @@ -1617,23 +1590,23 @@ msgid "“%s” Properties" msgstr "“%s” īpašības" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Nosaukums:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "A_drese:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "T_emati:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Parādī_t visus tematus" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1729,7 +1702,7 @@ msgstr "Izveidot jaunu tematu" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Atvērt jaunā _logā" @@ -1741,7 +1714,7 @@ msgstr "Atvērt izvēlēto grāmatzīmi jaunā logā" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Atvērt jaunā _cilnē" @@ -1802,7 +1775,7 @@ msgstr "Izgriezt izvēlēto" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopēt" @@ -1863,7 +1836,7 @@ msgstr "Rādīt nosaukuma kolonnu" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adrese" @@ -1959,7 +1932,7 @@ msgstr "Eksportēt grāmatzīmes" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Grāmatzīmes" @@ -1985,15 +1958,15 @@ msgid "File" msgstr "Datne" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopēt adresi" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Temati" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Nosaukums" @@ -2271,7 +2244,6 @@ msgstr "Fonti un stils" #: ../src/resources/prefs-dialog.ui.h:22 -#| msgid "Manage _Cookies" msgid "Manage _Cookies…" msgstr "Pārvaldīt _sīkdatnes…" @@ -2297,12 +2269,10 @@ msgstr "Izsekošana" #: ../src/resources/prefs-dialog.ui.h:29 -#| msgid "_Tell web sites I do not want to be tracked" msgid "_Tell websites I do not want to be tracked" msgstr "_Informēt tīmekļa vietnes, ka mani nevajadzētu izsekot" #: ../src/resources/prefs-dialog.ui.h:31 -#| msgid "Manage _Passwords" msgid "Manage _Passwords…" msgstr "Pārvaldīt _paroles…" @@ -2319,7 +2289,6 @@ msgstr "Jūs varat attīrīt saglabātos personiskos datus." #: ../src/resources/prefs-dialog.ui.h:35 -#| msgid "Clear Personal Data" msgid "Cl_ear Personal Data…" msgstr "Dzēst visus p_ersoniskos datus…" @@ -2391,11 +2360,11 @@ msgid "Other encodings" msgstr "Citi kodējumi" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Attīrīt pārlūkošanas vēsturi?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2472,11 +2441,11 @@ "Palaišana neizdevās šādas kļūdas dēļ:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Tīmekļa pārlūka opcijas" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Aizvērt cilni" @@ -2613,142 +2582,153 @@ msgstr "Atvērt saiti jaunā _cilnē" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Atvērt saiti inkognito _logā" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Saglabāt saiti kā..." -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopēt saites adresi" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Kopēt e-pasta adresi" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Skatīt _attēlu jaunā cilnē" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kopēt a_ttēla adresi" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Saglabāt attēlu kā..." -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Iestatīt kā _ekrāntapeti" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Atvērt video jaunā _logā" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Atvērt video jaunā _cilnē" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Saglabāt video kā…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopēt video adresi" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Atvērt audio jaunā _logā" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Atvērt audio jaunā _cilnē" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Saglabāt audio kā…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopēt audio adresi" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Formu elementos ir nenosūtītas izmaiņas" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Ja tomēr aizvērsiet dokumentu, jūs zaudēsiet šo informāciju." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Aizvērt _dokumentu" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Šajā logā ir aktīvas lejupielādes" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Ja aizvērsiet šo logu, visas lejupielādes tiks atceltas" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Aizvērt logu un atcelt lejupielādes" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Saglabāt kā" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Saglabāt kā lietotni" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Drukāt" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Grāmatzīme" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Meklēt" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Lielāks" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Mazāks" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Atpakaļ" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Uz priekšu" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Tālummaiņa" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Jauna _cilne" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Doties uz biežāk apmeklēto" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Meklēt “%s” tīmeklī" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Saglabāt saiti kā" @@ -2871,19 +2851,19 @@ msgid "C_reate" msgstr "Iz_veidot" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Sazinieties ar mums:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Veidotāji:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Bijušie izstrādātāji:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2900,21 +2880,21 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Pēteris Krišjānis \n" "Anita Reitere " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Tīmekļa pārlūka mājas lapa" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Aktivēt kursora pārlūkošanas režīmu?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2924,7 +2904,6 @@ "lapās novieto kursoru, kuru var pārvietot ar tastatūru. Vai vēlaties aktivēt " "kursora pārlūkošanu?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Aktivēt" - diff -Nru epiphany-browser-3.16.3/po/Makevars epiphany-browser-3.18.0/po/Makevars --- epiphany-browser-3.16.3/po/Makevars 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/Makevars 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -# Makefile variables for PO directory in any package using GNU gettext. - -# Usually the message domain is the same as the package name. -DOMAIN = $(GETTEXT_PACKAGE) - -# These two variables depend on the location of this directory. -subdir = po -top_builddir = .. - -# These options get passed to xgettext. -#XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=Q_ - -# This is the copyright holder that gets inserted into the header of the -# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding -# package. (Note that the msgstr strings, extracted from the package's -# sources, belong to the copyright holder of the package.) Translators are -# expected to transfer the copyright for their translations to this person -# or entity, or to disclaim their copyright. The empty string stands for -# the public domain; in this case the translators are expected to disclaim -# their copyright. -COPYRIGHT_HOLDER = GNOME Translation Project - -# This is the email address or URL to which the translators shall report -# bugs in the untranslated strings: -# - Strings which are not entire sentences, see the maintainer guidelines -# in the GNU gettext documentation, section 'Preparing Strings'. -# - Strings which use unclear terms or require additional context to be -# understood. -# - Strings which make invalid assumptions about notation of date, time or -# money. -# - Pluralisation problems. -# - Incorrect English spelling. -# - Incorrect formatting. -# It can be your email address, or a mailing list address where translators -# can write to without being subscribed, or the URL of a web page through -# which the translators can contact you. -MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany - -# This is the list of locale categories, beyond LC_MESSAGES, for which the -# message catalogs shall be used. It is usually empty. -EXTRA_LOCALE_CATEGORIES = diff -Nru epiphany-browser-3.16.3/po/nb.po epiphany-browser-3.18.0/po/nb.po --- epiphany-browser-3.16.3/po/nb.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/nb.po 2015-08-07 08:41:17.000000000 +0000 @@ -8,12 +8,11 @@ # Torstein Adolf Winterseth , 2010. msgid "" msgstr "" -"Project-Id-Version: epiphany 3.15.x\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=epiphany\n" -"POT-Creation-Date: 2015-03-09 19:35+0100\n" -"PO-Revision-Date: 2015-03-09 19:35+0100\n" -"Last-Translator: Åka Sikrom \n" +"Project-Id-Version: epiphany 3.17.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-06 11:13+0200\n" +"PO-Revision-Date: 2015-08-06 11:15+0200\n" +"Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language: nb\n" "MIME-Version: 1.0\n" @@ -49,15 +48,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME nettleser" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -67,35 +66,41 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Nettleseren for GNOME skrivebordet, som er tett integrert med skrivebordet " "og har et enkelt og intuitivt brukergrensesnitt som lar deg fokusere på dine " -"nettsider." +"nettsider. Hvis du leter etter en enkel, ryddig og vakker måte å vise " +"nettsider så er dette nettleseren for deg." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME nettleser omtales ofte med sitt kodenavn, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Internett" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Nettleser" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany nettleser" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Surf på nettet" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;nettleser;internett;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nytt inkognitovindu" @@ -225,18 +230,17 @@ "secondary-process-per-web-view» for å bruke separat prosess per fane." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Stil for verktøylinje" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "Maksimalt antall web prosesser som lages på samme tid når man bruker modellen «one-secondary-process-per-web-view»" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Verktøylinje-stil. La feltet stå tomt for å bruke standard GNOME-stil. Bruk " -"«both» for tekst og ikoner, «both-horiz» for tekst ved siden av ikoner, " -"«icons» for ikoner og «text» for tekst." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "Dette valget setter en grense på antall web-prosesser som vil brukes på samme for modellen «one-secondary-process-per-web-view». Forvalgt verdi er 0 og betyr ingen grense." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -544,19 +548,19 @@ msgid "Installed on:" msgstr "Installert:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Fjern fra oversikt" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Mest besøkte" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Fjern fra oversikt" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privat nettlesing" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -566,14 +570,14 @@ "synlig i nettleserhistorikken og all lagret informasjon vil fjernes når du " "lukker vinduet. Filer du laster ned vil bli beholdt." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Inkognitomodus skjuler kun din aktivitet fra personer som bruker denne " "datamaskinen." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -952,60 +956,60 @@ msgid "Find next occurrence of the search string" msgstr "Finn neste oppføring av søketeksten" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Lagre" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Ikke lagre" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Lagre" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Vil du lagre ditt passord for «%s»?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Nekt" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Tillat" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Siden på %s vil vite hvor du befinner deg." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Siden på %s vil vise skrivebordsvarsler." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Laster «%s» …" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Laster …" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Nettstedet presenterte identifikasjon som tilhører et annet nettsted." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1014,19 +1018,19 @@ "datamaskinens kalender." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Nettstedets identifikasjon er ikke utstedt av en tiltrodd organisasjon." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "Nettstedets identifikasjon kan ikke prosesseres. Den kan være korrupt." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1035,7 +1039,7 @@ "organisasjonen som utstedte den." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1044,7 +1048,7 @@ "kryptering." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1053,13 +1057,13 @@ "på datamaskinens kalender." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Dette er muligvis ikke den virkelige %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1070,7 +1074,7 @@ "endret. Det er noe galt med dette nettstedets identifikasjon:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1081,29 +1085,29 @@ "identifikasjon." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Legitime banker, butikker og andre offentlige nettsteder vil ikke spørre deg " "om å gjøre dette." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Ingen oppgitt" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problem ved lasting av «%s»" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Oops! Det var umulig å vise dette nettstedet." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Prøv igjen" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Oops! Det kan være problemer." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1135,20 +1139,20 @@ "p>

Rapporter problemet til utviklerene av %s hvis dette " "skjer igjen.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Last på nytt likevel" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problem ved visning av «%s»" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Oops!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1157,21 +1161,21 @@ "gå til et annet nettsted for å fortsette." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Pass på!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Last likevel" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1227,7 +1231,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Passord for %s i et skjema i %s" @@ -1235,7 +1239,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Passord i et skjema i %s" @@ -1467,71 +1471,71 @@ msgid "_View Certificate…" msgstr "_Vis sertifikat …" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d sekund igjen" msgstr[1] "%d sekunder igjen" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d minutt igjen" msgstr[1] "%d minutter igjen" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d time igjen" msgstr[1] "%d timer igjen" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d dag igjen" msgstr[1] "%d dager igjen" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d uke igjen" msgstr[1] "%d uke igjen" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d måned igjen" msgstr[1] "%d måneder igjen" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Fullført" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Feil under nedlasting: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Avbryt" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Åpne" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Vis i mappe" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Starter …" @@ -1539,7 +1543,7 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "Tø_m" @@ -1575,23 +1579,23 @@ msgid "“%s” Properties" msgstr "Egenskaper for «%s»" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Tittel:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "A_dresse:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Em_ner:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "_Vis alle emner" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1687,7 +1691,7 @@ msgstr "Opprett et nytt emne" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Åpne i nytt _vindu" @@ -1698,7 +1702,7 @@ msgstr "Åpne valgte bokmerker i et nytt vindu" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Åpne i ny _fane" @@ -1759,7 +1763,7 @@ msgstr "Klipp ut utvalget" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopier" @@ -1820,7 +1824,7 @@ msgstr "Vis tittelkolonnen" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adresse" @@ -1917,7 +1921,7 @@ msgstr "Eksporter bokmerker" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Bokmerker" @@ -1943,15 +1947,15 @@ msgid "File" msgstr "Fil" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopier adresse" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Emner" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Tittel" @@ -2060,7 +2064,7 @@ #: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:100 msgid "New _Incognito Window" -msgstr "_Nytt inkognitovindu" +msgstr "Nytt _inkognitovindu" #: ../src/resources/epiphany-application-menu.ui.h:3 msgid "Reopen Closed _Tab" @@ -2346,11 +2350,11 @@ msgid "Other encodings" msgstr "Andre kodinger" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Tøm nettleserens historikk?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2425,11 +2429,11 @@ "Oppstart feilet på grunn av følgende feil:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Alternativer for Nettleser" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Lukk fane" @@ -2566,142 +2570,151 @@ msgstr "Åpne lenke i ny _fane" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Åpne lenke i i_nkognitovindu" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Lagre lenke som …" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopier lenkens adresse" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Kopier e-postadresse" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Vis b_ilde i ny fane" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Ko_pier adressen til bildet" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Lagre bilde som …" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Sett som _bakgrunn" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Åpne video i nytt _vindu" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Åpne video i ny _fane" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Lagre video som …" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopier adresse til video" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Åpne lyd i nytt _vindu" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Åpne lyd i ny _fane" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Lagre lyd som …" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopier adresse til lyd" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Det finnes endringer i skjemaet som ikke er sendt" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Hvis du lukker dokumentet likevel vil du miste denne informasjonen." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Lukk _dokument" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Det er pågående nedlastinger i dette vinduet" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Hvis du lukker dette vinduet vil nedlastingene bli avbrutt" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Lukk vinduet og avbryt nedlastinger" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Lagre som" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Lagre som program" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Skriv ut" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Bokmerke" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Finn" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Større" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Mindre" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Tilbake" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Fremover" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zoom" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Ny _fane" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Gå til mest besøkte" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Søk på nettet etter «%s»" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Lagre lenke som" @@ -2824,19 +2837,19 @@ msgid "C_reate" msgstr "_Lag" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Kontakt oss her:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Bidragsytere:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Tidligere utviklere:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2853,21 +2866,21 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Kjartan Maraas \n" "Torstein Adolf Winterseth " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Nettsted for GNOME Nettleser" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Slå på markør i nettleser?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2877,6 +2890,6 @@ "bevegelig markør på nettsidene som lar deg flytte rundt med tastaturet. Vil " "du slå på markørmodus?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Slå på" diff -Nru epiphany-browser-3.16.3/po/nl.po epiphany-browser-3.18.0/po/nl.po --- epiphany-browser-3.16.3/po/nl.po 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/po/nl.po 2015-09-22 07:28:20.000000000 +0000 @@ -1,17 +1,17 @@ # Dutch translation for Epiphany # This file is distributed under the same license as the Epiphany package. # Vincent van Adrighem , 2003 -# Reinout van Schouwen , 2003–2014. +# Reinout van Schouwen , 2003–2015. # Lode Vermeiren , 2004 # Wouter Bolsterlee , 2007–2012 -# Rachid BM , 2012. +# Rachid BM , 2012 +# Nathan Follens , 2015. msgid "" msgstr "" "Project-Id-Version: epiphany\n" -"Report-Msgid-Bugs-To: " -"http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany\n" -"POT-Creation-Date: 2014-09-19 23:29+0200\n" -"PO-Revision-Date: 2014-09-23 00:05+0200\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-21 23:29+0200\n" +"PO-Revision-Date: 2015-09-21 23:38+0200\n" "Last-Translator: Reinout van Schouwen \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Poedit 1.5.4\n" "X-Project-Style: gnome\n" # src/window_callbacks.c:2194 @@ -51,15 +51,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:243 -#: ../src/ephy-search-provider.c:306 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 +#: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=nl-nl&kad=nl_NL" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" # GNOME_epiphany_Automation.oaf.in.h:1 # epiphany.desktop.in.h:2 @@ -71,39 +71,51 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"De webbrowser voor de Gnome-werkomgeving, met als bijzondere eigenschappen " +"De webbrowser voor de GNOME-werkomgeving, met als bijzondere eigenschappen " "de nauwe integratie met het bureaublad en een simpele, intuïtieve interface " -"die u in staat stelt zich te concentreren op uw webpagina's." - -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:290 -#: ../embed/ephy-about-handler.c:321 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1514 +"die u in staat stelt zich te concentreren op uw webpagina's. Bent u op zoek " +"naar een simpele, opgeruimde en elegante weergave van het web? Dan is dit " +"de webbrowser voor u." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web is ook wel bekend onder zijn codenaam Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" # GNOME_epiphany_Automation.oaf.in.h:1 # epiphany.desktop.in.h:2 -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Webbrowser" # GNOME_epiphany_Automation.oaf.in.h:1 # epiphany.desktop.in.h:2 -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany webbrowser" # src/window_callbacks.c:2194 -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Websurfen" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;browser;internet;surfen;" +# src/context.c:60 +#: ../data/epiphany.desktop.in.h:6 +msgid "New Incognito Window" +msgstr "Nieuw incognitovenster" + # src/window_callbacks.c:2194 #: ../data/org.gnome.epiphany.gschema.xml.h:1 msgid "Browse with caret" @@ -172,7 +184,7 @@ msgstr "Wachtwoorden onthouden" #: ../data/org.gnome.epiphany.gschema.xml.h:20 -msgid "Whether to store and prefill passwords in web sites." +msgid "Whether to store and prefill passwords in websites." msgstr "" "Of wachtwoorden voor websites onthouden en vooraf ingevuld moeten worden." @@ -236,20 +248,23 @@ "'one-secondary-process-per-web-view' om een afzonderlijk webproces voor elk " "tabblad te gebruiken." -# src/menubar.c:150 #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Werkbalkstijl" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maximum aantal webprocessen tegelijkertijd gecreëerd bij gebruik van " +"‘one-secondary-process-per-web-view’-model" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Werkbalkstijl. Toegestane waardes zijn ‘(use GNOME default style)’, " -"‘both’ (tekst en pictogrammen), ‘both-horiz’ (tekst naast pictogrammen), " -"‘icons’, en ‘text’." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Deze optie begrenst het aantal webprocessen dat tegelijkertijd gebruikt wordt " +"voor het ‘one-secondary-process-per-web-view’-model. De standaardwaarde is " +"‘0’ en betekent geen grens." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -391,43 +406,36 @@ "Standaard codering. Toegestane waardes zijn degene die begrepen worden door " "WebKitGTK+." -#: ../data/org.gnome.epiphany.gschema.xml.h:57 -msgid "Size of disk cache" -msgstr "Grootte van schijfbuffer" - -#: ../data/org.gnome.epiphany.gschema.xml.h:58 -msgid "Size of disk cache, in MB." -msgstr "Grootte van schijfbuffer, in MB." - # src/prefs.c:397 # ui/preferences.glade.h:103 -#: ../data/org.gnome.epiphany.gschema.xml.h:59 -#: ../src/resources/prefs-dialog.ui.h:40 +#: ../data/org.gnome.epiphany.gschema.xml.h:57 +#: ../src/resources/prefs-dialog.ui.h:39 msgid "Languages" msgstr "Talen" -#: ../data/org.gnome.epiphany.gschema.xml.h:60 +#: ../data/org.gnome.epiphany.gschema.xml.h:58 msgid "Preferred languages, two letter codes." msgstr "Voorkeurstalen, tweeletterige codes." # ui/preferences.glade.h:118 -#: ../data/org.gnome.epiphany.gschema.xml.h:61 +#: ../data/org.gnome.epiphany.gschema.xml.h:59 msgid "Cookie accept" msgstr "Cookies accepteren" -#: ../data/org.gnome.epiphany.gschema.xml.h:62 +#: ../data/org.gnome.epiphany.gschema.xml.h:60 msgid "" -"Where to accept cookies from. Possible values are \"anywhere\", \"current " -"site\" and \"nowhere\"." +"Where to accept cookies from. Possible values are \"always\", \"no-third-" +"party\" and \"never\"." msgstr "" -"Waar cookies van geaccepteerd worden. Mogelijke waardes zijn " -"‘anywhere’ (overal), ‘current site’ (huidige website) en ‘nowhere’ (nergens)." +"Waar cookies van geaccepteerd worden. Mogelijke waarden zijn \"always" +"\" (altijd), \"no-third-party\" (enkel van de huidige website) en \"never" +"\" (nooit)." -#: ../data/org.gnome.epiphany.gschema.xml.h:63 +#: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" msgstr "Afbeeldingsanimatiemodus" -#: ../data/org.gnome.epiphany.gschema.xml.h:64 +#: ../data/org.gnome.epiphany.gschema.xml.h:62 msgid "" "How to present animated images. Possible values are \"normal\", \"once\" and " "\"disabled\"." @@ -436,48 +444,48 @@ "‘normal’ (normaal), ‘once’ (eenmaal) en ‘disabled’ (uit)." # src/menubar.c:416 -#: ../data/org.gnome.epiphany.gschema.xml.h:65 +#: ../data/org.gnome.epiphany.gschema.xml.h:63 msgid "Allow popups" msgstr "Pop-ups toestaan" -#: ../data/org.gnome.epiphany.gschema.xml.h:66 +#: ../data/org.gnome.epiphany.gschema.xml.h:64 msgid "" "Allow sites to open new windows using JavaScript (if JavaScript is enabled)." msgstr "" "Webpagina's toestaan om nieuwe vensters te openen met JavaScript (als " "JavaScript is ingeschakeld)." -#: ../data/org.gnome.epiphany.gschema.xml.h:67 +#: ../data/org.gnome.epiphany.gschema.xml.h:65 msgid "Enable Plugins" msgstr "Plug-ins inschakelen" # src/menubar.c:411 # ui/preferences.glade.h:12 -#: ../data/org.gnome.epiphany.gschema.xml.h:68 +#: ../data/org.gnome.epiphany.gschema.xml.h:66 msgid "Enable JavaScript" msgstr "JavaScript inschakelen" -#: ../data/org.gnome.epiphany.gschema.xml.h:69 +#: ../data/org.gnome.epiphany.gschema.xml.h:67 msgid "Enable WebGL" msgstr "WebGL inschakelen" -#: ../data/org.gnome.epiphany.gschema.xml.h:70 +#: ../data/org.gnome.epiphany.gschema.xml.h:68 msgid "Whether to enable support for WebGL contexts." msgstr "Of ondersteuning voor WebGL-contexten ingeschakeld moet worden." -#: ../data/org.gnome.epiphany.gschema.xml.h:71 +#: ../data/org.gnome.epiphany.gschema.xml.h:69 msgid "Enable WebAudio" msgstr "WebAudio inschakelen" -#: ../data/org.gnome.epiphany.gschema.xml.h:72 +#: ../data/org.gnome.epiphany.gschema.xml.h:70 msgid "Whether to enable support for WebAudio." msgstr "Of ondersteuning voor WebAudio ingeschakeld moet worden." -#: ../data/org.gnome.epiphany.gschema.xml.h:73 +#: ../data/org.gnome.epiphany.gschema.xml.h:71 msgid "Do Not Track" msgstr "Niet volgen (Do Not Track)" -#: ../data/org.gnome.epiphany.gschema.xml.h:74 +#: ../data/org.gnome.epiphany.gschema.xml.h:72 msgid "" "Whether to tell websites that we do not wish to be tracked. Please note that " "web pages are not forced to follow this setting." @@ -485,11 +493,11 @@ "Of websites gemeld moet worden de gebruiker niet te volgen (tracken). Let " "erop dat websites niet verplicht zijn deze instelling te respecteren." -#: ../data/org.gnome.epiphany.gschema.xml.h:75 +#: ../data/org.gnome.epiphany.gschema.xml.h:73 msgid "Enable Adblock" msgstr "Adblock inschakelen" -#: ../data/org.gnome.epiphany.gschema.xml.h:76 +#: ../data/org.gnome.epiphany.gschema.xml.h:74 msgid "" "Whether to block the embedded advertisements that web pages might want to " "show." @@ -498,11 +506,11 @@ # src/context.c:62 # src/history_callbacks.c:159 # src/misc_callbacks.c:408 -#: ../data/org.gnome.epiphany.gschema.xml.h:77 +#: ../data/org.gnome.epiphany.gschema.xml.h:75 msgid "The downloads folder" msgstr "De downloadmap" -#: ../data/org.gnome.epiphany.gschema.xml.h:78 +#: ../data/org.gnome.epiphany.gschema.xml.h:76 msgid "" "The path of the folder where to download files to; or \"Downloads\" to use " "the default downloads folder, or \"Desktop\" to use the desktop folder." @@ -511,11 +519,11 @@ "\"Downloads\" om de standaard downloadsmap te gebruiken, of \"Desktop\" om " "de bureaubladmap te gebruiken." -#: ../data/org.gnome.epiphany.gschema.xml.h:79 +#: ../data/org.gnome.epiphany.gschema.xml.h:77 msgid "Whether to show the title column in the bookmarks window." msgstr "Of de titelkolom wordt getoond in het bladwijzervenster." -#: ../data/org.gnome.epiphany.gschema.xml.h:80 +#: ../data/org.gnome.epiphany.gschema.xml.h:78 msgid "Whether to show the address column in the bookmarks window." msgstr "Of de adreskolom wordt getoond in het bladwijzervenster." @@ -557,52 +565,52 @@ msgid "Suffixes" msgstr "Achtervoegsels" -#: ../embed/ephy-about-handler.c:218 ../embed/ephy-about-handler.c:220 +#: ../embed/ephy-about-handler.c:220 ../embed/ephy-about-handler.c:222 msgid "Memory usage" msgstr "Geheugengebruik" -#: ../embed/ephy-about-handler.c:268 +#: ../embed/ephy-about-handler.c:270 #, c-format msgid "Version %s" msgstr "Versie %s" # src/menubar.c:43 -#: ../embed/ephy-about-handler.c:288 +#: ../embed/ephy-about-handler.c:290 msgid "About Web" msgstr "Info over Web" -#: ../embed/ephy-about-handler.c:292 +#: ../embed/ephy-about-handler.c:294 msgid "A simple, clean, beautiful view of the web" msgstr "Een simpele, heldere en mooie weergave van het web" -#: ../embed/ephy-about-handler.c:343 ../embed/ephy-about-handler.c:344 +#: ../embed/ephy-about-handler.c:352 ../embed/ephy-about-handler.c:353 msgid "Applications" msgstr "Toepassingen" -#: ../embed/ephy-about-handler.c:345 +#: ../embed/ephy-about-handler.c:354 msgid "List of installed web applications" msgstr "Lijst van geïnstalleerde toepassingen" #. Note for translators: this refers to the installation date. -#: ../embed/ephy-about-handler.c:362 +#: ../embed/ephy-about-handler.c:370 msgid "Installed on:" msgstr "Geïnstalleerd op:" -# src/menubar.c:150 -#: ../embed/ephy-about-handler.c:466 -msgid "Remove from overview" -msgstr "Verwijderen uit overzicht" - # ui/epiphany.glade.h:83 -#: ../embed/ephy-about-handler.c:481 ../embed/ephy-embed-utils.c:300 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Meest bezocht" -#: ../embed/ephy-about-handler.c:541 ../embed/ephy-about-handler.c:542 +# src/menubar.c:150 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Verwijderen uit overzicht" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privénavigatie" -#: ../embed/ephy-about-handler.c:543 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -613,13 +621,22 @@ "informatie wordt gewist wanneer u het venster sluit. Bestanden die u " "downloadt blijven behouden." -#: ../embed/ephy-about-handler.c:547 +#: ../embed/ephy-about-handler.c:579 +msgid "" +"Incognito mode hides your activity only from people using this computer." +msgstr "" +"Incognito-modus verbergt uw activiteit enkel van personen die deze computer " +"gebruiken." + +#: ../embed/ephy-about-handler.c:581 msgid "" -"Incognito mode will not hide your activity from your employer, your Internet " -"Service Provider, your government, or the websites that you visit." +"It will not hide your activity from your employer if you are at work. Your " +"internet service provider, your government, other governments, the websites " +"that you visit, and advertisers on these websites may still be tracking you." msgstr "" -"Incognito-modus verbergt uw activiteit niet voor uw werkgever, uw " -"internetprovider, de autoriteiten of de websites die u bezoekt." +"Het zal uw activiteit niet van uw werkgever verbergen wanneer u aan het werk " +"bent. Uw internetprovider, uw regering, andere regeringen, de websites die u " +"bezoekt en adverteerders op die websites kunnen u nog steeds volgen." # ui/preferences.glade.h:170 #. characters @@ -628,21 +645,21 @@ msgstr "Blanco pagina" # src/main.c:111 -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Gebruik %s om volledig scherm te verlaten" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" -#: ../embed/ephy-embed-utils.c:64 +#: ../embed/ephy-embed-utils.c:65 #, c-format msgid "Send an email message to “%s”" msgstr "E-mailbericht sturen naar ‘%s’" @@ -1072,125 +1089,139 @@ msgid "Find next occurrence of the search string" msgstr "Zoeken naar volgende positie waar de zoektekst voorkomt" +# src/bookmarks.c:245 +# src/prefs.c:365 +# src/toolbar.c:260 +# ui/bookmarks.glade.h:3 +#: ../embed/ephy-web-view.c:494 +msgid "_Don’t Save" +msgstr "_Niet opslaan" + # src/menubar.c:63 -#: ../embed/ephy-web-view.c:492 ../src/window-commands.c:330 -msgid "Save" -msgstr "Opslaan" +#: ../embed/ephy-web-view.c:495 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "Op_slaan" #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:506 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Wilt u uw wachtwoord voor ‘%s’ opslaan?" -#: ../embed/ephy-web-view.c:1415 +#: ../embed/ephy-web-view.c:1434 msgid "Deny" msgstr "Weigeren" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1435 msgid "Allow" msgstr "Toestaan" -#: ../embed/ephy-web-view.c:1426 +#. Translators: Geolocation policy for a specific site. +#: ../embed/ephy-web-view.c:1447 #, c-format msgid "The page at %s wants to know your location." msgstr "De pagina %s wil uw locatiegegevens weten." +#. Translators: Notification policy for a specific site. +#: ../embed/ephy-web-view.c:1451 +#, c-format +msgid "The page at %s wants to show desktop notifications." +msgstr "De pagina %s wil bureaubladnotificaties weergeven." + # src/mozcallbacks.c:424 #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1510 +#: ../embed/ephy-web-view.c:1539 #, c-format msgid "Loading “%s”…" msgstr "Laden van ‘%s’…" # src/mozcallbacks.c:424 -#: ../embed/ephy-web-view.c:1512 +#: ../embed/ephy-web-view.c:1541 msgid "Loading…" msgstr "Laden…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1734 +#: ../embed/ephy-web-view.c:1764 msgid "" -"This web site presented identification that belongs to a different web site." +"This website presented identification that belongs to a different website." msgstr "" "Deze website presenteerde identificatie die bij een andere website hoort." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1739 +#: ../embed/ephy-web-view.c:1769 msgid "" -"This web site’s identification is too old to trust. Check the date on your " +"This website’s identification is too old to trust. Check the date on your " "computer’s calendar." msgstr "" "De identificatie van deze website is te oud om te vertrouwen. Controleer de " "datum op de kalender van uw computer." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1744 -msgid "" -"This web site’s identification was not issued by a trusted organization." +#: ../embed/ephy-web-view.c:1774 +msgid "This website’s identification was not issued by a trusted organization." msgstr "" "De identificatie van deze website is niet uitgegeven door een vertrouwde " "organisatie." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1749 +#: ../embed/ephy-web-view.c:1779 msgid "" -"This web site’s identification could not be processed. It may be corrupted." +"This website’s identification could not be processed. It may be corrupted." msgstr "" -"Deze website-identificatie kan niet worden verwerkt. Mogelijk is zij " +"De identificatie van deze website kan niet worden verwerkt. Mogelijk is zij " "beschadigd." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1754 +#: ../embed/ephy-web-view.c:1784 msgid "" -"This web site’s identification has been revoked by the trusted organization " +"This website’s identification has been revoked by the trusted organization " "that issued it." msgstr "" "De identificatie van deze website is ingetrokken door de vertrouwde " "organisatie die haar heeft verstrekt." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1759 +#: ../embed/ephy-web-view.c:1789 msgid "" -"This web site’s identification cannot be trusted because it uses very weak " +"This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "" "De identificatie van deze website kan niet vertrouwd worden omdat zij zeer " "zwakke versleuteling gebruikt." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1764 +#: ../embed/ephy-web-view.c:1794 msgid "" -"This web site’s identification is only valid for future dates. Check the " -"date on your computer’s calendar." +"This website’s identification is only valid for future dates. Check the date " +"on your computer’s calendar." msgstr "" "De identificatie van deze website is alleen geldig voor een datum in de " "toekomst. Controleer de datum op de kalender van uw computer." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1800 +#: ../embed/ephy-web-view.c:1830 #, c-format msgid "This might not be the real %s." msgstr "Dit is mogelijk niet de echte %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1805 +#: ../embed/ephy-web-view.c:1835 msgid "" -"When you try to connect securely, web sites present identification to prove " +"When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " -"something wrong with this site’s identification:" +"something wrong with this website’s identification:" msgstr "" "Wanneer u een beveiligde verbinding probeert te maken, presenteren websites " "identificatie om te bewijzen dat uw verbinding niet door kwaadwillenden " "onderschept wordt. Er is iets mis met de identificatie van deze website:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1811 +#: ../embed/ephy-web-view.c:1841 msgid "" "A third party may have hijacked your connection. You should continue only if " -"you know there is a good reason why this site does not use trusted " +"you know there is a good reason why this website does not use trusted " "identification." msgstr "" "Een derde partij kan uw verbinding hebben gekaapt. U zou alleen moeten " @@ -1198,30 +1229,30 @@ "vertrouwde identificatie heeft." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1815 +#: ../embed/ephy-web-view.c:1845 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Bonafide banken, winkels en andere openbare sites zullen u niet vragen om " "dit te doen." -#: ../embed/ephy-web-view.c:1856 +#: ../embed/ephy-web-view.c:1886 msgid "None specified" msgstr "Niet opgegeven" # src/mozcallbacks.c:424 #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1869 ../embed/ephy-web-view.c:1884 -#: ../embed/ephy-web-view.c:1904 +#: ../embed/ephy-web-view.c:1899 ../embed/ephy-web-view.c:1914 +#: ../embed/ephy-web-view.c:1934 #, c-format msgid "Problem loading “%s”" msgstr "Probleem bij het laden van ‘%s’" -#: ../embed/ephy-web-view.c:1871 +#: ../embed/ephy-web-view.c:1901 msgid "Oops! Unable to display this website." msgstr "Oeps! Kon deze webpagina niet weergeven." -#: ../embed/ephy-web-view.c:1872 +#: ../embed/ephy-web-view.c:1902 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1910 msgid "Try again" msgstr "Opnieuw proberen" -#: ../embed/ephy-web-view.c:1886 +#: ../embed/ephy-web-view.c:1916 msgid "Oops! There may be a problem." msgstr "Oeps! Er zou een probleem kunnen zijn." -#: ../embed/ephy-web-view.c:1887 +#: ../embed/ephy-web-view.c:1917 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1253,21 +1284,21 @@ "p>

Als dit opnieuw gebeurt, meld het probleem dan alstublieft bij de " "ontwikkelaars van %s.

" -#: ../embed/ephy-web-view.c:1892 ../embed/ephy-web-view.c:1899 +#: ../embed/ephy-web-view.c:1922 ../embed/ephy-web-view.c:1929 msgid "Reload Anyway" msgstr "Toch opnieuw laden" # src/menubar.c:63 -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1926 #, c-format msgid "Problem displaying “%s”" msgstr "Probleem bij het weergeven van ‘%s’" -#: ../embed/ephy-web-view.c:1897 +#: ../embed/ephy-web-view.c:1927 msgid "Oops!" msgstr "Oeps!" -#: ../embed/ephy-web-view.c:1898 +#: ../embed/ephy-web-view.c:1928 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1276,24 +1307,24 @@ "of een andere pagina te bezoeken om door te gaan." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1936 msgid "Look out!" msgstr "Kijk uit!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1909 +#: ../embed/ephy-web-view.c:1939 msgid "Load Anyway" msgstr "Toch laden" -#: ../embed/ephy-web-view.c:2805 +#: ../embed/ephy-web-view.c:2867 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:428 -#: ../src/bookmarks/ephy-bookmarks-editor.c:819 +#: ../src/bookmarks/ephy-bookmark-properties.c:436 +#: ../src/bookmarks/ephy-bookmarks-editor.c:820 #: ../src/resources/clear-data-dialog.ui.h:3 -#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808 +#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 msgid "_Cancel" msgstr "_Annuleren" @@ -1303,50 +1334,45 @@ msgid "_Open" msgstr "_Openen" -# src/menubar.c:63 -#: ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "Op_slaan" - #: ../lib/ephy-file-chooser.c:209 msgid "All supported types" msgstr "Alle ondersteunde types" -#: ../lib/ephy-file-chooser.c:221 +#: ../lib/ephy-file-chooser.c:223 msgid "Web pages" msgstr "Webpagina's" # src/history.c:845 -#: ../lib/ephy-file-chooser.c:230 +#: ../lib/ephy-file-chooser.c:234 msgid "Images" msgstr "Afbeeldingen" # src/history.c:845 -#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:637 +#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:638 msgid "All files" msgstr "Alle bestanden" #. If we don't have XDG user dirs info, return an educated guess. -#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:2 +#: ../lib/ephy-file-helpers.c:114 ../src/resources/prefs-dialog.ui.h:2 msgid "Downloads" msgstr "Downloads" #. If we don't have XDG user dirs info, return an educated guess. -#: ../lib/ephy-file-helpers.c:165 +#: ../lib/ephy-file-helpers.c:167 msgid "Desktop" msgstr "Bureaublad" -#: ../lib/ephy-file-helpers.c:333 +#: ../lib/ephy-file-helpers.c:335 #, c-format msgid "Could not create a temporary directory in “%s”." msgstr "Kan geen tijdelijke map aanmaken in ‘%s’." -#: ../lib/ephy-file-helpers.c:469 +#: ../lib/ephy-file-helpers.c:466 #, c-format msgid "The file “%s” exists. Please move it out of the way." msgstr "Het bestand ‘%s’ bestaat. Haal het alstublieft uit de weg." -#: ../lib/ephy-file-helpers.c:490 +#: ../lib/ephy-file-helpers.c:487 #, c-format msgid "Failed to create directory “%s”." msgstr "Aanmaken van de map ‘%s’ is mislukt." @@ -1355,7 +1381,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Wachtwoord voor %s in een formulier op %s" @@ -1363,7 +1389,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Wachtwoord in een formulier op %s" @@ -1651,32 +1677,32 @@ msgstr[1] "%d maanden te gaan" # src/toolbar.c:351 -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:305 msgid "Finished" msgstr "Klaar" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:321 #, c-format msgid "Error downloading: %s" msgstr "Fout bij het downloaden: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:712 +#: ../lib/widgets/ephy-download-widget.c:376 ../src/window-commands.c:713 msgid "Cancel" msgstr "Annuleren" # src/bookmarks_editor.c:942 # src/menubar.c:34 -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1122 +#: ../lib/widgets/ephy-download-widget.c:384 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Openen" # src/menubar.c:150 -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:389 msgid "Show in folder" msgstr "Tonen in map" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:593 msgid "Starting…" msgstr "Starten…" @@ -1685,60 +1711,64 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:603 -#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:265 msgid "Cl_ear" msgstr "_Wissen" # src/mozilla_i18n.c:37 # ui/preferences.glade.h:202 #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:622 ../src/ephy-window.c:121 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Ongedaan maken" -#: ../lib/widgets/ephy-location-entry.c:629 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "O_pnieuw" -#: ../lib/widgets/ephy-location-entry.c:909 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Sleep dit pictogram om een verwijzing naar deze pagina te maken" #. Translators: This string is used when counting bookmarks that #. * are similar to each other -#: ../src/bookmarks/ephy-bookmark-properties.c:84 +#: ../src/bookmarks/ephy-bookmark-properties.c:85 #, c-format msgid "%d bookmark is similar" msgid_plural "%d bookmarks are similar" msgstr[0] "%d bladwijzer is vergelijkbaar" msgstr[1] "%d bladwijzers zijn vergelijkbaar" -#: ../src/bookmarks/ephy-bookmark-properties.c:234 +# src/menubar.c:571 +#: ../src/bookmarks/ephy-bookmark-properties.c:236 +msgid "Add Bookmark" +msgstr "Bladwijzer toevoegen" + +#: ../src/bookmarks/ephy-bookmark-properties.c:238 #, c-format msgid "“%s” Properties" msgstr "‘%s’-eigenschappen" # ui/epiphany.glade.h:121 -#: ../src/bookmarks/ephy-bookmark-properties.c:358 +#: ../src/bookmarks/ephy-bookmark-properties.c:364 msgid "_Title:" msgstr "Tit_el:" -#: ../src/bookmarks/ephy-bookmark-properties.c:375 +#: ../src/bookmarks/ephy-bookmark-properties.c:382 msgid "A_ddress:" msgstr "A_dres:" -#: ../src/bookmarks/ephy-bookmark-properties.c:387 +#: ../src/bookmarks/ephy-bookmark-properties.c:395 msgid "T_opics:" msgstr "_Onderwerpen:" # ui/preferences.glade.h:195 -#: ../src/bookmarks/ephy-bookmark-properties.c:410 +#: ../src/bookmarks/ephy-bookmark-properties.c:418 msgid "Sho_w all topics" msgstr "Alle o_nderwerpen tonen" -#: ../src/bookmarks/ephy-bookmark-properties.c:431 -#: ../src/resources/prefs-dialog.ui.h:41 +#: ../src/bookmarks/ephy-bookmark-properties.c:439 +#: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" msgstr "_Toevoegen" @@ -1770,14 +1800,14 @@ # src/mozilla/mozilla.cpp:994 #. Translators: this topic contains all bookmarks -#: ../src/bookmarks/ephy-bookmarks.c:926 +#: ../src/bookmarks/ephy-bookmarks.c:927 msgctxt "bookmarks" msgid "All" msgstr "Alles" #. Translators: this topic contains the not categorized #. bookmarks -#: ../src/bookmarks/ephy-bookmarks.c:930 +#: ../src/bookmarks/ephy-bookmarks.c:931 msgctxt "bookmarks" msgid "Not Categorized" msgstr "Niet ingedeeld" @@ -1785,7 +1815,7 @@ # ui/epiphany.glade.h:83 #. Translators: this is an automatic topic containing local #. * websites bookmarks autodiscovered with zeroconf. -#: ../src/bookmarks/ephy-bookmarks.c:934 +#: ../src/bookmarks/ephy-bookmarks.c:935 msgctxt "bookmarks" msgid "Nearby Sites" msgstr "Sites dichtbij" @@ -1796,20 +1826,20 @@ # src/misc.c:354 # src/mozcallbacks.c:225 # src/window.c:2279 -#: ../src/bookmarks/ephy-bookmarks.c:1148 +#: ../src/bookmarks/ephy-bookmarks.c:1150 #: ../src/bookmarks/ephy-bookmarks-import.c:270 msgid "Untitled" msgstr "Naamloos" -#: ../src/bookmarks/ephy-bookmarks-editor.c:75 +#: ../src/bookmarks/ephy-bookmarks-editor.c:76 msgid "Web (RDF)" msgstr "Web (RDF)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:76 +#: ../src/bookmarks/ephy-bookmarks-editor.c:77 msgid "Mozilla (HTML)" msgstr "Mozilla (HTML)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:124 +#: ../src/bookmarks/ephy-bookmarks-editor.c:125 msgid "Remove from this topic" msgstr "Verwijderen uit dit onderwerp" @@ -1817,80 +1847,80 @@ # src/bookmarks_editor.c:1148 # src/menubar.c:565 #. Toplevel -#: ../src/bookmarks/ephy-bookmarks-editor.c:151 +#: ../src/bookmarks/ephy-bookmarks-editor.c:152 msgid "_File" msgstr "_Bestand" # src/bookmarks_editor.c:946 # src/bookmarks_editor.c:1149 # src/menubar.c:566 -#: ../src/bookmarks/ephy-bookmarks-editor.c:152 +#: ../src/bookmarks/ephy-bookmarks-editor.c:153 msgid "_Edit" msgstr "Be_werken" # src/bookmarks_editor.c:950 # src/bookmarks_editor.c:1150 # src/menubar.c:567 -#: ../src/bookmarks/ephy-bookmarks-editor.c:153 +#: ../src/bookmarks/ephy-bookmarks-editor.c:154 msgid "_View" msgstr "Beel_d" # src/menubar.c:573 #. Help. -#: ../src/bookmarks/ephy-bookmarks-editor.c:154 -#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:191 +#: ../src/bookmarks/ephy-bookmarks-editor.c:155 +#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 msgid "_Help" msgstr "_Hulp" # ui/preferences.glade.h:195 #. File Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:158 +#: ../src/bookmarks/ephy-bookmarks-editor.c:159 msgid "_New Topic" msgstr "_Nieuw onderwerp" # src/menubar.c:54 -#: ../src/bookmarks/ephy-bookmarks-editor.c:159 +#: ../src/bookmarks/ephy-bookmarks-editor.c:160 msgid "Create a new topic" msgstr "Nieuw onderwerp aanmaken" # src/context.c:60 -#: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1156 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "In nieuw _venster openen" msgstr[1] "In nieuwe _vensters openen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +#: ../src/bookmarks/ephy-bookmarks-editor.c:163 msgid "Open the selected bookmark in a new window" msgstr "Geselecteerde bladwijzer openen in een nieuw venster" # src/context.c:66 -#: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1159 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "In nieuw _tabblad openen" msgstr[1] "In nieuwe _tabbladen openen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +#: ../src/bookmarks/ephy-bookmarks-editor.c:166 msgid "Open the selected bookmark in a new tab" msgstr "Geselecteerde bladwijzer openen in een nieuw tabblad" # ui/epiphany.glade.h:103 -#: ../src/bookmarks/ephy-bookmarks-editor.c:167 +#: ../src/bookmarks/ephy-bookmarks-editor.c:168 msgid "_Rename…" msgstr "_Hernoemen…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:168 +#: ../src/bookmarks/ephy-bookmarks-editor.c:169 msgid "Rename the selected bookmark or topic" msgstr "Geselecteerde bladwijzer of onderwerp hernoemen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:169 +#: ../src/bookmarks/ephy-bookmarks-editor.c:170 msgid "_Properties" msgstr "_Eigenschappen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:170 +#: ../src/bookmarks/ephy-bookmarks-editor.c:171 msgid "View or modify the properties of the selected bookmark" msgstr "Eigenschappen bekijken of bewerken van de geselecteerde bladwijzer" @@ -1898,11 +1928,11 @@ # src/prefs.c:365 # src/toolbar.c:260 # ui/bookmarks.glade.h:3 -#: ../src/bookmarks/ephy-bookmarks-editor.c:172 +#: ../src/bookmarks/ephy-bookmarks-editor.c:173 msgid "_Import Bookmarks…" msgstr "Bladwijzers i_mporteren…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:173 +#: ../src/bookmarks/ephy-bookmarks-editor.c:174 msgid "Import bookmarks from another browser or a bookmarks file" msgstr "Bladwijzers importeren van andere browser of bladwijzerbestand" @@ -1910,7 +1940,7 @@ # src/prefs.c:365 # src/toolbar.c:260 # ui/bookmarks.glade.h:3 -#: ../src/bookmarks/ephy-bookmarks-editor.c:175 +#: ../src/bookmarks/ephy-bookmarks-editor.c:176 msgid "_Export Bookmarks…" msgstr "Bladwijzers e_xporteren…" @@ -1918,19 +1948,19 @@ # src/prefs.c:365 # src/toolbar.c:260 # ui/bookmarks.glade.h:3 -#: ../src/bookmarks/ephy-bookmarks-editor.c:176 +#: ../src/bookmarks/ephy-bookmarks-editor.c:177 msgid "Export bookmarks to a file" msgstr "Bladwijzers exporteren naar een bestand" # src/bookmarks_editor.c:945 # src/menubar.c:91 -#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:114 +#: ../src/bookmarks/ephy-bookmarks-editor.c:179 ../src/ephy-window.c:112 msgid "_Close" msgstr "Sl_uiten" # GNOME_epiphany_Automation.oaf.in.h:1 # epiphany.desktop.in.h:2 -#: ../src/bookmarks/ephy-bookmarks-editor.c:179 +#: ../src/bookmarks/ephy-bookmarks-editor.c:180 msgid "Close the bookmarks window" msgstr "Bladwijzervenster sluiten" @@ -1938,114 +1968,114 @@ # src/window_callbacks.c:1145 # src/window_callbacks.c:2880 #. Edit Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:184 ../src/ephy-window.c:123 msgid "Cu_t" msgstr "K_nippen" # src/menubar.c:37 -#: ../src/bookmarks/ephy-bookmarks-editor.c:184 +#: ../src/bookmarks/ephy-bookmarks-editor.c:185 msgid "Cut the selection" msgstr "Selectie knippen" # src/bookmarks_editor.c:948 # src/bookmarks_editor.c:1167 # src/menubar.c:38 -#: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:127 +#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1169 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopiëren" # src/menubar.c:38 -#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +#: ../src/bookmarks/ephy-bookmarks-editor.c:188 msgid "Copy the selection" msgstr "Selectie kopiëren" # src/bookmarks_editor.c:949 # src/bookmarks_editor.c:1169 # src/menubar.c:39 -#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:129 +#: ../src/bookmarks/ephy-bookmarks-editor.c:190 ../src/ephy-window.c:127 msgid "_Paste" msgstr "_Plakken" # src/menubar.c:39 -#: ../src/bookmarks/ephy-bookmarks-editor.c:190 +#: ../src/bookmarks/ephy-bookmarks-editor.c:191 msgid "Paste the clipboard" msgstr "Plakken vanuit klembord" # src/bookmarks_editor.c:949 # src/bookmarks_editor.c:1169 # src/menubar.c:39 -#: ../src/bookmarks/ephy-bookmarks-editor.c:192 +#: ../src/bookmarks/ephy-bookmarks-editor.c:193 #: ../src/resources/history-dialog.ui.h:12 msgid "_Delete" msgstr "_Verwijderen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:193 +#: ../src/bookmarks/ephy-bookmarks-editor.c:194 msgid "Delete the selected bookmark or topic" msgstr "Geselecteerde bladwijzer of onderwerp verwijderen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:133 +#: ../src/bookmarks/ephy-bookmarks-editor.c:196 ../src/ephy-window.c:131 msgid "Select _All" msgstr "_Alles selecteren" -#: ../src/bookmarks/ephy-bookmarks-editor.c:196 +#: ../src/bookmarks/ephy-bookmarks-editor.c:197 msgid "Select all bookmarks or text" msgstr "Alle bladwijzers of tekst selecteren" #. Help Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:200 +#: ../src/bookmarks/ephy-bookmarks-editor.c:201 msgid "_Contents" msgstr "I_nhoud" # GNOME_epiphany_Automation.oaf.in.h:1 # epiphany.desktop.in.h:2 -#: ../src/bookmarks/ephy-bookmarks-editor.c:201 +#: ../src/bookmarks/ephy-bookmarks-editor.c:202 msgid "Display bookmarks help" msgstr "Hulp voor bladwijzers weergeven" # src/menubar.c:43 -#: ../src/bookmarks/ephy-bookmarks-editor.c:203 -#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:193 +#: ../src/bookmarks/ephy-bookmarks-editor.c:204 +#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 msgid "_About" msgstr "_Info" -#: ../src/bookmarks/ephy-bookmarks-editor.c:204 +#: ../src/bookmarks/ephy-bookmarks-editor.c:205 msgid "Display credits for the web browser creators" msgstr "Namen van de webbrowser-auteurs weergeven" # ui/epiphany.glade.h:121 #. View Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:210 +#: ../src/bookmarks/ephy-bookmarks-editor.c:211 msgid "_Title" msgstr "Tit_el" -#: ../src/bookmarks/ephy-bookmarks-editor.c:211 +#: ../src/bookmarks/ephy-bookmarks-editor.c:212 msgid "Show the title column" msgstr "De titelkolom weergeven" -#: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1644 msgid "Address" msgstr "Adres" -#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +#: ../src/bookmarks/ephy-bookmarks-editor.c:214 msgid "Show the address column" msgstr "De adreskolom weergeven" -#: ../src/bookmarks/ephy-bookmarks-editor.c:255 +#: ../src/bookmarks/ephy-bookmarks-editor.c:256 msgid "Type a topic" msgstr "Geef een onderwerp" -#: ../src/bookmarks/ephy-bookmarks-editor.c:377 +#: ../src/bookmarks/ephy-bookmarks-editor.c:378 #, c-format msgid "Delete topic “%s”?" msgstr "Onderwerp ‘%s’ verwijderen?" -#: ../src/bookmarks/ephy-bookmarks-editor.c:380 +#: ../src/bookmarks/ephy-bookmarks-editor.c:381 msgid "Delete this topic?" msgstr "Dit onderwerp verwijderen?" -#: ../src/bookmarks/ephy-bookmarks-editor.c:382 +#: ../src/bookmarks/ephy-bookmarks-editor.c:383 msgid "" "Deleting this topic will cause all its bookmarks to become uncategorized, " "unless they also belong to other topics. The bookmarks will not be deleted." @@ -2057,24 +2087,24 @@ # src/bookmarks_editor.c:949 # src/bookmarks_editor.c:1169 # src/menubar.c:39 -#: ../src/bookmarks/ephy-bookmarks-editor.c:385 +#: ../src/bookmarks/ephy-bookmarks-editor.c:386 msgid "_Delete Topic" msgstr "Onderwerp _verwijderen" #. FIXME: proper i18n after freeze -#: ../src/bookmarks/ephy-bookmarks-editor.c:495 -#: ../src/bookmarks/ephy-bookmarks-editor.c:499 +#: ../src/bookmarks/ephy-bookmarks-editor.c:496 +#: ../src/bookmarks/ephy-bookmarks-editor.c:500 msgid "Firefox" msgstr "Firefox" # src/menubar.c:571 -#: ../src/bookmarks/ephy-bookmarks-editor.c:504 -#: ../src/bookmarks/ephy-bookmarks-editor.c:508 +#: ../src/bookmarks/ephy-bookmarks-editor.c:505 +#: ../src/bookmarks/ephy-bookmarks-editor.c:509 msgid "Firebird" msgstr "Firebird" #. Translators: The %s is the name of a Mozilla profile. -#: ../src/bookmarks/ephy-bookmarks-editor.c:513 +#: ../src/bookmarks/ephy-bookmarks-editor.c:514 #, c-format msgid "Mozilla “%s” profile" msgstr "Mozilla ‘%s’-profiel" @@ -2085,24 +2115,24 @@ # src/mozilla/PromptService.cpp:666 # src/window.c:191 # ui/epiphany.glade.h:50 -#: ../src/bookmarks/ephy-bookmarks-editor.c:517 +#: ../src/bookmarks/ephy-bookmarks-editor.c:518 msgid "Galeon" msgstr "Galeon" # src/bookmarks_editor.c:981 -#: ../src/bookmarks/ephy-bookmarks-editor.c:521 +#: ../src/bookmarks/ephy-bookmarks-editor.c:522 msgid "Konqueror" msgstr "Konqueror" -#: ../src/bookmarks/ephy-bookmarks-editor.c:550 +#: ../src/bookmarks/ephy-bookmarks-editor.c:551 msgid "Import failed" msgstr "Importeren mislukt" -#: ../src/bookmarks/ephy-bookmarks-editor.c:552 +#: ../src/bookmarks/ephy-bookmarks-editor.c:553 msgid "Import Failed" msgstr "Importeren mislukt" -#: ../src/bookmarks/ephy-bookmarks-editor.c:555 +#: ../src/bookmarks/ephy-bookmarks-editor.c:556 #, c-format msgid "" "The bookmarks from “%s” could not be imported because the file is corrupted " @@ -2115,22 +2145,22 @@ # src/prefs.c:365 # src/toolbar.c:260 # ui/bookmarks.glade.h:3 -#: ../src/bookmarks/ephy-bookmarks-editor.c:618 +#: ../src/bookmarks/ephy-bookmarks-editor.c:619 msgid "Import Bookmarks from File" msgstr "Bladwijzers importeren uit een bestand" # src/bookmarks_editor.c:1111 -#: ../src/bookmarks/ephy-bookmarks-editor.c:625 +#: ../src/bookmarks/ephy-bookmarks-editor.c:626 msgid "Firefox/Mozilla bookmarks" msgstr "Firefox/Mozilla-bladwijzers" # src/bookmarks_editor.c:981 -#: ../src/bookmarks/ephy-bookmarks-editor.c:629 +#: ../src/bookmarks/ephy-bookmarks-editor.c:630 msgid "Galeon/Konqueror bookmarks" msgstr "Galeon/Konqueror-bladwijzers" # src/menubar.c:571 -#: ../src/bookmarks/ephy-bookmarks-editor.c:633 +#: ../src/bookmarks/ephy-bookmarks-editor.c:634 msgid "Web bookmarks" msgstr "Webbladwijzers" @@ -2138,19 +2168,19 @@ # src/prefs.c:365 # src/toolbar.c:260 # ui/bookmarks.glade.h:3 -#: ../src/bookmarks/ephy-bookmarks-editor.c:757 +#: ../src/bookmarks/ephy-bookmarks-editor.c:758 msgid "Export Bookmarks" msgstr "Bladwijzers exporteren" # src/menubar.c:571 -#: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:765 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1507 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Bladwijzers" #. Make a format selection combo & label -#: ../src/bookmarks/ephy-bookmarks-editor.c:770 +#: ../src/bookmarks/ephy-bookmarks-editor.c:771 msgid "File f_ormat:" msgstr "Bestandsf_ormaat:" @@ -2158,11 +2188,11 @@ # src/prefs.c:365 # src/toolbar.c:260 # ui/bookmarks.glade.h:3 -#: ../src/bookmarks/ephy-bookmarks-editor.c:816 +#: ../src/bookmarks/ephy-bookmarks-editor.c:817 msgid "Import Bookmarks" msgstr "Bladwijzers importeren" -#: ../src/bookmarks/ephy-bookmarks-editor.c:821 +#: ../src/bookmarks/ephy-bookmarks-editor.c:822 msgid "I_mport" msgstr "I_mporteren" @@ -2170,28 +2200,28 @@ # src/prefs.c:365 # src/toolbar.c:260 # ui/bookmarks.glade.h:3 -#: ../src/bookmarks/ephy-bookmarks-editor.c:837 +#: ../src/bookmarks/ephy-bookmarks-editor.c:838 msgid "Import bookmarks from:" msgstr "Bladwijzers importeren uit:" # src/bookmarks_editor.c:941 # src/bookmarks_editor.c:1148 # src/menubar.c:565 -#: ../src/bookmarks/ephy-bookmarks-editor.c:857 +#: ../src/bookmarks/ephy-bookmarks-editor.c:858 msgid "File" msgstr "Bestand" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1165 msgid "_Copy Address" msgstr "Adres _kopiëren" # ui/preferences.glade.h:195 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1563 msgid "Topics" msgstr "Onderwerpen" # ui/epiphany.glade.h:121 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1633 msgid "Title" msgstr "Titel" @@ -2289,14 +2319,32 @@ msgid "Delete the selected cookies" msgstr "De geselecteerde cookies verwijderen" +# src/prefs.c:385 +# ui/epiphany.glade.h:36 +#: ../src/resources/encoding-dialog.ui.h:1 +msgid "Text Encoding" +msgstr "Tekstcodering" + +#: ../src/resources/encoding-dialog.ui.h:2 ../src/ephy-encoding-menu.c:327 +msgid "_Automatic" +msgstr "_Automatisch" + +#: ../src/resources/encoding-dialog.ui.h:3 ../src/ephy-encoding-menu.c:328 +msgid "Use the encoding specified by the document" +msgstr "De door het document gespecificeerde codering gebruiken" + +#: ../src/resources/encoding-dialog.ui.h:4 +msgid "_Use a different encoding:" +msgstr "Andere _codering gebruiken:" + # src/context.c:60 #. File actions. -#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:100 +#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:98 msgid "_New Window" msgstr "_Nieuw venster" # src/context.c:60 -#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:102 +#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:100 msgid "New _Incognito Window" msgstr "Nieuw _incognitovenster" @@ -2306,7 +2354,7 @@ # src/menubar.c:571 #. Toplevel -#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:93 +#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:91 msgid "_Bookmarks" msgstr "Bl_adwijzers" @@ -2314,37 +2362,19 @@ # src/toolbar.c:273 # ui/epiphany.glade.h:78 # ui/preferences.glade.h:88 -#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:143 +#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:141 msgid "_History" msgstr "_Geschiedenis" # ui/preferences.glade.h:142 -#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:145 +#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:143 msgid "Pr_eferences" msgstr "_Voorkeuren" -#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:116 +#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:114 msgid "_Quit" msgstr "A_fsluiten" -# src/prefs.c:385 -# ui/epiphany.glade.h:36 -#: ../src/resources/epiphany.ui.h:1 -msgid "Text Encoding" -msgstr "Tekstcodering" - -#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327 -msgid "_Automatic" -msgstr "_Automatisch" - -#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328 -msgid "Use the encoding specified by the document" -msgstr "De door het document gespecificeerde codering gebruiken" - -#: ../src/resources/epiphany.ui.h:4 -msgid "_Use a different encoding:" -msgstr "Andere _codering gebruiken:" - # src/prefs.c:367 # src/toolbar.c:273 # ui/epiphany.glade.h:78 @@ -2527,8 +2557,8 @@ msgstr "Lettertypen & Stijl" #: ../src/resources/prefs-dialog.ui.h:22 -msgid "Manage _Cookies" -msgstr "_Cookies beheren" +msgid "Manage _Cookies…" +msgstr "_Cookies beheren…" #: ../src/resources/prefs-dialog.ui.h:23 msgid "_Always accept" @@ -2553,71 +2583,71 @@ msgstr "Tracking" #: ../src/resources/prefs-dialog.ui.h:29 -msgid "_Tell web sites I do not want to be tracked" -msgstr "Websites vertellen mij niet te volgen (tracken)" +msgid "_Tell websites I do not want to be tracked" +msgstr "Websites ver_tellen mij niet te volgen (tracken)" # src/menubar.c:502 # ui/epiphany.glade.h:163 #: ../src/resources/prefs-dialog.ui.h:31 -msgid "Manage _Passwords" -msgstr "_Wachtwoorden beheren" +msgid "Manage _Passwords…" +msgstr "_Wachtwoorden beheren…" #: ../src/resources/prefs-dialog.ui.h:32 msgid "_Remember passwords" msgstr "Wachtwoorden _onthouden" -# ui/preferences.glade.h:50 #: ../src/resources/prefs-dialog.ui.h:33 -msgid "Temporary Files" -msgstr "Tijdelijke bestanden" +msgid "Stored Data" +msgstr "Opgeslagen gegevens" -# ui/preferences.glade.h:253 #: ../src/resources/prefs-dialog.ui.h:34 -msgid "_Disk space:" -msgstr "_Schijfruimte:" +msgid "You can clear stored personal data." +msgstr "U kan opgeslagen persoonlijke gegevens wissen." +# src/persistent_data_manager.c:138 +# ui/epiphany.glade.h:94 #: ../src/resources/prefs-dialog.ui.h:35 -msgid "MB" -msgstr "MB" +msgid "Cl_ear Personal Data…" +msgstr "Persoonlijke gegevens wissen…" -#: ../src/resources/prefs-dialog.ui.h:37 +#: ../src/resources/prefs-dialog.ui.h:36 msgid "Privacy" msgstr "Privacy" # src/prefs.c:385 # ui/epiphany.glade.h:36 -#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379 +#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-encoding-dialog.c:379 msgid "Encodings" msgstr "Coderingen" # ui/preferences.glade.h:105 -#: ../src/resources/prefs-dialog.ui.h:39 +#: ../src/resources/prefs-dialog.ui.h:38 msgid "De_fault:" msgstr "St_andaard:" -#: ../src/resources/prefs-dialog.ui.h:42 +#: ../src/resources/prefs-dialog.ui.h:41 msgid "_Remove" msgstr "_Verwijderen" -#: ../src/resources/prefs-dialog.ui.h:43 +#: ../src/resources/prefs-dialog.ui.h:42 msgid "_Up" msgstr "_Omhoog" -#: ../src/resources/prefs-dialog.ui.h:44 +#: ../src/resources/prefs-dialog.ui.h:43 msgid "_Down" msgstr "Om_laag" -#: ../src/resources/prefs-dialog.ui.h:45 +#: ../src/resources/prefs-dialog.ui.h:44 msgid "Spell checking" msgstr "Spellingcontrole" -#: ../src/resources/prefs-dialog.ui.h:46 +#: ../src/resources/prefs-dialog.ui.h:45 msgid "_Enable spell checking" msgstr "Sp_ellingcontrole inschakelen" # src/prefs.c:397 # ui/preferences.glade.h:103 -#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:840 +#: ../src/resources/prefs-dialog.ui.h:46 ../src/prefs-dialog.c:840 msgid "Language" msgstr "Taal" @@ -2645,7 +2675,7 @@ # src/menubar.c:468 # ui/preferences.glade.h:262 -#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:154 +#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:152 msgid "_Reload" msgstr "_Herladen" @@ -2665,11 +2695,11 @@ msgid "Other encodings" msgstr "Overige coderingen" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:255 msgid "Clear browsing history?" msgstr "Geschiedenis wissen?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:259 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2758,13 +2788,13 @@ "%s" # src/menu_callbacks.c:1286 -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Web-opties" # src/bookmarks_editor.c:945 # src/menubar.c:91 -#: ../src/ephy-notebook.c:602 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Tabblad sluiten" @@ -2776,118 +2806,118 @@ # src/bookmarks_editor.c:942 # src/menubar.c:34 -#: ../src/ephy-window.c:104 +#: ../src/ephy-window.c:102 msgid "_Open…" msgstr "_Openen…" # src/menubar.c:63 -#: ../src/ephy-window.c:106 +#: ../src/ephy-window.c:104 msgid "Save _As…" msgstr "Opslaan _als…" -#: ../src/ephy-window.c:108 +#: ../src/ephy-window.c:106 msgid "Save As _Web Application…" msgstr "Als _webtoepassing opslaan…" # src/toolbar.c:286 -#: ../src/ephy-window.c:110 +#: ../src/ephy-window.c:108 msgid "_Print…" msgstr "Af_drukken…" # src/menubar.c:68 -#: ../src/ephy-window.c:112 +#: ../src/ephy-window.c:110 msgid "S_end Link by Email…" msgstr "Verwijzing ve_rsturen per e-mail…" -#: ../src/ephy-window.c:123 +#: ../src/ephy-window.c:121 msgid "Re_do" msgstr "Op_nieuw" # ui/epiphany.glade.h:149 -#: ../src/ephy-window.c:135 +#: ../src/ephy-window.c:133 msgid "_Find…" msgstr "_Zoeken…" # src/menubar.c:117 -#: ../src/ephy-window.c:137 +#: ../src/ephy-window.c:135 msgid "Find Ne_xt" msgstr "V_olgende zoeken" # src/menubar.c:208 -#: ../src/ephy-window.c:139 +#: ../src/ephy-window.c:137 msgid "Find Pre_vious" msgstr "Vo_rige zoeken" # src/menubar.c:571 -#: ../src/ephy-window.c:141 +#: ../src/ephy-window.c:139 msgid "Edit _Bookmarks" msgstr "Bladwijzers be_werken" # src/menubar.c:477 #. View actions. -#: ../src/ephy-window.c:150 ../src/ephy-window.c:152 +#: ../src/ephy-window.c:148 ../src/ephy-window.c:150 msgid "_Stop" msgstr "_Afbreken" # src/menubar.c:127 -#: ../src/ephy-window.c:156 +#: ../src/ephy-window.c:154 msgid "Zoom _In" msgstr "_Inzoomen" # src/menubar.c:127 -#: ../src/ephy-window.c:158 +#: ../src/ephy-window.c:156 msgid "Zoom O_ut" msgstr "_Uitzoomen" # ui/epiphany.glade.h:90 -#: ../src/ephy-window.c:160 +#: ../src/ephy-window.c:158 msgid "_Normal Size" msgstr "_Normale grootte" # src/prefs.c:385 # ui/epiphany.glade.h:36 -#: ../src/ephy-window.c:162 +#: ../src/ephy-window.c:160 msgid "Text _Encoding" msgstr "Tekst_codering" # src/menubar.c:187 -#: ../src/ephy-window.c:163 +#: ../src/ephy-window.c:161 msgid "_Page Source" msgstr "B_ron weergeven" # src/menubar.c:571 #. Bookmarks actions. -#: ../src/ephy-window.c:168 +#: ../src/ephy-window.c:166 msgid "_Add Bookmark…" msgstr "_Bladwijzer toevoegen…" # ui/epiphany.glade.h:85 #. Go actions. -#: ../src/ephy-window.c:173 +#: ../src/ephy-window.c:171 msgid "_Location…" msgstr "_Locatie…" # src/menubar.c:208 #. Tabs actions. -#: ../src/ephy-window.c:178 +#: ../src/ephy-window.c:176 msgid "_Previous Tab" msgstr "_Vorig tabblad" # ui/preferences.glade.h:272 -#: ../src/ephy-window.c:180 +#: ../src/ephy-window.c:178 msgid "_Next Tab" msgstr "V_olgend tabblad" -#: ../src/ephy-window.c:182 +#: ../src/ephy-window.c:180 msgid "Move Tab _Left" msgstr "Tabblad naar lin_ks verplaatsen" -#: ../src/ephy-window.c:184 +#: ../src/ephy-window.c:182 msgid "Move Tab _Right" msgstr "Tabblad naar _rechts verplaatsen" # ui/preferences.glade.h:272 -#: ../src/ephy-window.c:186 +#: ../src/ephy-window.c:184 msgid "_Detach Tab" msgstr "Tabblad los_scheuren" @@ -2895,42 +2925,47 @@ # src/history_callbacks.c:159 # src/misc_callbacks.c:408 #. View actions. -#: ../src/ephy-window.c:201 +#: ../src/ephy-window.c:199 msgid "_Downloads Bar" msgstr "_Downloadsbalk" # src/menubar.c:165 -#: ../src/ephy-window.c:204 +#: ../src/ephy-window.c:202 msgid "_Fullscreen" msgstr "_Volledig scherm" # src/menubar.c:416 -#: ../src/ephy-window.c:206 +#: ../src/ephy-window.c:204 msgid "Popup _Windows" msgstr "_Opduikvensters" # ui/preferences.glade.h:7 -#: ../src/ephy-window.c:208 +#: ../src/ephy-window.c:206 msgid "Selection Caret" msgstr "Selectie-tekstcursor" # src/menubar.c:571 #. Document. -#: ../src/ephy-window.c:215 +#: ../src/ephy-window.c:213 msgid "Add Boo_kmark…" msgstr "_Bladwijzer toevoegen…" # src/context.c:60 #. Links. -#: ../src/ephy-window.c:220 +#: ../src/ephy-window.c:218 msgid "Open Link in New _Window" msgstr "Verwijzing openen in _nieuw venster" # src/context.c:61 -#: ../src/ephy-window.c:222 +#: ../src/ephy-window.c:220 msgid "Open Link in New _Tab" msgstr "Verwijzing openen in een nieuw _tabblad" +# src/context.c:60 +#: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Verwijzing openen in In_cognito-venster" + # src/menubar.c:63 #: ../src/ephy-window.c:224 msgid "_Save Link As…" @@ -3003,99 +3038,105 @@ msgid "_Copy Audio Address" msgstr "Adres _kopiëren" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Er zijn niet-verstuurde wijzigingen in delen van het formulier" -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Als u het document desondanks sluit, verliest u die informatie." -#: ../src/ephy-window.c:471 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Do_cument sluiten" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Dit venster bevat actieve downloads" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Als u dit venster sluit, dan worden de downloads geannuleerd" -#: ../src/ephy-window.c:488 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Venster sluiten en downloads annuleren" # src/menubar.c:63 -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Opslaan als" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Opslaan als toepassing" # src/toolbar.c:286 -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Afdrukken" # src/menubar.c:571 -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Bladwijzer" # src/toolbar.c:351 -#: ../src/ephy-window.c:1132 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Zoeken" #. Translators: This refers to text size -#: ../src/ephy-window.c:1141 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Groter" #. Translators: This refers to text size -#: ../src/ephy-window.c:1144 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Kleiner" -#: ../src/ephy-window.c:1166 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Terug" # src/menubar.c:458 -#: ../src/ephy-window.c:1178 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Vooruit" # src/menubar.c:127 -#: ../src/ephy-window.c:1190 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zoomen" # src/menubar.c:54 -#: ../src/ephy-window.c:1199 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nieuw _tabblad" -#: ../src/ephy-window.c:1207 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Ga naar meest bezocht" +# src/window_callbacks.c:2194 +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Het web doorzoeken naar ‘%s’" + # src/menubar.c:63 -#: ../src/popup-commands.c:225 +#: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Verwijzing opslaan als" # src/context.c:67 -#: ../src/popup-commands.c:232 +#: ../src/popup-commands.c:236 msgid "Save Image As" msgstr "Afbeelding opslaan als" # src/menubar.c:63 -#: ../src/popup-commands.c:239 +#: ../src/popup-commands.c:243 msgid "Save Media As" msgstr "Media opslaan als" @@ -3142,45 +3183,50 @@ #. * you chose in the gschema, but with & instead of & #. * If the match is not exact, there will be a spurious, ugly #. * entry in the preferences combo, so please test this. -#: ../src/prefs-dialog.c:1023 +#: ../src/prefs-dialog.c:1024 #, c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=nl-nl&kad=nl_NL" #. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1025 +#: ../src/prefs-dialog.c:1026 msgid "Google" msgstr "Google" #. For the preferences dialog. Consider a regional variant, like google.co.uk -#: ../src/prefs-dialog.c:1027 +#: ../src/prefs-dialog.c:1029 #, c-format msgid "https://google.com/search?q=%s" msgstr "https://www.google.nl/search?q=%s" #. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1029 +#: ../src/prefs-dialog.c:1031 msgid "Bing" msgstr "Bing" #. For the preferences dialog. Consider a regional variant, like uk.bing.com -#: ../src/prefs-dialog.c:1031 +#: ../src/prefs-dialog.c:1034 #, c-format msgid "https://www.bing.com/search?q=%s" msgstr "http://nl.bing.com/search?q=%s" -#: ../src/window-commands.c:709 +# src/menubar.c:63 +#: ../src/window-commands.c:330 +msgid "Save" +msgstr "Opslaan" + +#: ../src/window-commands.c:710 #, c-format msgid "A web application named '%s' already exists. Do you want to replace it?" msgstr "Een webtoepassing met de naam ‘%s’ bestaat al. Wilt u haar vervangen?" # src/menubar.c:468 # ui/preferences.glade.h:262 -#: ../src/window-commands.c:714 +#: ../src/window-commands.c:715 msgid "Replace" msgstr "Vervangen" -#: ../src/window-commands.c:718 +#: ../src/window-commands.c:719 msgid "" "An application with the same name already exists. Replacing it will " "overwrite it." @@ -3188,45 +3234,45 @@ "Een toepassing met dezelfde naam bestaat al. Als u haar vervangt wordt zij " "overschreven." -#: ../src/window-commands.c:754 +#: ../src/window-commands.c:755 #, c-format msgid "The application '%s' is ready to be used" msgstr "De toepassing ‘%s’ is klaar voor gebruik" -#: ../src/window-commands.c:757 +#: ../src/window-commands.c:758 #, c-format msgid "The application '%s' could not be created" msgstr "Kon de toepassing ‘%s’ niet aanmaken" -#: ../src/window-commands.c:765 +#: ../src/window-commands.c:766 msgid "Launch" msgstr "Starten" # src/menubar.c:54 #. Show dialog with icon, title. -#: ../src/window-commands.c:805 +#: ../src/window-commands.c:806 msgid "Create Web Application" msgstr "Webtoepassing aanmaken" # src/menubar.c:468 # ui/preferences.glade.h:262 -#: ../src/window-commands.c:810 +#: ../src/window-commands.c:811 msgid "C_reate" msgstr "_Aanmaken" -#: ../src/window-commands.c:1475 ../src/window-commands.c:1498 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Wij zijn te bereiken op:" -#: ../src/window-commands.c:1478 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Met bijdragen van:" -#: ../src/window-commands.c:1481 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Ex-ontwikkelaars:" -#: ../src/window-commands.c:1507 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -3243,7 +3289,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1530 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Reinout van Schouwen \n" @@ -3251,21 +3297,22 @@ "Wouter Bolsterlee\n" "Lode Vereiren\n" "Thijs Vermeir\n" +"Nathan Follens\n" "\n" "Kijk voor meer info op http://nl.gnome.org/" # GNOME_epiphany_Automation.oaf.in.h:1 # epiphany.desktop.in.h:2 -#: ../src/window-commands.c:1533 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Webstek van Web" # Cursorbladermodus?? -#: ../src/window-commands.c:1672 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Cursornavigatie inschakelen?" -#: ../src/window-commands.c:1675 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -3275,1055 +3322,28 @@ "een verplaatsbare cursor op webpagina's, zodat u met het toetsenbord door de " "pagina kunt bewegen. Wilt u cursornavigatie inschakelen?" -#: ../src/window-commands.c:1678 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Inschakelen" -#~ msgid "Show toolbars by default" -#~ msgstr "Werkbalken standaard tonen" - -#~ msgid "History pages time range" -#~ msgstr "Tijdspanne voor geschiedenis" - -#~ msgid "Whether to show the title column in the history window." -#~ msgstr "Of de titelkolom wordt getoond in het geschiedenisvenster." - -#~ msgid "Whether to show the address column in the history window." -#~ msgstr "Of de adreskolom wordt getoond in het geschiedenisvenster." - -#~ msgid "Whether to show the date-time column in the history window." -#~ msgstr "Of de datum-tijdkolom wordt getoond in het geschiedenisvenster." - -#~ msgid "http://duckduckgo.com/?q=%s&t=epiphany" -#~ msgstr "" -#~ "http://duckduckgo.com/?q=%s&t=epiphany&kl=nl-nl&kad=nl_NL" - -# src/history.c:845 -#~ msgid "All sites" -#~ msgstr "Alle sites" - -# ui/epiphany.glade.h:109 -#~ msgid "Sites" -#~ msgstr "Sites" - -#~ msgid "%d _Similar" -#~ msgid_plural "%d _Similar" -#~ msgstr[0] "%d Gelij_kende" -#~ msgstr[1] "%d Gelij_kende" - -#~ msgid "_Unify With %d Identical Bookmark" -#~ msgid_plural "_Unify With %d Identical Bookmarks" -#~ msgstr[0] "Samen_voegen met %d identieke bladwijzer" -#~ msgstr[1] "Samen_voegen met %d identieke bladwijzers" - -# src/menubar.c:63 -#~ msgid "Show “%s”" -#~ msgstr "‘%s’ tonen" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" -#~ msgid "Open the selected history link in a new window" -#~ msgstr "" -#~ "Geselecteerde verwijzing uit de geschiedenis openen in een nieuw venster" +# src/menubar.c:150 +#~ msgid "Toolbar style" +#~ msgstr "Werkbalkstijl" -#~ msgid "Open the selected history link in a new tab" +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." #~ msgstr "" -#~ "Geselecteerde verwijzing uit de geschiedenis openen in een nieuw tabblad" - -#~ msgid "Bookmark the selected history link" -#~ msgstr "Geselecteerde item uit de geschiedenis opslaan als bladwijzer" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "Close the history window" -#~ msgstr "Geschiedenisvenster sluiten" - -#~ msgid "Delete the selected history link" -#~ msgstr "Geselecteerde verwijzing uit de geschiedenis verwijderen" - -#~ msgid "Select all history links or text" -#~ msgstr "Alle verwijzingen uit de geschiedenis of tekst selecteren" - -# src/prefs.c:367 -# src/toolbar.c:273 -# ui/epiphany.glade.h:78 -# ui/preferences.glade.h:88 -#~ msgid "Clear _History" -#~ msgstr "_Geschiedenis wissen" - -#~ msgid "Clear your browsing history" -#~ msgstr "Uw lijst van bezochte pagina's leegmaken" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "Display history help" -#~ msgstr "Hulp voor geschiedenis weergeven" - -#~ msgid "_Address" -#~ msgstr "_Adres" - -#~ msgid "_Date and Time" -#~ msgstr "_Datum en tijd" - -#~ msgid "Show the date and time column" -#~ msgstr "De datum- en tijdkolom weergeven" - -#~ msgid "Last 30 minutes" -#~ msgstr "Afgelopen 30 minuten" - -#~ msgid "Today" -#~ msgstr "Vandaag" - -#~ msgid "Last %d day" -#~ msgid_plural "Last %d days" -#~ msgstr[0] "Laatste %d dag" -#~ msgstr[1] "Laatste %d dagen" - -# src/prefs.c:367 -# src/toolbar.c:273 -# ui/epiphany.glade.h:78 -# ui/preferences.glade.h:88 -#~ msgid "All history" -#~ msgstr "Alle geschiedenis" - -#~ msgid "St_art Animation" -#~ msgstr "A_nimatie starten" - -#~ msgid "St_op Animation" -#~ msgstr "Animatie st_oppen" - -#~ msgid "%u:%02u hour left" -#~ msgid_plural "%u:%02u hours left" -#~ msgstr[0] "%u:%02u uur te gaan" -#~ msgstr[1] "%u:%02u uren te gaan" - -# src/menu_callbacks.c:1286 -#~ msgid "_Automatic" -#~ msgstr "_Automatisch" - -# src/menubar.c:502 -# ui/epiphany.glade.h:163 -#~ msgid "Show Passwords" -#~ msgstr "Wachtwoorden tonen" - -#~ msgid "Use GNOME desktop wide font configuration." -#~ msgstr "De lettertype-instellingen van Gnome gebruiken." - -#~ msgid "Not now" -#~ msgstr "Niet nu" - -# src/menubar.c:502 -# ui/epiphany.glade.h:163 -#~ msgid "Store password" -#~ msgstr "Wachtwoord opslaan" - -#~ msgid "" -#~ "Would you like to store the password for %s in %s?" -#~ msgstr "" -#~ "Wilt u het wachtwoord voor %s in %s opslaan?" - -#~ msgid "Oops! Error loading %s" -#~ msgstr "Oeps! Fout bij laden van %s" - -#~ msgid "" -#~ "Oops! This site might have caused the web browser to close unexpectedly" -#~ msgstr "" -#~ "Oeps! Deze site kan ervoor gezorgd hebben dat de webbrowser onverwachts " -#~ "werd afgesloten" - -#~ msgid "Oops! Something went wrong displaying %s" -#~ msgstr "Oeps! Er ging iets mis bij het weergeven van %s" - -#~ msgid "Epiphany (RDF)" -#~ msgstr "Epiphany (RDF)" - -# src/bookmarks_editor.c:981 -#~ msgid "Epiphany bookmarks" -#~ msgstr "Epiphany-bladwijzers" - -# src/persistent_data_manager.c:138 -# ui/epiphany.glade.h:94 -#~ msgid "_Personal Data" -#~ msgstr "_Persoonlijke gegevens" - -#~ msgid "Cookie properties" -#~ msgstr "Cookie-eigenschappen" - -#~ msgid "Content:" -#~ msgstr "Inhoud:" - -# src/context.c:83 -# src/window_callbacks.c:1149 -# src/window_callbacks.c:2884 -#~ msgid "Path:" -#~ msgstr "Pad:" - -# src/menubar.c:68 -#~ msgid "Send for:" -#~ msgstr "Versturen voor:" - -# ui/preferences.glade.h:50 -#~ msgid "Expires:" -#~ msgstr "Verloopt:" - -# src/persistent_data_manager.c:138 -# ui/epiphany.glade.h:94 -#~ msgid "Personal Data" -#~ msgstr "Persoonlijke informatie" - -#~ msgid "Start the application without opening windows" -#~ msgstr "De toepassing starten zonder vensters openen" - -# ui/epiphany.glade.h:91 -#~ msgid "_Open Link" -#~ msgstr "Verwijzing _openen" - -# src/context.c:62 -# src/history_callbacks.c:159 -# src/misc_callbacks.c:408 -#~ msgid "_Download Link" -#~ msgstr "Verwijzing _downloaden" - -# src/context.c:64 -# src/history_callbacks.c:165 -# src/misc_callbacks.c:412 -#~ msgid "_Bookmark Link…" -#~ msgstr "Bl_adwijzer maken van verwijzing…" - -# src/context.c:68 -#~ msgid "_Use Image As Background" -#~ msgstr "Afbeelding _gebruiken als achtergrond" - -#~ msgid "Inspect _Element" -#~ msgstr "_Element inspecteren" - -# src/menubar.c:494 -# ui/epiphany.glade.h:143 -#~ msgid "C_ookies" -#~ msgstr "C_ookies" - -# src/prefs.c:367 -# src/toolbar.c:273 -# ui/epiphany.glade.h:78 -# ui/preferences.glade.h:88 -#~ msgid "Hi_story" -#~ msgstr "_Geschiedenis" - -#~ msgid "Encrypted connections only" -#~ msgstr "Uitsluitend versleutelde verbindingen" - -#~ msgid "Any type of connection" -#~ msgstr "Eender welk type verbinding" - -# ui/preferences.glade.h:249 -#~ msgid "End of current session" -#~ msgstr "Einde van huidige sessie" - -# ui/preferences.glade.h:207 -#~ msgid "Domain" -#~ msgstr "Domein" - -# ui/epiphany.glade.h:156 -#~ msgid "Host" -#~ msgstr "Host" - -# src/menubar.c:502 -# ui/epiphany.glade.h:163 -#~ msgid "User Password" -#~ msgstr "Gebruikerswachtwoord" - -# src/context.c:62 -# src/history_callbacks.c:159 -# src/misc_callbacks.c:408 -#~ msgid "Download Link" -#~ msgstr "Verwijzing downloaden" - -#~ msgid "" -#~ "Web is free software; you can redistribute it and/or modify it under the " -#~ "terms of the GNU General Public License as published by the Free Software " -#~ "Foundation; either version 2 of the License, or (at your option) any " -#~ "later version." -#~ msgstr "" -#~ "Web is vrije software; U mag het herdistribueren en/of wijzigen onder de " -#~ "voorwaarden van de GNU General Public License als gepubliceerd door the " -#~ "Free Software Foundation; ofwel versie 2, als ook (uw eigen keuze) elke " -#~ "latere versie." - -#~ msgid "" -#~ "The GNOME Web Browser is distributed in the hope that it will be useful, " -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of " -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " -#~ "Public License for more details." -#~ msgstr "" -#~ "Dit programma wordt gedistribueerd in de hoop dat het bruikbaar zal zijn, " -#~ "maar ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie voor " -#~ "VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN SPECIFIEK DOEL. Zie de GNU " -#~ "General Public License voor meer details." - -#~ msgid "" -#~ "You should have received a copy of the GNU General Public License along " -#~ "with the GNOME Web Browser; if not, write to the Free Software " -#~ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " -#~ "02110-1301 USA" -#~ msgstr "" -#~ "U zou een kopie ontvangen moeten hebben van de GNU General Public License " -#~ "bij de GNOME webbrowser; indien dit niet het geval is, schrijf dan een " -#~ "brief naar de Free Software Foundation, Inc., 51 Franklin Street, Fifth " -#~ "Floor, Boston, MA 02110-1301, USA" - -#~ msgid "http://www.google.com" -#~ msgstr "http://www.google.nl/" - -#~ msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8" -#~ msgstr "http://www.google.nl/search?q=%s&ie=UTF-8&oe=UTF-8" - -#~ msgid "Web Inspector" -#~ msgstr "Web-inspector" - -#~ msgid "Epiphany can't be used now. Initialization failed." -#~ msgstr "Epiphany kan nu niet gebruikt worden. Initialisatie mislukt." - -#~ msgid "%s Files" -#~ msgstr "%s bestanden" - -#~ msgid "_Work Offline" -#~ msgstr "_Offline werken" - -#~ msgid "" -#~ "Middle click to open the web page pointed to by the currently selected " -#~ "text" -#~ msgstr "" -#~ "De middelste muisknop gebruiken om de pagina te openen waarnaar wordt " -#~ "verwezen door de geselecteerde tekst" - -#~ msgid "" -#~ "Middle clicking on the main view pane will open the web page pointed to " -#~ "by the currently selected text." -#~ msgstr "" -#~ "Het met de middelste muisknop klikken op de hoofdweergave zal de pagina " -#~ "openen waarnaar wordt verwezen door de geselecteerde tekst." - -#~ msgid "File is not a valid .desktop file" -#~ msgstr "Bestand is geen geldig .desktop-bestand" - -#~ msgid "Unrecognized desktop file Version '%s'" -#~ msgstr "Niet-herkende versie van desktop-bestand ‘%s’" - -#~ msgid "Starting %s" -#~ msgstr "%s starten" - -#~ msgid "Application does not accept documents on command line" -#~ msgstr "Bestand accepteert geen documenten op de opdrachtregel" - -#~ msgid "Unrecognized launch option: %d" -#~ msgstr "Niet-herkende startoptie: %d" - -#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -#~ msgstr "" -#~ "Kan document-URI's niet doorgeven aan een desktop-object van ‘Type=Link’" - -#~ msgid "Not a launchable item" -#~ msgstr "Dit is geen startbaar object" - -#~ msgid "Wrapped" -#~ msgstr "Omgeslagen" - -# ui/epiphany.glade.h:149 -#~ msgid "Find links:" -#~ msgstr "Verwijzingen zoeken:" - -# ui/epiphany.glade.h:149 -#~ msgid "Find:" -#~ msgstr "Zoeken:" - -#~ msgid "_Case sensitive" -#~ msgstr "_Hoofdlettergevoelig" - -# src/menubar.c:208 -#~ msgid "Find Previous" -#~ msgstr "Vorige zoeken" - -# src/menubar.c:117 -#~ msgid "Find Next" -#~ msgstr "Volgende zoeken" - -#~ msgid "Launch the bookmarks editor" -#~ msgstr "Bladwijzerbeheer starten" - -#~ msgid "_Larger Text" -#~ msgstr "Grotere _tekst" - -#~ msgid "S_maller Text" -#~ msgstr "_Kleinere tekst" - -#~ msgid "Active extensions" -#~ msgstr "Actieven uitbreidingen" - -#~ msgid "Lists the active extensions." -#~ msgstr "Toont opsomming van actieve uitbreidingen." - -# src/mozilla/mozilla.cpp:1993 -# src/prefs.c:1069 -# src/prefs_callbacks.c:237 -# src/prefs_callbacks.c:407 -#~ msgctxt "file type" -#~ msgid "Unknown" -#~ msgstr "Onbekend" - -# src/menubar.c:411 -# ui/preferences.glade.h:12 -#~ msgid "Enable Java_Script" -#~ msgstr "Ja_vascript inschakelen" - -# src/menubar.c:165 -#~ msgid "Leave Fullscreen" -#~ msgstr "Volledig scherm verlaten" - -#~ msgid "_Extensions" -#~ msgstr "_Uitbreidingen" - -#~ msgid "" -#~ "Lets you view web pages and find information on the internet.\n" -#~ "Powered by WebKit %d.%d.%d" -#~ msgstr "" -#~ "Stelt u in staat webpagina's en informatie op het internet te vinden.\n" -#~ "Gebaseerd op WebKit %d.%d.%d" - -# src/mozilla/mozilla.cpp:994 -#~ msgid "All" -#~ msgstr "Alles" - -#~ msgid "Disable connection to session manager" -#~ msgstr "Verbinding met sessiebeheer uitschakelen" - -#~ msgid "Specify file containing saved configuration" -#~ msgstr "Bestand dat opgeslagen configuratie bevat specificeren" - -#~ msgid "Specify session management ID" -#~ msgstr "Sessiebeheer-ID specificeren" - -#~ msgid "ID" -#~ msgstr "ID" - -#~ msgid "Session management options:" -#~ msgstr "Sessiebeheersopties:" - -#~ msgid "Show session management options" -#~ msgstr "Sessiebeheersopties tonen" - -#~ msgid "Downloads will be aborted and logout proceed in %d second." -#~ msgid_plural "Downloads will be aborted and logout proceed in %d seconds." -#~ msgstr[0] "" -#~ "Downloads zullen worden afgebroken en het afmelden gaat door binnen %d " -#~ "seconde." -#~ msgstr[1] "" -#~ "Downloads zullen worden afgebroken en het afmelden gaat door binnen %d " -#~ "seconden." - -#~ msgid "Abort pending downloads?" -#~ msgstr "Lopende downloads afbreken?" - -#~ msgid "" -#~ "There are still downloads pending. If you log out, they will be aborted " -#~ "and lost." -#~ msgstr "" -#~ "Er zijn nog downloads bezig. Als u zich afmeldt, worden deze afgebroken " -#~ "en zijn ze verloren." - -#~ msgid "_Cancel Logout" -#~ msgstr "Afmelden _annuleren" - -#~ msgid "_Abort Downloads" -#~ msgstr "_Downloads afbreken" - -#~ msgid "_Don't recover" -#~ msgstr "_Niet herstellen" - -#~ msgid "_Recover session" -#~ msgstr "Sessie _herstellen" - -#~ msgid "Do you want to recover the previous browser windows and tabs?" -#~ msgstr "Eerdere browservensters en -tabbladen herstellen?" - -# src/bookmarks_editor.c:981 -#~ msgid "Update bookmark “%s”?" -#~ msgstr "Bladwijzer ‘%s’ bijwerken?" - -#~ msgid "The bookmarked page has moved to “%s”." -#~ msgstr "De pagina waar de bladwijzer naar verwijst is verhuisd naar ‘%s’." - -# src/bookmarks.c:245 -# src/prefs.c:365 -# src/toolbar.c:260 -# ui/bookmarks.glade.h:3 -#~ msgid "_Don't Update" -#~ msgstr "_Niet bijwerken" - -# src/bookmarks_editor.c:949 -# src/bookmarks_editor.c:1169 -# src/menubar.c:39 -#~ msgid "_Update" -#~ msgstr "_Bijwerken" - -# src/bookmarks.c:245 -# src/prefs.c:365 -# src/toolbar.c:260 -# ui/bookmarks.glade.h:3 -#~ msgid "Update Bookmark?" -#~ msgstr "Bladwijzer bijwerken?" - -#~ msgid "Browse and organize your bookmarks" -#~ msgstr "Uw bladwijzers bekijken en beheren" - -# src/bookmarks_editor.c:981 -#~ msgid "Epiphany Web Bookmarks" -#~ msgstr "Epiphany webbladwijzers" - -#~ msgid "Certificate _Hierarchy" -#~ msgstr "Certificaat_hiërarchie" - -#~ msgid "Common Name:" -#~ msgstr "Algemene naam:" - -#~ msgid "Details" -#~ msgstr "Details" - -# ui/preferences.glade.h:50 -#~ msgid "Expires On:" -#~ msgstr "Verloopt op:" - -#~ msgid "Field _Value" -#~ msgstr "Veld_waarde" - -#~ msgid "MD5 Fingerprint:" -#~ msgstr "MD5 vingerafdruk:" - -#~ msgid "Organization:" -#~ msgstr "Organisatie:" - -#~ msgid "Organizational Unit:" -#~ msgstr "Organisatie-eenheid:" - -#~ msgid "SHA1 Fingerprint:" -#~ msgstr "SHA1-vingerafdruk:" - -#~ msgid "Serial Number:" -#~ msgstr "Serienummer:" - -# src/menu_callbacks.c:1286 -#~| msgid "Validity" -#~ msgid "Validity" -#~ msgstr "Geldigheid" - -# src/menubar.c:117 -#~ msgid "Sign Text" -#~ msgstr "Tekst ondertekenen" - -# weet iemand een betere zinsconstructie? -RvS -#~ msgid "" -#~ "To confirm that you want to sign the above text, choose a certificate to " -#~ "sign the text with and enter its password below." -#~ msgstr "" -#~ "Kies een certificaat om de tekst mee te ondertekenen om het ondertekenen " -#~ "ervan te bevestigen en voer hieronder het wachtwoord van het certificaat " -#~ "in." - -#~ msgid "_Certificate:" -#~ msgstr "_Certificaat:" - -# src/menubar.c:473 -#~| msgid "Home page" -#~ msgid "Home page" -#~ msgstr "Startpagina" - -# ui/preferences.glade.h:161 -#~ msgid "Set to Current _Page" -#~ msgstr "Huidige _pagina instellen" - -# ui/preferences.glade.h:161 -#~ msgid "Set to _Blank Page" -#~ msgstr "_Blanco pagina" - -#~ msgid "_Address:" -#~ msgstr "_Adres:" - -#~ msgid "As laid out on the _screen" -#~ msgstr "Zoals ingedeeld op het _scherm" - -# src/menu_callbacks.c:1286 -#~| msgid "Background" -#~ msgid "Background" -#~ msgstr "Achtergrond" - -# ui/preferences.glade.h:50 -#~| msgid "Footers" -#~ msgid "Footers" -#~ msgstr "Voetteksten" - -# src/menu_callbacks.c:1286 -#~| msgid "Frames" -#~ msgid "Frames" -#~ msgstr "Frames" - -# src/menu_callbacks.c:1286 -#~| msgid "Headers" -#~ msgid "Headers" -#~ msgstr "Kopteksten" - -#~ msgid "O_nly the selected frame" -#~ msgstr "Alleen het geselecteerde _deelvenster" - -# ui/epiphany.glade.h:121 -#~ msgid "P_age title" -#~ msgstr "Pagina_titel" - -#~ msgid "Page _numbers" -#~ msgstr "Paginanu_mmers" - -# src/menubar.c:401 -#~ msgid "Print background c_olors" -#~ msgstr "Achtergrondkleuren afdrukken" - -# src/context.c:80 -#~ msgid "Print background i_mages" -#~ msgstr "Achtergrondafbeeldingen afdrukken" - -# src/bookmarks_editor.c:949 -# src/bookmarks_editor.c:1169 -# src/menubar.c:39 -#~ msgid "_Date" -#~ msgstr "_Datum" - -#~ msgid "_Each frame separately" -#~ msgstr "_Elk deelvenster apart" - -#~ msgid "_Page address" -#~ msgstr "Pagina-a_dres" - -#~ msgid "" -#~ "CA Certificates file we should use was not found, all SSL sites will be " -#~ "considered to have a broken certificate." -#~ msgstr "" -#~ "CA-Certificatenbestand dat gebruikt hoort te worden is niet gevonden. " -#~ "Alle SSL-sites zullen beschouwd worden als hebbende een ongeldig " -#~ "certificaat." - -# src/menubar.c:63 -#~ msgid "Show “_%s”" -#~ msgstr "‘_%s’ tonen" - -# src/menubar.c:150 -#~ msgid "_Move on Toolbar" -#~ msgstr "Ver_plaatsen op werkbalk" - -#~ msgid "Move the selected item on the toolbar" -#~ msgstr "Geselecteerd item op de werkbalk verplaatsen" - -# src/menubar.c:150 -#~ msgid "_Delete Toolbar" -#~ msgstr "_Werkbalk verwijderen" - -#~ msgid "Separator" -#~ msgstr "Scheidingsteken" - -# src/menubar.c:416 -#~ msgid "Popup Windows" -#~ msgstr "Opduikvensters" - -#~ msgid "Address Entry" -#~ msgstr "Adresingang" - -#~ msgid "%s:" -#~ msgstr "%s:" - -#~ msgid "Executes the script “%s”" -#~ msgstr "Script ‘%s’ uitvoeren" - -# src/menubar.c:150 -#~ msgid "_Show on Toolbar" -#~ msgstr "Op _werkbalk tonen" - -#~ msgid "Show the selected bookmark on a toolbar" -#~ msgstr "Geselecteerde bladwijzer tonen op een werkbalk" - -# src/bookmarks_menus.c:525 -# ui/bookmarks.glade.h:47 -#~ msgid "Show properties for this bookmark" -#~ msgstr "Eigenschappen van deze bladwijzer weergeven" - -#~ msgid "Open this bookmark in a new tab" -#~ msgstr "Deze bladwijzer openen in een nieuw tabblad" - -#~ msgid "Open this bookmark in a new window" -#~ msgstr "Deze bladwijzer openen in een nieuw venster" - -# src/menubar.c:468 -# ui/preferences.glade.h:262 -#~ msgid "Related" -#~ msgstr "Gerelateerd" - -# ui/preferences.glade.h:195 -#~ msgid "Topic" -#~ msgstr "Onderwerp" - -# src/menubar.c:570 -#~ msgid "Go" -#~ msgstr "Ga naar" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "GNOME Web Browser" -#~ msgstr "GNOME-webbrowser" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "GNOME Web Browser options" -#~ msgstr "Opties voor GNOME-webbrowser" - -#~ msgid "Switch to this tab" -#~ msgstr "Naar dit tabblad overschakelen" - -#~ msgid "Go to the previous visited page" -#~ msgstr "Ga naar de vorige bezochte pagina" - -# src/prefs.c:367 -# src/toolbar.c:273 -# ui/epiphany.glade.h:78 -# ui/preferences.glade.h:88 -#~ msgid "Forward history" -#~ msgstr "Vooruit-geschiedenis" - -# src/bookmarks_editor.c:1056 -#~ msgid "Go up one level" -#~ msgstr "Eén niveau \"omhoog\" gaan" - -# src/bookmarks_editor.c:1056 -#~ msgid "List of upper levels" -#~ msgstr "Lijst van bovenliggende niveaus" - -#~ msgid "Enter a web address to open, or a phrase to search for" -#~ msgstr "Geef een webadres om te openen, of een tekst om naar te zoeken" - -#~ msgid "Adjust the text size" -#~ msgstr "Tekstgrootte aanpassen" - -#~ msgid "Go to the address entered in the address entry" -#~ msgstr "Ga naar het in het adresveld ingegeven adres " - -# src/toolbar.c:143 -#~ msgid "_Home" -#~ msgstr "_Start" - -# ui/preferences.glade.h:172 -#~ msgid "Go to the home page" -#~ msgstr "Ga naar de startpagina" - -# src/menubar.c:54 -#~ msgid "Open a new tab" -#~ msgstr "Nieuw tabblad openen" - -# src/context.c:60 -#~ msgid "Open a new window" -#~ msgstr "Nieuw venster openen" - -# ui/preferences.glade.h:105 -#~ msgctxt "toolbar style" -#~ msgid "Default" -#~ msgstr "Standaard" - -#~ msgctxt "toolbar style" -#~ msgid "Text below icons" -#~ msgstr "Tekst onder pictogrammen" - -#~ msgctxt "toolbar style" -#~ msgid "Text beside icons" -#~ msgstr "Tekst naast pictogrammen" - -#~ msgctxt "toolbar style" -#~ msgid "Icons only" -#~ msgstr "Alleen pictogrammen" - -# src/prefs.c:385 -# ui/epiphany.glade.h:36 -#~ msgctxt "toolbar style" -#~ msgid "Text only" -#~ msgstr "Alleen tekst" - -# src/menubar.c:150 -#~ msgid "Toolbar Editor" -#~ msgstr "Werkbalk-editor" - -#~ msgid "Toolbar _button labels:" -#~ msgstr "Werkbalkkno_p-opschriften:" - -# src/bookmarks_menus.c:525 -# ui/bookmarks.glade.h:47 -#~ msgid "_Add a New Toolbar" -#~ msgstr "Nieuwe werkbalk _toevoegen" - -# src/menubar.c:570 -#~ msgid "_Go" -#~ msgstr "_Ga naar" - -# src/menubar.c:150 -#~ msgid "T_ools" -#~ msgstr "E_xtra" - -# src/menubar.c:54 -#~ msgid "_Tabs" -#~ msgstr "_Tabbladen" - -# src/menubar.c:34 -#~ msgid "Open a file" -#~ msgstr "Bestand openen" - -# src/menubar.c:64 -#~ msgid "Save the current page" -#~ msgstr "Huidige pagina opslaan" - -# src/menubar.c:64 -#~| msgid "Save the current page" -#~ msgid "Save the current page as a Web Application" -#~ msgstr "De huidige pagina opslaan als een webtoepassing" - -# src/toolbar.c:286 -#~ msgid "Page Set_up" -#~ msgstr "Afdrukin_stellingen" - -#~ msgid "Setup the page settings for printing" -#~ msgstr "De pagina instellen voor afdrukken" - -#~ msgid "Print Pre_view" -#~ msgstr "Afdruk_voorbeeld" - -#~ msgid "Print preview" -#~ msgstr "Afdrukvoorbeeld" - -# src/menubar.c:73 -#~ msgid "Print the current page" -#~ msgstr "Huidige pagina afdrukken" - -# src/toolbar.c:131 -#~ msgid "Send a link of the current page" -#~ msgstr "Verwijzing naar de huidige pagina versturen" - -# src/bookmarks_editor.c:945 -# src/menubar.c:91 -#~ msgid "Close this tab" -#~ msgstr "Dit tabblad sluiten" - -# ui/epiphany.glade.h:18 -#~ msgid "Undo the last action" -#~ msgstr "Laatste bewerking ongedaan maken" - -#~ msgid "Redo the last undone action" -#~ msgstr "De laatst ongedaan gemaakte actie weer opnieuw uitvoeren" - -# src/menubar.c:39 -#~ msgid "Paste clipboard" -#~ msgstr "Plakken vanuit klembord" - -# src/bookmarks_editor.c:949 -# src/bookmarks_editor.c:1169 -# src/menubar.c:39 -#~ msgid "Delete text" -#~ msgstr "Tekst _verwijderen" - -# src/window.c:985 -#~ msgid "Select the entire page" -#~ msgstr "De hele pagina selecteren" - -#~ msgid "Find a word or phrase in the page" -#~ msgstr "Zoeken naar een woord of zin in de pagina" - -#~ msgid "Find next occurrence of the word or phrase" -#~ msgstr "Volgende overeenkomende tekenreeks zoeken" - -#~ msgid "Find previous occurrence of the word or phrase" -#~ msgstr "Vorige overeenkomende tekenreeks zoeken" - -# src/persistent_data_manager.c:138 -# ui/epiphany.glade.h:94 -#~ msgid "P_ersonal Data" -#~ msgstr "P_ersoonlijke informatie" - -#~ msgid "View and remove cookies and passwords" -#~ msgstr "Cookies en wachtwoorden bekijken en verwijderen" - -#~ msgid "Certificate_s" -#~ msgstr "_Certificaten" - -# ui/preferences.glade.h:142 -#~ msgid "P_references" -#~ msgstr "_Voorkeuren" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "Configure the web browser" -#~ msgstr "De webbrowser instellen" - -#~ msgid "_Customize Toolbars…" -#~ msgstr "Werkbalken _bewerken…" - -#~ msgid "Customize toolbars" -#~ msgstr "Werkbalken bewerken" - -#~ msgid "Increase the text size" -#~ msgstr "Tekst vergroten" - -#~ msgid "Decrease the text size" -#~ msgstr "Tekst verkleinen" - -#~ msgid "Use the normal text size" -#~ msgstr "Standaard tekstgrootte" - -#~ msgid "Change the text encoding" -#~ msgstr "Tekstcodering aanpassen" - -#~ msgid "View the source code of the page" -#~ msgstr "De broncode van de pagina bekijken" - -#~ msgid "Page _Security Information" -#~ msgstr "Beveiligingsin_formatie over pagina" - -#~ msgid "Display security information for the web page" -#~ msgstr "Beveiligingsinformatie betreffende deze webpagina weergeven" - -# src/menubar.c:433 -#~ msgid "Add a bookmark for the current page" -#~ msgstr "Bladwijzer toevoegen voor de huidige pagina" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "Open the bookmarks window" -#~ msgstr "Bladwijzervenster openen" - -# src/toolbar.c:170 -#~ msgid "Go to a specified location" -#~ msgstr "Ga naar een bepaalde locatie" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "Open the history window" -#~ msgstr "Geschiedenisvenster openen" - -#~ msgid "Activate previous tab" -#~ msgstr "Vorige tabblad activeren" - -#~ msgid "Activate next tab" -#~ msgstr "Volgende tabblad activeren" - -# src/menubar.c:73 -#~ msgid "Move current tab to left" -#~ msgstr "Huidige tabblad naar links verplaatsen" - -# src/menubar.c:73 -#~ msgid "Move current tab to right" -#~ msgstr "Huidige tabblad naar rechts verplaatsen" - -# src/menubar.c:73 -#~ msgid "Detach current tab" -#~ msgstr "Huidige tabblad losscheuren" - -# GNOME_epiphany_Automation.oaf.in.h:1 -# epiphany.desktop.in.h:2 -#~ msgid "Display web browser help" -#~ msgstr "Hulp voor webbrowser weergeven" - -# src/bookmarks_editor.c:945 -# src/menubar.c:91 -#~ msgid "Switch to offline mode" -#~ msgstr "Naar offline stand schakelen" - -# src/menubar.c:150 -#~ msgid "_Hide Toolbars" -#~ msgstr "_Werkbalken verbergen" - -# src/bookmarks_menus.c:525 -# ui/bookmarks.glade.h:47 -#~ msgid "Show or hide toolbar" -#~ msgstr "Werkbalk weergeven/verbergen" - -# src/context.c:71 -#~ msgid "Show the active downloads for this window" -#~ msgstr "De in dit venster actieve downloads tonen" - -#~ msgid "Men_ubar" -#~ msgstr "Menu_balk" - -#~ msgid "Show or hide unrequested popup windows from this site" -#~ msgstr "Ongevraagde opduikvensters van deze pagina tonen of verbergen" - -#~ msgid "Show Only _This Frame" -#~ msgstr "Alleen dit _deelvenster tonen" - -# src/context.c:71 -#~ msgid "Show only this frame in this window" -#~ msgstr "Alleen dit deelvenster in dit venster tonen" - -# src/context.c:60 -#~ msgid "Open link in this window" -#~ msgstr "Verwijzing openen in dit venster" - -# src/context.c:60 -#~ msgid "Open link in a new window" -#~ msgstr "Verwijzing openen in nieuw venster" - -# src/context.c:61 -#~ msgid "Open link in a new tab" -#~ msgstr "Verwijzing openen in een nieuw tabblad" - -#~ msgid "Save link with a different name" -#~ msgstr "Verwijzing opslaan onder een andere naam" - -# src/menubar.c:68 -#~ msgid "_Send Email…" -#~ msgstr "E-mail ve_rsturen…" - -#~ msgid "Insecure" -#~ msgstr "Onveilig" - -# src/mozilla/mozilla.cpp:996 -# src/persistent_data_manager.c:374 -# src/persistent_data_manager.c:609 -#~ msgid "Broken" -#~ msgstr "Gebroken" - -#~ msgid "Low" -#~ msgstr "Laag" - -# src/mozilla/mozilla.cpp:1982 -#~ msgid "High" -#~ msgstr "Hoog" - -#~ msgid "Security level: %s" -#~ msgstr "Beveiligingsniveau: %s" - -# src/context.c:1075 -#~ msgid "Open image “%s”" -#~ msgstr "Afbeelding ‘%s’ openen" - -# src/context.c:68 -#~ msgid "Use as desktop background “%s”" -#~ msgstr "Gebruiken als werkbladachtergrond ‘%s’" - -# src/context.c:67 -#~ msgid "Save image “%s”" -#~ msgstr "Afbeelding ‘%s’ opslaan" - -#~ msgid "Copy image address “%s”" -#~ msgstr "Afbeeldingsadres ‘%s’ kopiëren" - -#~ msgid "Send email to address “%s”" -#~ msgstr "E-mail versturen naar adres ‘%s’" +#~ "Werkbalkstijl. Toegestane waardes zijn ‘(use GNOME default style)’, " +#~ "‘both’ (tekst en pictogrammen), ‘both-horiz’ (tekst naast pictogrammen), " +#~ "‘icons’, en ‘text’." -#~ msgid "Copy email address “%s”" -#~ msgstr "E-mailadres ‘%s’ kopiëren" - -# src/context.c:64 -# src/history_callbacks.c:165 -# src/misc_callbacks.c:412 -#~ msgid "Bookmark link “%s”" -#~ msgstr "Bladwijzer maken van verwijzing ‘%s’" +#~ msgid "Size of disk cache" +#~ msgstr "Grootte van schijfbuffer" -#~ msgid "Copy link's address “%s”" -#~ msgstr "Verwijzing-adres ‘%s’ kopiëren" +#~ msgid "Size of disk cache, in MB." +#~ msgstr "Grootte van schijfbuffer, in MB." diff -Nru epiphany-browser-3.16.3/po/pl.po epiphany-browser-3.18.0/po/pl.po --- epiphany-browser-3.16.3/po/pl.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/pl.po 2015-09-08 11:37:53.000000000 +0000 @@ -9,17 +9,16 @@ # Artur Flinta , 2003-2006. # Wadim Dziedzic , 2007. # Tomasz Dominikowski , 2007-2009. -# Piotr Drąg , 2009-2013. +# Piotr Drąg , 2009-2015. # Paweł Żołnowski , 2014-2015. # Aviary.pl , 2007-2015. msgid "" msgstr "" "Project-Id-Version: epiphany\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=epiphany\n" -"POT-Creation-Date: 2015-03-10 19:08+0100\n" -"PO-Revision-Date: 2015-03-09 06:40+0100\n" -"Last-Translator: Paweł Żołnowski \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-30 01:19+0200\n" +"PO-Revision-Date: 2015-08-30 01:20+0200\n" +"Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -58,15 +57,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=pl-pl&kad=pl_PL" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "Przeglądarka WWW dla GNOME" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -76,35 +75,42 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Przeglądarka WWW dla środowiska GNOME, oferująca ścisłą integrację z " "pulpitem oraz prosty i intuicyjny interfejs użytkownika, umożliwiający " "skupienie się na stronach WWW." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "" +"Przeglądarka WWW dla środowiska GNOME znana jest też pod nazwą kodową " +"Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "WWW" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Przeglądarka WWW" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Przeglądarka WWW Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Przeglądanie stron WWW" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "www;web;przeglądarka;wyszukiwarka;internet;sieć;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nowe okno incognito" @@ -200,9 +206,9 @@ "'never' (the homepage is always shown)." msgstr "" "Określa sposób, w haki sesja ma być przywracana podczas uruchamiania. " -"Dozwolone wartości to \"always\" (poprzedni stan programu jest zawsze " -"przywracany), \"crashed\" (sesja jest przywracana tylko, jeśli program uległ " -"awarii) i \"never\" (zawsze wyświetlana jest strona domowa)." +"Dozwolone wartości to „always” (poprzedni stan programu jest zawsze " +"przywracany), „crashed” (sesja jest przywracana tylko, jeśli program uległ " +"awarii) i „never” (zawsze wyświetlana jest strona domowa)." #: ../data/org.gnome.epiphany.gschema.xml.h:26 msgid "" @@ -217,12 +223,12 @@ "When this option is set to true, tabs will not start loading until the user " "switches to them, upon session restore." msgstr "" -"Jeśli ta opcja jest ustawiona na \"true\", to podczas przywracania sesji " -"karty nie będą wczytywane, dopóki użytkownik nie przełączy na nie." +"Jeśli ta opcja jest ustawiona na „true”, to podczas przywracania sesji karty " +"nie będą wczytywane, dopóki użytkownik nie przełączy na nie." #: ../data/org.gnome.epiphany.gschema.xml.h:28 msgid "Process model" -msgstr "Model przetwarzania" +msgstr "Model procesów" #: ../data/org.gnome.epiphany.gschema.xml.h:29 msgid "" @@ -230,24 +236,28 @@ "process' to use a single web process shared by all the tabs and 'one-" "secondary-process-per-web-view' to use a different web process for each tab." msgstr "" -"Ta opcja umożliwia ustawienie modelu przetwarzania. Należy użyć \"shared-" -"secondary-process\", aby jeden proces sieciowy był współdzielony przez " -"wszystkie karty, a \"one-secondary-process-per-web-view\", aby na każdą " -"kartę użyty został inny proces sieciowy." +"Ta opcja umożliwia ustawienie modelu procesów. Należy użyć „shared-secondary-" +"process”, aby jeden proces sieciowy był współdzielony przez wszystkie karty, " +"a „one-secondary-process-per-web-view”, aby na każdą kartę użyty został inny " +"proces sieciowy." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Styl paska narzędziowego" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maksymalna liczba procesów WWW tworzonych w tym samym czasie podczas " +"używania modelu „one-secondary-process-per-web-view”" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Styl paska narzędziowego. Dozwolone wartości to \"\" (domyślny styl " -"środowiska GNOME), \"both\" (tekst i ikony), \"both-horiz\" (tekst obok " -"ikon), \"icons\" (ikony) i \"text\" (tekst)." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Ta opcja ustawia ograniczenie liczby procesów WWW używanych w tym samym " +"czasie dla modelu „one-secondary-process-per-web-view”. Domyślna wartość „0” " +"oznacza brak ograniczenia." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -258,8 +268,8 @@ "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " "instead." msgstr "" -"[Przestarzałe] To ustawienie jest przestarzałe, należy używać opcji \"tabs-" -"bar-visibility-policy\" zamiast tego." +"[Przestarzałe] To ustawienie jest przestarzałe, należy używać opcji „tabs-" +"bar-visibility-policy” zamiast tego." #: ../data/org.gnome.epiphany.gschema.xml.h:34 msgid "Visibility of the downloads window" @@ -283,9 +293,9 @@ "bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " "two or more tabs) and 'never' (the tabs bar is never shown)." msgstr "" -"Kontroluje, kiedy wyświetlany jest pasek kart. Możliwe wartości to \"always" -"\" (pasek jest zawsze wyświetlany), \"more-than-one\" (pasek jest " -"wyświetlany tylko, jeśli otwarte są dwie lub więcej kart) i \"never\" (pasek " +"Kontroluje, kiedy wyświetlany jest pasek kart. Możliwe wartości to " +"„always” (pasek jest zawsze wyświetlany), „more-than-one” (pasek jest " +"wyświetlany tylko, jeśli otwarte są dwie lub więcej kart) i „never” (pasek " "nigdy nie jest wyświetlany)." #: ../data/org.gnome.epiphany.gschema.xml.h:38 @@ -310,7 +320,7 @@ "is set." msgstr "" "Wartość używana do zastąpienia czcionki bezszeryfowej środowiska, kiedy " -"ustawiona jest opcja \"use-gnome-fonts\"." +"ustawiona jest opcja „use-gnome-fonts”." #: ../data/org.gnome.epiphany.gschema.xml.h:43 msgid "Custom serif font" @@ -322,7 +332,7 @@ "set." msgstr "" "Wartość używana do zastąpienia czcionki szeryfowej środowiska, kiedy " -"ustawiona jest opcja \"use-gnome-fonts\"." +"ustawiona jest opcja „use-gnome-fonts”." #: ../data/org.gnome.epiphany.gschema.xml.h:45 msgid "Custom monospace font" @@ -334,7 +344,7 @@ "is set." msgstr "" "Wartość używana do zastąpienia czcionki o stałej szerokości środowiska, " -"kiedy ustawiona jest opcja \"use-gnome-fonts\"." +"kiedy ustawiona jest opcja „use-gnome-fonts”." #: ../data/org.gnome.epiphany.gschema.xml.h:47 msgid "Use own colors" @@ -397,10 +407,10 @@ "Where to accept cookies from. Possible values are \"always\", \"no-third-" "party\" and \"never\"." msgstr "" -"Określa, skąd akceptować ciasteczka. Możliwe wartości to \"always" -"\" (akceptowanie wszystkich ciasteczek), \"no-third-party\" (nieakceptowanie " -"ciasteczek od podmiotów zewnętrznych) i \"never\" (nieakceptowanie żadnych " -"ciasteczek)." +"Określa, skąd akceptować ciasteczka. Możliwe wartości to " +"„always” (akceptowanie wszystkich ciasteczek), „no-third-" +"party” (nieakceptowanie ciasteczek od podmiotów zewnętrznych) i " +"„never” (nieakceptowanie żadnych ciasteczek)." #: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" @@ -411,9 +421,9 @@ "How to present animated images. Possible values are \"normal\", \"once\" and " "\"disabled\"." msgstr "" -"Jak wyświetlać animowane obrazy. Możliwe wartości to \"normal" -"\" (wyświetlanie animacji), \"once\" (wyświetlanie animacji tylko raz) i " -"\"disabled\" (bez animacji)." +"Jak wyświetlać animowane obrazy. Możliwe wartości to „normal” (wyświetlanie " +"animacji), „once” (wyświetlanie animacji tylko raz) i „disabled” (bez " +"animacji)." #: ../data/org.gnome.epiphany.gschema.xml.h:63 msgid "Allow popups" @@ -436,11 +446,11 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:67 msgid "Enable WebGL" -msgstr "Obsługa protokołu WebGL" +msgstr "Obsługa WebGL" #: ../data/org.gnome.epiphany.gschema.xml.h:68 msgid "Whether to enable support for WebGL contexts." -msgstr "Określa, czy włączyć obsługę kontekstów protokołu WebGL." +msgstr "Określa, czy włączyć obsługę kontekstów WebGL." #: ../data/org.gnome.epiphany.gschema.xml.h:69 msgid "Enable WebAudio" @@ -481,8 +491,8 @@ "The path of the folder where to download files to; or \"Downloads\" to use " "the default downloads folder, or \"Desktop\" to use the desktop folder." msgstr "" -"Ścieżka do katalogu, do którego pobierać pliki. Wartość \"Downloads\" " -"spowoduje użycie domyślnego katalogu pobierania, a wartość \"Desktop\" " +"Ścieżka do katalogu, do którego pobierać pliki. Wartość „Downloads” " +"spowoduje użycie domyślnego katalogu pobierania, a wartość „Desktop” " "spowoduje użyciu katalogu pulpitu." #: ../data/org.gnome.epiphany.gschema.xml.h:77 @@ -560,19 +570,19 @@ msgid "Installed on:" msgstr "Zainstalowano:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Usuń z podglądu" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Najczęściej odwiedzane" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Usuń z podglądu" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Tryb prywatny" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -583,14 +593,14 @@ "przechowywane informacje zostaną wyczyszczone po zamknięciu okna. Pobrane " "pliki zostaną zachowane." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Tryb incognito ukrywa wykonywane operacje wyłącznie przed osobami " "korzystającymi z tego komputera." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -623,7 +633,7 @@ #: ../embed/ephy-embed-utils.c:65 #, c-format msgid "Send an email message to “%s”" -msgstr "Wyślij wiadomość e-mail na adres \"%s\"" +msgstr "Wyślij wiadomość e-mail na adres „%s”" #: ../embed/ephy-encodings.c:54 msgid "Arabic (_IBM-864)" @@ -969,60 +979,60 @@ msgid "Find next occurrence of the search string" msgstr "Wyszukuje następne wystąpienie ciągu" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Zapisz" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Nie zapisuj" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Zapisz" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" -msgstr "Zapamiętać hasło dla witryny \"%s\"?" +msgstr "Zapamiętać hasło dla witryny „%s”?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" -msgstr "Odmawianie" +msgstr "Odmów" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" -msgstr "Zezwalanie" +msgstr "Zezwól" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Witryna %s chce poznać położenie użytkownika." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Witryna %s chce wyświetlać powiadomienia pulpitu." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" -msgstr "Wczytywanie witryny \"%s\"…" +msgstr "Wczytywanie witryny „%s”…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Wczytywanie…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Ta witryna przedstawiła certyfikat należący do innej witryny." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1031,18 +1041,18 @@ "sprawdzić, czy data w komputerze jest prawidłowa." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "Certyfikat tej witryny nie został wydany przez zaufaną organizację." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "Nie można przetworzyć certyfikatu tej witryny. Może on być uszkodzony." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1051,7 +1061,7 @@ "go wydała." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1060,7 +1070,7 @@ "szyfrowania." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1069,13 +1079,13 @@ "data w komputerze jest prawidłowa." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Witryna %s może nie być prawdziwa." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1086,7 +1096,7 @@ "tej witryny jest nieprawidłowy:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1097,29 +1107,29 @@ "zaufanego certyfikatu. " #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Wiarygodne banki, sklepy i inne publiczne witryny nie prosiłyby o coś " "takiego." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Nie podano nikogo" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" -msgstr "Problem podczas wczytywania witryny \"%s\"" +msgstr "Problem podczas wczytywania witryny „%s”" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Nie można wyświetlić tej witryny." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" msgstr "" -"

Witryna \"%s\" jest niedostępna. Dokładna treść błędu:

%sWitryna „%s” jest niedostępna. Dokładna treść błędu:

%s

Witryna mogła zostać tymczasowo wyłączona lub przeniesiona na " "nowy adres. Proszę także sprawdzić, czy połączenie internetowe działa " "poprawnie.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Spróbuj ponownie" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Wystąpił problem." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1151,20 +1161,20 @@ "p>

Jeśli to się wydarzy ponownie, proszę zgłosić ten problem programistom " "programu %s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Wczytaj ponownie mimo to" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" -msgstr "Problem podczas wyświetlania witryny \"%s\"" +msgstr "Problem podczas wyświetlania witryny „%s”" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Błąd" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1173,21 +1183,21 @@ "lub odwiedzić inną, aby kontynuować." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Uwaga!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Wczytaj mimo to" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1227,23 +1237,23 @@ #: ../lib/ephy-file-helpers.c:335 #, c-format msgid "Could not create a temporary directory in “%s”." -msgstr "Nie można utworzyć katalogu tymczasowego w \"%s\"." +msgstr "Nie można utworzyć katalogu tymczasowego w „%s”." #: ../lib/ephy-file-helpers.c:466 #, c-format msgid "The file “%s” exists. Please move it out of the way." -msgstr "Plik \"%s\" istnieje. Proszę przenieść go w inne miejsce." +msgstr "Plik „%s” istnieje. Proszę przenieść go w inne miejsce." #: ../lib/ephy-file-helpers.c:487 #, c-format msgid "Failed to create directory “%s”." -msgstr "Utworzenie katalogu \"%s\" się nie powiodło." +msgstr "Utworzenie katalogu „%s” się nie powiodło." #. Translators: The first %s is the username and the second one is the #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Hasło dla użytkownika %s w formularzu na %s" @@ -1251,7 +1261,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Hasło w formularzu na %s" @@ -1259,7 +1269,7 @@ #: ../lib/ephy-gui.c:206 #, c-format msgid "Directory “%s” is not writable" -msgstr "Nie można zapisywać w katalogu \"%s\"" +msgstr "Nie można zapisywać w katalogu „%s”" #: ../lib/ephy-gui.c:210 msgid "You do not have permission to create files in this directory." @@ -1272,13 +1282,14 @@ #: ../lib/ephy-gui.c:242 #, c-format msgid "Cannot overwrite existing file “%s”" -msgstr "Nie można zastąpić istniejącego pliku \"%s\"" +msgstr "Nie można zastąpić istniejącego pliku „%s”" #: ../lib/ephy-gui.c:246 msgid "" "A file with this name already exists and you don't have permission to " "overwrite it." -msgstr "Plik o tej nazwie już istnieje i brak uprawnień do zastąpienia go." +msgstr "" +"Plik o tej nazwie już istnieje i brak jest uprawnień do zastąpienia go." #: ../lib/ephy-gui.c:249 msgid "Cannot Overwrite File" @@ -1482,7 +1493,7 @@ msgid "_View Certificate…" msgstr "_Wyświetl certyfikat…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1490,7 +1501,7 @@ msgstr[1] "Pozostały %d sekundy" msgstr[2] "Pozostało %d sekund" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1498,7 +1509,7 @@ msgstr[1] "Pozostały %d minuty" msgstr[2] "Pozostało %d minut" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1506,7 +1517,7 @@ msgstr[1] "Pozostały %d godziny" msgstr[2] "Pozostało %d godzin" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1514,7 +1525,7 @@ msgstr[1] "Pozostały %d dni" msgstr[2] "Pozostało %d dni" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1522,7 +1533,7 @@ msgstr[1] "Pozostały %d tygodnie" msgstr[2] "Pozostało %d tygodni" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1530,29 +1541,29 @@ msgstr[1] "Pozostały %d miesiące" msgstr[2] "Pozostało %d miesięcy" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Ukończono" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Błąd podczas pobierania: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Anuluj" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Otwórz" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Wyświetl w katalogu" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Uruchamianie…" @@ -1560,20 +1571,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_Wyczyść" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "Cof_nij" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "P_onów" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Przeciągnięcie tej ikony utworzy dowiązanie do tej strony" @@ -1594,25 +1605,25 @@ #: ../src/bookmarks/ephy-bookmark-properties.c:237 #, c-format msgid "“%s” Properties" -msgstr "Właściwości \"%s\"" +msgstr "Właściwości „%s”" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "Tyt_uł:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Adres:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "T_ematy:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Wyświetl _wszystkie tematy" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1669,7 +1680,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:75 msgid "Web (RDF)" -msgstr "Web (RDF)" +msgstr "Przeglądarka WWW (RDF)" #: ../src/bookmarks/ephy-bookmarks-editor.c:76 msgid "Mozilla (HTML)" @@ -1708,7 +1719,7 @@ msgstr "Tworzy nowy temat" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Otwórz w no_wym oknie" @@ -1717,10 +1728,10 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:162 msgid "Open the selected bookmark in a new window" -msgstr "Otwiera wybraną zakładkę w nowym oknie" +msgstr "Otwiera zaznaczoną zakładkę w nowym oknie" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Otwórz w nowej _karcie" @@ -1729,7 +1740,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:165 msgid "Open the selected bookmark in a new tab" -msgstr "Otwiera wybraną zakładkę w nowej karcie" +msgstr "Otwiera zaznaczoną zakładkę w nowej karcie" #: ../src/bookmarks/ephy-bookmarks-editor.c:167 msgid "_Rename…" @@ -1737,7 +1748,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:168 msgid "Rename the selected bookmark or topic" -msgstr "Zmienia nazwę zakładki lub tematu" +msgstr "Zmienia nazwę zaznaczonej zakładki lub tematu" #: ../src/bookmarks/ephy-bookmarks-editor.c:169 msgid "_Properties" @@ -1745,7 +1756,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:170 msgid "View or modify the properties of the selected bookmark" -msgstr "Wyświetla lub zmienia właściwości wybranej zakładki" +msgstr "Wyświetla lub modyfikuje właściwości zaznaczonej zakładki" #: ../src/bookmarks/ephy-bookmarks-editor.c:172 msgid "_Import Bookmarks…" @@ -1753,7 +1764,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:173 msgid "Import bookmarks from another browser or a bookmarks file" -msgstr "Zaimportowanie zakładek z innej przeglądarki lub pliku" +msgstr "Importuje zakładki z innej przeglądarki lub pliku" #: ../src/bookmarks/ephy-bookmarks-editor.c:175 msgid "_Export Bookmarks…" @@ -1761,7 +1772,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:176 msgid "Export bookmarks to a file" -msgstr "Wyeksportowanie zakładki do pliku" +msgstr "Eksportuje zakładki do pliku" #: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:112 msgid "_Close" @@ -1781,7 +1792,7 @@ msgstr "Wycina zaznaczenie" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "S_kopiuj" @@ -1842,7 +1853,7 @@ msgstr "Wyświetlanie kolumny tytułu" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adres" @@ -1857,7 +1868,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:377 #, c-format msgid "Delete topic “%s”?" -msgstr "Usunąć temat \"%s\"?" +msgstr "Usunąć temat „%s”?" #: ../src/bookmarks/ephy-bookmarks-editor.c:380 msgid "Delete this topic?" @@ -1891,7 +1902,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:513 #, c-format msgid "Mozilla “%s” profile" -msgstr "Profil \"%s\" Mozilli" +msgstr "Profil „%s” Mozilli" #: ../src/bookmarks/ephy-bookmarks-editor.c:517 msgid "Galeon" @@ -1903,11 +1914,11 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:550 msgid "Import failed" -msgstr "Zaimportowanie się nie powiodło" +msgstr "Importowanie się nie powiodło" #: ../src/bookmarks/ephy-bookmarks-editor.c:552 msgid "Import Failed" -msgstr "Zaimportowanie się nie powiodło" +msgstr "Importowanie się nie powiodło" #: ../src/bookmarks/ephy-bookmarks-editor.c:555 #, c-format @@ -1915,12 +1926,12 @@ "The bookmarks from “%s” could not be imported because the file is corrupted " "or of an unsupported type." msgstr "" -"Zakładki z \"%s\" nie mogły zostać zaimportowane z powodu uszkodzenia pliku " +"Zakładki z „%s” nie mogły zostać zaimportowane z powodu uszkodzenia pliku " "lub nieobsługiwanego typu." #: ../src/bookmarks/ephy-bookmarks-editor.c:618 msgid "Import Bookmarks from File" -msgstr "Zaimportowanie zakładek z pliku" +msgstr "Importowanie zakładek z pliku" #: ../src/bookmarks/ephy-bookmarks-editor.c:625 msgid "Firefox/Mozilla bookmarks" @@ -1936,10 +1947,10 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:757 msgid "Export Bookmarks" -msgstr "Wyeksportowanie zakładek" +msgstr "Eksportowanie zakładek" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Zakładki" @@ -1951,7 +1962,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:816 msgid "Import Bookmarks" -msgstr "Zaimportowanie zakładek" +msgstr "Importowanie zakładek" #: ../src/bookmarks/ephy-bookmarks-editor.c:821 msgid "I_mport" @@ -1959,21 +1970,21 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:837 msgid "Import bookmarks from:" -msgstr "Zaimportowanie zakładek z:" +msgstr "Importowanie zakładek z:" #: ../src/bookmarks/ephy-bookmarks-editor.c:857 msgid "File" msgstr "Plik" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" -msgstr "_Skopiuj adres" +msgstr "S_kopiuj adres" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Tematy" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Tytuł" @@ -1989,7 +2000,7 @@ #: ../src/bookmarks/ephy-topics-entry.c:330 #, c-format msgid "Create topic “%s”" -msgstr "Tworzy temat \"%s\"" +msgstr "Tworzy temat „%s”" #: ../src/resources/clear-data-dialog.ui.h:1 msgid "Clear Personal Data" @@ -2357,7 +2368,7 @@ #: ../src/ephy-combined-stop-reload-action.c:45 msgid "Display the latest content of the current page" -msgstr "Wyświetla ostatnią zawartość bieżącej strony" +msgstr "Wyświetla najnowszą treść bieżącej strony" #: ../src/ephy-encoding-menu.c:320 msgid "_Other…" @@ -2367,11 +2378,11 @@ msgid "Other encodings" msgstr "Inne kodowania" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Wyczyścić historię przeglądania?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2389,7 +2400,7 @@ #: ../src/ephy-main.c:80 msgid "Import bookmarks from the given file" -msgstr "Zaimportuje zakładki z podanego pliku" +msgstr "Importuje zakładki z podanego pliku" #: ../src/ephy-main.c:80 ../src/ephy-main.c:82 msgid "FILE" @@ -2448,18 +2459,18 @@ "Uruchomienie się nie powiodło z powodu błędu:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Opcje przeglądarki WWW" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Zamyka kartę" #: ../src/ephy-search-provider.c:201 #, c-format msgid "Search the Web for %s" -msgstr "Wyszukiwanie %s w sieci WWW" +msgstr "Wyszukiwanie „%s” w sieci WWW" #: ../src/ephy-window.c:102 msgid "_Open…" @@ -2572,7 +2583,7 @@ #: ../src/ephy-window.c:206 msgid "Selection Caret" -msgstr "Zaznaczenie korektorskie" +msgstr "Zaznaczenie za pomocą karetki" #. Document. #: ../src/ephy-window.c:213 @@ -2589,141 +2600,150 @@ msgstr "Otwórz odnośnik w nowej _karcie" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Otwórz odnośnik w oknie in_cognito" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Zapisz odnośnik jako…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Skopiuj _adres odnośnika" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "Skopiuj adres _e-mail" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Wyświetl o_braz w nowej karcie" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Skopiuj adres ob_razu" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Zapisz _obraz jako…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Ustaw jako _tapetę" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Otwórz plik wi_deo w nowym oknie" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Otwórz plik wid_eo w nowej karcie" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Zapisz plik _wideo jako…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "Skopiuj adres pliku wide_o" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Otwórz plik dźwiękowy w _nowym oknie" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Otwórz plik dźwiękowy w nowej k_arcie" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Zapisz plik dźwiękowy ja_ko…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "Skopiuj ad_res pliku dźwiękowego" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Pozostały niewysłane zmiany elementów formularza" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Jeżeli dokument zostanie zamknięty, to informacja zostanie utracona." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Zamknij _dokument" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "W tym oknie znajdują się trwające pobierania" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Jeśli to okno zostanie zamknięte, to pobierania zostaną anulowane" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Zamknij okno i anuluj pobierania" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" -msgstr "Zapis jako" +msgstr "Zapisz jako" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Zapisz jako program" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Wydrukuj" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" -msgstr "Zakładka" +msgstr "Dodaj zakładkę" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Znajdź" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Większy" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Mniejszy" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Wstecz" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Do przodu" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Powiększenie" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nowa _karta" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" -msgstr "Przechodzi do najczęściej odwiedzanych" +msgstr "Przejdź do najczęściej odwiedzanych" + +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Znajdź „%s” w sieci WWW" #: ../src/popup-commands.c:229 msgid "Save Link As" @@ -2811,7 +2831,7 @@ #: ../src/window-commands.c:710 #, c-format msgid "A web application named '%s' already exists. Do you want to replace it?" -msgstr "Program WWW o nazwie \"%s\" już istnieje. Zastąpić go?" +msgstr "Program WWW o nazwie „%s” już istnieje. Zastąpić go?" #: ../src/window-commands.c:715 msgid "Replace" @@ -2828,12 +2848,12 @@ #: ../src/window-commands.c:755 #, c-format msgid "The application '%s' is ready to be used" -msgstr "Program \"%s\" jest gotowy do użycia" +msgstr "Program „%s” jest gotowy do użycia" #: ../src/window-commands.c:758 #, c-format msgid "The application '%s' could not be created" -msgstr "Nie można utworzyć programu \"%s\"" +msgstr "Nie można utworzyć programu „%s”" #: ../src/window-commands.c:766 msgid "Launch" @@ -2848,19 +2868,19 @@ msgid "C_reate" msgstr "U_twórz" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Kontakt:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Współtwórcy:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Poprzedni programiści:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2877,7 +2897,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Cezary Jackiewicz , 2000-2001\n" @@ -2885,19 +2905,19 @@ "Artur Flinta , 2003-2006\n" "Wadim Dziedzic , 2007\n" "Tomasz Dominikowski , 2007-2009\n" -"Piotr Drąg , 2009-2013\n" +"Piotr Drąg , 2009-2015\n" "Paweł Żołnowski , 2014-2015\n" "Aviary.pl , 2007-2015" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Witryna przeglądarki WWW" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Włączyć tryb przeglądania za pomocą karetki?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2907,6 +2927,6 @@ "umieszcza ruchomy kursor na stronach WWW, umożliwiając poruszanie się za " "pomocą klawiatury. Włączyć tę funkcję?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" -msgstr "_Włączenie" +msgstr "_Włącz" diff -Nru epiphany-browser-3.16.3/po/POTFILES.in epiphany-browser-3.18.0/po/POTFILES.in --- epiphany-browser-3.16.3/po/POTFILES.in 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/POTFILES.in 2015-08-07 08:41:06.000000000 +0000 @@ -3,7 +3,7 @@ # Please keep this file sorted alphabetically. [type: gettext/xml]data/default-bookmarks.rdf.in data/epiphany.appdata.xml.in -data/epiphany.desktop.in.in +data/epiphany.desktop.in data/org.gnome.epiphany.gschema.xml embed/ephy-about-handler.c embed/ephy-download.c diff -Nru epiphany-browser-3.16.3/po/POTFILES.skip epiphany-browser-3.18.0/po/POTFILES.skip --- epiphany-browser-3.16.3/po/POTFILES.skip 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/POTFILES.skip 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -data/bme.desktop.in -data/epiphany.appdata.xml -data/epiphany.desktop.in -plugins/desktop-file/plugin.cpp diff -Nru epiphany-browser-3.16.3/po/pt_BR.po epiphany-browser-3.18.0/po/pt_BR.po --- epiphany-browser-3.16.3/po/pt_BR.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/pt_BR.po 2015-08-11 09:36:01.000000000 +0000 @@ -26,9 +26,10 @@ msgid "" msgstr "" "Project-Id-Version: epiphany\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-04 16:39+0000\n" -"PO-Revision-Date: 2015-03-04 15:33-0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=epiphany&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-08-10 15:44+0000\n" +"PO-Revision-Date: 2015-08-10 20:11-0300\n" "Last-Translator: Enrico Nicoletto \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -36,7 +37,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.7.3\n" +"X-Generator: Poedit 1.6.4\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -68,50 +69,64 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 ../src/ephy-search-provider.c:289 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 +#: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=br-pt" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "Navegador da web para o GNOME" #: ../data/epiphany.appdata.xml.in.h:3 -msgid "" -"The web browser for GNOME, featuring tight integration with the desktop and a simple and intuitive user interface that allows " -"you to focus on your web pages." -msgstr "" -"O navegador web para a área de trabalho GNOME, apresentando forte integração com a área de trabalho e uma interface gráfica " -"simples e intuitiva que permite a você concentrar-se em suas páginas web." - -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." +msgid "" +"The web browser for GNOME, featuring tight integration with the desktop and " +"a simple and intuitive user interface that allows you to focus on your web " +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." +msgstr "" +"O navegador web para a área de trabalho GNOME, apresentando forte integração " +"com a área de trabalho e uma interface gráfica simples e intuitiva que " +"permite a você concentrar-se em suas páginas web. Se você está à procura de " +"uma visão simples, limpa e bonita da web, este é o navegador para você." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "O GNOME Web é geralmente mencionado por seu codinome, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Navegador da web" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Navegador da web Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Navegue na web" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;navegador;internet;" # Seguindo ideia do Chromium: icognito -> anônimo. -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nova janela anônima" @@ -145,8 +160,12 @@ msgstr "Agente de usuário" #: ../data/org.gnome.epiphany.gschema.xml.h:14 -msgid "String that will be used as user agent, to identify the browser to the web servers." -msgstr "Texto que será usado como agente de usuário, para identificar o navegador nos servidores web." +msgid "" +"String that will be used as user agent, to identify the browser to the web " +"servers." +msgstr "" +"Texto que será usado como agente de usuário, para identificar o navegador " +"nos servidores web." #: ../data/org.gnome.epiphany.gschema.xml.h:15 msgid "Automatic downloads" @@ -154,19 +173,22 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:16 msgid "" -"When files cannot be opened by the browser they are automatically downloaded to the download folder and opened with the " -"appropriate application." +"When files cannot be opened by the browser they are automatically downloaded " +"to the download folder and opened with the appropriate application." msgstr "" -"Arquivos que não podem ser abertos pelo navegador são automaticamente baixados na pasta de download e abertos com o aplicativo " -"apropriado." +"Arquivos que não podem ser abertos pelo navegador são automaticamente " +"baixados na pasta de download e abertos com o aplicativo apropriado." #: ../data/org.gnome.epiphany.gschema.xml.h:17 msgid "Force new windows to be opened in tabs" msgstr "Abre novas janelas em abas" #: ../data/org.gnome.epiphany.gschema.xml.h:18 -msgid "Force new window requests to be opened in tabs instead of using a new window." -msgstr "Força pedidos de novas janelas a serem abertas em abas ao invés de usar uma nova janela." +msgid "" +"Force new window requests to be opened in tabs instead of using a new window." +msgstr "" +"Força pedidos de novas janelas a serem abertas em abas ao invés de usar uma " +"nova janela." #: ../data/org.gnome.epiphany.gschema.xml.h:19 msgid "Remember passwords" @@ -194,22 +216,31 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:25 msgid "" -"Defines how the session will be restored during startup. Allowed values are 'always' (the previous state of the application is " -"always restored), 'crashed' (the session is only restored if the application crashes) and 'never' (the homepage is always shown)." -msgstr "" -"Define como a sessão será restaurada durante a inicialização. Valores permitidos são \"always\" (o estado anterior do aplicativo " -"é sempre restaurado), \"crashed\" (a sessão somente será restaurada se o aplicativo trava) e \"never\" (a página inicial é " -"sempre mostrada)." +"Defines how the session will be restored during startup. Allowed values are " +"'always' (the previous state of the application is always restored), " +"'crashed' (the session is only restored if the application crashes) and " +"'never' (the homepage is always shown)." +msgstr "" +"Define como a sessão será restaurada durante a inicialização. Valores " +"permitidos são \"always\" (o estado anterior do aplicativo é sempre " +"restaurado), \"crashed\" (a sessão somente será restaurada se o aplicativo " +"trava) e \"never\" (a página inicial é sempre mostrada)." #: ../data/org.gnome.epiphany.gschema.xml.h:26 -msgid "Whether to delay loading of tabs that are not immediately visible on session restore" -msgstr "Atrasar o carregamento das abas que não estão imediatamente visíveis ao restaurar a sessão" +msgid "" +"Whether to delay loading of tabs that are not immediately visible on session " +"restore" +msgstr "" +"Atrasar o carregamento das abas que não estão imediatamente visíveis ao " +"restaurar a sessão" #: ../data/org.gnome.epiphany.gschema.xml.h:27 -msgid "When this option is set to true, tabs will not start loading until the user switches to them, upon session restore." +msgid "" +"When this option is set to true, tabs will not start loading until the user " +"switches to them, upon session restore." msgstr "" -"Quando esta opção estiver definida como verdadeiro, as abas não vão iniciar carregando até que o usuário acesse-as, ao restaurar " -"a sessão." +"Quando esta opção estiver definida como verdadeiro, as abas não vão iniciar " +"carregando até que o usuário acesse-as, ao restaurar a sessão." #: ../data/org.gnome.epiphany.gschema.xml.h:28 msgid "Process model" @@ -217,39 +248,56 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:29 msgid "" -"This option allows to set the process model used. Use 'shared-secondary-process' to use a single web process shared by all the " -"tabs and 'one-secondary-process-per-web-view' to use a different web process for each tab." -msgstr "" -"Esta opção permite definir o modelo de processo utilizado. Use 'shared-secondary-process' para usar um único processo web " -"compartilhado por todas as abas e 'one-secondary-process-per-web-view' para usar um processo web diferente para cada aba." +"This option allows to set the process model used. Use 'shared-secondary-" +"process' to use a single web process shared by all the tabs and 'one-" +"secondary-process-per-web-view' to use a different web process for each tab." +msgstr "" +"Esta opção permite definir o modelo de processo utilizado. Use 'shared-" +"secondary-process' para usar um único processo web compartilhado por todas " +"as abas e 'one-secondary-process-per-web-view' para usar um processo web " +"diferente para cada aba." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Estilo de barras de ferramentas" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Número máximo de processos web criados ao mesmo tempo ao usar o modelo \"one-" +"secondary-process-per-web-view\"" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both\" (text and icons), \"both-horiz\" (text besides " -"icons), \"icons\", and \"text\"." -msgstr "" -"Estilo de barras de ferramentas. Valores permitidos são \"\" (usar estilo padrão do GNOME), \"both\" (texto e icones), \"both-" -"horiz\" (texto ao lado de icones), \"icons\", e \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Esta opção define um limite ao número de processos web a serem usados ao " +"mesmo tempo para o modelo \"one-secondary-process-per-web-view\". O valor " +"padrão é \"0\" e significa nenhum limite." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" msgstr "[Obsoleto]" #: ../data/org.gnome.epiphany.gschema.xml.h:33 -msgid "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' instead." -msgstr "[Obsoleto] Esta configuração está obsoleta; invés usar \"tabs-bar-visibility-policy\"." +msgid "" +"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " +"instead." +msgstr "" +"[Obsoleto] Esta configuração está obsoleta; invés usar \"tabs-bar-visibility-" +"policy\"." #: ../data/org.gnome.epiphany.gschema.xml.h:34 msgid "Visibility of the downloads window" msgstr "Visibilidade da janela de downloads" #: ../data/org.gnome.epiphany.gschema.xml.h:35 -msgid "Hide or show the downloads window. When hidden, a notification will be shown when new downloads are started." -msgstr "Ocultar janela de downloads. Quando oculta, uma notificação será mostrada quando novos downloads forem iniciados." +msgid "" +"Hide or show the downloads window. When hidden, a notification will be shown " +"when new downloads are started." +msgstr "" +"Ocultar janela de downloads. Quando oculta, uma notificação será mostrada " +"quando novos downloads forem iniciados." #: ../data/org.gnome.epiphany.gschema.xml.h:36 msgid "The visibility policy for the tabs bar." @@ -257,11 +305,14 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:37 msgid "" -"Controls when the tabs bar is shown. Possible values are 'always' (the tabs bar is always shown), 'more-than-one' (the tabs bar " -"is only shown if there's two or more tabs) and 'never' (the tabs bar is never shown)." -msgstr "" -"Controla quando a barra de abas é mostrada. Valores possíveis são \"always\" (a barra de abas é sempre mostrada), \"more-than-one" -"\" ( a barra de abas é somente mostrada se existem duas ou mais abas) e \"never\" (a barra de abas nunca é mostrada)." +"Controls when the tabs bar is shown. Possible values are 'always' (the tabs " +"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " +"two or more tabs) and 'never' (the tabs bar is never shown)." +msgstr "" +"Controla quando a barra de abas é mostrada. Valores possíveis são \"always" +"\" (a barra de abas é sempre mostrada), \"more-than-one\" ( a barra de abas " +"é somente mostrada se existem duas ou mais abas) e \"never\" (a barra de " +"abas nunca é mostrada)." #: ../data/org.gnome.epiphany.gschema.xml.h:38 msgid "Minimum font size" @@ -280,26 +331,36 @@ msgstr "Fonte personalizada sem serifa" #: ../data/org.gnome.epiphany.gschema.xml.h:42 -msgid "A value to be used to override sans-serif desktop font when use-gnome-fonts is set." +msgid "" +"A value to be used to override sans-serif desktop font when use-gnome-fonts " +"is set." msgstr "" -"Um valor para ser usado para sobrescrever a fonte sem serifa do ambiente de trabalho quando \"use-gnome-font\" está definido." +"Um valor para ser usado para sobrescrever a fonte sem serifa do ambiente de " +"trabalho quando \"use-gnome-font\" está definido." #: ../data/org.gnome.epiphany.gschema.xml.h:43 msgid "Custom serif font" msgstr "Fonte personalizada serifa" #: ../data/org.gnome.epiphany.gschema.xml.h:44 -msgid "A value to be used to override serif desktop font when use-gnome-fonts is set." -msgstr "Um valor para ser usado para sobrescrever a fonte serifa do ambiente de trabalho quando \"use-gnome-font\" está definido." +msgid "" +"A value to be used to override serif desktop font when use-gnome-fonts is " +"set." +msgstr "" +"Um valor para ser usado para sobrescrever a fonte serifa do ambiente de " +"trabalho quando \"use-gnome-font\" está definido." #: ../data/org.gnome.epiphany.gschema.xml.h:45 msgid "Custom monospace font" msgstr "Fonte personalizada monoespaçada" #: ../data/org.gnome.epiphany.gschema.xml.h:46 -msgid "A value to be used to override monospace desktop font when use-gnome-fonts is set." +msgid "" +"A value to be used to override monospace desktop font when use-gnome-fonts " +"is set." msgstr "" -"Um valor para ser usado para sobrescrever a fonte monoespaçada do ambiente de trabalho quando \"use-gnome-font\" está definido." +"Um valor para ser usado para sobrescrever a fonte monoespaçada do ambiente " +"de trabalho quando \"use-gnome-font\" está definido." #: ../data/org.gnome.epiphany.gschema.xml.h:47 msgid "Use own colors" @@ -323,7 +384,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:52 msgid "Use a custom CSS file to modify websites own CSS." -msgstr "Usar um arquivo de CSS personalizado para modificar o CSS de páginas web." +msgstr "" +"Usar um arquivo de CSS personalizado para modificar o CSS de páginas web." #: ../data/org.gnome.epiphany.gschema.xml.h:53 msgid "Enable spell checking" @@ -331,17 +393,22 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:54 msgid "Spell check any text typed in editable areas." -msgstr "Usar corretor ortográfico em qualquer texto digitado em áreas editáveis." +msgstr "" +"Usar corretor ortográfico em qualquer texto digitado em áreas editáveis." #: ../data/org.gnome.epiphany.gschema.xml.h:55 msgid "Default encoding" msgstr "Codificação padrão" #: ../data/org.gnome.epiphany.gschema.xml.h:56 -msgid "Default encoding. Accepted values are the ones WebKitGTK+ can understand." -msgstr "Codificação padrão. Valores aceitados são aqueles que que o WebKitGTK+ entende." +msgid "" +"Default encoding. Accepted values are the ones WebKitGTK+ can understand." +msgstr "" +"Codificação padrão. Valores aceitados são aqueles que que o WebKitGTK+ " +"entende." -#: ../data/org.gnome.epiphany.gschema.xml.h:57 ../src/resources/prefs-dialog.ui.h:39 +#: ../data/org.gnome.epiphany.gschema.xml.h:57 +#: ../src/resources/prefs-dialog.ui.h:39 msgid "Languages" msgstr "Idiomas" @@ -354,24 +421,35 @@ msgstr "Aceitar cookies" #: ../data/org.gnome.epiphany.gschema.xml.h:60 -msgid "Where to accept cookies from. Possible values are \"always\", \"no-third-party\" and \"never\"." -msgstr "De onde aceitar cookies. Valores possíveis são \"always\", \"no-third-partycurrent site\" e \"nevernowhere\"." +msgid "" +"Where to accept cookies from. Possible values are \"always\", \"no-third-" +"party\" and \"never\"." +msgstr "" +"De onde aceitar cookies. Valores possíveis são \"always\", \"no-third-" +"partycurrent site\" e \"nevernowhere\"." #: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" msgstr "Modo de animação de imagens" #: ../data/org.gnome.epiphany.gschema.xml.h:62 -msgid "How to present animated images. Possible values are \"normal\", \"once\" and \"disabled\"." -msgstr "Como apresentar imagens animadas. Valores possíveis são \"normal\", \"once\" e \"disabled\"." +msgid "" +"How to present animated images. Possible values are \"normal\", \"once\" and " +"\"disabled\"." +msgstr "" +"Como apresentar imagens animadas. Valores possíveis são \"normal\", \"once\" " +"e \"disabled\"." #: ../data/org.gnome.epiphany.gschema.xml.h:63 msgid "Allow popups" msgstr "Aceitar janelas instantâneas" #: ../data/org.gnome.epiphany.gschema.xml.h:64 -msgid "Allow sites to open new windows using JavaScript (if JavaScript is enabled)." -msgstr "Permitir que sites abram novas janelas usando JavaScript (se JavaScript estiver habilitado)." +msgid "" +"Allow sites to open new windows using JavaScript (if JavaScript is enabled)." +msgstr "" +"Permitir que sites abram novas janelas usando JavaScript (se JavaScript " +"estiver habilitado)." #: ../data/org.gnome.epiphany.gschema.xml.h:65 msgid "Enable Plugins" @@ -403,17 +481,22 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:72 msgid "" -"Whether to tell websites that we do not wish to be tracked. Please note that web pages are not forced to follow this setting." +"Whether to tell websites that we do not wish to be tracked. Please note that " +"web pages are not forced to follow this setting." msgstr "" -"Avisa às páginas web que não desejamos ser rastreados. Favor notar que páginas web não são forçadas a seguirem esta configuração." +"Avisa às páginas web que não desejamos ser rastreados. Favor notar que " +"páginas web não são forçadas a seguirem esta configuração." #: ../data/org.gnome.epiphany.gschema.xml.h:73 msgid "Enable Adblock" msgstr "Habilitar bloqueio de propagandas" #: ../data/org.gnome.epiphany.gschema.xml.h:74 -msgid "Whether to block the embedded advertisements that web pages might want to show." -msgstr "Bloqueia as propagandas embutidas que as páginas web pode desejar mostrar." +msgid "" +"Whether to block the embedded advertisements that web pages might want to " +"show." +msgstr "" +"Bloqueia as propagandas embutidas que as páginas web pode desejar mostrar." #: ../data/org.gnome.epiphany.gschema.xml.h:75 msgid "The downloads folder" @@ -421,11 +504,12 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:76 msgid "" -"The path of the folder where to download files to; or \"Downloads\" to use the default downloads folder, or \"Desktop\" to use " -"the desktop folder." +"The path of the folder where to download files to; or \"Downloads\" to use " +"the default downloads folder, or \"Desktop\" to use the desktop folder." msgstr "" -"O caminha da pasta onde baixar arquivos; ou \"Downloads\" para usar a pasta padrão de downloads, ou \"Área de trabalho\" para " -"usar a pasta área de trabalho." +"O caminha da pasta onde baixar arquivos; ou \"Downloads\" para usar a pasta " +"padrão de downloads, ou \"Área de trabalho\" para usar a pasta área de " +"trabalho." #: ../data/org.gnome.epiphany.gschema.xml.h:77 msgid "Whether to show the title column in the bookmarks window." @@ -502,38 +586,44 @@ msgid "Installed on:" msgstr "Instalados em:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Remover da visão geral" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Mais visitados" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Remover da visão geral" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Navegação privativa" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" -"You are currently browsing incognito. Pages viewed in this mode will not show up in your browsing history and all " -"stored information will be cleared when you close the window. Files you download will be kept." +"You are currently browsing incognito. Pages viewed in this mode " +"will not show up in your browsing history and all stored information will be " +"cleared when you close the window. Files you download will be kept." msgstr "" -"Você está navegando atualmente em modo anônimo. As páginas vistas com este modo não serão mostradas em seu histórico de " -"navegação e todas as informações armazenadas serão apagadas quando você fechar a janela. Os arquivos que você baixou serão " -"mantidos." +"Você está navegando atualmente em modo anônimo. As páginas vistas " +"com este modo não serão mostradas em seu histórico de navegação e todas as " +"informações armazenadas serão apagadas quando você fechar a janela. Os " +"arquivos que você baixou serão mantidos." -#: ../embed/ephy-about-handler.c:555 -msgid "Incognito mode hides your activity only from people using this computer." -msgstr "Modo anônimo oculta sua atividade apenas de pessoas usando este computador." +#: ../embed/ephy-about-handler.c:579 +msgid "" +"Incognito mode hides your activity only from people using this computer." +msgstr "" +"Modo anônimo oculta sua atividade apenas de pessoas usando este computador." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" -"It will not hide your activity from your employer if you are at work. Your internet service provider, your government, other " -"governments, the websites that you visit, and advertisers on these websites may still be tracking you." +"It will not hide your activity from your employer if you are at work. Your " +"internet service provider, your government, other governments, the websites " +"that you visit, and advertisers on these websites may still be tracking you." msgstr "" -"Ele não vai ocultar sua atividade de seu empregador, se você estiver no trabalho. Seu provedor de Internet, seu governo, outros " -"governos, os sites que você visita e os anunciantes nestes sites ainda podem rastrear você." +"Ele não vai ocultar sua atividade de seu empregador, se você estiver no " +"trabalho. Seu provedor de Internet, seu governo, outros governos, os sites " +"que você visita e os anunciantes nestes sites ainda podem rastrear você." #. characters #: ../embed/ephy-embed.c:51 @@ -903,193 +993,234 @@ msgid "Find next occurrence of the search string" msgstr "Localiza a próxima ocorrência da palavra ou frase" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Salvar" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Não salvar" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Salvar" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Você deseja salvar sua senha pra \"%s\"?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Negar" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Permitir" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "A página em %s deseja saber sua localização." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "A página em %s deseja mostrar notificações na área de trabalho." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Carregando \"%s\"…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Carregando…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 -msgid "This website presented identification that belongs to a different website." -msgstr "Este site da web apresentou uma identificação que pertence a um site diferente." +#: ../embed/ephy-web-view.c:1763 +msgid "" +"This website presented identification that belongs to a different website." +msgstr "" +"Este site da web apresentou uma identificação que pertence a um site " +"diferente." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 -msgid "This website’s identification is too old to trust. Check the date on your computer’s calendar." -msgstr "A identificação deste site da web é muito antiga para ser confiável. Verifique a data no calendário do seu computador." +#: ../embed/ephy-web-view.c:1768 +msgid "" +"This website’s identification is too old to trust. Check the date on your " +"computer’s calendar." +msgstr "" +"A identificação deste site da web é muito antiga para ser confiável. " +"Verifique a data no calendário do seu computador." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." -msgstr "A identificação deste site da web não foi emitida por uma organização confiável." +msgstr "" +"A identificação deste site da web não foi emitida por uma organização " +"confiável." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 -msgid "This website’s identification could not be processed. It may be corrupted." -msgstr "Não foi possível processar a identificação deste site da web. Ela pode estar corrompida." +#: ../embed/ephy-web-view.c:1778 +msgid "" +"This website’s identification could not be processed. It may be corrupted." +msgstr "" +"Não foi possível processar a identificação deste site da web. Ela pode estar " +"corrompida." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 -msgid "This website’s identification has been revoked by the trusted organization that issued it." -msgstr "A identificação deste site da web foi revogada pela organização confiável que a emitiu." +#: ../embed/ephy-web-view.c:1783 +msgid "" +"This website’s identification has been revoked by the trusted organization " +"that issued it." +msgstr "" +"A identificação deste site da web foi revogada pela organização confiável " +"que a emitiu." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 -msgid "This website’s identification cannot be trusted because it uses very weak encryption." -msgstr "A identificação deste site da web pode não ser confiável pois ela utiliza uma codificação muito fraca." +#: ../embed/ephy-web-view.c:1788 +msgid "" +"This website’s identification cannot be trusted because it uses very weak " +"encryption." +msgstr "" +"A identificação deste site da web pode não ser confiável pois ela utiliza " +"uma codificação muito fraca." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 -msgid "This website’s identification is only valid for future dates. Check the date on your computer’s calendar." +#: ../embed/ephy-web-view.c:1793 +msgid "" +"This website’s identification is only valid for future dates. Check the date " +"on your computer’s calendar." msgstr "" -"A identificação deste site da web somente é válida para datas futuras. Por favor, verifique a data no calendário do seu " -"computador." +"A identificação deste site da web somente é válida para datas futuras. Por " +"favor, verifique a data no calendário do seu computador." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Este pode não ser o(a) verdadeiro(a) %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" -"When you try to connect securely, websites present identification to prove that your connection has not been maliciously " -"intercepted. There is something wrong with this website’s identification:" -msgstr "" -"Quando você tenta se conectar de forma segura, sites da web apresentam uma identificação para provar que sua conexão não foi " -"interceptada maliciosamente. Há algo de errado com a identificação deste site:" +"When you try to connect securely, websites present identification to prove " +"that your connection has not been maliciously intercepted. There is " +"something wrong with this website’s identification:" +msgstr "" +"Quando você tenta se conectar de forma segura, sites da web apresentam uma " +"identificação para provar que sua conexão não foi interceptada " +"maliciosamente. Há algo de errado com a identificação deste site:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" -"A third party may have hijacked your connection. You should continue only if you know there is a good reason why this website " -"does not use trusted identification." -msgstr "" -"Uma entidade desconhecida pode ter sequestrado sua conexão. Você somente deve continuar caso você tenha ciência de uma boa razão " -"sobre o porquê este site não usa identificação confiável." +"A third party may have hijacked your connection. You should continue only if " +"you know there is a good reason why this website does not use trusted " +"identification." +msgstr "" +"Uma entidade desconhecida pode ter sequestrado sua conexão. Você somente " +"deve continuar caso você tenha ciência de uma boa razão sobre o porquê este " +"site não usa identificação confiável." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 -msgid "Legitimate banks, stores, and other public sites will not ask you to do this." -msgstr "Bancos, lojas e outros sites públicos legítimos não irão lhe pedir para fazer isto." +#: ../embed/ephy-web-view.c:1844 +msgid "" +"Legitimate banks, stores, and other public sites will not ask you to do this." +msgstr "" +"Bancos, lojas e outros sites públicos legítimos não irão lhe pedir para " +"fazer isto." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Nada especificado" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problema no carregamento de \"%s\"" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Opa! Não foi possível mostrar esta página web." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" -"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily " -"unavailable or moved to a new address. You may wish to verify that your internet connection is working correctly.

" +"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily unavailable or moved to a " +"new address. You may wish to verify that your internet connection is working " +"correctly.

" msgstr "" -"

A página web em \"%s\" está provavelmente indisponível. O erro preciso foi:

%s

Poderia ser " -"temporariamente desligado ou transferido para um novo endereço. Não esqueça de verificar se sua conexão com a internet está " -"funcionando corretamente.

" +"

A página web em \"%s\" está provavelmente indisponível. O erro preciso " +"foi:

%s

Poderia ser temporariamente desligado ou " +"transferido para um novo endereço. Não esqueça de verificar se sua conexão " +"com a internet está funcionando corretamente.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Tentar novamente" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Opa! Pode ter alguma coisa de errada." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" -"

This site may have caused Web to close unexpectedly.

If this happens again, please report the problem to the " -"%s developers.

" +"

This site may have caused Web to close unexpectedly.

If this " +"happens again, please report the problem to the %s " +"developers.

" msgstr "" -"

Esta página estava carregando quando o navegador da web fechou inesperadamente.

Se acontecer, por favor relate o " -"problema aos desenvolvedores do %s.

" +"

Esta página estava carregando quando o navegador da web fechou " +"inesperadamente.

Se acontecer, por favor relate o problema aos " +"desenvolvedores do %s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Recarregar mesmo assim" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problema na exibição de \"%s\"" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Oopa!" -#: ../embed/ephy-web-view.c:1907 -msgid "Something went wrong while displaying this page. Please reload or visit a different page to continue." -msgstr "Alguma coisa deu errado ao exibir esta página. Por favor recarregue-a ou visite uma página diferente para continuar." +#: ../embed/ephy-web-view.c:1927 +msgid "" +"Something went wrong while displaying this page. Please reload or visit a " +"different page to continue." +msgstr "" +"Alguma coisa deu errado ao exibir esta página. Por favor recarregue-a ou " +"visite uma página diferente para continuar." # Acrescentei a interjeição 'Ei' para chamar a atenção do usuário final --Enrico #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Ei, cuidado!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Carregar mesmo assim" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" -#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 ../src/bookmarks/ephy-bookmark-properties.c:432 -#: ../src/bookmarks/ephy-bookmarks-editor.c:819 ../src/resources/clear-data-dialog.ui.h:3 +#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmarks-editor.c:819 +#: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 msgid "_Cancel" msgstr "_Cancelar" @@ -1143,7 +1274,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Senha para %s em um formulário em %s" @@ -1151,7 +1282,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Senha em um formulário em %s" @@ -1175,8 +1306,12 @@ msgstr "Não foi possível sobrescrever arquivo \"%s\" existente" #: ../lib/ephy-gui.c:246 -msgid "A file with this name already exists and you don't have permission to overwrite it." -msgstr "Um arquivo com este nome já existe e você não tem permissões para sobrescrevê-lo." +msgid "" +"A file with this name already exists and you don't have permission to " +"overwrite it." +msgstr "" +"Um arquivo com este nome já existe e você não tem permissões para " +"sobrescrevê-lo." #: ../lib/ephy-gui.c:249 msgid "Cannot Overwrite File" @@ -1193,19 +1328,24 @@ #: ../lib/ephy-nss-glue.c:64 msgid "" -"The passwords from the previous version are locked with a master password. If you want to import them, please enter your master " -"password below." +"The passwords from the previous version are locked with a master password. " +"If you want to import them, please enter your master password below." msgstr "" -"As senhas provenientes da versão anterior estão bloqueadas por uma senha mestre. Se você deseja que o Epiphany importe essas " -"senhas, por favor digite sua senha mestre abaixo." +"As senhas provenientes da versão anterior estão bloqueadas por uma senha " +"mestre. Se você deseja que o Epiphany importe essas senhas, por favor digite " +"sua senha mestre abaixo." #: ../lib/ephy-profile-migrator.c:100 msgid "Failed to copy cookies file from Mozilla." msgstr "Falha ao copiar os arquivos de cookie do Mozilla." #: ../lib/ephy-profile-migrator.c:652 -msgid "Web 3.6 deprecated this directory and tried migrating this configuration to ~/.config/epiphany" -msgstr "Este diretório é obsoleto em Web 3.6 e foi feito uma tentativa de migrar esta configuração para ~/.config/epiphany" +msgid "" +"Web 3.6 deprecated this directory and tried migrating this configuration to " +"~/.config/epiphany" +msgstr "" +"Este diretório é obsoleto em Web 3.6 e foi feito uma tentativa de migrar " +"esta configuração para ~/.config/epiphany" #: ../lib/ephy-profile-migrator.c:1030 msgid "Executes only the n-th migration step" @@ -1354,8 +1494,12 @@ #. Label in certificate popover when site is untrusted. %s is a URL. #: ../lib/widgets/ephy-certificate-popover.c:113 #, c-format -msgid "This web site’s digital identification is not trusted. You may have connected to an attacker pretending to be %s." -msgstr "A identificação digital deste site da web não é confiável. Você pode ter se conectado a um ofensor fingindo ser %s." +msgid "" +"This web site’s digital identification is not trusted. You may have " +"connected to an attacker pretending to be %s." +msgstr "" +"A identificação digital deste site da web não é confiável. Você pode ter se " +"conectado a um ofensor fingindo ser %s." #. Label in certificate popover when site sends mixed content. #: ../lib/widgets/ephy-certificate-popover.c:124 @@ -1371,70 +1515,71 @@ msgid "_View Certificate…" msgstr "_Ver certificado…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d segundo restante" msgstr[1] "%d segundos restantes" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d minuto restante" msgstr[1] "%d minutos restantes" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d hora restante" msgstr[1] "%d horas restantes" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d dia restante" msgstr[1] "%d dias restantes" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d semana restante" msgstr[1] "%d semanas restantes" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d mês restante" msgstr[1] "%d meses restantes" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Terminado" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Erro ao baixar: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Cancelar" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 ../src/window-commands.c:275 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 +#: ../src/window-commands.c:275 msgid "Open" msgstr "Abrir" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Mostrar na pasta" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Iniciando…" @@ -1442,20 +1587,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_Limpar" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "Desfa_zer" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Refazer" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Arraste e solte esse ícone para criar um link para essa página" @@ -1477,23 +1622,25 @@ msgid "“%s” Properties" msgstr "Propriedades de \"%s\"" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Título:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Endereço:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Tópic_os:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Mos_trar todos os tópicos" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 ../src/resources/prefs-dialog.ui.h:40 ../src/resources/prefs-lang-dialog.ui.h:3 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 +#: ../src/resources/prefs-dialog.ui.h:40 +#: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" msgstr "_Adicionar" @@ -1541,7 +1688,8 @@ msgid "Nearby Sites" msgstr "Sites vizinhos" -#: ../src/bookmarks/ephy-bookmarks.c:1150 ../src/bookmarks/ephy-bookmarks-import.c:270 +#: ../src/bookmarks/ephy-bookmarks.c:1150 +#: ../src/bookmarks/ephy-bookmarks-import.c:270 msgid "Untitled" msgstr "Sem título" @@ -1571,7 +1719,8 @@ msgstr "_Ver" #. Help. -#: ../src/bookmarks/ephy-bookmarks-editor.c:154 ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 +#: ../src/bookmarks/ephy-bookmarks-editor.c:154 +#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 msgid "_Help" msgstr "Aj_uda" @@ -1584,7 +1733,8 @@ msgid "Create a new topic" msgstr "Cria um novo tópico" -#: ../src/bookmarks/ephy-bookmarks-editor.c:161 ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:161 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Abrir em nova _janela" @@ -1594,7 +1744,8 @@ msgid "Open the selected bookmark in a new window" msgstr "Abre o favorito selecionado em uma nova janela" -#: ../src/bookmarks/ephy-bookmarks-editor.c:164 ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:164 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Abrir em nova a_ba" @@ -1653,7 +1804,8 @@ msgid "Cut the selection" msgstr "Corta a seleção" -#: ../src/bookmarks/ephy-bookmarks-editor.c:186 ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:186 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Copiar" @@ -1669,7 +1821,8 @@ msgid "Paste the clipboard" msgstr "Cola a área de transferência" -#: ../src/bookmarks/ephy-bookmarks-editor.c:192 ../src/resources/history-dialog.ui.h:12 +#: ../src/bookmarks/ephy-bookmarks-editor.c:192 +#: ../src/resources/history-dialog.ui.h:12 msgid "_Delete" msgstr "E_xcluir" @@ -1694,7 +1847,8 @@ msgid "Display bookmarks help" msgstr "Mostra a ajuda sobre os favoritos" -#: ../src/bookmarks/ephy-bookmarks-editor.c:203 ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 +#: ../src/bookmarks/ephy-bookmarks-editor.c:203 +#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 msgid "_About" msgstr "_Sobre" @@ -1711,7 +1865,8 @@ msgid "Show the title column" msgstr "Mostra a coluna de título" -#: ../src/bookmarks/ephy-bookmarks-editor.c:212 ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:212 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Endereço" @@ -1734,22 +1889,25 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:382 msgid "" -"Deleting this topic will cause all its bookmarks to become uncategorized, unless they also belong to other topics. The bookmarks " -"will not be deleted." +"Deleting this topic will cause all its bookmarks to become uncategorized, " +"unless they also belong to other topics. The bookmarks will not be deleted." msgstr "" -"Excluir esse tópico irá fazer com que os favoritos dele sejam descategorizados, a menos que eles também pertençam a outros " -"tópicos. Os favoritos não serão excluídos." +"Excluir esse tópico irá fazer com que os favoritos dele sejam " +"descategorizados, a menos que eles também pertençam a outros tópicos. Os " +"favoritos não serão excluídos." #: ../src/bookmarks/ephy-bookmarks-editor.c:385 msgid "_Delete Topic" msgstr "E_xcluir tópico" #. FIXME: proper i18n after freeze -#: ../src/bookmarks/ephy-bookmarks-editor.c:495 ../src/bookmarks/ephy-bookmarks-editor.c:499 +#: ../src/bookmarks/ephy-bookmarks-editor.c:495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:499 msgid "Firefox" msgstr "Firefox" -#: ../src/bookmarks/ephy-bookmarks-editor.c:504 ../src/bookmarks/ephy-bookmarks-editor.c:508 +#: ../src/bookmarks/ephy-bookmarks-editor.c:504 +#: ../src/bookmarks/ephy-bookmarks-editor.c:508 msgid "Firebird" msgstr "Firebird" @@ -1777,8 +1935,12 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:555 #, c-format -msgid "The bookmarks from “%s” could not be imported because the file is corrupted or of an unsupported type." -msgstr "Os favoritos de \"%s\" não foram importados pois o arquivo está corrompido ou é de um tipo sem suporte." +msgid "" +"The bookmarks from “%s” could not be imported because the file is corrupted " +"or of an unsupported type." +msgstr "" +"Os favoritos de \"%s\" não foram importados pois o arquivo está corrompido " +"ou é de um tipo sem suporte." #: ../src/bookmarks/ephy-bookmarks-editor.c:618 msgid "Import Bookmarks from File" @@ -1800,7 +1962,8 @@ msgid "Export Bookmarks" msgstr "Exportar favoritos" -#: ../src/bookmarks/ephy-bookmarks-editor.c:764 ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:764 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Favoritos" @@ -1826,15 +1989,15 @@ msgid "File" msgstr "Arquivo" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Copiar endereço" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Tópicos" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Título" @@ -1866,11 +2029,11 @@ #: ../src/resources/clear-data-dialog.ui.h:5 msgid "" -"You are about to clear personal data that is stored about the web pages you have visited. Check the types of information that " -"you want to remove:" +"You are about to clear personal data that is stored about the web pages you " +"have visited. Check the types of information that you want to remove:" msgstr "" -"Você está prestes a limpar os dados pessoais armazenados sobre as páginas da web que visitou. Verifique os tipos de informação " -"que deseja remover:" +"Você está prestes a limpar os dados pessoais armazenados sobre as páginas da " +"web que visitou. Verifique os tipos de informação que deseja remover:" #: ../src/resources/clear-data-dialog.ui.h:6 msgid "Coo_kies" @@ -1889,18 +2052,26 @@ msgstr "Senhas sa_lvas" #: ../src/resources/clear-data-dialog.ui.h:10 -msgid "You cannot undo this action. The data you are choosing to clear will be removed forever." -msgstr "Você não pode desfazer esta ação. Os dados escolhidos para serem limpos serão excluídos permanentemente." +msgid "" +"You cannot undo this action. The data you are choosing to clear will be " +"removed forever." +msgstr "" +"Você não pode desfazer esta ação. Os dados escolhidos para serem limpos " +"serão excluídos permanentemente." -#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 +#: ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Cookies" -#: ../src/resources/cookies-dialog.ui.h:2 ../src/resources/history-dialog.ui.h:2 ../src/resources/passwords-dialog.ui.h:2 +#: ../src/resources/cookies-dialog.ui.h:2 +#: ../src/resources/history-dialog.ui.h:2 +#: ../src/resources/passwords-dialog.ui.h:2 msgid "C_lear All" msgstr "_Limpar tudo" -#: ../src/resources/cookies-dialog.ui.h:3 ../src/resources/passwords-dialog.ui.h:4 +#: ../src/resources/cookies-dialog.ui.h:3 +#: ../src/resources/passwords-dialog.ui.h:4 msgid "Site" msgstr "Site" @@ -1995,7 +2166,8 @@ msgid "Add _Bookmark" msgstr "A_dicionar favorito" -#: ../src/resources/passwords-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:30 +#: ../src/resources/passwords-dialog.ui.h:1 +#: ../src/resources/prefs-dialog.ui.h:30 msgid "Passwords" msgstr "Senhas" @@ -2222,13 +2394,17 @@ msgid "Other encodings" msgstr "Outras codificações" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Limpar o histórico de navegação?" -#: ../src/ephy-history-window.c:257 -msgid "Clearing the browsing history will cause all history links to be permanently deleted." -msgstr "Limpar o histórico de navegação fará com que todos os links do histórico sejam apagados." +#: ../src/ephy-history-window.c:258 +msgid "" +"Clearing the browsing history will cause all history links to be permanently " +"deleted." +msgstr "" +"Limpar o histórico de navegação fará com que todos os links do histórico " +"sejam apagados." #: ../src/ephy-main.c:76 msgid "Open a new tab in an existing browser window" @@ -2299,11 +2475,11 @@ "Inicialização falhou pelo seguinte erro:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Opções da web" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Fechar aba" @@ -2440,142 +2616,153 @@ msgstr "Abrir link em nova a_ba" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Abrir link em janela anôn_ima" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Salvar link _como…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Copiar endereço do _link" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Copiar endereço de e-mail" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Ver _imagem em nova aba" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Copiar endereço da i_magem" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Salvar imagem como…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Definir como _papel de parede" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Abrir vídeo em nova _janela" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Abrir vídeo em nova a_ba" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Sal_var vídeo como…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Copiar endereço de vídeo" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Abrir áudio em nova _janela" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Abrir áudio em nova a_ba" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Sal_var áudio como…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Copiar endereço de áudio" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Há mudanças em elementos de formulário que não foram enviadas" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Se você fechar o documento você perderá esta informação." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Fechar o documento" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Há downloads em andamento nesta janela" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Se você fechar esta janela, os downloads serão cancelados" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Fechar janela e cancelar downloads" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Salvar como" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Salva como aplicativo" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Imprimir" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Favorito" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Localizar" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Ampliar" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Reduzir" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Voltar" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Avançar" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zoom" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nova a_ba" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Ir para os mais visitados" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Pesquisar na web por \"%s\"" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Salvar link como" @@ -2662,15 +2849,19 @@ #: ../src/window-commands.c:710 #, c-format msgid "A web application named '%s' already exists. Do you want to replace it?" -msgstr "Um aplicativo web com o nome \"%s\" já existe. Você deseja substituí-lo?" +msgstr "" +"Um aplicativo web com o nome \"%s\" já existe. Você deseja substituí-lo?" #: ../src/window-commands.c:715 msgid "Replace" msgstr "Substituir" #: ../src/window-commands.c:719 -msgid "An application with the same name already exists. Replacing it will overwrite it." -msgstr "Um aplicativo com mesmo nome já existe. Substituí-lo irá sobrescrevê-lo." +msgid "" +"An application with the same name already exists. Replacing it will " +"overwrite it." +msgstr "" +"Um aplicativo com mesmo nome já existe. Substituí-lo irá sobrescrevê-lo." #: ../src/window-commands.c:755 #, c-format @@ -2695,19 +2886,19 @@ msgid "C_reate" msgstr "C_riar" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Contate-nos em:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Contribuidores:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Desenvolvedores no passado:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2724,7 +2915,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Afonso Celso Medina \n" @@ -2749,26 +2940,44 @@ "Rafael Ferreira \n" "Enrico Nicoletto " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Website do Navegador web" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Ativar o modo de navegação com cursor?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" -"Pressing F7 turns caret browsing on or off. This feature places a moveable cursor in web pages, allowing you to move around with " -"your keyboard. Do you want to enable caret browsing?" -msgstr "" -"Ao pressionar a tecla F7 alterna-se a navegação com cursor para ligado ou desligado. Esta funcionalidade insere um cursor nas " -"páginas web, permitindo-lhe navegar pela página com o seu teclado. Você deseja habilitar o modo de navegação com cursor?" +"Pressing F7 turns caret browsing on or off. This feature places a moveable " +"cursor in web pages, allowing you to move around with your keyboard. Do you " +"want to enable caret browsing?" +msgstr "" +"Ao pressionar a tecla F7 alterna-se a navegação com cursor para ligado ou " +"desligado. Esta funcionalidade insere um cursor nas páginas web, permitindo-" +"lhe navegar pela página com o seu teclado. Você deseja habilitar o modo de " +"navegação com cursor?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Ativar" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Estilo de barras de ferramentas" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Estilo de barras de ferramentas. Valores permitidos são \"\" (usar estilo " +#~ "padrão do GNOME), \"both\" (texto e icones), \"both-horiz\" (texto ao " +#~ "lado de icones), \"icons\", e \"text\"." + #~ msgid "Size of disk cache" #~ msgstr "Tamanho de cache de disco" @@ -2784,8 +2993,16 @@ #~ msgid "MB" #~ msgstr "MB" -#~ msgid "This web site’s identification uses very weak encryption. It has probably been forged." -#~ msgstr "A identificação deste site da web usa codificação muito fraca. Provavelmente ela foi forjada." - -#~ msgid "This web site’s identification time-travelled from the future. Check the date on your computer’s calendar." -#~ msgstr "A identificação deste site da web \"viajou no tempo\" futuro. Verifique a data no calendário do seu computador." +#~ msgid "" +#~ "This web site’s identification uses very weak encryption. It has probably " +#~ "been forged." +#~ msgstr "" +#~ "A identificação deste site da web usa codificação muito fraca. " +#~ "Provavelmente ela foi forjada." + +#~ msgid "" +#~ "This web site’s identification time-travelled from the future. Check the " +#~ "date on your computer’s calendar." +#~ msgstr "" +#~ "A identificação deste site da web \"viajou no tempo\" futuro. Verifique a " +#~ "data no calendário do seu computador." diff -Nru epiphany-browser-3.16.3/po/pt.po epiphany-browser-3.18.0/po/pt.po --- epiphany-browser-3.16.3/po/pt.po 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/pt.po 2015-08-07 08:41:17.000000000 +0000 @@ -1,28 +1,29 @@ # epiphany's Portuguese translation. # Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 epiphany # This file is distributed under the same license as the epiphany package. -# Duarte Loreto , 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # António Lima , 2013. +# Duarte Loreto , 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. +# Pedro Albuquerque , 2015. # msgid "" msgstr "" "Project-Id-Version: 3.12\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-03-19 16:39+0000\n" -"PO-Revision-Date: 2014-03-19 23:15-0100\n" -"Last-Translator: Duarte Loreto \n" -"Language-Team: Portuguese \n" +"POT-Creation-Date: 2015-08-04 03:45+0000\n" +"PO-Revision-Date: 2015-08-04 11:25+0100\n" +"Last-Translator: Pedro Albuquerque \n" +"Language-Team: Português \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" -msgstr "Procurar na web" +msgstr "Procurar na Web" #. Translators: you can use the regions listed in #. https://duckduckgo.com/params to boost a particular region @@ -48,43 +49,61 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 +#: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=pt-pt&kad=pt_PT" #: ../data/epiphany.appdata.xml.in.h:1 +msgid "GNOME Web" +msgstr "GNOME Web" + +#: ../data/epiphany.appdata.xml.in.h:2 +msgid "Web browser for GNOME" +msgstr "Navegador Web para o GNOME" + +#: ../data/epiphany.appdata.xml.in.h:3 msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "O navegador web para o GNOME, que apresenta uma integração perfeita com o " -"ambiente de trabalho e uma interface de utilizador simples e intuitiva que " +"ambiente de trabalho e um ambiente de utilizador simples e intuitivo que " "permite que se foque nas suas páginas web." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "O GNOME Web é muitas vezes referido pelo seu nome de código, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:472 ../src/window-commands.c:1512 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Navegador Web" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Navegador Web Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" -msgstr "Navegar na web" +msgstr "Navegar na Web" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;navegador;internet;" +#: ../data/epiphany.desktop.in.h:6 +msgid "New Incognito Window" +msgstr "Nova janela incógnita" + #: ../data/org.gnome.epiphany.gschema.xml.h:1 msgid "Browse with caret" msgstr "Navegar com o cursor" @@ -99,7 +118,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:10 #, no-c-format msgid "'https://duckduckgo.com/?q=%s&t=epiphany'" -msgstr "'https://duckduckgo.com/?q=%s&t=epiphany&kl=pt-pt&kad=pt_PT'" +msgstr "" +"'https://duckduckgo.com/?q=%s&t=epiphany&kl=pt-pt&kad=pt_PT'" #: ../data/org.gnome.epiphany.gschema.xml.h:11 msgid "URL Search" @@ -107,7 +127,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:12 msgid "Search string for keywords entered in the URL bar." -msgstr "Expressão de procura para palavras chave introduzidas na barra de URL." +msgstr "Cadeia de procura para palavras chave inseridas na barra de URL." #: ../data/org.gnome.epiphany.gschema.xml.h:13 msgid "User agent" @@ -118,20 +138,20 @@ "String that will be used as user agent, to identify the browser to the web " "servers." msgstr "" -"Expressão que será utilizada como user agent, para identificar o navegador " +"Cadeia que será utilizada como user agent, para identificar o navegador " "perante os servidores web." #: ../data/org.gnome.epiphany.gschema.xml.h:15 msgid "Automatic downloads" -msgstr "Downloads automáticos" +msgstr "Transferências automáticas" #: ../data/org.gnome.epiphany.gschema.xml.h:16 msgid "" "When files cannot be opened by the browser they are automatically downloaded " "to the download folder and opened with the appropriate application." msgstr "" -"Quando os ficheiros não podem ser abertos pelo navegador é efetuado " -"automaticamente o download para a pasta de downloads e aberto na aplicação " +"Quando os ficheiros não podem ser abertos pelo navegador, são transferidos " +"automaticamente para a pasta de transferências e abertos na aplicação " "adequada." #: ../data/org.gnome.epiphany.gschema.xml.h:17 @@ -150,9 +170,9 @@ msgstr "Recordar as senhas" #: ../data/org.gnome.epiphany.gschema.xml.h:20 -msgid "Whether to store and prefill passwords in web sites." +msgid "Whether to store and prefill passwords in websites." msgstr "" -"Se deverá ou não guardar e preencher automaticamente as senhas nas páginas." +"Se deverá ou não armazenar e preencher automaticamente as senhas nas páginas." #: ../data/org.gnome.epiphany.gschema.xml.h:21 msgid "Automatically manage offline status with NetworkManager" @@ -166,8 +186,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:23 msgid "Don't use an external application to view page source." msgstr "" -"Não utilizar uma aplicação externa para visualizar o código-fonte de uma " -"página." +"Não utilizar uma aplicação externa para ver o código-fonte de uma página." #: ../data/org.gnome.epiphany.gschema.xml.h:24 msgid "Whether to automatically restore the last session" @@ -183,7 +202,7 @@ "Define como será restaurada a sessão durante o arranque. Valores permitidos " "são 'always' (recupera-se sempre o estado anterior da aplicação), " "'crashed' (a sessão apenas é recuperada se a aplicação terminar " -"inesperadamente com erro) e 'never' (é sempre apresentada a página inicial)." +"inesperadamente com erro) e 'never' (é sempre mostrada a página inicial)." #: ../data/org.gnome.epiphany.gschema.xml.h:26 msgid "" @@ -198,8 +217,8 @@ "When this option is set to true, tabs will not start loading until the user " "switches to them, upon session restore." msgstr "" -"Quando esta opção é verdadeira, separadores não começarão a ler até que o " -"utilizador alterne para eles, após restaurar uma sessão." +"Quando esta opção é verdadeira, os separadores não começarão a carregar até " +"que o utilizador mude para eles, após restaurar uma sessão." #: ../data/org.gnome.epiphany.gschema.xml.h:28 msgid "Process model" @@ -214,21 +233,25 @@ "Esta opção permite-lhe definir o modelo de processo utilizado. Utilize " "'shared-secondary-process' para utilizar um único processo web partilhado " "por todos os separadores e 'one-secondary-process-per-web-view' para " -"utilizar um processo web diferente para cada tab." +"utilizar um processo web diferente para cada separador." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Estilo da barra de ferramentas" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Número máximo de processos Web criados em simultâneo usando o modelo \"one-" +"secondary-process-per-web-view\"" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Estilo da barra de ferramentas. Valores permitidos são \"\" (utilizar o " -"estilo por omissão do GNOME), \"both\" (texto e ícones), \"both-horiz" -"\" (texto ao lado dos ícones), \"icons\" e \"text\" (apenas ícones ou texto)." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Esta opção define um limite ao número de processos Web que serão usados ao " +"mesmo tempo para o modelo \"one-secondary-process-per-web-view\". O valor " +"predefinido é 0 e significa que não há limite." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -244,15 +267,15 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:34 msgid "Visibility of the downloads window" -msgstr "Visibilidade da janela de downloads" +msgstr "Visibilidade da janela de transferências" #: ../data/org.gnome.epiphany.gschema.xml.h:35 msgid "" "Hide or show the downloads window. When hidden, a notification will be shown " "when new downloads are started." msgstr "" -"Esconder ou apresentar a janela de downloads. Quando escondida, será " -"apresentada uma notificação ao iniciar downloads." +"Ocultar ou mostrar a janela de transferências. Quando oculta, será mostrada " +"uma notificação ao iniciar transferências." #: ../data/org.gnome.epiphany.gschema.xml.h:36 msgid "The visibility policy for the tabs bar." @@ -264,57 +287,57 @@ "bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " "two or more tabs) and 'never' (the tabs bar is never shown)." msgstr "" -"Controla quando é apresentada a barra de separadores. Valores possíveis são " -"'always' (a barra de separadores é sempre apresentada), 'more-than-one' (a " -"barra de separadores apenas é apresentada se existirem dois ou mais " -"separadores) e 'never' (a barra de separadores nunca é apresentada)." +"Controla quando é mostrada a barra de separadores. Valores possíveis são " +"'always' (a barra de separadores é sempre mostrada), 'more-than-one' (a " +"barra de separadores só é mostrada se existirem dois ou mais separadores) e " +"'never' (a barra de separadores nunca é mostrada)." #: ../data/org.gnome.epiphany.gschema.xml.h:38 msgid "Minimum font size" -msgstr "Tamanho _mínimo da fonte" +msgstr "Tamanho _mínimo da letra" #: ../data/org.gnome.epiphany.gschema.xml.h:39 msgid "Use GNOME fonts" -msgstr "Utilizar as fontes GNOME" +msgstr "Utilizar as letras do GNOME" #: ../data/org.gnome.epiphany.gschema.xml.h:40 msgid "Use GNOME font settings." -msgstr "Utilizar as definições de fontes GNOME." +msgstr "Utilizar as definições de letra do GNOME." #: ../data/org.gnome.epiphany.gschema.xml.h:41 msgid "Custom sans-serif font" -msgstr "Fonte sans serif personalizada" +msgstr "Letra sans serif personalizada" #: ../data/org.gnome.epiphany.gschema.xml.h:42 msgid "" "A value to be used to override sans-serif desktop font when use-gnome-fonts " "is set." msgstr "" -"Um valor a ser utilizado para sobrepor à fonte sans-serif do ambiente quando " +"Um valor a ser utilizado para sobrepor à letra sans-serif do ambiente quando " "use-gnome-fonts estiver definido." #: ../data/org.gnome.epiphany.gschema.xml.h:43 msgid "Custom serif font" -msgstr "Fonte serif personalizada" +msgstr "Letra serif personalizada" #: ../data/org.gnome.epiphany.gschema.xml.h:44 msgid "" "A value to be used to override serif desktop font when use-gnome-fonts is " "set." msgstr "" -"Um valor a ser utilizado para sobrepor à fonte serif do ambiente quando use-" +"Um valor a ser utilizado para sobrepor à letra serif do ambiente quando use-" "gnome-fonts estiver definido." #: ../data/org.gnome.epiphany.gschema.xml.h:45 msgid "Custom monospace font" -msgstr "Fonte monoespaçada personalizada" +msgstr "Letra monoespaçada personalizada" #: ../data/org.gnome.epiphany.gschema.xml.h:46 msgid "" "A value to be used to override monospace desktop font when use-gnome-fonts " "is set." msgstr "" -"Um valor a ser utilizado para sobrepor à fonte monoespaçada do ambiente " +"Um valor a ser utilizado para sobrepor à letra monoespaçada do ambiente " "quando use-gnome-fonts estiver definido." #: ../data/org.gnome.epiphany.gschema.xml.h:47 @@ -327,11 +350,11 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:49 msgid "Use own fonts" -msgstr "Utilizar fontes próprias" +msgstr "Utilizar letras próprias" #: ../data/org.gnome.epiphany.gschema.xml.h:50 msgid "Use your own fonts instead of the fonts the page requests." -msgstr "Utilizar as suas próprias fontes em vez das indicadas pela página." +msgstr "Utilizar as suas próprias letras em vez das indicadas pela página." #: ../data/org.gnome.epiphany.gschema.xml.h:51 msgid "Use a custom CSS" @@ -353,169 +376,161 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:55 msgid "Default encoding" -msgstr "Codificação por omissão" +msgstr "Codificação predefinida" #: ../data/org.gnome.epiphany.gschema.xml.h:56 msgid "" "Default encoding. Accepted values are the ones WebKitGTK+ can understand." msgstr "" -"Codificação por omissão. Valores aceites são os que o WebKitGTK+ reconhecer." +"Codificação predefinida. Valores aceites são os que o WebKitGTK+ reconhecer." #: ../data/org.gnome.epiphany.gschema.xml.h:57 -msgid "Size of disk cache" -msgstr "Tamanho da cache de disco" - -#: ../data/org.gnome.epiphany.gschema.xml.h:58 -msgid "Size of disk cache, in MB." -msgstr "Tamanho da cache de disco, em MB." - -#: ../data/org.gnome.epiphany.gschema.xml.h:59 -#: ../src/resources/prefs-dialog.ui.h:40 +#: ../src/resources/prefs-dialog.ui.h:39 msgid "Languages" msgstr "Idiomas" -#: ../data/org.gnome.epiphany.gschema.xml.h:60 +#: ../data/org.gnome.epiphany.gschema.xml.h:58 msgid "Preferred languages, two letter codes." msgstr "Idiomas preferidos, códigos de duas letras." -#: ../data/org.gnome.epiphany.gschema.xml.h:61 +#: ../data/org.gnome.epiphany.gschema.xml.h:59 msgid "Cookie accept" -msgstr "Aceitar cookie" +msgstr "Aceitar cookies" -#: ../data/org.gnome.epiphany.gschema.xml.h:62 +#: ../data/org.gnome.epiphany.gschema.xml.h:60 msgid "" -"Where to accept cookies from. Possible values are \"anywhere\", \"current " -"site\" and \"nowhere\"." +"Where to accept cookies from. Possible values are \"always\", \"no-third-" +"party\" and \"never\"." msgstr "" -"De onde aceitar cookies. Valores possíveis são \"anywhere\", \"current site" -"\" e \"nowhere\"." +"De onde aceitar cookies. Valores possíveis são \"always\", \"no-third-party" +"\" e \"never\"." -#: ../data/org.gnome.epiphany.gschema.xml.h:63 +#: ../data/org.gnome.epiphany.gschema.xml.h:61 msgid "Image animation mode" msgstr "Modo de animação de imagem" -#: ../data/org.gnome.epiphany.gschema.xml.h:64 +#: ../data/org.gnome.epiphany.gschema.xml.h:62 msgid "" "How to present animated images. Possible values are \"normal\", \"once\" and " "\"disabled\"." msgstr "" -"Como apresentar imagens animadas. Valores possíveis são \"normal\", \"once\" " -"e \"disabled\"." +"Como mostrar imagens animadas. Valores possíveis são \"normal\", \"once\" e " +"\"disabled\"." -#: ../data/org.gnome.epiphany.gschema.xml.h:65 +#: ../data/org.gnome.epiphany.gschema.xml.h:63 msgid "Allow popups" -msgstr "Permitir popups" +msgstr "Permitir balões" -#: ../data/org.gnome.epiphany.gschema.xml.h:66 +#: ../data/org.gnome.epiphany.gschema.xml.h:64 msgid "" "Allow sites to open new windows using JavaScript (if JavaScript is enabled)." msgstr "" -"Permitir que páginas abram novas janelas utilizando JavaScript (se " +"Permitir que páginas abram novas janelas utilizando JavaScript (se o " "JavaScript estiver ativo)." -#: ../data/org.gnome.epiphany.gschema.xml.h:67 +#: ../data/org.gnome.epiphany.gschema.xml.h:65 msgid "Enable Plugins" -msgstr "Ativar Plugins" +msgstr "Ativar extensões" -#: ../data/org.gnome.epiphany.gschema.xml.h:68 +#: ../data/org.gnome.epiphany.gschema.xml.h:66 msgid "Enable JavaScript" msgstr "Ativar JavaScript" -#: ../data/org.gnome.epiphany.gschema.xml.h:69 +#: ../data/org.gnome.epiphany.gschema.xml.h:67 msgid "Enable WebGL" msgstr "Ativar WebGL" -#: ../data/org.gnome.epiphany.gschema.xml.h:70 +#: ../data/org.gnome.epiphany.gschema.xml.h:68 msgid "Whether to enable support for WebGL contexts." msgstr "Se ativar ou não suporte para contextos WebGL." -#: ../data/org.gnome.epiphany.gschema.xml.h:71 +#: ../data/org.gnome.epiphany.gschema.xml.h:69 msgid "Enable WebAudio" msgstr "Ativar WebAudio" -#: ../data/org.gnome.epiphany.gschema.xml.h:72 +#: ../data/org.gnome.epiphany.gschema.xml.h:70 msgid "Whether to enable support for WebAudio." msgstr "Se ativar ou não suporte para WebAudio." -#: ../data/org.gnome.epiphany.gschema.xml.h:73 +#: ../data/org.gnome.epiphany.gschema.xml.h:71 msgid "Do Not Track" -msgstr "Não Registar" +msgstr "Não ser seguido" -#: ../data/org.gnome.epiphany.gschema.xml.h:74 +#: ../data/org.gnome.epiphany.gschema.xml.h:72 msgid "" "Whether to tell websites that we do not wish to be tracked. Please note that " "web pages are not forced to follow this setting." msgstr "" -"Se dizer ou não às páginas web que não queremos ser registados/reconhecidos. " -"Note que as páginas web não são obrigadas a respeitar esta definição." +"Se dizer ou não às páginas web que não queremos ser seguidos. Note que as " +"páginas web não são obrigadas a respeitar esta definição." -#: ../data/org.gnome.epiphany.gschema.xml.h:75 +#: ../data/org.gnome.epiphany.gschema.xml.h:73 msgid "Enable Adblock" msgstr "Ativar Adblock" -#: ../data/org.gnome.epiphany.gschema.xml.h:76 +#: ../data/org.gnome.epiphany.gschema.xml.h:74 msgid "" "Whether to block the embedded advertisements that web pages might want to " "show." msgstr "" "Se bloquear ou não a publicidade embutida que as páginas web poderão querer " -"apresentar." +"mostrar." -#: ../data/org.gnome.epiphany.gschema.xml.h:77 +#: ../data/org.gnome.epiphany.gschema.xml.h:75 msgid "The downloads folder" -msgstr "A pasta de downloads" +msgstr "A pasta de transferências" -#: ../data/org.gnome.epiphany.gschema.xml.h:78 +#: ../data/org.gnome.epiphany.gschema.xml.h:76 msgid "" "The path of the folder where to download files to; or \"Downloads\" to use " "the default downloads folder, or \"Desktop\" to use the desktop folder." msgstr "" -"O caminho para a pasta onde gravar os ficheiros de que se fizer download; ou " -"\"Downloads\" para utilizar a pasta de downloads por omissão ou \"Desktop\" " -"para utilizar a pasta de área de trabalho." +"O caminho para a pasta onde gravar os ficheiros que se transferir; ou " +"\"Transferências\" para utilizar a pasta predefinida ou \"Ambiente de " +"trabalho\" para utilizar a pasta de área de trabalho." -#: ../data/org.gnome.epiphany.gschema.xml.h:79 +#: ../data/org.gnome.epiphany.gschema.xml.h:77 msgid "Whether to show the title column in the bookmarks window." -msgstr "Se apresentar ou não a coluna de título na janela de marcadores." +msgstr "Se mostrar ou não a coluna de título na janela de marcadores." -#: ../data/org.gnome.epiphany.gschema.xml.h:80 +#: ../data/org.gnome.epiphany.gschema.xml.h:78 msgid "Whether to show the address column in the bookmarks window." -msgstr "Se apresentar ou não a coluna de endereço na janela de marcadores." +msgstr "Se mostrar ou não a coluna de endereço na janela de marcadores." -#: ../embed/ephy-about-handler.c:141 +#: ../embed/ephy-about-handler.c:139 msgid "Installed plugins" -msgstr "Plugins instalados" +msgstr "Extensões instaladas" -#: ../embed/ephy-about-handler.c:142 +#: ../embed/ephy-about-handler.c:140 msgid "Plugins" -msgstr "Plugins" +msgstr "Extensões" -#: ../embed/ephy-about-handler.c:145 +#: ../embed/ephy-about-handler.c:143 msgid "Plugins are disabled in the preferences" -msgstr "Plugins são desativados nas preferências" +msgstr "Extensões são desativadas nas preferências" -#: ../embed/ephy-about-handler.c:158 +#: ../embed/ephy-about-handler.c:156 msgid "Enabled" msgstr "Ativo" #. webkit_plugin_get_enabled (plugin) && -#: ../embed/ephy-about-handler.c:158 +#: ../embed/ephy-about-handler.c:156 msgid "Yes" msgstr "Sim" -#: ../embed/ephy-about-handler.c:158 +#: ../embed/ephy-about-handler.c:156 msgid "No" msgstr "Não" -#: ../embed/ephy-about-handler.c:159 +#: ../embed/ephy-about-handler.c:157 msgid "MIME type" msgstr "Tipo MIME" -#: ../embed/ephy-about-handler.c:159 +#: ../embed/ephy-about-handler.c:157 msgid "Description" msgstr "Descrição" -#: ../embed/ephy-about-handler.c:159 +#: ../embed/ephy-about-handler.c:157 msgid "Suffixes" msgstr "Sufixos" @@ -536,40 +551,58 @@ msgid "A simple, clean, beautiful view of the web" msgstr "Uma vista simples, limpa e linda sobre a web" -#: ../embed/ephy-about-handler.c:345 ../embed/ephy-about-handler.c:346 +#: ../embed/ephy-about-handler.c:352 ../embed/ephy-about-handler.c:353 msgid "Applications" msgstr "Aplicações" -#: ../embed/ephy-about-handler.c:347 +#: ../embed/ephy-about-handler.c:354 msgid "List of installed web applications" msgstr "Lista de aplicações web instaladas" #. Note for translators: this refers to the installation date. -#: ../embed/ephy-about-handler.c:364 +#: ../embed/ephy-about-handler.c:370 msgid "Installed on:" msgstr "Instalada em:" -#: ../embed/ephy-about-handler.c:468 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 +msgid "Most Visited" +msgstr "Mais visitadas" + +#: ../embed/ephy-about-handler.c:507 msgid "Remove from overview" msgstr "Remover da vista geral" -#: ../embed/ephy-about-handler.c:483 ../embed/ephy-embed-utils.c:300 -msgid "Most Visited" -msgstr "Mais Visitadas" - -#: ../embed/ephy-about-handler.c:542 ../embed/ephy-about-handler.c:543 +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" -msgstr "Navegação Privada" +msgstr "Navegação privada" -#: ../embed/ephy-about-handler.c:544 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " -"cleared when you close the window." +"cleared when you close the window. Files you download will be kept." +msgstr "" +"Neste momento navega incógnito. Páginas vistas desta forma não " +"serão visíveis no seu histórico de navegação e toda a informação armazenada " +"será apagada quando fechar a janela. Os ficheiros transferidos serão " +"mantidos." + +#: ../embed/ephy-about-handler.c:579 +msgid "" +"Incognito mode hides your activity only from people using this computer." +msgstr "" +"O modo Incógnito só oculta a sua atividade de pessoas que usem este " +"computador." + +#: ../embed/ephy-about-handler.c:581 +msgid "" +"It will not hide your activity from your employer if you are at work. Your " +"internet service provider, your government, other governments, the websites " +"that you visit, and advertisers on these websites may still be tracking you." msgstr "" -"Neste momento navega incógnito. Páginas visualizadas desta forma " -"não serão visíveis no seu histórico de navegação e toda a informação " -"armazenada será apagada quando fechar a janela." +"Não ocultará a sua atividade do seu empregador, caso esteja no trabalho. O " +"seu fornecedor de Internet, o seu Governo, outros governos, as páginas que " +"visita e anunciantes nas páginas ainda o podem seguir." #. characters #: ../embed/ephy-embed.c:51 @@ -579,7 +612,7 @@ #: ../embed/ephy-embed.c:542 #, c-format msgid "Press %s to exit fullscreen" -msgstr "Prima %s para sair de ecrã completo" +msgstr "Prima %s para sair do ecrã completo" #. Translators: 'ESC' and 'F11' are keyboard keys. #: ../embed/ephy-embed.c:545 @@ -590,15 +623,10 @@ msgid "F11" msgstr "F11" -#: ../embed/ephy-embed-utils.c:64 +#: ../embed/ephy-embed-utils.c:65 #, c-format msgid "Send an email message to “%s”" -msgstr "Enviar um email para “%s”" - -#: ../embed/ephy-embed-utils.c:243 ../src/ephy-search-provider.c:287 -#, c-format -msgid "http://duckduckgo.com/?q=%s&t=epiphany" -msgstr "http://duckduckgo.com/?q=%s&t=epiphany&kl=pt-pt&kad=pt_PT" +msgstr "Enviar uma mensagem para “%s”" #: ../embed/ephy-encodings.c:54 msgid "Arabic (_IBM-864)" @@ -654,35 +682,35 @@ #: ../embed/ephy-encodings.c:67 msgid "Chinese Simplified (_GB18030)" -msgstr "Chinês Simplificado (_GB18030)" +msgstr "Chinês simplificado (_GB18030)" #: ../embed/ephy-encodings.c:68 msgid "Chinese Simplified (G_B2312)" -msgstr "Chinês Simplificado (G_B2312)" +msgstr "Chinês simplificado (G_B2312)" #: ../embed/ephy-encodings.c:69 msgid "Chinese Simplified (GB_K)" -msgstr "Chinês Simplificado (GB_K)" +msgstr "Chinês simplificado (GB_K)" #: ../embed/ephy-encodings.c:70 msgid "Chinese Simplified (_HZ)" -msgstr "Chinês Simplificado (_HZ)" +msgstr "Chinês simplificado (_HZ)" #: ../embed/ephy-encodings.c:71 msgid "Chinese Simplified (_ISO-2022-CN)" -msgstr "Chinês Simplificado (_ISO-2022-CN)" +msgstr "Chinês simplificado (_ISO-2022-CN)" #: ../embed/ephy-encodings.c:72 msgid "Chinese Traditional (Big_5)" -msgstr "Chinês Tradicional (Big_5)" +msgstr "Chinês tradicional (Big_5)" #: ../embed/ephy-encodings.c:73 msgid "Chinese Traditional (Big5-HK_SCS)" -msgstr "Chinês Tradicional (Big5-HK_SCS)" +msgstr "Chinês tradicional (Big5-HK_SCS)" #: ../embed/ephy-encodings.c:74 msgid "Chinese Traditional (_EUC-TW)" -msgstr "Chinês Tradicional (_EUC-TW)" +msgstr "Chinês tradicional (_EUC-TW)" #: ../embed/ephy-encodings.c:75 msgid "Cyrillic (_IBM-855)" @@ -810,7 +838,7 @@ #: ../embed/ephy-encodings.c:106 msgid "R_omanian (ISO-8859-16)" -msgstr "R_omeno (ISO-8859-16)" +msgstr "R_Omeno (ISO-8859-16)" #: ../embed/ephy-encodings.c:107 msgid "South _European (ISO-8859-3)" @@ -924,75 +952,181 @@ msgid "Unknown (%s)" msgstr "Desconhecido (%s)" -#: ../embed/ephy-find-toolbar.c:105 +#: ../embed/ephy-find-toolbar.c:104 msgid "Text not found" msgstr "Texto não encontrado" -#: ../embed/ephy-find-toolbar.c:112 +#: ../embed/ephy-find-toolbar.c:110 msgid "Search wrapped back to the top" msgstr "Procura deu a volta para o início" -#: ../embed/ephy-find-toolbar.c:456 +#: ../embed/ephy-find-toolbar.c:451 msgid "Type to search…" msgstr "Escreva para procurar…" -#: ../embed/ephy-find-toolbar.c:462 +#: ../embed/ephy-find-toolbar.c:457 msgid "Find previous occurrence of the search string" -msgstr "Procurar a ocorrência anterior da expressão" +msgstr "Procurar a ocorrência anterior da cadeia" -#: ../embed/ephy-find-toolbar.c:470 +#: ../embed/ephy-find-toolbar.c:465 msgid "Find next occurrence of the search string" -msgstr "Procurar a ocorrência seguinte da expressão" +msgstr "Procurar a ocorrência seguinte da cadeia" -#: ../embed/ephy-web-view.c:488 ../src/window-commands.c:330 -msgid "Save" -msgstr "Gravar" +#: ../embed/ephy-web-view.c:493 +msgid "_Don’t Save" +msgstr "_Não gravar" + +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Gravar" #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:500 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Deseja gravar a sua senha para “%s”?" -#: ../embed/ephy-web-view.c:1380 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Negar" -#: ../embed/ephy-web-view.c:1381 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Permitir" -#: ../embed/ephy-web-view.c:1391 +#. Translators: Geolocation policy for a specific site. +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "A página em %s deseja saber a sua localização." +#. Translators: Notification policy for a specific site. +#: ../embed/ephy-web-view.c:1450 +#, c-format +msgid "The page at %s wants to show desktop notifications." +msgstr "" +"A página em %s deseja mostrar notificações do ambiente de trabalho." + #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1475 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" -msgstr "A ler “%s”…" +msgstr "A carregar “%s”…" -#: ../embed/ephy-web-view.c:1477 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" -msgstr "A ler…" +msgstr "A carregar…" + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1763 +msgid "" +"This website presented identification that belongs to a different website." +msgstr "Esta página usa identificação pertencente a uma página diferente." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1768 +msgid "" +"This website’s identification is too old to trust. Check the date on your " +"computer’s calendar." +msgstr "" +"A identificação desta página é demasiado antiga para ser de confiança. " +"Verifique a data do seu calendário." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1773 +msgid "This website’s identification was not issued by a trusted organization." +msgstr "" +"A identificação desta página não foi emitida por uma organização de " +"confiança." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1778 +msgid "" +"This website’s identification could not be processed. It may be corrupted." +msgstr "" +"A identificação desta página não pôde ser processada. Pode estar corrompida." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1783 +msgid "" +"This website’s identification has been revoked by the trusted organization " +"that issued it." +msgstr "" +"A identificação desta página foi revogada pela organização de confiança que " +"a emitiu." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1788 +msgid "" +"This website’s identification cannot be trusted because it uses very weak " +"encryption." +msgstr "" +"A identificação desta página não é de confiança porque usa encriptação muito " +"fraca." + +#. Possible error message when a site presents a bad certificate. +#: ../embed/ephy-web-view.c:1793 +msgid "" +"This website’s identification is only valid for future dates. Check the date " +"on your computer’s calendar." +msgstr "" +"A identificação desta página só é válida para datas futuras. Verifique a " +"data do seu calendário." + +#. Message when a site's TLS certificate is invalid. %s is the site's hostname. +#: ../embed/ephy-web-view.c:1829 +#, c-format +msgid "This might not be the real %s." +msgstr "Isto pode não ser o verdadeiro %s." -#: ../embed/ephy-web-view.c:1718 +#. Message when a site's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1834 +msgid "" +"When you try to connect securely, websites present identification to prove " +"that your connection has not been maliciously intercepted. There is " +"something wrong with this website’s identification:" +msgstr "" +"Quando se tenta ligar com segurança, as páginas identificam-se para provar " +"que a sua ligação não foi maliciosamente interpretada. Há algo de errado com " +"a identificação desta página:" + +#. Message when a site's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1840 +msgid "" +"A third party may have hijacked your connection. You should continue only if " +"you know there is a good reason why this website does not use trusted " +"identification." +msgstr "" +"Uma terceira parte poderá ter desviado a sua ligação. Só deve continuar se " +"sabe haver uma boa razão para esta página não usar identificação de " +"confiança." + +#. Good advice from Firefox; displays when a site's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1844 +msgid "" +"Legitimate banks, stores, and other public sites will not ask you to do this." +msgstr "" +"Bancos, lojas e outras páginas públicas com legitimidade não lhe pedem que " +"faça isto." + +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Nenhuma especificada" -#: ../embed/ephy-web-view.c:1731 ../embed/ephy-web-view.c:1746 +#. Page title when a site cannot be loaded. %s is the site's hostname. +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" -msgstr "Problemas ao ler “%s”" +msgstr "Problema ao carregar “%s”" -#: ../embed/ephy-web-view.c:1733 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." -msgstr "Oops! Incapaz de apresentar esta página web." +msgstr "Oops! Impossível mostrar esta página web." -#: ../embed/ephy-web-view.c:1734 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" msgstr "" -"

A página web em “%s” parece estar indisponível. O erro exato foi:

" -"%s

Poderá estar temporariamente inacessível ou ter sido " -"movida para um novo endereço. Certifique-se de que a sua ligação à internet " -"está a funcionar corretamente.

" +"

A página web em “%s” parece estar indisponível. O erro exato foi:

%s

Poderá estar temporariamente inacessível ou ter " +"sido movida para um novo endereço. Certifique-se que a sua ligação à " +"Internet está a funcionar corretamente.

" -#: ../embed/ephy-web-view.c:1742 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Tentar novamente" -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Oops! Ocorreu um problema." -#: ../embed/ephy-web-view.c:1749 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1021,96 +1155,102 @@ "developers.

" msgstr "" "

Esta página poderá ter levado o navegador web a terminar inesperadamente." -"

Se voltar a acontecer, relate o problema aos programadores do " -"%s.

" +"

Se voltar a acontecer, reporte o problema aos programadores do " +"%s.

" -#: ../embed/ephy-web-view.c:1754 ../embed/ephy-web-view.c:1761 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" -msgstr "Ainda Assim Reler" +msgstr "Ainda assim recarregar" -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" -msgstr "Um problema ao apresentar “%s”" +msgstr "Problema ao mostrar “%s”" -#: ../embed/ephy-web-view.c:1759 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Oops!" -#: ../embed/ephy-web-view.c:1760 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." msgstr "" -"Ocorreu um erro ao apresentar esta página. Releia-a ou visite uma página " +"Ocorreu um erro ao mostrar esta página. Recarregue-a ou visite uma página " "diferente para prosseguir." -#: ../embed/ephy-web-view.c:2607 +#. Title of error page when a website's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1935 +msgid "Look out!" +msgstr "Atenção!" + +#. Button on error page when a website's TLS certificate is invalid. +#: ../embed/ephy-web-view.c:1938 +msgid "Load Anyway" +msgstr "Ainda assim carregar" + +#: ../embed/ephy-web-view.c:2863 msgid "_OK" -msgstr "_Ok" +msgstr "_Aceitar" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:428 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 -#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:808 +#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 msgid "_Cancel" msgstr "_Cancelar" -#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:7 +#: ../lib/ephy-file-chooser.c:185 ../src/resources/history-dialog.ui.h:9 msgid "_Open" msgstr "_Abrir" -#: ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Gravar" - #: ../lib/ephy-file-chooser.c:209 msgid "All supported types" msgstr "Todos os tipos suportados" -#: ../lib/ephy-file-chooser.c:221 +#: ../lib/ephy-file-chooser.c:223 msgid "Web pages" msgstr "Páginas web" -#: ../lib/ephy-file-chooser.c:230 +#: ../lib/ephy-file-chooser.c:234 msgid "Images" msgstr "Imagens" -#: ../lib/ephy-file-chooser.c:238 ../src/bookmarks/ephy-bookmarks-editor.c:637 +#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:637 msgid "All files" msgstr "Todos os ficheiros" #. If we don't have XDG user dirs info, return an educated guess. -#: ../lib/ephy-file-helpers.c:112 ../src/resources/prefs-dialog.ui.h:2 +#: ../lib/ephy-file-helpers.c:114 ../src/resources/prefs-dialog.ui.h:2 msgid "Downloads" -msgstr "Downloads" +msgstr "Transferências" #. If we don't have XDG user dirs info, return an educated guess. -#: ../lib/ephy-file-helpers.c:165 +#: ../lib/ephy-file-helpers.c:167 msgid "Desktop" -msgstr "Ambiente de Trabalho" +msgstr "Ambiente de trabalho" -#: ../lib/ephy-file-helpers.c:333 +#: ../lib/ephy-file-helpers.c:335 #, c-format msgid "Could not create a temporary directory in “%s”." -msgstr "Incapaz de criar diretório temporário em “%s”." +msgstr "Impossível criar pasta temporária em “%s”." -#: ../lib/ephy-file-helpers.c:469 +#: ../lib/ephy-file-helpers.c:466 #, c-format msgid "The file “%s” exists. Please move it out of the way." -msgstr "O ficheiro “%s” existe. Mova-o para outra localização." +msgstr "O ficheiro “%s” existe. Por favor, mova-o para outra localização." -#: ../lib/ephy-file-helpers.c:490 +#: ../lib/ephy-file-helpers.c:487 #, c-format msgid "Failed to create directory “%s”." -msgstr "Falha ao criar diretório “%s”." +msgstr "Falha ao criar pasta “%s”." #. Translators: The first %s is the username and the second one is the #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Senha de %s num formulário em %s" @@ -1118,7 +1258,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Senha num formulário em %s" @@ -1126,36 +1266,37 @@ #: ../lib/ephy-gui.c:206 #, c-format msgid "Directory “%s” is not writable" -msgstr "Diretório “%s” não lhe permite escrever" +msgstr "A pasta “%s” não lhe permite escrever" #: ../lib/ephy-gui.c:210 msgid "You do not have permission to create files in this directory." -msgstr "Não possui permissões para criar ficheiros neste diretório." +msgstr "Não possui permissões para criar ficheiros nesta pasta." #: ../lib/ephy-gui.c:213 msgid "Directory not Writable" -msgstr "Diretório sem Permissões de Escrita" +msgstr "Pastas sem permissões de escrita" #: ../lib/ephy-gui.c:242 #, c-format msgid "Cannot overwrite existing file “%s”" -msgstr "Incapaz de sobrepor ficheiro “%s” existente" +msgstr "Impossível sobrescrever ficheiro “%s” existente" #: ../lib/ephy-gui.c:246 msgid "" "A file with this name already exists and you don't have permission to " "overwrite it." msgstr "" -"Já existe um ficheiro com este nome e não possui permissões para o sobrepor." +"Já existe um ficheiro com este nome e não possui permissões para o " +"sobrescrever." #: ../lib/ephy-gui.c:249 msgid "Cannot Overwrite File" -msgstr "Incapaz de Sobrepor Ficheiro" +msgstr "Impossível sobrescrever ficheiro" #: ../lib/ephy-gui.c:307 #, c-format msgid "Could not display help: %s" -msgstr "Incapaz de apresentar ajuda: %s" +msgstr "Impossível mostrar a ajuda: %s" #: ../lib/ephy-nss-glue.c:62 msgid "Master password needed" @@ -1166,8 +1307,8 @@ "The passwords from the previous version are locked with a master password. " "If you want to import them, please enter your master password below." msgstr "" -"As senhas da versão anterior estão trancadas com uma senha mestra. Se deseja " -"importá-las, introduza abaixo a sua senha mestra." +"As senhas da versão anterior estão trancadas com uma senha mestra. Se as " +"quer importar, por favor, insira abaixo a sua senha mestra." #: ../lib/ephy-profile-migrator.c:100 msgid "Failed to copy cookies file from Mozilla." @@ -1178,12 +1319,12 @@ "Web 3.6 deprecated this directory and tried migrating this configuration to " "~/.config/epiphany" msgstr "" -"O Web 3.6 tornou este diretório obsoleto e tentou migrar esta configuração " -"para ~/.config/epiphany" +"O Web 3.6 tornou esta pasta obsoleta e tentou migrar esta configuração para " +"~/.config/epiphany" #: ../lib/ephy-profile-migrator.c:1030 msgid "Executes only the n-th migration step" -msgstr "Executa apenas o enésimo passo de migração" +msgstr "Executa só o enésimo passo de migração" #: ../lib/ephy-profile-migrator.c:1032 msgid "Specifies the required version for the migrator" @@ -1284,8 +1425,8 @@ msgstr "Ficheiros locais" #: ../lib/widgets/ephy-certificate-dialog.c:92 -msgid "The certificate does not match the expected identity" -msgstr "O certificado não coincide com a identidade esperada" +msgid "The certificate does not match this website" +msgstr "O certificado não coincide com esta página" #: ../lib/widgets/ephy-certificate-dialog.c:95 msgid "The certificate has expired" @@ -1312,78 +1453,108 @@ msgstr "A data de ativação do certificado é no futuro" #: ../lib/widgets/ephy-certificate-dialog.c:149 -msgid "The identity of this website has been verified" -msgstr "A identidade desta página web foi verificada" +msgid "The identity of this website has been verified." +msgstr "A identidade desta página web foi verificada." #: ../lib/widgets/ephy-certificate-dialog.c:150 -msgid "The identity of this website has not been verified" -msgstr "A identidade desta página web não foi verificada" +msgid "The identity of this website has not been verified." +msgstr "A identidade desta página web não foi verificada." + +#. Label when clicking the lock icon on a secure page. %s is the website's hostname. +#: ../lib/widgets/ephy-certificate-popover.c:71 +#, c-format +msgid "You are connected to %s" +msgstr "Está ligado a %s" -#: ../lib/widgets/ephy-download-widget.c:107 +#. Label in certificate popover when site is untrusted. %s is a URL. +#: ../lib/widgets/ephy-certificate-popover.c:113 +#, c-format +msgid "" +"This web site’s digital identification is not trusted. You may have " +"connected to an attacker pretending to be %s." +msgstr "" +"A identificação digital desta página não é de confiança. Poderá estar ligado " +"a um atacante fazendo-se passar por %s." + +#. Label in certificate popover when site sends mixed content. +#: ../lib/widgets/ephy-certificate-popover.c:124 +msgid "Part of this page is insecure." +msgstr "Parte desta página é insegura." + +#. Label in certificate popover on secure sites. +#: ../lib/widgets/ephy-certificate-popover.c:130 +msgid "Your connection is secure." +msgstr "A sua ligação é segura." + +#: ../lib/widgets/ephy-certificate-popover.c:318 +msgid "_View Certificate…" +msgstr "_Ver certificado..." + +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d segundo remanescente" msgstr[1] "%d segundos remanescentes" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d minuto remanescente" msgstr[1] "%d minutos remanescentes" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d hora remanescente" msgstr[1] "%d horas remanescentes" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d dia remanescente" msgstr[1] "%d dias remanescentes" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d semana remanescente" msgstr[1] "%d semanas remanescentes" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d mês remanescente" msgstr[1] "%d meses remanescentes" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Terminado" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" -msgstr "Erro ao realizar o download: %s" +msgstr "Erro ao transferir: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:712 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Cancelar" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1146 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Abrir" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" -msgstr "Apresentar na pasta" +msgstr "Mostrar na pasta" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "A iniciar…" @@ -1391,23 +1562,22 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:618 -#: ../src/resources/prefs-dialog.ui.h:36 ../src/ephy-history-window.c:189 +#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_Limpar" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:637 ../src/ephy-window.c:121 +#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Desfazer" -#: ../lib/widgets/ephy-location-entry.c:644 +#: ../lib/widgets/ephy-location-entry.c:632 msgid "_Redo" msgstr "_Refazer" -#: ../lib/widgets/ephy-location-entry.c:924 +#: ../lib/widgets/ephy-location-entry.c:912 msgid "Drag and drop this icon to create a link to this page" -msgstr "Arrastar e largar este ícone para criar um link para esta página" +msgstr "Arrastar e largar este ícone para criar uma ligação a esta página" #. Translators: This string is used when counting bookmarks that #. * are similar to each other @@ -1418,38 +1588,37 @@ msgstr[0] "%d marcador é semelhante" msgstr[1] "%d marcadores são semelhantes" -#: ../src/bookmarks/ephy-bookmark-properties.c:234 +#: ../src/bookmarks/ephy-bookmark-properties.c:235 +msgid "Add Bookmark" +msgstr "Adicionar marcador" + +#: ../src/bookmarks/ephy-bookmark-properties.c:237 #, c-format msgid "“%s” Properties" msgstr "Propriedades de “%s”" -#: ../src/bookmarks/ephy-bookmark-properties.c:358 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Título:" -#: ../src/bookmarks/ephy-bookmark-properties.c:375 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Endereço:" -#: ../src/bookmarks/ephy-bookmark-properties.c:387 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" -msgstr "Tó_picos:" +msgstr "Tópic_Os:" -#: ../src/bookmarks/ephy-bookmark-properties.c:410 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" -msgstr "Apre_sentar todos os tópicos" +msgstr "_Mostrar todos os tópicos" -#: ../src/bookmarks/ephy-bookmark-properties.c:431 -#: ../src/resources/prefs-dialog.ui.h:41 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 +#: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" msgstr "_Adicionar" -#: ../src/bookmarks/ephy-bookmark-properties.c:438 -#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:114 -msgid "_Close" -msgstr "_Fechar" - #: ../src/bookmarks/ephy-bookmarks.c:88 msgid "Entertainment" msgstr "Entretenimento" @@ -1475,26 +1644,26 @@ msgstr "Trabalho" #. Translators: this topic contains all bookmarks -#: ../src/bookmarks/ephy-bookmarks.c:926 +#: ../src/bookmarks/ephy-bookmarks.c:927 msgctxt "bookmarks" msgid "All" msgstr "Todos" #. Translators: this topic contains the not categorized #. bookmarks -#: ../src/bookmarks/ephy-bookmarks.c:930 +#: ../src/bookmarks/ephy-bookmarks.c:931 msgctxt "bookmarks" msgid "Not Categorized" -msgstr "Por Categorizar" +msgstr "Por categorizar" #. Translators: this is an automatic topic containing local #. * websites bookmarks autodiscovered with zeroconf. -#: ../src/bookmarks/ephy-bookmarks.c:934 +#: ../src/bookmarks/ephy-bookmarks.c:935 msgctxt "bookmarks" msgid "Nearby Sites" -msgstr "Páginas Próximas" +msgstr "Páginas próximas" -#: ../src/bookmarks/ephy-bookmarks.c:1148 +#: ../src/bookmarks/ephy-bookmarks.c:1150 #: ../src/bookmarks/ephy-bookmarks-import.c:270 msgid "Untitled" msgstr "Sem título" @@ -1526,36 +1695,36 @@ #. Help. #: ../src/bookmarks/ephy-bookmarks-editor.c:154 -#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:191 +#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 msgid "_Help" -msgstr "_Ajuda" +msgstr "A_Juda" #. File Menu #: ../src/bookmarks/ephy-bookmarks-editor.c:158 msgid "_New Topic" -msgstr "_Novo Tópico" +msgstr "_Novo tópico" #: ../src/bookmarks/ephy-bookmarks-editor.c:159 msgid "Create a new topic" msgstr "Criar um novo tópico" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" -msgstr[0] "Abrir numa Nova _Janela" -msgstr[1] "Abrir em Novas _Janelas" +msgstr[0] "Abrir em nova _Janela" +msgstr[1] "Abrir em novas _Janelas" #: ../src/bookmarks/ephy-bookmarks-editor.c:162 msgid "Open the selected bookmark in a new window" msgstr "Abrir o marcador selecionado numa nova janela" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" -msgstr[0] "Abrir num Novo _Separador" -msgstr[1] "Abrir em Novos _Separadores" +msgstr[0] "Abrir num novo _Separador" +msgstr[1] "Abrir em novos _Separadores" #: ../src/bookmarks/ephy-bookmarks-editor.c:165 msgid "Open the selected bookmark in a new tab" @@ -1579,7 +1748,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:172 msgid "_Import Bookmarks…" -msgstr "_Importar Marcadores…" +msgstr "_Importar marcadores…" #: ../src/bookmarks/ephy-bookmarks-editor.c:173 msgid "Import bookmarks from another browser or a bookmarks file" @@ -1587,27 +1756,31 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:175 msgid "_Export Bookmarks…" -msgstr "_Exportar Marcadores…" +msgstr "_Exportar marcadores…" #: ../src/bookmarks/ephy-bookmarks-editor.c:176 msgid "Export bookmarks to a file" msgstr "Exportar marcadores para um ficheiro" +#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:112 +msgid "_Close" +msgstr "_Fechar" + #: ../src/bookmarks/ephy-bookmarks-editor.c:179 msgid "Close the bookmarks window" msgstr "Fechar a janela de marcadores" #. Edit Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:123 msgid "Cu_t" -msgstr "Cor_tar" +msgstr "Cor_Tar" #: ../src/bookmarks/ephy-bookmarks-editor.c:184 msgid "Cut the selection" msgstr "Cortar a seleção" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:127 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Copiar" @@ -1615,26 +1788,26 @@ msgid "Copy the selection" msgstr "Copiar a seleção" -#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:129 +#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:127 msgid "_Paste" -msgstr "Co_lar" +msgstr "Co_Lar" #: ../src/bookmarks/ephy-bookmarks-editor.c:190 msgid "Paste the clipboard" msgstr "Colar a área de transferência" #: ../src/bookmarks/ephy-bookmarks-editor.c:192 -#: ../src/resources/history-dialog.ui.h:10 +#: ../src/resources/history-dialog.ui.h:12 msgid "_Delete" -msgstr "_Apagar" +msgstr "_Eliminar" #: ../src/bookmarks/ephy-bookmarks-editor.c:193 msgid "Delete the selected bookmark or topic" -msgstr "Apagar o marcador ou tópico selecionado" +msgstr "Eliminar o marcador ou tópico selecionado" -#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:133 +#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:131 msgid "Select _All" -msgstr "Selecionar T_udo" +msgstr "Selecion_Ar tudo" #: ../src/bookmarks/ephy-bookmarks-editor.c:196 msgid "Select all bookmarks or text" @@ -1647,16 +1820,16 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:201 msgid "Display bookmarks help" -msgstr "Apresentar a ajuda dos marcadores" +msgstr "Mostrar a ajuda dos marcadores" #: ../src/bookmarks/ephy-bookmarks-editor.c:203 -#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:193 +#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 msgid "_About" msgstr "_Sobre" #: ../src/bookmarks/ephy-bookmarks-editor.c:204 msgid "Display credits for the web browser creators" -msgstr "Apresentar créditos dos criadores do navegador web" +msgstr "Mostrar créditos dos criadores do navegador web" #. View Menu #: ../src/bookmarks/ephy-bookmarks-editor.c:210 @@ -1665,16 +1838,16 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:211 msgid "Show the title column" -msgstr "Apresentar a coluna de título" +msgstr "Mostrar a coluna de título" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Endereço" #: ../src/bookmarks/ephy-bookmarks-editor.c:213 msgid "Show the address column" -msgstr "Apresentar a coluna de endereço" +msgstr "Mostrar a coluna de endereço" #: ../src/bookmarks/ephy-bookmarks-editor.c:255 msgid "Type a topic" @@ -1683,24 +1856,24 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:377 #, c-format msgid "Delete topic “%s”?" -msgstr "Apagar o tópico “%s”?" +msgstr "Eliminar o tópico “%s”?" #: ../src/bookmarks/ephy-bookmarks-editor.c:380 msgid "Delete this topic?" -msgstr "Apagar este tópico?" +msgstr "Eliminar este tópico?" #: ../src/bookmarks/ephy-bookmarks-editor.c:382 msgid "" "Deleting this topic will cause all its bookmarks to become uncategorized, " "unless they also belong to other topics. The bookmarks will not be deleted." msgstr "" -"Apagar este tópico fará com que todos os seus marcadores fiquem sem uma " +"Eliminar este tópico fará com que todos os seus marcadores fiquem sem uma " "categoria definída exceto se também pertencerem a outros tópicos. Os " "marcadores não serão apagados." #: ../src/bookmarks/ephy-bookmarks-editor.c:385 msgid "_Delete Topic" -msgstr "_Apagar o Tópico" +msgstr "_Eliminar o tópico" #. FIXME: proper i18n after freeze #: ../src/bookmarks/ephy-bookmarks-editor.c:495 @@ -1733,7 +1906,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:552 msgid "Import Failed" -msgstr "Falha ao Importar" +msgstr "Falha ao importar" #: ../src/bookmarks/ephy-bookmarks-editor.c:555 #, c-format @@ -1741,12 +1914,12 @@ "The bookmarks from “%s” could not be imported because the file is corrupted " "or of an unsupported type." msgstr "" -"Incapaz de importar os marcadores de “%s” pois o ficheiro está corrompido ou " +"Impossível importar os marcadores de “%s” pois o ficheiro está corrompido ou " "é de um tipo não suportado." #: ../src/bookmarks/ephy-bookmarks-editor.c:618 msgid "Import Bookmarks from File" -msgstr "Importar Marcadores de um Ficheiro" +msgstr "Importar marcadores de um ficheiro" #: ../src/bookmarks/ephy-bookmarks-editor.c:625 msgid "Firefox/Mozilla bookmarks" @@ -1762,10 +1935,10 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:757 msgid "Export Bookmarks" -msgstr "Exportar Marcadores" +msgstr "Exportar marcadores" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Marcadores" @@ -1773,15 +1946,15 @@ #. Make a format selection combo & label #: ../src/bookmarks/ephy-bookmarks-editor.c:770 msgid "File f_ormat:" -msgstr "F_ormato do ficheiro:" +msgstr "F_Ormato do ficheiro:" #: ../src/bookmarks/ephy-bookmarks-editor.c:816 msgid "Import Bookmarks" -msgstr "Importar Marcadores" +msgstr "Importar marcadores" #: ../src/bookmarks/ephy-bookmarks-editor.c:821 msgid "I_mport" -msgstr "I_mportar" +msgstr "I_Mportar" #: ../src/bookmarks/ephy-bookmarks-editor.c:837 msgid "Import bookmarks from:" @@ -1791,22 +1964,22 @@ msgid "File" msgstr "Ficheiro" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" -msgstr "_Copiar Endereço" +msgstr "_Copiar endereço" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Tópicos" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Título" #. FIXME !!!! #: ../src/bookmarks/ephy-open-tabs-action.c:74 msgid "Open in New _Tabs" -msgstr "Abrir em Novos _Separadores" +msgstr "Abrir em novos _Separadores" #: ../src/bookmarks/ephy-open-tabs-action.c:75 msgid "Open the bookmarks in this topic in new tabs" @@ -1819,7 +1992,7 @@ #: ../src/resources/clear-data-dialog.ui.h:1 msgid "Clear Personal Data" -msgstr "Limpar Dados Pessoais" +msgstr "Limpar dados pessoais" #: ../src/resources/clear-data-dialog.ui.h:2 msgid "C_lear" @@ -1838,22 +2011,20 @@ "visitou. Verifique os tipos de informação que deseja remover:" #: ../src/resources/clear-data-dialog.ui.h:6 -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 -msgid "Cookies" -msgstr "Cookies" +msgid "Coo_kies" +msgstr "Coo_Kies" #: ../src/resources/clear-data-dialog.ui.h:7 -msgid "Cache and temporary files" -msgstr "Cache e ficheiros temporários" +msgid "Cache and _temporary files" +msgstr "Cache e ficheiros _Temporários" #: ../src/resources/clear-data-dialog.ui.h:8 -msgid "Browsing history" -msgstr "Histórico de navegação" +msgid "Browsing _history" +msgstr "_Histórico de navegação" #: ../src/resources/clear-data-dialog.ui.h:9 -msgid "Saved passwords" -msgstr "Senhas gravadas" +msgid "Saved _passwords" +msgstr "Senhas _Gravadas" #: ../src/resources/clear-data-dialog.ui.h:10 msgid "" @@ -1863,6 +2034,11 @@ "Não é possível desfazer esta ação. Os dados que decidir limpar serão " "definitivamente apagados." +#: ../src/resources/cookies-dialog.ui.h:1 +#: ../src/resources/prefs-dialog.ui.h:21 +msgid "Cookies" +msgstr "Cookies" + #: ../src/resources/cookies-dialog.ui.h:2 #: ../src/resources/history-dialog.ui.h:2 #: ../src/resources/passwords-dialog.ui.h:2 @@ -1878,52 +2054,56 @@ msgid "Remove" msgstr "Remover" +#: ../src/resources/cookies-dialog.ui.h:5 +msgid "Delete the selected cookies" +msgstr "Eliminar os cookies selecionados" + +#: ../src/resources/encoding-dialog.ui.h:1 +msgid "Text Encoding" +msgstr "Codificação de texto" + +#: ../src/resources/encoding-dialog.ui.h:2 ../src/ephy-encoding-menu.c:327 +msgid "_Automatic" +msgstr "_Automática" + +#: ../src/resources/encoding-dialog.ui.h:3 ../src/ephy-encoding-menu.c:328 +msgid "Use the encoding specified by the document" +msgstr "Utilizar a codificação especificada pelo documento" + +#: ../src/resources/encoding-dialog.ui.h:4 +msgid "_Use a different encoding:" +msgstr "_Utilizar uma codificação diferente:" + #. File actions. -#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:100 +#: ../src/resources/epiphany-application-menu.ui.h:1 ../src/ephy-window.c:98 msgid "_New Window" -msgstr "_Nova Janela" +msgstr "_Nova janela" -#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:102 +#: ../src/resources/epiphany-application-menu.ui.h:2 ../src/ephy-window.c:100 msgid "New _Incognito Window" -msgstr "Nova Janela _Incógnita" +msgstr "Nova janela _Incógnita" #: ../src/resources/epiphany-application-menu.ui.h:3 msgid "Reopen Closed _Tab" -msgstr "Reabrir Separador Fec_hado" +msgstr "Reabrir _Separador fechado" #. Toplevel -#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:93 +#: ../src/resources/epiphany-application-menu.ui.h:4 ../src/ephy-window.c:91 msgid "_Bookmarks" msgstr "_Marcadores" -#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:143 +#: ../src/resources/epiphany-application-menu.ui.h:5 ../src/ephy-window.c:141 msgid "_History" msgstr "_Histórico" -#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:145 +#: ../src/resources/epiphany-application-menu.ui.h:6 ../src/ephy-window.c:143 msgid "Pr_eferences" -msgstr "Pr_eferências" +msgstr "Pr_Eferências" -#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:116 +#: ../src/resources/epiphany-application-menu.ui.h:9 ../src/ephy-window.c:114 msgid "_Quit" msgstr "_Sair" -#: ../src/resources/epiphany.ui.h:1 -msgid "Text Encoding" -msgstr "Codificação de Texto" - -#: ../src/resources/epiphany.ui.h:2 ../src/ephy-encoding-menu.c:327 -msgid "_Automatic" -msgstr "_Automática" - -#: ../src/resources/epiphany.ui.h:3 ../src/ephy-encoding-menu.c:328 -msgid "Use the encoding specified by the document" -msgstr "Utilizar a codificação especificada pelo documento" - -#: ../src/resources/epiphany.ui.h:4 -msgid "_Use a different encoding:" -msgstr "_Utilizar uma codificação diferente:" - #: ../src/resources/history-dialog.ui.h:1 msgid "History" msgstr "Histórico" @@ -1944,11 +2124,19 @@ msgid "Location" msgstr "Localização" +#: ../src/resources/history-dialog.ui.h:7 +msgid "Remove the selected pages from history" +msgstr "Remover as páginas selecionadas do histórico" + #: ../src/resources/history-dialog.ui.h:8 +msgid "Open the selected pages in new tabs" +msgstr "Abrir as páginas selecionadas em novos separadores" + +#: ../src/resources/history-dialog.ui.h:10 msgid "_Copy Location" -msgstr "_Copiar Localização" +msgstr "_Copiar localização" -#: ../src/resources/history-dialog.ui.h:9 +#: ../src/resources/history-dialog.ui.h:11 msgid "Add _Bookmark" msgstr "Adicionar _Marcador" @@ -1970,12 +2158,20 @@ msgstr "Senha" #: ../src/resources/passwords-dialog.ui.h:7 -msgid "_Copy Password" -msgstr "_Copiar Senha" +msgid "Forget the selected passwords" +msgstr "Esquecer as senhas selecionadas" #: ../src/resources/passwords-dialog.ui.h:8 +msgid "Reveal all the passwords" +msgstr "Revelar todas as senhas" + +#: ../src/resources/passwords-dialog.ui.h:9 +msgid "_Copy Password" +msgstr "_Copiar senha" + +#: ../src/resources/passwords-dialog.ui.h:10 msgid "C_opy Username" -msgstr "C_opiar Utilizador" +msgstr "C_opiar utilizador" #: ../src/resources/prefs-dialog.ui.h:1 msgid "Preferences" @@ -1983,11 +2179,11 @@ #: ../src/resources/prefs-dialog.ui.h:3 msgid "_Download folder:" -msgstr "Pasta de _downloads:" +msgstr "Pasta de _Transferências:" #: ../src/resources/prefs-dialog.ui.h:4 msgid "A_utomatically open downloaded files" -msgstr "Abrir a_utomaticamente os ficheiros ao terminar o download" +msgstr "Abrir a_Utomaticamente os ficheiros transferidos" #: ../src/resources/prefs-dialog.ui.h:5 msgid "Search" @@ -2003,15 +2199,15 @@ #: ../src/resources/prefs-dialog.ui.h:8 msgid "Allow popup _windows" -msgstr "Permitir janelas de _popup" +msgstr "Permitir _Balões" #: ../src/resources/prefs-dialog.ui.h:9 msgid "Allow _advertisements" -msgstr "Permitir p_ublicidade" +msgstr "Permitir publicid_Ade" #: ../src/resources/prefs-dialog.ui.h:10 msgid "Enable _plugins" -msgstr "Ativar _plugins" +msgstr "Ativar _Extensões" #: ../src/resources/prefs-dialog.ui.h:11 msgid "General" @@ -2019,23 +2215,23 @@ #: ../src/resources/prefs-dialog.ui.h:12 msgid "Fonts" -msgstr "Fontes" +msgstr "Letras" #: ../src/resources/prefs-dialog.ui.h:13 msgid "_Use system fonts" -msgstr "_Utilizar as fontes do sistema" +msgstr "_Usar as fontes do sistema" #: ../src/resources/prefs-dialog.ui.h:14 msgid "Sans serif font:" -msgstr "Fonte sans serif:" +msgstr "Letra sans serif:" #: ../src/resources/prefs-dialog.ui.h:15 msgid "Serif font:" -msgstr "Fonte serif:" +msgstr "Letra serif:" #: ../src/resources/prefs-dialog.ui.h:16 msgid "Monospace font:" -msgstr "Fonte monoespaçada:" +msgstr "Letra monoespaçada:" #: ../src/resources/prefs-dialog.ui.h:17 msgid "Style" @@ -2043,19 +2239,19 @@ #: ../src/resources/prefs-dialog.ui.h:18 msgid "Use custom _stylesheet" -msgstr "Utilizar folha de e_stilos personalizada" +msgstr "Usar folha de e_Stilos personalizada" #: ../src/resources/prefs-dialog.ui.h:19 msgid "_Edit Stylesheet…" -msgstr "_Editar Folha de Estilos…" +msgstr "_Editar folha de estilos…" #: ../src/resources/prefs-dialog.ui.h:20 msgid "Fonts & Style" -msgstr "Fontes & Estilos" +msgstr "Letras & Estilos" #: ../src/resources/prefs-dialog.ui.h:22 -msgid "Manage Cookies" -msgstr "Gerir Cookies" +msgid "Manage _Cookies…" +msgstr "Gerir _Cookies..." #: ../src/resources/prefs-dialog.ui.h:23 msgid "_Always accept" @@ -2063,7 +2259,7 @@ #: ../src/resources/prefs-dialog.ui.h:24 msgid "Only _from sites you visit" -msgstr "Ape_nas de páginas que visite" +msgstr "Só de páginas que _Visite" #. Refers to "Only from sites you visit" option under Cookies. #: ../src/resources/prefs-dialog.ui.h:26 @@ -2076,75 +2272,75 @@ #: ../src/resources/prefs-dialog.ui.h:28 msgid "Tracking" -msgstr "Registar" +msgstr "Seguir" #: ../src/resources/prefs-dialog.ui.h:29 -msgid "_Tell web sites I do not want to be tracked" -msgstr "_Dizer às páginas web que não quero ser registado" +msgid "_Tell websites I do not want to be tracked" +msgstr "_Dizer às páginas web que não quero ser seguido" #: ../src/resources/prefs-dialog.ui.h:31 -msgid "Manage Passwords" -msgstr "Gerir Senhas" +msgid "Manage _Passwords…" +msgstr "Gerir senhas" #: ../src/resources/prefs-dialog.ui.h:32 msgid "_Remember passwords" msgstr "_Recordar as senhas" #: ../src/resources/prefs-dialog.ui.h:33 -msgid "Temporary Files" -msgstr "Ficheiros Temporários" +msgid "Stored Data" +msgstr "Dados armazenados" #: ../src/resources/prefs-dialog.ui.h:34 -msgid "_Disk space:" -msgstr "Espaço em _disco:" +msgid "You can clear stored personal data." +msgstr "Pode limpar dados pessoais armazenados." #: ../src/resources/prefs-dialog.ui.h:35 -msgid "MB" -msgstr "MB" +msgid "Cl_ear Personal Data…" +msgstr "Limpar dados _Pessoais…" -#: ../src/resources/prefs-dialog.ui.h:37 +#: ../src/resources/prefs-dialog.ui.h:36 msgid "Privacy" msgstr "Privacidade" -#: ../src/resources/prefs-dialog.ui.h:38 ../src/ephy-encoding-dialog.c:379 +#: ../src/resources/prefs-dialog.ui.h:37 ../src/ephy-encoding-dialog.c:379 msgid "Encodings" msgstr "Codificações" -#: ../src/resources/prefs-dialog.ui.h:39 +#: ../src/resources/prefs-dialog.ui.h:38 msgid "De_fault:" -msgstr "_Omissão:" +msgstr "Prede_Finição:" -#: ../src/resources/prefs-dialog.ui.h:42 +#: ../src/resources/prefs-dialog.ui.h:41 msgid "_Remove" msgstr "_Remover" -#: ../src/resources/prefs-dialog.ui.h:43 +#: ../src/resources/prefs-dialog.ui.h:42 msgid "_Up" msgstr "_Acima" -#: ../src/resources/prefs-dialog.ui.h:44 +#: ../src/resources/prefs-dialog.ui.h:43 msgid "_Down" -msgstr "A_baixo" +msgstr "A_Baixo" -#: ../src/resources/prefs-dialog.ui.h:45 +#: ../src/resources/prefs-dialog.ui.h:44 msgid "Spell checking" msgstr "Verificação ortográfica" -#: ../src/resources/prefs-dialog.ui.h:46 +#: ../src/resources/prefs-dialog.ui.h:45 msgid "_Enable spell checking" msgstr "_Ativar verificação ortográfica" -#: ../src/resources/prefs-dialog.ui.h:47 ../src/prefs-dialog.c:839 +#: ../src/resources/prefs-dialog.ui.h:46 ../src/prefs-dialog.c:840 msgid "Language" msgstr "Idioma" #: ../src/resources/prefs-lang-dialog.ui.h:1 msgid "Add Language" -msgstr "Adicionar Idioma" +msgstr "Adicionar idioma" #: ../src/resources/prefs-lang-dialog.ui.h:4 msgid "Choose a l_anguage:" -msgstr "Selecione um idiom_a:" +msgstr "Selecione um idiom_A:" #: ../src/ephy-combined-stop-reload-action.c:41 msgid "Stop" @@ -2154,13 +2350,13 @@ msgid "Stop current data transfer" msgstr "Parar a transferência de dados atual" -#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:154 +#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:152 msgid "_Reload" msgstr "_Atualizar" #: ../src/ephy-combined-stop-reload-action.c:45 msgid "Display the latest content of the current page" -msgstr "Apresentar o mais recente conteúdo da página atual" +msgstr "Mostrar o mais recente conteúdo da página atual" #: ../src/ephy-encoding-menu.c:320 msgid "_Other…" @@ -2170,11 +2366,11 @@ msgid "Other encodings" msgstr "Outras codificações" -#: ../src/ephy-history-window.c:179 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Limpar o seu histórico de navegação?" -#: ../src/ephy-history-window.c:183 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2200,7 +2396,7 @@ #: ../src/ephy-main.c:82 msgid "Load the given session file" -msgstr "Ler o ficheiro de sessão indicado" +msgstr "Carregar o ficheiro de sessão indicado" #: ../src/ephy-main.c:84 msgid "Add a bookmark" @@ -2228,7 +2424,7 @@ #: ../src/ephy-main.c:94 msgid "Profile directory to use in the private instance" -msgstr "Diretório de perfil utilizado na instância privada" +msgstr "Pasta de perfil a utilizar na instância privada" #: ../src/ephy-main.c:94 msgid "DIR" @@ -2240,7 +2436,7 @@ #: ../src/ephy-main.c:201 msgid "Could not start Web" -msgstr "Incapaz de iniciar o Navegador Web" +msgstr "Impossível iniciar o Navegador Web" #: ../src/ephy-main.c:204 #, c-format @@ -2251,264 +2447,303 @@ "Falha na iniciação devido ao seguinte erro:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Opções do Navegador Web" -#: ../src/ephy-notebook.c:602 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Fechar o separador" -#: ../src/ephy-search-provider.c:199 +#: ../src/ephy-search-provider.c:201 #, c-format msgid "Search the Web for %s" -msgstr "Procurar a Web por %s" +msgstr "Procurar na Web por %s" -#: ../src/ephy-window.c:104 +#: ../src/ephy-window.c:102 msgid "_Open…" msgstr "_Abrir…" -#: ../src/ephy-window.c:106 +#: ../src/ephy-window.c:104 msgid "Save _As…" msgstr "Gravar _Como…" -#: ../src/ephy-window.c:108 +#: ../src/ephy-window.c:106 msgid "Save As _Web Application…" -msgstr "Gravar Como Aplicação _Web…" +msgstr "Gravar como aplicação _Web…" -#: ../src/ephy-window.c:110 +#: ../src/ephy-window.c:108 msgid "_Print…" msgstr "_Imprimir…" -#: ../src/ephy-window.c:112 +#: ../src/ephy-window.c:110 msgid "S_end Link by Email…" -msgstr "_Enviar Link por Email…" +msgstr "_Enviar ligação por email…" -#: ../src/ephy-window.c:123 +#: ../src/ephy-window.c:121 msgid "Re_do" -msgstr "Re_fazer" +msgstr "Re_Fazer" -#: ../src/ephy-window.c:135 +#: ../src/ephy-window.c:133 msgid "_Find…" -msgstr "_Procurar…" +msgstr "_Localizar…" -#: ../src/ephy-window.c:137 +#: ../src/ephy-window.c:135 msgid "Find Ne_xt" -msgstr "Procurar _Seguinte" +msgstr "Localizar _Seguinte" -#: ../src/ephy-window.c:139 +#: ../src/ephy-window.c:137 msgid "Find Pre_vious" -msgstr "Procurar _Anterior" +msgstr "Localizar _Anterior" -#: ../src/ephy-window.c:141 +#: ../src/ephy-window.c:139 msgid "Edit _Bookmarks" msgstr "Editar _Marcadores" #. View actions. -#: ../src/ephy-window.c:150 ../src/ephy-window.c:152 +#: ../src/ephy-window.c:148 ../src/ephy-window.c:150 msgid "_Stop" msgstr "_Parar" -#: ../src/ephy-window.c:156 +#: ../src/ephy-window.c:154 msgid "Zoom _In" -msgstr "_Aum Zoom" +msgstr "_Ampliar" -#: ../src/ephy-window.c:158 +#: ../src/ephy-window.c:156 msgid "Zoom O_ut" -msgstr "_Red Zoom" +msgstr "_Reduzir" -#: ../src/ephy-window.c:160 +#: ../src/ephy-window.c:158 msgid "_Normal Size" msgstr "Tamanho _Normal" -#: ../src/ephy-window.c:162 +#: ../src/ephy-window.c:160 msgid "Text _Encoding" -msgstr "_Codificação do Texto" +msgstr "_Codificação do texto" -#: ../src/ephy-window.c:163 +#: ../src/ephy-window.c:161 msgid "_Page Source" msgstr "Código da _Página" #. Bookmarks actions. -#: ../src/ephy-window.c:168 +#: ../src/ephy-window.c:166 msgid "_Add Bookmark…" -msgstr "_Adicionar Marcador…" +msgstr "_Adicionar marcador…" #. Go actions. -#: ../src/ephy-window.c:173 +#: ../src/ephy-window.c:171 msgid "_Location…" msgstr "_Localização…" #. Tabs actions. -#: ../src/ephy-window.c:178 +#: ../src/ephy-window.c:176 msgid "_Previous Tab" msgstr "Separador _Anterior" -#: ../src/ephy-window.c:180 +#: ../src/ephy-window.c:178 msgid "_Next Tab" msgstr "Separador _Seguinte" -#: ../src/ephy-window.c:182 +#: ../src/ephy-window.c:180 msgid "Move Tab _Left" -msgstr "Mover Separador à _Esquerda" +msgstr "Mover separador à _Esquerda" -#: ../src/ephy-window.c:184 +#: ../src/ephy-window.c:182 msgid "Move Tab _Right" -msgstr "Mover Separador à _Direita" +msgstr "Mover separador à _Direita" -#: ../src/ephy-window.c:186 +#: ../src/ephy-window.c:184 msgid "_Detach Tab" -msgstr "_Destacar Separador" +msgstr "_Destacar separador" #. View actions. -#: ../src/ephy-window.c:201 +#: ../src/ephy-window.c:199 msgid "_Downloads Bar" -msgstr "Barra de _Downloads" +msgstr "Barra de _Transferências" -#: ../src/ephy-window.c:204 +#: ../src/ephy-window.c:202 msgid "_Fullscreen" -msgstr "_Ecrã Completo" +msgstr "_Ecrã completo" -#: ../src/ephy-window.c:206 +#: ../src/ephy-window.c:204 msgid "Popup _Windows" -msgstr "_Janelas de Popup" +msgstr "_Balões" -#: ../src/ephy-window.c:208 +#: ../src/ephy-window.c:206 msgid "Selection Caret" -msgstr "Cursor de Seleção" +msgstr "Cursor de seleção" #. Document. -#: ../src/ephy-window.c:215 +#: ../src/ephy-window.c:213 msgid "Add Boo_kmark…" msgstr "Adicionar _Marcador…" #. Links. -#: ../src/ephy-window.c:220 +#: ../src/ephy-window.c:218 msgid "Open Link in New _Window" -msgstr "Abrir Link em Nova _Janela" +msgstr "Abrir ligação em nova _Janela" -#: ../src/ephy-window.c:222 +#: ../src/ephy-window.c:220 msgid "Open Link in New _Tab" -msgstr "Abrir Link em Novo _Separador" +msgstr "Abrir ligação em novo _Separador" + +#: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Abrir ligação em janela i_Ncógnita" #: ../src/ephy-window.c:224 msgid "_Save Link As…" -msgstr "_Gravar o Link Como…" +msgstr "_Gravar ligação como…" #: ../src/ephy-window.c:226 msgid "_Copy Link Address" -msgstr "_Copiar o Endereço do Link" +msgstr "_Copiar endereço da ligação" #: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" -msgstr "_Copiar Endereço de Email" +msgstr "_Copiar endereço de email" #. Images. #: ../src/ephy-window.c:233 -msgid "View _Image" -msgstr "Visualizar _Imagem" +msgid "View _Image in New Tab" +msgstr "Ver _Imagem em novo separador" #: ../src/ephy-window.c:235 msgid "Copy I_mage Address" -msgstr "Copiar Endereço da I_magem" +msgstr "Copiar endereço da i_Magem" #: ../src/ephy-window.c:237 msgid "_Save Image As…" -msgstr "_Gravar Imagem Como…" +msgstr "_Gravar imagem como…" #: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Definir como _Fundo" -#: ../src/ephy-window.c:241 -msgid "St_art Animation" -msgstr "Iniciar a _Animação" - -#: ../src/ephy-window.c:243 -msgid "St_op Animation" -msgstr "_Parar a Animação" +#. Video. +#: ../src/ephy-window.c:244 +msgid "Open Video in New _Window" +msgstr "Abrir vídeo em nova _Janela" + +#: ../src/ephy-window.c:246 +msgid "Open Video in New _Tab" +msgstr "Abrir vídeo em novo _Separador" + +#: ../src/ephy-window.c:248 +msgid "_Save Video As…" +msgstr "_Gravar vídeo como…" + +#: ../src/ephy-window.c:250 +msgid "_Copy Video Address" +msgstr "_Copiar endereço do vídeo" + +#. Audio. +#: ../src/ephy-window.c:255 +msgid "Open Audio in New _Window" +msgstr "Abrir áudio em nova _Janela" + +#: ../src/ephy-window.c:257 +msgid "Open Audio in New _Tab" +msgstr "Abrir áudio em novo _Separador" + +#: ../src/ephy-window.c:259 +msgid "_Save Audio As…" +msgstr "_Gravar áudio como…" + +#: ../src/ephy-window.c:261 +msgid "_Copy Audio Address" +msgstr "_Copiar endereço do áudio" -#: ../src/ephy-window.c:451 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" -msgstr "Existem alterações por enviar a elementos do formulário" +msgstr "Existem alterações não submetidas a elementos do formulário" -#: ../src/ephy-window.c:452 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Se ainda assim fechar o documento, essa informação será perdida." -#: ../src/ephy-window.c:454 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Fechar o _Documento" -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" -msgstr "Estão a ser realizados downloads nesta janela" +msgstr "Há transferências em curso nesta janela" -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" -msgstr "Se fechar esta janela, os downloads serão cancelados" +msgstr "Se fechar esta janela, as transferências serão canceladas" -#: ../src/ephy-window.c:471 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" -msgstr "Fechar a janela e cancelar os downloads" +msgstr "Fechar a janela e cancelar as transferências" -#: ../src/ephy-window.c:1148 +#: ../src/ephy-window.c:1132 msgid "Save As" -msgstr "Gravar Como" +msgstr "Gravar como" -#: ../src/ephy-window.c:1150 +#: ../src/ephy-window.c:1134 msgid "Save As Application" -msgstr "Gravar Como Aplicação" +msgstr "Gravar como aplicação" -#: ../src/ephy-window.c:1152 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Imprimir" -#: ../src/ephy-window.c:1154 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Marcador" -#: ../src/ephy-window.c:1156 +#: ../src/ephy-window.c:1140 msgid "Find" -msgstr "Procurar" +msgstr "Localizar" #. Translators: This refers to text size -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Maior" #. Translators: This refers to text size -#: ../src/ephy-window.c:1168 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Menor" -#: ../src/ephy-window.c:1196 +#: ../src/ephy-window.c:1174 msgid "Back" -msgstr "Retroceder" +msgstr "Recuar" -#: ../src/ephy-window.c:1208 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Avançar" -#: ../src/ephy-window.c:1220 +#: ../src/ephy-window.c:1198 msgid "Zoom" -msgstr "Zoom" +msgstr "Ampliação" -#: ../src/ephy-window.c:1229 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Novo _Separador" -#: ../src/ephy-window.c:1237 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" -msgstr "Ir para as páginas mais visitadas" +msgstr "Ir para as mais visitadas" + +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Procurar na Web por \"%s\"" -#: ../src/popup-commands.c:237 +#: ../src/popup-commands.c:229 msgid "Save Link As" -msgstr "Gravar o Link Como" +msgstr "Gravar ligação como" -#: ../src/popup-commands.c:243 +#: ../src/popup-commands.c:236 msgid "Save Image As" -msgstr "Gravar Imagem Como" +msgstr "Gravar imagem como" + +#: ../src/popup-commands.c:243 +msgid "Save Media As" +msgstr "Gravar multimédia como" #. Translators: the first %s is the language name, and the #. * second %s is the locale name. Example: @@ -2536,12 +2771,12 @@ msgstr[0] "Idioma do sistema (%s)" msgstr[1] "Idiomas do sistema (%s)" -#: ../src/prefs-dialog.c:922 +#: ../src/prefs-dialog.c:923 msgid "Select a Directory" -msgstr "Selecione um Diretório" +msgstr "Selecione uma pasta" #. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1017 +#: ../src/prefs-dialog.c:1018 msgid "DuckDuckGo" msgstr "DuckDuckGo" @@ -2549,84 +2784,89 @@ #. * you chose in the gschema, but with & instead of & #. * If the match is not exact, there will be a spurious, ugly #. * entry in the preferences combo, so please test this. -#: ../src/prefs-dialog.c:1022 +#: ../src/prefs-dialog.c:1024 #, c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=pt-pt&kad=pt_PT" #. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1024 +#: ../src/prefs-dialog.c:1026 msgid "Google" msgstr "Google" #. For the preferences dialog. Consider a regional variant, like google.co.uk -#: ../src/prefs-dialog.c:1026 +#: ../src/prefs-dialog.c:1029 #, c-format msgid "https://google.com/search?q=%s" msgstr "https://www.google.pt/search?q=%s&ie=UTF-8&oe=UTF-8" #. Search engine option in the preferences dialog -#: ../src/prefs-dialog.c:1028 +#: ../src/prefs-dialog.c:1031 msgid "Bing" msgstr "Bing" #. For the preferences dialog. Consider a regional variant, like uk.bing.com -#: ../src/prefs-dialog.c:1030 +#: ../src/prefs-dialog.c:1034 #, c-format -msgid "http://www.bing.com/search?q=%s" -msgstr "http://www.bing.com/search?q=%s" +msgid "https://www.bing.com/search?q=%s" +msgstr "https://www.bing.com/search?q=%s" + +#: ../src/window-commands.c:330 +msgid "Save" +msgstr "Gravar" -#: ../src/window-commands.c:709 +#: ../src/window-commands.c:710 #, c-format msgid "A web application named '%s' already exists. Do you want to replace it?" -msgstr "Já existe uma aplicação web designada '%s'. Deseja substituí-la?" +msgstr "Já existe uma aplicação web designada \"%s\". Deseja substituí-la?" -#: ../src/window-commands.c:714 +#: ../src/window-commands.c:715 msgid "Replace" msgstr "Substituir" -#: ../src/window-commands.c:718 +#: ../src/window-commands.c:719 msgid "" "An application with the same name already exists. Replacing it will " "overwrite it." -msgstr "Já existe uma aplicação com o mesmo nome. Substituí-la irá sobrepo-la." +msgstr "" +"Já existe uma aplicação com o mesmo nome. Substituí-la irá sobrescrevê-la." -#: ../src/window-commands.c:754 +#: ../src/window-commands.c:755 #, c-format msgid "The application '%s' is ready to be used" -msgstr "A aplicação '%s' está pronta a ser utilizada" +msgstr "A aplicação \"%s\" está pronta a ser utilizada" -#: ../src/window-commands.c:757 +#: ../src/window-commands.c:758 #, c-format msgid "The application '%s' could not be created" -msgstr "Incapaz de criar a aplicação '%s'" +msgstr "Impossível criar a aplicação \"%s\"" -#: ../src/window-commands.c:765 +#: ../src/window-commands.c:766 msgid "Launch" msgstr "Iniciar" #. Show dialog with icon, title. -#: ../src/window-commands.c:805 +#: ../src/window-commands.c:806 msgid "Create Web Application" -msgstr "Criar Aplicação Web" +msgstr "Criar aplicação Web" -#: ../src/window-commands.c:810 +#: ../src/window-commands.c:811 msgid "C_reate" -msgstr "C_riar" +msgstr "C_Riar" -#: ../src/window-commands.c:1473 ../src/window-commands.c:1496 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Contacte-nos em:" -#: ../src/window-commands.c:1476 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Contribuições:" -#: ../src/window-commands.c:1479 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Programadores anteriores:" -#: ../src/window-commands.c:1505 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2643,32 +2883,75 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1528 +#: ../src/window-commands.c:1533 msgid "translator-credits" -msgstr "Duarte Loreto " +msgstr "" +"Duarte Loreto \n" +"Pedro Albuquerque " -#: ../src/window-commands.c:1531 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Página do Navegador Web" -#: ../src/window-commands.c:1670 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Ativar o modo de navegação com cursor?" -#: ../src/window-commands.c:1673 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " "want to enable caret browsing?" msgstr "" -"Pressionar F7 desliga a navegação com cursor. Esta funcionalidade coloca um " -"cursor móvel nas páginas de texto, permitindo que o mova e selecione texto " -"com o seu teclado. Deseja ativar a navegação com cursor?" +"Premir F7 liga/desliga a navegação com cursor. Esta funcionalidade coloca um " +"cursor móvel nas páginas web, permitindo-lhe que se desloque com o teclado. " +"Quer ativar a navegação com cursor?" -#: ../src/window-commands.c:1676 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Ativar" +#~| msgid "Epiphany (RDF)" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Estilo da barra de ferramentas" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Estilo da barra de ferramentas. Valores permitidos são \"\" (utilizar o " +#~ "estilo predefinido do GNOME), \"both\" (texto e ícones), \"both-horiz" +#~ "\" (texto ao lado dos ícones), \"icons\" e \"text\" (só ícones ou texto)." + +#~ msgid "Size of disk cache" +#~ msgstr "Tamanho da cache de disco" + +#~ msgid "Size of disk cache, in MB." +#~ msgstr "Tamanho da cache de disco, em MB." + +#~ msgid "http://duckduckgo.com/?q=%s&t=epiphany" +#~ msgstr "" +#~ "http://duckduckgo.com/?q=%s&t=epiphany&kl=pt-pt&kad=pt_PT" + +#~ msgid "Temporary Files" +#~ msgstr "Ficheiros Temporários" + +#~ msgid "_Disk space:" +#~ msgstr "Espaço em _disco:" + +#~ msgid "MB" +#~ msgstr "MB" + +#~ msgid "St_art Animation" +#~ msgstr "Iniciar a _Animação" + +#~ msgid "St_op Animation" +#~ msgstr "_Parar a Animação" + #~ msgid "Show toolbars by default" #~ msgstr "Por omissão apresentar barra de ferramentas" @@ -2730,9 +3013,6 @@ #~ msgid "Show “%s”" #~ msgstr "Apresentar “%s”" -#~ msgid "Epiphany (RDF)" -#~ msgstr "Epiphany (RDF)" - #~ msgid "Epiphany bookmarks" #~ msgstr "Marcadores Epiphany" @@ -2772,9 +3052,6 @@ #~ msgid "Close the history window" #~ msgstr "Fechar a janela de histórico" -#~ msgid "Delete the selected history link" -#~ msgstr "Apagar o link de histórico selecionado" - #~ msgid "Select all history links or text" #~ msgstr "Selecionar todos os links de histórico ou texto" diff -Nru epiphany-browser-3.16.3/po/ru.po epiphany-browser-3.18.0/po/ru.po --- epiphany-browser-3.16.3/po/ru.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/ru.po 2015-09-21 08:20:22.000000000 +0000 @@ -14,8 +14,8 @@ "Project-Id-Version: epiphany trunk\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-11 16:39+0000\n" -"PO-Revision-Date: 2015-03-12 01:10+0300\n" +"POT-Creation-Date: 2015-09-17 03:47+0000\n" +"PO-Revision-Date: 2015-09-17 12:57+0300\n" "Last-Translator: Stas Solovey \n" "Language-Team: Русский \n" "Language: ru\n" @@ -24,7 +24,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -54,53 +54,63 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "Веб-браузер GNOME" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "Веб-браузер для GNOME" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "Веб-браузер для рабочего стола GNOME, обеспечивающий тесную интеграцию с " "рабочим столом, имеющий простой и интуитивно-понятный интерфейс, который " -"позволяет вам сосредоточиться на веб-страницах." +"позволяет вам сосредоточиться на веб-страницах. Если вы ищете простой, " +"лёгкий и красивый веб-браузер, то вы его нашли." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "Веб-браузер GNOME иногда упоминается по имени кода — Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Веб-браузер" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Веб-браузер" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Веб-браузер Epiphany" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Веб-браузер" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "веб;браузер;интернет;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Создать приватное окно" @@ -231,18 +241,23 @@ "вкладки." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Стиль панели инструментов" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Максимальное количество веб-процессов, созданных в одно время при " +"использовании модели «один-вторичный-процесс-для-каждого-представления-веб»" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Стиль панели инструментов. Разрешённые значение: «» (использовать стиль " -"GNOME), «both» (текст и значки), «both-horiz» (текст рядом со значками), " -"«icons» (значки) и «text» (текст)." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Эта опция устанавливает ограничение на количество веб-процессов, которые " +"будут использоваться в одно время для модели «один-вторичный-процесс-для-" +"каждого-представления-веб». Значение по умолчанию «0», и означает что " +"предела нет." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -551,19 +566,19 @@ msgid "Installed on:" msgstr "Установлено:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Удалить" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Наиболее посещаемый" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Удалить" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Приватный просмотр" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -574,14 +589,14 @@ "удалены после закрытия окна, сохранятся лишь файлы, загруженные на ваш " "компьютер." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Режим инкогнито скрывает вашу деятельность только от людей, использующих " "этот компьютер." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -597,17 +612,17 @@ msgid "Blank page" msgstr "Пустая страница" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Для перехода в полноэкранный режим нажмите %s" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -960,61 +975,61 @@ msgid "Find next occurrence of the search string" msgstr "Найти следующее вхождение строки поиска" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Сохранить" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "Не со_хранять" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Сохранить" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Сохранить пароль для «%s»?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Запретить" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Разрешить" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "" "Страница %s пытается получить информацию о вашем местоположении." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Страница %s пытается отобразить уведомления на рабочем столе." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Загружается «%s»…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Загружается…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Этот веб-сайт предоставил сертификат, принадлежащий другому веб-сайту." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1023,12 +1038,12 @@ "дату, установленную на вашем компьютере." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "Сертификат этого веб-сайта был выдан недоверенной организацией." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "" @@ -1036,7 +1051,7 @@ "повреждён." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1045,7 +1060,7 @@ "этот сертификат." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1054,7 +1069,7 @@ "слишком слабое шифрование." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1063,13 +1078,13 @@ "установленную на вашем компьютере." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Ресурс %s может быть поддельным." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1080,7 +1095,7 @@ "этого веб-сайта что-то не так:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1091,29 +1106,29 @@ "предоставил недоверенный сертификат." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Банки, магазины и другие публичные сайты не должны вас просить продолжать " "работу." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Не определено" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Проблема при загрузке «%s»" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Ой! Невозможно отобразить этот веб-сайт" -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:

Сайт может быть временно недоступен, или изменился адрес сайта. Также " "проверьте Интернет-соединение.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Попробовать снова" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Ой! Кажется возникла проблема." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1144,20 +1159,20 @@ "p>

Если это произойдёт ещё раз, сообщите о проблеме разработчикам " "%s.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Всё равно перезагрузить" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Проблема при отображении «%s»" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Ой!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1166,21 +1181,21 @@ "другую страницу." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Осторожно!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Всё равно загрузить" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_ОК" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1236,7 +1251,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Пароль для %s в форме в %s" @@ -1244,7 +1259,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Пароль в форме в %s" @@ -1475,7 +1490,7 @@ msgid "_View Certificate…" msgstr "_Просмотреть сертификат…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1483,7 +1498,7 @@ msgstr[1] "Осталось %d секунды" msgstr[2] "Осталось %d секунд" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1491,7 +1506,7 @@ msgstr[1] "Осталось %d минуты" msgstr[2] "Осталось %d минут" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1499,7 +1514,7 @@ msgstr[1] "Осталось %d часа" msgstr[2] "Осталось %d часов" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1507,7 +1522,7 @@ msgstr[1] "Осталось %d дня" msgstr[2] "Осталось %d дней" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1515,7 +1530,7 @@ msgstr[1] "Осталось %d недели" msgstr[2] "Осталось %d недель" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1523,29 +1538,29 @@ msgstr[1] "Осталось %d месяца" msgstr[2] "Осталось %d месяцев" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Завершено" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Ошибка загрузки: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Отменить" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Открыть" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Открыть папку" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Запуск…" @@ -1553,20 +1568,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "О_чистить" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Отменить" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Повторить" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Перетащите этот значок, чтобы создать ссылку на эту страницу" @@ -1589,23 +1604,23 @@ msgid "“%s” Properties" msgstr "Свойства «%s»" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Заголовок:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Адрес:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Те_мы:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Показывать все _темы" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1701,7 +1716,7 @@ msgstr "Создать новую тему" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Открыть в _новом окне" @@ -1713,7 +1728,7 @@ msgstr "Открыть выбранную закладку в новом окне" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Открыть в новой _вкладке" @@ -1774,7 +1789,7 @@ msgstr "Вырезать выделенное" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Копировать" @@ -1835,7 +1850,7 @@ msgstr "Показывать столбец заголовка" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Адрес" @@ -1932,7 +1947,7 @@ msgstr "Экспортировать закладки" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Закладки" @@ -1958,15 +1973,15 @@ msgid "File" msgstr "Файл" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Копировать адрес" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Темы" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Заголовок" @@ -2028,8 +2043,7 @@ "Это действие нельзя отменить. Данные, которые вы выберете, будут удалены " "навсегда." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Cookie" @@ -2361,11 +2375,11 @@ msgid "Other encodings" msgstr "Другие кодировки" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Очистить журнал посещений?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2440,11 +2454,11 @@ "Запуск завершился неудачно из-за следующей ошибки:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Параметры веб-браузера" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Закрыть вкладку" @@ -2581,142 +2595,153 @@ msgstr "Открыть ссылку в новой _вкладке" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Открыть ссылку в _новом приватном окне" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Сохранить сс_ылку как…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Копировать адрес ссылки" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Копировать адрес e-mail" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "_Открыть изображение в новой вкладке" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "_Копировать адрес изображения" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Сохранить _изображение как…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Использовать как _фон рабочего стола" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Открыть видео в _новом окне" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Открыть видео в новой _вкладке" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Сохранить видео как…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Копировать адрес видео" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Открыть аудио в _новом окне" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Открыть аудио в новой _вкладке" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Сохранить аудио как…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Копировать адрес аудио" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "В элементах формы есть непереданные изменения" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Если документ будет закрыт, информация будет потеряна." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Закрыть документ" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "В этом окне есть незавершённые загрузки" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Если вы закроете это окно, загрузки будут отменены" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Закрыть окно и отменить загрузки" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Сохранить как" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Сохранить как приложение" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Печать" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Закладка" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Найти" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Увеличить" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Уменьшить" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Назад" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Вперёд" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Масштаб" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Создать _вкладку" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Открыть наиболее посещаемый сайт" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Поиск «%s» в Интернете" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Сохранить ссылку как" @@ -2840,19 +2865,19 @@ msgid "C_reate" msgstr "С_оздать" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Свяжитесь с нами:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Помощники:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Предыдущие разработчики:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2869,22 +2894,22 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Yuri Kozlov , 2010.\n" "Yuri Myasoedov , 2012, 2013, 2014.\n" "Stas Solovey , 2011, 2013, 2015." -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Веб-сайт браузера" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Включить режим клавишной навигации?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2894,6 +2919,21 @@ "помещает на страницу курсор, позволяющий перемещаться по странице с помощью " "клавиатуры. Включить клавишную навигацию?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Включить" + +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Стиль панели инструментов" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Стиль панели инструментов. Разрешённые значение: «» (использовать стиль " +#~ "GNOME), «both» (текст и значки), «both-horiz» (текст рядом со значками), " +#~ "«icons» (значки) и «text» (текст)." diff -Nru epiphany-browser-3.16.3/po/sk.po epiphany-browser-3.18.0/po/sk.po --- epiphany-browser-3.16.3/po/sk.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/sk.po 2015-09-08 11:37:53.000000000 +0000 @@ -2,22 +2,23 @@ # Copyright (C) 2003-2005, 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the epiphany package. # Marcel Telka , 2003, 2004, 2005. -# Dušan Kazik , 2012. +# Dušan Kazik , 2012, 2015. # msgid "" msgstr "" "Project-Id-Version: epiphany\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-04 04:39+0000\n" -"PO-Revision-Date: 2015-03-04 11:59+0100\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=epiphany&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-08-24 03:45+0000\n" +"PO-Revision-Date: 2015-08-24 17:53+0200\n" "Last-Translator: Dušan Kazik \n" -"Language-Team: Slovak \n" +"Language-Team: slovenčina <>\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural= (n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Generator: Poedit 1.7.4\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -47,14 +48,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 ../src/ephy-search-provider.c:289 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 +#: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=sk-sk&kad=sk_SK" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "Web prostredia GNOME" # desktop entry gnenericname #: ../data/epiphany.appdata.xml.in.h:2 @@ -62,37 +64,54 @@ msgstr "Webový prehliadač prostredia GNOME" #: ../data/epiphany.appdata.xml.in.h:3 -msgid "The web browser for GNOME, featuring tight integration with the desktop and a simple and intuitive user interface that allows you to focus on your web pages." +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." +msgid "" +"The web browser for GNOME, featuring tight integration with the desktop and " +"a simple and intuitive user interface that allows you to focus on your web " +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." +msgstr "" +"Webový prehliadač prostredia GNOME, ktorý je veľmi úzko prepojený s " +"prostredím a má jednoduché a intuitívne používateľské rozhranie, ktoré vám " +"umožní sústrediť sa na webové stránky. Ak hľadáte jednoduché, čisté a pekné " +"zobrazenie webu, toto je prehliadač pre vás." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." msgstr "" -"Webový prehliadač prostredia GNOME, ktorý je veľmi úzko prepojený s prostredím a má jednoduché a intuitívne používateľské rozhranie, ktoré vám umožní sústrediť sa na webové stránky." +"Web prostredia GNOME je často označovaný svojím kódovým názvom, Epiphany." # https://bugzilla.gnome.org/show_bug.cgi?id=687595 # desktop entry name -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 ../src/ephy-main.c:314 ../src/ephy-main.c:470 -#: ../src/window-commands.c:1519 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" # desktop entry gnenericname -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Webový prehliadač" # desktop entry X-FullName -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany - webový prehliadač" # desktop entry comment -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Prehliada web" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;prehliadač;internet;prehľadávanie;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nové okno v režime inkognito" @@ -130,8 +149,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:14 -msgid "String that will be used as user agent, to identify the browser to the web servers." -msgstr "Reťazec, ktorý bude použitý ako agent používateľa, kvôli rozpoznaniu prehliadača webovými servermi." +msgid "" +"String that will be used as user agent, to identify the browser to the web " +"servers." +msgstr "" +"Reťazec, ktorý bude použitý ako agent používateľa, kvôli rozpoznaniu " +"prehliadača webovými servermi." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:15 @@ -141,8 +164,12 @@ # DK: momentalny preklad default priecinka je "Stiahnuté".prepise sa na "Prebraté" po zjednotení prekladu slova "download" # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:16 -msgid "When files cannot be opened by the browser they are automatically downloaded to the download folder and opened with the appropriate application." -msgstr "Keď súbory nemôžu byť otvorené pomocou prehliadača, sú automaticky prevzaté do priečinka „Stiahnuté“ a otvorené pomocou príslušnej aplikácie." +msgid "" +"When files cannot be opened by the browser they are automatically downloaded " +"to the download folder and opened with the appropriate application." +msgstr "" +"Keď súbory nemôžu byť otvorené pomocou prehliadača, sú automaticky prevzaté " +"do priečinka „Stiahnuté“ a otvorené pomocou príslušnej aplikácie." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:17 @@ -151,7 +178,8 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:18 -msgid "Force new window requests to be opened in tabs instead of using a new window." +msgid "" +"Force new window requests to be opened in tabs instead of using a new window." msgstr "Vynúti otvorenie stránok na kartách namiesto otvorenia v novom okne." # gsettings summary @@ -162,7 +190,8 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:20 msgid "Whether to store and prefill passwords in websites." -msgstr "Určuje, či sa majú ukladať a následne predpĺňať heslá vo webových stránkach." +msgstr "" +"Určuje, či sa majú ukladať a následne predpĺňať heslá vo webových stránkach." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:21 @@ -187,21 +216,33 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:25 msgid "" -"Defines how the session will be restored during startup. Allowed values are 'always' (the previous state of the application is always restored), 'crashed' (the session is only restored " -"if the application crashes) and 'never' (the homepage is always shown)." +"Defines how the session will be restored during startup. Allowed values are " +"'always' (the previous state of the application is always restored), " +"'crashed' (the session is only restored if the application crashes) and " +"'never' (the homepage is always shown)." msgstr "" -"Určuje, ako bude po spustení obnovená relácia. Povolenými hodnotami sú „always“ (predošlý stav aplikácie bude vždy obnovený), „crashed“ (relácia bude obnovená iba po páde aplikácie) a " -"„never“ (vždy bude zobrazená domovská stránka)." +"Určuje, ako bude po spustení obnovená relácia. Povolenými hodnotami sú " +"„always“ (predošlý stav aplikácie bude vždy obnovený), „crashed“ (relácia " +"bude obnovená iba po páde aplikácie) a „never“ (vždy bude zobrazená domovská " +"stránka)." # summary #: ../data/org.gnome.epiphany.gschema.xml.h:26 -msgid "Whether to delay loading of tabs that are not immediately visible on session restore" -msgstr "Určiť, či sa má odložiť načítanie kariet, ktoré nie sú okamžite viditeľné pri obnovení relácie" +msgid "" +"Whether to delay loading of tabs that are not immediately visible on session " +"restore" +msgstr "" +"Určiť, či sa má odložiť načítanie kariet, ktoré nie sú okamžite viditeľné " +"pri obnovení relácie" # description #: ../data/org.gnome.epiphany.gschema.xml.h:27 -msgid "When this option is set to true, tabs will not start loading until the user switches to them, upon session restore." -msgstr "Keď je táto voľba nastavená na hodnotu true, po obnovení relácie nebude spustené načítanie kariet, až pokiaľ používateľ na ne neprepne." +msgid "" +"When this option is set to true, tabs will not start loading until the user " +"switches to them, upon session restore." +msgstr "" +"Keď je táto voľba nastavená na hodnotu true, po obnovení relácie nebude " +"spustené načítanie kariet, až pokiaľ používateľ na ne neprepne." #: ../data/org.gnome.epiphany.gschema.xml.h:28 msgid "Process model" @@ -211,21 +252,33 @@ # PV: „“ #: ../data/org.gnome.epiphany.gschema.xml.h:29 msgid "" -"This option allows to set the process model used. Use 'shared-secondary-process' to use a single web process shared by all the tabs and 'one-secondary-process-per-web-view' to use a " -"different web process for each tab." +"This option allows to set the process model used. Use 'shared-secondary-" +"process' to use a single web process shared by all the tabs and 'one-" +"secondary-process-per-web-view' to use a different web process for each tab." msgstr "" -"Táto voľba umožní nastaviť použitý model procesov. Použite „shared-secondary-process“ ak chcete použiť spoločný proces pre všetky karty a „one-secondary-process-per-web-view“ ak chcete " -"pre každú kartu použiť samostatný proces." +"Táto voľba umožní nastaviť použitý model procesov. Použite „shared-secondary-" +"process“ ak chcete použiť spoločný proces pre všetky karty a „one-secondary-" +"process-per-web-view“ ak chcete pre každú kartu použiť samostatný proces." -# gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Štýl panela nástrojov" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maximálny počet webových procesov vytvorených v rovnakom čase použitím " +"modelu „one-secondary-process-per-web-view“(jeden druhoradý proces na jedno " +"zobrazenie webu)" -# gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:31 -msgid "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and \"text\"." -msgstr "Štýl panela nástrojov. Povolené hodnoty sú „“ (použiť predvolený štýl GNOME), „both“ (text a ikony), „both-horiz“ (text vedľa ikon), „icons“ (ikony), a „text“." +msgid "" +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Táto voľba nastavuje obmedzenie počtu webových procesov, ktoré budú použité " +"v rovnakom čase pre model „one-secondary-process-per-web-view“(jeden " +"druhoradý proces na jedno zobrazenie webu). Predvolená hodnota je „0“ a " +"znamená bez obmedzenia." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:32 @@ -234,8 +287,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:33 -msgid "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' instead." -msgstr "[Zastaralé] Toto nastavenie nie je povolené, namiesto toho použite nastavenie „tabs-bar-visibility-policy“." +msgid "" +"[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " +"instead." +msgstr "" +"[Zastaralé] Toto nastavenie nie je povolené, namiesto toho použite " +"nastavenie „tabs-bar-visibility-policy“." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:34 @@ -244,8 +301,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:35 -msgid "Hide or show the downloads window. When hidden, a notification will be shown when new downloads are started." -msgstr "Skryje alebo zobrazí okno s preberanými súbormi. Pri skrytom okne sa po spustení nového preberania zobrazí upozornenie." +msgid "" +"Hide or show the downloads window. When hidden, a notification will be shown " +"when new downloads are started." +msgstr "" +"Skryje alebo zobrazí okno s preberanými súbormi. Pri skrytom okne sa po " +"spustení nového preberania zobrazí upozornenie." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:36 @@ -255,11 +316,14 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:37 msgid "" -"Controls when the tabs bar is shown. Possible values are 'always' (the tabs bar is always shown), 'more-than-one' (the tabs bar is only shown if there's two or more tabs) and " -"'never' (the tabs bar is never shown)." +"Controls when the tabs bar is shown. Possible values are 'always' (the tabs " +"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " +"two or more tabs) and 'never' (the tabs bar is never shown)." msgstr "" -"Ovláda zobrazenie panelu kariet. Možné hodnoty sú „always“ (panel kariet bude vždy zobrazený), „more-than-one“ (panel kariet bude zobrazený iba ak je otvorená viac ako jedna karta) a " -"„never“ (panel kariet nebude nikdy zobrazený)." +"Ovláda zobrazenie panelu kariet. Možné hodnoty sú „always“ (panel kariet " +"bude vždy zobrazený), „more-than-one“ (panel kariet bude zobrazený iba ak je " +"otvorená viac ako jedna karta) a „never“ (panel kariet nebude nikdy " +"zobrazený)." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:38 @@ -283,8 +347,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:42 -msgid "A value to be used to override sans-serif desktop font when use-gnome-fonts is set." -msgstr "Hodnota, ktorá sa má použiť na preváženie nastavenia písma prostredia typu sans-serif pri použití nastavenia „use-gnome-fonts“." +msgid "" +"A value to be used to override sans-serif desktop font when use-gnome-fonts " +"is set." +msgstr "" +"Hodnota, ktorá sa má použiť na preváženie nastavenia písma prostredia typu " +"sans-serif pri použití nastavenia „use-gnome-fonts“." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:43 @@ -293,8 +361,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:44 -msgid "A value to be used to override serif desktop font when use-gnome-fonts is set." -msgstr "Hodnota, ktorá sa má použiť na preváženie nastavenia písma prostredia typu serif pri použití nastavenia „use-gnome-fonts“." +msgid "" +"A value to be used to override serif desktop font when use-gnome-fonts is " +"set." +msgstr "" +"Hodnota, ktorá sa má použiť na preváženie nastavenia písma prostredia typu " +"serif pri použití nastavenia „use-gnome-fonts“." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:45 @@ -303,8 +375,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:46 -msgid "A value to be used to override monospace desktop font when use-gnome-fonts is set." -msgstr "Hodnota, ktorá sa má použiť na preváženie nastavenia písma prostredia typu monospace pri použití nastavenia „use-gnome-fonts“." +msgid "" +"A value to be used to override monospace desktop font when use-gnome-fonts " +"is set." +msgstr "" +"Hodnota, ktorá sa má použiť na preváženie nastavenia písma prostredia typu " +"monospace pri použití nastavenia „use-gnome-fonts“." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:47 @@ -334,7 +410,8 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:52 msgid "Use a custom CSS file to modify websites own CSS." -msgstr "Použiť vlastný súbor štýlov CSS na úpravu pôvodných štýlov webovej stránky." +msgstr "" +"Použiť vlastný súbor štýlov CSS na úpravu pôvodných štýlov webovej stránky." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:53 @@ -353,11 +430,14 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:56 -msgid "Default encoding. Accepted values are the ones WebKitGTK+ can understand." -msgstr "Predvolené kódovanie. Prijateľné hodnoty sú tie, ktoré rozpozná WebKitGTK+." +msgid "" +"Default encoding. Accepted values are the ones WebKitGTK+ can understand." +msgstr "" +"Predvolené kódovanie. Prijateľné hodnoty sú tie, ktoré rozpozná WebKitGTK+." # gsettings summary -#: ../data/org.gnome.epiphany.gschema.xml.h:57 ../src/resources/prefs-dialog.ui.h:39 +#: ../data/org.gnome.epiphany.gschema.xml.h:57 +#: ../src/resources/prefs-dialog.ui.h:39 msgid "Languages" msgstr "Jazyky" @@ -373,8 +453,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:60 -msgid "Where to accept cookies from. Possible values are \"always\", \"no-third-party\" and \"never\"." -msgstr "Odkiaľ prijímať cookies. Možné hodnoty sú „always“ (vždy), „no-third-party“ (nikto ďalší) a „never“ (nikdy)." +msgid "" +"Where to accept cookies from. Possible values are \"always\", \"no-third-" +"party\" and \"never\"." +msgstr "" +"Odkiaľ prijímať cookies. Možné hodnoty sú „always“ (vždy), „no-third-" +"party“ (nikto ďalší) a „never“ (nikdy)." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:61 @@ -383,8 +467,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:62 -msgid "How to present animated images. Possible values are \"normal\", \"once\" and \"disabled\"." -msgstr "Určuje, ako budú zobrazované animované obrázky. Voľby sú „normal“ (normálne), „once“ (iba raz) a „disabled“ (zakázané)." +msgid "" +"How to present animated images. Possible values are \"normal\", \"once\" and " +"\"disabled\"." +msgstr "" +"Určuje, ako budú zobrazované animované obrázky. Voľby sú " +"„normal“ (normálne), „once“ (iba raz) a „disabled“ (zakázané)." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:63 @@ -393,8 +481,11 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:64 -msgid "Allow sites to open new windows using JavaScript (if JavaScript is enabled)." -msgstr "Povoliť stránkam otvárať nové okná pomocou JavaScriptu (ak je JavaScript povolený)." +msgid "" +"Allow sites to open new windows using JavaScript (if JavaScript is enabled)." +msgstr "" +"Povoliť stránkam otvárať nové okná pomocou JavaScriptu (ak je JavaScript " +"povolený)." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:65 @@ -433,8 +524,12 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:72 -msgid "Whether to tell websites that we do not wish to be tracked. Please note that web pages are not forced to follow this setting." -msgstr "Určuje, či sa má webovým stránkam oznámiť, že si neželáte byť sledovaný. Nezabudnite, že webové stránky nemusia toto nastavenie vziať do úvahy." +msgid "" +"Whether to tell websites that we do not wish to be tracked. Please note that " +"web pages are not forced to follow this setting." +msgstr "" +"Určuje, či sa má webovým stránkam oznámiť, že si neželáte byť sledovaný. " +"Nezabudnite, že webové stránky nemusia toto nastavenie vziať do úvahy." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:73 @@ -443,7 +538,9 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:74 -msgid "Whether to block the embedded advertisements that web pages might want to show." +msgid "" +"Whether to block the embedded advertisements that web pages might want to " +"show." msgstr "Určuje, či sa majú zablokovať reklamy zobrazované webovými stránkami." # gsettings summary @@ -453,10 +550,13 @@ # gsettings description #: ../data/org.gnome.epiphany.gschema.xml.h:76 -msgid "The path of the folder where to download files to; or \"Downloads\" to use the default downloads folder, or \"Desktop\" to use the desktop folder." +msgid "" +"The path of the folder where to download files to; or \"Downloads\" to use " +"the default downloads folder, or \"Desktop\" to use the desktop folder." msgstr "" -"Cesta k priečinku, kam budú uložené prebraté súbory; alebo „Downloads“ (Stiahnuté) pre použitie štandardného priečinku preberaní, alebo „Desktop“ (Pracovná plocha) pre použitie " -"priečinka pracovnej plochy." +"Cesta k priečinku, kam budú uložené prebraté súbory; alebo " +"„Downloads“ (Stiahnuté) pre použitie štandardného priečinku preberaní, alebo " +"„Desktop“ (Pracovná plocha) pre použitie priečinka pracovnej plochy." # gsettings summary #: ../data/org.gnome.epiphany.gschema.xml.h:77 @@ -544,37 +644,46 @@ msgid "Installed on:" msgstr "Dátum inštalácie:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Odstrániť z prehľadu" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Najčastejšie navštevované" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Odstrániť z prehľadu" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Súkromné prehliadanie" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" -"You are currently browsing incognito. Pages viewed in this mode will not show up in your browsing history and all stored information will be cleared when you close the window. " -"Files you download will be kept." +"You are currently browsing incognito. Pages viewed in this mode " +"will not show up in your browsing history and all stored information will be " +"cleared when you close the window. Files you download will be kept." msgstr "" -"Momentálne prehliadate v režime inkognito. Stránky prezerané v tomto režime nebudú zobrazené vo vašej histórii prehliadaných stránok a všetky uložené informácie budú zmazané po " -"zavretí okna. Súbory, ktoré prevezmete, budú zachované." +"Momentálne prehliadate v režime inkognito. Stránky prezerané v " +"tomto režime nebudú zobrazené vo vašej histórii prehliadaných stránok a " +"všetky uložené informácie budú zmazané po zavretí okna. Súbory, ktoré " +"prevezmete, budú zachované." -#: ../embed/ephy-about-handler.c:555 -msgid "Incognito mode hides your activity only from people using this computer." -msgstr "Režim inkognito skryje vašu aktivitu iba pred ľuďmi, ktorí používajú tento počítač." +#: ../embed/ephy-about-handler.c:579 +msgid "" +"Incognito mode hides your activity only from people using this computer." +msgstr "" +"Režim inkognito skryje vašu aktivitu iba pred ľuďmi, ktorí používajú tento " +"počítač." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" -"It will not hide your activity from your employer if you are at work. Your internet service provider, your government, other governments, the websites that you visit, and advertisers on " -"these websites may still be tracking you." +"It will not hide your activity from your employer if you are at work. Your " +"internet service provider, your government, other governments, the websites " +"that you visit, and advertisers on these websites may still be tracking you." msgstr "" -"Neskryje vašu aktivitu pred zamestnávateľom, ak ste v práci. Váš poskytovateľ pripojenia na internet, vaše vládne organizácie, cudzie vládne organizácie, webové stránky, ktoré " -"navštívite a poskytovatelia reklám na týchto stránkach vás môžu naďalej sledovať." +"Neskryje vašu aktivitu pred zamestnávateľom, ak ste v práci. Váš " +"poskytovateľ pripojenia na internet, vaše vládne organizácie, cudzie vládne " +"organizácie, webové stránky, ktoré navštívite a poskytovatelia reklám na " +"týchto stránkach vás môžu naďalej sledovať." #. characters #: ../embed/ephy-embed.c:51 @@ -949,36 +1058,36 @@ msgid "Find next occurrence of the search string" msgstr "Nájde ďalší výskyt hľadaného reťazca" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Uložiť" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Neukladať" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Uložiť" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Chcete uložiť heslo pre stránku „%s“?" # button -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Odmietnuť" # button -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Povoliť" # PM: myslí sa GPS - takto to bude zrozumiteľnejšie # %s adresa #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Stránka %s chce poznať vašu polohu." @@ -986,162 +1095,209 @@ # PM: myslí sa GPS - takto to bude zrozumiteľnejšie # %s adresa #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Stránka %s chce zobraziť oznámenia v pracovnom prostredí." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Načítava sa „%s“…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Načítava sa…" # DK: zjednotil by som preklad "identification" na "identifikácia". aj ked sa spomina certifikat. # PV: Akceptujem, ja som však zvyknutý radšej hovoriť o certifikáte ako o identifikácii #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 -msgid "This website presented identification that belongs to a different website." -msgstr "Táto webová stránka predložila identifikáciu určenú pre inú webovú stránku." +#: ../embed/ephy-web-view.c:1763 +msgid "" +"This website presented identification that belongs to a different website." +msgstr "" +"Táto webová stránka predložila identifikáciu určenú pre inú webovú stránku." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 -msgid "This website’s identification is too old to trust. Check the date on your computer’s calendar." -msgstr "Identifikácia tejto webovej stránky nie je dostatočne dôveryhodná, pretože je zastaralá. Skontrolujte nastavenie dátumu na vašom počítači." +#: ../embed/ephy-web-view.c:1768 +msgid "" +"This website’s identification is too old to trust. Check the date on your " +"computer’s calendar." +msgstr "" +"Identifikácia tejto webovej stránky nie je dostatočne dôveryhodná, pretože " +"je zastaralá. Skontrolujte nastavenie dátumu na vašom počítači." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." -msgstr "Identifikácia tejto webovej stránky nebola vydaná dôveryhodnou organizáciou." +msgstr "" +"Identifikácia tejto webovej stránky nebola vydaná dôveryhodnou organizáciou." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 -msgid "This website’s identification could not be processed. It may be corrupted." -msgstr "Nie je možné získať identifikáciu tejto webovej stránky. Môže byť poškodená." +#: ../embed/ephy-web-view.c:1778 +msgid "" +"This website’s identification could not be processed. It may be corrupted." +msgstr "" +"Nie je možné získať identifikáciu tejto webovej stránky. Môže byť poškodená." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 -msgid "This website’s identification has been revoked by the trusted organization that issued it." -msgstr "Identifikácia tejto webovej stránky bola odmietnutá dôveryhodnou organizáciou, ktorá ju vydala." +#: ../embed/ephy-web-view.c:1783 +msgid "" +"This website’s identification has been revoked by the trusted organization " +"that issued it." +msgstr "" +"Identifikácia tejto webovej stránky bola odmietnutá dôveryhodnou " +"organizáciou, ktorá ju vydala." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 -msgid "This website’s identification cannot be trusted because it uses very weak encryption." -msgstr "Identifikácia tejto webovej stránky nie je dostatočne dôveryhodná, pretože je zakódovaná slabou šifrou." +#: ../embed/ephy-web-view.c:1788 +msgid "" +"This website’s identification cannot be trusted because it uses very weak " +"encryption." +msgstr "" +"Identifikácia tejto webovej stránky nie je dostatočne dôveryhodná, pretože " +"je zakódovaná slabou šifrou." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 -msgid "This website’s identification is only valid for future dates. Check the date on your computer’s calendar." -msgstr "Identifikácia tejto webovej stránky ešte nevstúpila do platnosti. Prosím, skontrolujte nastavenie dátumu na vašom počítači." +#: ../embed/ephy-web-view.c:1793 +msgid "" +"This website’s identification is only valid for future dates. Check the date " +"on your computer’s calendar." +msgstr "" +"Identifikácia tejto webovej stránky ešte nevstúpila do platnosti. Prosím, " +"skontrolujte nastavenie dátumu na vašom počítači." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Toto pravdepodobne nie je skutočná stránka %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" -"When you try to connect securely, websites present identification to prove that your connection has not been maliciously intercepted. There is something wrong with this website’s " -"identification:" +"When you try to connect securely, websites present identification to prove " +"that your connection has not been maliciously intercepted. There is " +"something wrong with this website’s identification:" msgstr "" -"Keď používate zabezpečené spojenie, webové stránky poskytujú identifikáciu, podľa ktorej je možné overiť, či spojenie nie je odpočúvané. Identifikácia tejto webovej stránky nie je v " -"poriadku:" +"Keď používate zabezpečené spojenie, webové stránky poskytujú identifikáciu, " +"podľa ktorej je možné overiť, či spojenie nie je odpočúvané. Identifikácia " +"tejto webovej stránky nie je v poriadku:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 -msgid "A third party may have hijacked your connection. You should continue only if you know there is a good reason why this website does not use trusted identification." +#: ../embed/ephy-web-view.c:1840 +msgid "" +"A third party may have hijacked your connection. You should continue only if " +"you know there is a good reason why this website does not use trusted " +"identification." msgstr "" -"Kontrolu nad vaším spojením pravdepodobne môže získať niekto ďalší. Mali by ste pokračovať len v prípade, že dokážete vysvetliť, prečo sa táto webová stránka preukázala nedôveryhodnou " -"identifikáciou.." +"Kontrolu nad vaším spojením pravdepodobne môže získať niekto ďalší. Mali by " +"ste pokračovať len v prípade, že dokážete vysvetliť, prečo sa táto webová " +"stránka preukázala nedôveryhodnou identifikáciou.." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 -msgid "Legitimate banks, stores, and other public sites will not ask you to do this." -msgstr "Legálne inštitúcie ako banky, internetové obchody a ďalšie stránky verejných služieb niečo takéto nebudú vyžadovať." +#: ../embed/ephy-web-view.c:1844 +msgid "" +"Legitimate banks, stores, and other public sites will not ask you to do this." +msgstr "" +"Legálne inštitúcie ako banky, internetové obchody a ďalšie stránky verejných " +"služieb niečo takéto nebudú vyžadovať." # chyba -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Žiadna konkrétna" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problém pri načítaní stránky „%s“" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Ale nie! Nie je možné zobraziť túto webovú stránku" -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" -"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily unavailable or moved to a new address. You may wish to verify that " -"your internet connection is working correctly.

" +"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily unavailable or moved to a " +"new address. You may wish to verify that your internet connection is working " +"correctly.

" msgstr "" -"

Zdá sa, že webová stránka na adrese „%s“ nie je dostupná. Presný popis chyby je:

%s

Webová stránka môže byť dočasne nedostupná alebo môže byť premiestnená na " -"novú adresu. Nezabudnite tiež skontrolovať, či vaše internetové pripojenie funguje správne.

" +"

Zdá sa, že webová stránka na adrese „%s“ nie je dostupná. Presný popis " +"chyby je:

%s

Webová stránka môže byť dočasne " +"nedostupná alebo môže byť premiestnená na novú adresu. Nezabudnite tiež " +"skontrolovať, či vaše internetové pripojenie funguje správne.

" # button -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Skúsiť znovu" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Ale nie. Vyskytol sa problém." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format -msgid "

This site may have caused Web to close unexpectedly.

If this happens again, please report the problem to the %s developers.

" +msgid "" +"

This site may have caused Web to close unexpectedly.

If this " +"happens again, please report the problem to the %s " +"developers.

" msgstr "" -"

Načítanie tejto stránky pravdepodobne spôsobilo neočakávané zavretie programu Web..

Ak sa pokúsite načítať stránku znova, môže sa to zopakovať. Ak sa tak stane, nahláste " -"problém vývojárom aplikácie %s.

" +"

Načítanie tejto stránky pravdepodobne spôsobilo neočakávané zavretie " +"programu Web..

Ak sa pokúsite načítať stránku znova, môže sa to " +"zopakovať. Ak sa tak stane, nahláste problém vývojárom aplikácie %s.

" # button -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Napriek tomu načítať znovu" # DK: dal by som Problém pri zobrazovaní stránky -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problém pri zobrazovaní „%s“" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Ale nie!" -#: ../embed/ephy-web-view.c:1907 -msgid "Something went wrong while displaying this page. Please reload or visit a different page to continue." -msgstr "Počas zobrazovania tejto stránky nastala chyba. Prosím, načítajte ju znovu, alebo pokračujte návštevou inej stránky." +#: ../embed/ephy-web-view.c:1927 +msgid "" +"Something went wrong while displaying this page. Please reload or visit a " +"different page to continue." +msgstr "" +"Počas zobrazovania tejto stránky nastala chyba. Prosím, načítajte ju znovu, " +"alebo pokračujte návštevou inej stránky." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Pozor!" # button #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Napriek tomu načítať" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" # menu item -#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 ../src/bookmarks/ephy-bookmark-properties.c:432 ../src/bookmarks/ephy-bookmarks-editor.c:819 -#: ../src/resources/clear-data-dialog.ui.h:3 ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 +#: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmarks-editor.c:819 +#: ../src/resources/clear-data-dialog.ui.h:3 +#: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 msgid "_Cancel" msgstr "_Zrušiť" @@ -1195,7 +1351,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Heslo pre používateľa %s vo formulári na adrese %s" @@ -1203,7 +1359,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Heslo vo formulári na adrese %s" @@ -1227,7 +1383,9 @@ msgstr "Nedá sa prepísať existujúci súbor „%s“" #: ../lib/ephy-gui.c:246 -msgid "A file with this name already exists and you don't have permission to overwrite it." +msgid "" +"A file with this name already exists and you don't have permission to " +"overwrite it." msgstr "Súbor s týmto názvom už existuje a nemáte práva na jeho prepísanie." #: ../lib/ephy-gui.c:249 @@ -1244,16 +1402,24 @@ msgstr "Je vyžadované hlavné heslo" #: ../lib/ephy-nss-glue.c:64 -msgid "The passwords from the previous version are locked with a master password. If you want to import them, please enter your master password below." -msgstr "Heslá z predošlej verzie sú uzamknuté hlavným heslom. Ak si ich želáte importovať, prosím, zadajte vaše hlavné heslo nižšie. " +msgid "" +"The passwords from the previous version are locked with a master password. " +"If you want to import them, please enter your master password below." +msgstr "" +"Heslá z predošlej verzie sú uzamknuté hlavným heslom. Ak si ich želáte " +"importovať, prosím, zadajte vaše hlavné heslo nižšie. " #: ../lib/ephy-profile-migrator.c:100 msgid "Failed to copy cookies file from Mozilla." msgstr "Zlyhalo kopírovanie súboru cookies z aplikácie Mozilla." #: ../lib/ephy-profile-migrator.c:652 -msgid "Web 3.6 deprecated this directory and tried migrating this configuration to ~/.config/epiphany" -msgstr "Aplikácia Web 3.6 označila tento adresár ako zastaralý a pokúsila sa migrovať nastavenia do adresára ~/.config/epiphany" +msgid "" +"Web 3.6 deprecated this directory and tried migrating this configuration to " +"~/.config/epiphany" +msgstr "" +"Aplikácia Web 3.6 označila tento adresár ako zastaralý a pokúsila sa " +"migrovať nastavenia do adresára ~/.config/epiphany" # cmd desc #: ../lib/ephy-profile-migrator.c:1030 @@ -1408,8 +1574,12 @@ #. Label in certificate popover when site is untrusted. %s is a URL. #: ../lib/widgets/ephy-certificate-popover.c:113 #, c-format -msgid "This web site’s digital identification is not trusted. You may have connected to an attacker pretending to be %s." -msgstr "Digitálna identifikácia tejto webovej stránky nie je dôveryhodná. Možno ste sa pripojili k serveru útočníka vydávajúceho sa za stránku %s." +msgid "" +"This web site’s digital identification is not trusted. You may have " +"connected to an attacker pretending to be %s." +msgstr "" +"Digitálna identifikácia tejto webovej stránky nie je dôveryhodná. Možno ste " +"sa pripojili k serveru útočníka vydávajúceho sa za stránku %s." #. Label in certificate popover when site sends mixed content. #: ../lib/widgets/ephy-certificate-popover.c:124 @@ -1425,7 +1595,7 @@ msgid "_View Certificate…" msgstr "_Zobraziť certifikát…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" @@ -1434,7 +1604,7 @@ msgstr[2] "zostávajú %d sekundy" # https://bugzilla.gnome.org/show_bug.cgi?id=687592 -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" @@ -1442,7 +1612,7 @@ msgstr[1] "zostáva %d minúta" msgstr[2] "zostávajú %d minúty" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" @@ -1450,7 +1620,7 @@ msgstr[1] "zostáva %d hodina" msgstr[2] "zostávajú %d hodiny" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" @@ -1458,7 +1628,7 @@ msgstr[1] "zostáva %d deň" msgstr[2] "zostávajú %d dni" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" @@ -1466,7 +1636,7 @@ msgstr[1] "zostáva %d týždeň" msgstr[2] "zostávajú %d týždne" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" @@ -1474,31 +1644,32 @@ msgstr[1] "zostáva %d mesiac" msgstr[2] "zostávajú %d mesiace" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Dokončené" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Chyba počas preberania súboru: %s" # menu item -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Zrušiť" # menu item -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1120 ../src/window-commands.c:275 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 +#: ../src/window-commands.c:275 msgid "Open" msgstr "Otvoriť" # menu item -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Zobraziť v priečinku" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Spúšťa sa…" @@ -1506,20 +1677,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "V_ymazať" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Vrátiť" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Zopakovať" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Pretiahnutím tejto ikony vytvoríte odkaz na túto stránku" @@ -1544,23 +1715,25 @@ msgstr "Vlastnosti záložky „%s“" # PM: ide o názov záložky -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Názov:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "A_dresa:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Té_my:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Zobraz_iť všetky témy" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 ../src/resources/prefs-dialog.ui.h:40 ../src/resources/prefs-lang-dialog.ui.h:3 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 +#: ../src/resources/prefs-dialog.ui.h:40 +#: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" msgstr "_Pridať" @@ -1608,7 +1781,8 @@ msgid "Nearby Sites" msgstr "Stránky z okolia" -#: ../src/bookmarks/ephy-bookmarks.c:1150 ../src/bookmarks/ephy-bookmarks-import.c:270 +#: ../src/bookmarks/ephy-bookmarks.c:1150 +#: ../src/bookmarks/ephy-bookmarks-import.c:270 msgid "Untitled" msgstr "Bez názvu" @@ -1638,7 +1812,8 @@ msgstr "_Zobraziť" #. Help. -#: ../src/bookmarks/ephy-bookmarks-editor.c:154 ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 +#: ../src/bookmarks/ephy-bookmarks-editor.c:154 +#: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 msgid "_Help" msgstr "_Pomocník" @@ -1652,7 +1827,8 @@ msgid "Create a new topic" msgstr "Vytvorí novú tému" -#: ../src/bookmarks/ephy-bookmarks-editor.c:161 ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:161 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Otvoriť v nových _oknách" @@ -1664,7 +1840,8 @@ msgid "Open the selected bookmark in a new window" msgstr "Otvorí vybranú záložku v novom okne" -#: ../src/bookmarks/ephy-bookmarks-editor.c:164 ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:164 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Otvoriť na nových _kartách" @@ -1731,7 +1908,8 @@ msgid "Cut the selection" msgstr "Vystrihne výber" -#: ../src/bookmarks/ephy-bookmarks-editor.c:186 ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:186 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopírovať" @@ -1749,7 +1927,8 @@ msgid "Paste the clipboard" msgstr "Vloží obsah schránky" -#: ../src/bookmarks/ephy-bookmarks-editor.c:192 ../src/resources/history-dialog.ui.h:12 +#: ../src/bookmarks/ephy-bookmarks-editor.c:192 +#: ../src/resources/history-dialog.ui.h:12 msgid "_Delete" msgstr "O_dstrániť" @@ -1777,7 +1956,8 @@ msgid "Display bookmarks help" msgstr "Zobrazí pomocníka pre záložky" -#: ../src/bookmarks/ephy-bookmarks-editor.c:203 ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 +#: ../src/bookmarks/ephy-bookmarks-editor.c:203 +#: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 msgid "_About" msgstr "_O programe" @@ -1796,7 +1976,8 @@ msgid "Show the title column" msgstr "Zobrazí stĺpec s názvom" -#: ../src/bookmarks/ephy-bookmarks-editor.c:212 ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:212 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adresa" @@ -1819,19 +2000,25 @@ msgstr "Odstrániť túto tému?" #: ../src/bookmarks/ephy-bookmarks-editor.c:382 -msgid "Deleting this topic will cause all its bookmarks to become uncategorized, unless they also belong to other topics. The bookmarks will not be deleted." -msgstr "Odstránením tejto témy zostanú všetky jej záložky bez kategórie. Odstránenie sa nevzťahuje na záložky z iných tém. Záložky odstránené nebudú." +msgid "" +"Deleting this topic will cause all its bookmarks to become uncategorized, " +"unless they also belong to other topics. The bookmarks will not be deleted." +msgstr "" +"Odstránením tejto témy zostanú všetky jej záložky bez kategórie. Odstránenie " +"sa nevzťahuje na záložky z iných tém. Záložky odstránené nebudú." #: ../src/bookmarks/ephy-bookmarks-editor.c:385 msgid "_Delete Topic" msgstr "O_dstrániť tému" #. FIXME: proper i18n after freeze -#: ../src/bookmarks/ephy-bookmarks-editor.c:495 ../src/bookmarks/ephy-bookmarks-editor.c:499 +#: ../src/bookmarks/ephy-bookmarks-editor.c:495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:499 msgid "Firefox" msgstr "Firefox" -#: ../src/bookmarks/ephy-bookmarks-editor.c:504 ../src/bookmarks/ephy-bookmarks-editor.c:508 +#: ../src/bookmarks/ephy-bookmarks-editor.c:504 +#: ../src/bookmarks/ephy-bookmarks-editor.c:508 msgid "Firebird" msgstr "Firebird" @@ -1859,8 +2046,12 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:555 #, c-format -msgid "The bookmarks from “%s” could not be imported because the file is corrupted or of an unsupported type." -msgstr "Záložky z „%s“ nemohli byť importované pretože súbor je poškodený, alebo tento typ súboru nie je podporovaný." +msgid "" +"The bookmarks from “%s” could not be imported because the file is corrupted " +"or of an unsupported type." +msgstr "" +"Záložky z „%s“ nemohli byť importované pretože súbor je poškodený, alebo " +"tento typ súboru nie je podporovaný." # window title #: ../src/bookmarks/ephy-bookmarks-editor.c:618 @@ -1885,7 +2076,9 @@ msgid "Export Bookmarks" msgstr "Exportovanie záložiek" -#: ../src/bookmarks/ephy-bookmarks-editor.c:764 ../src/bookmarks/ephy-bookmarks-editor.c:1495 ../src/bookmarks/ephy-topic-action.c:217 +#: ../src/bookmarks/ephy-bookmarks-editor.c:764 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 +#: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Záložky" @@ -1912,15 +2105,15 @@ msgid "File" msgstr "Súbor" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopírovať adresu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Témy" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Názov" @@ -1953,8 +2146,13 @@ msgstr "Zvoľte osobné údaje, ktoré si želáte vymazať" #: ../src/resources/clear-data-dialog.ui.h:5 -msgid "You are about to clear personal data that is stored about the web pages you have visited. Check the types of information that you want to remove:" -msgstr "Chystáte sa vymazať osobné údaje uložené o webových stránkach, ktoré ste navštívili. Pred pokračovaním skontrolujte typ informácií, ktoré chcete vymazať:" +msgid "" +"You are about to clear personal data that is stored about the web pages you " +"have visited. Check the types of information that you want to remove:" +msgstr "" +"Chystáte sa vymazať osobné údaje uložené o webových stránkach, ktoré ste " +"navštívili. Pred pokračovaním skontrolujte typ informácií, ktoré chcete " +"vymazať:" # GtkLabel label #: ../src/resources/clear-data-dialog.ui.h:6 @@ -1974,20 +2172,27 @@ msgstr "Uložené h_eslá" #: ../src/resources/clear-data-dialog.ui.h:10 -msgid "You cannot undo this action. The data you are choosing to clear will be removed forever." -msgstr "Tento úkon nie je možné vrátiť späť. Údaje, ktoré ste vybrali na vymazanie, budú natrvalo odstránené." +msgid "" +"You cannot undo this action. The data you are choosing to clear will be " +"removed forever." +msgstr "" +"Tento úkon nie je možné vrátiť späť. Údaje, ktoré ste vybrali na vymazanie, " +"budú natrvalo odstránené." # GtkLabel label #: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Cookies" -#: ../src/resources/cookies-dialog.ui.h:2 ../src/resources/history-dialog.ui.h:2 ../src/resources/passwords-dialog.ui.h:2 +#: ../src/resources/cookies-dialog.ui.h:2 +#: ../src/resources/history-dialog.ui.h:2 +#: ../src/resources/passwords-dialog.ui.h:2 msgid "C_lear All" msgstr "Vy_mazať všetko" # column -#: ../src/resources/cookies-dialog.ui.h:3 ../src/resources/passwords-dialog.ui.h:4 +#: ../src/resources/cookies-dialog.ui.h:3 +#: ../src/resources/passwords-dialog.ui.h:4 msgid "Site" msgstr "Stránka" @@ -2089,7 +2294,8 @@ msgstr "Pridať _záložku" # GtkLabel label -#: ../src/resources/passwords-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:30 +#: ../src/resources/passwords-dialog.ui.h:1 +#: ../src/resources/prefs-dialog.ui.h:30 msgid "Passwords" msgstr "Heslá" @@ -2362,13 +2568,17 @@ msgid "Other encodings" msgstr "Zobrazí ostatné kódovania" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Vymazať históriu prehliadania?" -#: ../src/ephy-history-window.c:257 -msgid "Clearing the browsing history will cause all history links to be permanently deleted." -msgstr "Vymazanie histórie prehliadania spôsobí, že sa trvalo odstránia všetky odkazy z histórie." +#: ../src/ephy-history-window.c:258 +msgid "" +"Clearing the browsing history will cause all history links to be permanently " +"deleted." +msgstr "" +"Vymazanie histórie prehliadania spôsobí, že sa trvalo odstránia všetky " +"odkazy z histórie." # cmd desc #: ../src/ephy-main.c:76 @@ -2450,12 +2660,12 @@ "Spúšťanie zlyhalo kvôli nasledujúcej chybe:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Voľby programu Web" # tooltip -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Zavrie kartu" @@ -2591,150 +2801,161 @@ msgid "Open Link in New _Tab" msgstr "Otvoriť odkaz na novej kar_te" -# https://bugzilla.gnome.org/show_bug.cgi?id=687594 #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Otvoriť odkaz v okne i_nkognito" + +# https://bugzilla.gnome.org/show_bug.cgi?id=687594 +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Uložiť cieľ odkazu ako…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopírovať adresu odkazu" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Kopírovať emailovú adresu" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Zobraziť _obrázok na novej karte" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kopírovať adresu _obrázka" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "_Uložiť obrázok ako…" # DK: wallpaper prekladame ako Pozadie pracovnej plochy -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Nastaviť ako _pozadie pracovnej plochy" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Otvoriť video v novom _okne" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Otvoriť video na novej _karte" # https://bugzilla.gnome.org/show_bug.cgi?id=687594 -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Uložiť video ako…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopírovať adresu videa" # DK: tieto retazce s "audiom" mi nejako nesedia. zisti coho sa to tyka to audio. ci by to nemohlo byt nieco na styl "Otvoriť zuvkový súbor/prvok(neviem čo) v novom okne" # DK:inde mas pouzite "zvukovy subor".tak to zjednot tak #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Otvoriť zvukový súbor v novom _okne" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Otvoriť zvukový súbor na novej _karte" # https://bugzilla.gnome.org/show_bug.cgi?id=687594 -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Uložiť zvukový súbor ako…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopírovať adresu zvukového súboru" -#: ../src/ephy-window.c:466 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "V prvkoch formulára sú neodoslané zmeny" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Ak aj napriek tomu dokument zavriete, tieto informácie stratíte." -#: ../src/ephy-window.c:469 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Zavrieť _dokument" -#: ../src/ephy-window.c:484 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "V tomto okne stále prebieha preberanie" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Ak zavriete toto okno, aktívne preberanie bude zrušené" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Zavrieť okno a zrušiť preberanie" -#: ../src/ephy-window.c:1122 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Uložiť ako" -#: ../src/ephy-window.c:1124 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Uložiť ako aplikáciu" -#: ../src/ephy-window.c:1126 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Tlačiť" -#: ../src/ephy-window.c:1128 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Záložka" -#: ../src/ephy-window.c:1130 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Nájsť" #. Translators: This refers to text size -#: ../src/ephy-window.c:1139 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Väčšie" #. Translators: This refers to text size -#: ../src/ephy-window.c:1142 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Menšie" -#: ../src/ephy-window.c:1164 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Späť" -#: ../src/ephy-window.c:1176 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Dopredu" -#: ../src/ephy-window.c:1188 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Mierka zobrazenia" -#: ../src/ephy-window.c:1197 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Nová _karta" # po stlaceni ALT₊HOME -#: ../src/ephy-window.c:1205 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Prejsť na najčastejšie navštevované" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Vyhľadanie výrazu „%s“ na webe" + # https://bugzilla.gnome.org/show_bug.cgi?id=687594 #: ../src/popup-commands.c:229 msgid "Save Link As" @@ -2831,7 +3052,9 @@ msgstr "Nahradiť" #: ../src/window-commands.c:719 -msgid "An application with the same name already exists. Replacing it will overwrite it." +msgid "" +"An application with the same name already exists. Replacing it will " +"overwrite it." msgstr "Aplikácia s týmto názvom už existuje. Nahradením bude prepísaná." #: ../src/window-commands.c:755 @@ -2859,19 +3082,19 @@ msgstr "Vytvo_riť" # emails -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Kontaktujte nás na:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Prispievatelia:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Minulí vývojári:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2888,32 +3111,53 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Marcel Telka \n" "Dušan Kazik \n" "Peter Vágner " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Webová stránka" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Povoliť režim prehliadania pomocou klávesnice?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" -"Pressing F7 turns caret browsing on or off. This feature places a moveable cursor in web pages, allowing you to move around with your keyboard. Do you want to enable caret browsing?" +"Pressing F7 turns caret browsing on or off. This feature places a moveable " +"cursor in web pages, allowing you to move around with your keyboard. Do you " +"want to enable caret browsing?" msgstr "" -"Stlačením klávesu F7 sa zapne alebo vypne prehliadanie pomocou klávesnice. Táto funkcia umiestni pohyblivý kurzor do webových stránok a umožní vám pohybovať sa po stránke pomocou " -"klávesnice. Chcete povoliť prehliadanie pomocou klávesnice?" +"Stlačením klávesu F7 sa zapne alebo vypne prehliadanie pomocou klávesnice. " +"Táto funkcia umiestni pohyblivý kurzor do webových stránok a umožní vám " +"pohybovať sa po stránke pomocou klávesnice. Chcete povoliť prehliadanie " +"pomocou klávesnice?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Povoliť" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +# gsettings summary +#~ msgid "Toolbar style" +#~ msgstr "Štýl panela nástrojov" + +# gsettings description +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Štýl panela nástrojov. Povolené hodnoty sú „“ (použiť predvolený štýl " +#~ "GNOME), „both“ (text a ikony), „both-horiz“ (text vedľa ikon), " +#~ "„icons“ (ikony), a „text“." + # gsettings summary #~ msgid "Size of disk cache" #~ msgstr "Veľkosť diskovej vyrovnávacej pamäte" @@ -2935,7 +3179,8 @@ #~ msgstr "MB" #~ msgid "http://duckduckgo.com/?q=%s&t=epiphany" -#~ msgstr "http://duckduckgo.com/?q=%s&t=epiphany&kl=sk-sk&kad=sk_SK" +#~ msgstr "" +#~ "http://duckduckgo.com/?q=%s&t=epiphany&kl=sk-sk&kad=sk_SK" #~ msgid "St_art Animation" #~ msgstr "Spustiť _animáciu" diff -Nru epiphany-browser-3.16.3/po/sr@latin.po epiphany-browser-3.18.0/po/sr@latin.po --- epiphany-browser-3.16.3/po/sr@latin.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/sr@latin.po 2015-09-22 07:28:20.000000000 +0000 @@ -2,24 +2,26 @@ # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015. # This file is distributed under the same license as the epiphany package. # Danilo Šegan 2005. -# Miloš Popović , 2010—2011. # Miroslav Nikolić , 2011—2015. +# Miloš Popović , 2010—20, 2015. +# msgid "" msgstr "" "Project-Id-Version: epiphany\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphan" -"y&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-04 16:39+0000\n" -"PO-Revision-Date: 2015-03-05 19:59+0200\n" -"Last-Translator: Miroslav Nikolić \n" -"Language-Team: Serbian \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=epiphany&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-09-21 15:49+0000\n" +"PO-Revision-Date: 2015-09-21 23:40+0200\n" +"Last-Translator: Miloš Popović \n" +"Language-Team: srpski \n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " -"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -49,57 +51,66 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Spoznaja" +msgid "GNOME Web" +msgstr "Gnomov veb" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "Veb preglednik za Gnom" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"Veb preglednik za Gnomovu radnu površ, koga odlikuje tesno sjedinjavanje sa " -"radnom površi i jednostavno i sagledivo korisničko sučelje koje vam omogućava " -"da se usredsredite na vaše veb stranice." +"Veb preglednik Gnoma, koji je napravljen tako da se uklopi u radnu površinu i " +"poseduje jednostavno i pametno korisničko sučelje koje vam omogućava da se " +"usredsredite na vaše veb stranice. Ako tragate za jednostavnim, čistim i " +"lepim preglednikom veba, onda je ovo pravi program za vas!" + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "Gnomov veb se često naziva po svom kodnom imenu, spoznaja (Epiphany)." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Veb" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Veb preglednik" # note(slobo): izbegavamo veb — to mnogima ništa ne znači iako je tehnički tačno -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Veb preglednik Spoznaja" # note(slobo): ovo je tooltip u meniju mislim da je bolje od „razgledaj veb“ # msgstr "Razgledanje Internet prostora" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Pregledajte veb" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "veb;preglednik;internet;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Novi tajnoviti prozor" @@ -226,18 +237,22 @@ "svaki jezičak." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Stil trake alata" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Najveći broj veb procesa koji se obrazuju u isto vreme kada se koristi model " +"„one-secondary-process-per-web-view“" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Stil trake alata. Dopuštene vrednosti su „“ (koristi podrazumevani stil " -"Gnoma), „both“ (tekst i ikonice), „both-horiz“ (tekst pored ikonica), " -"„icons“ (ikonice), i „text“ (tekst)." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Ova opcija postavlja ograničenje u broju veb procesa koji se pokreću u isto " +"vreme za model „one-secondary-process-per-web-view“. Podrazumevana vrednost " +"je „0“ i znači da nema nikakvih ograničenja." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -548,19 +563,19 @@ msgid "Installed on:" msgstr "Instaliran je:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Ukloni iz pregleda" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Najposećeniji" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Ukloni iz pregleda" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privatno pregledanje" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -570,13 +585,13 @@ "prikazane u vašem istorijatu pregledanja a svi pričuvani podaci će biti " "očišćeni kada zatvorite prozor. Datoteke koje ste preuzeli biće zadržane." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Tajni režim skriva vašu aktivnost samo od ljudi koji koriste ovaj računar." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -591,17 +606,17 @@ msgid "Blank page" msgstr "Prazna stranica" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Pritisnite „%s“ da napustite ceo ekran" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -954,60 +969,60 @@ msgid "Find next occurrence of the search string" msgstr "Pronađite sledeći izraz u nizu za pretraživanje" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Sačuvaj" - -#: ../embed/ephy-web-view.c:493 +#: ../embed/ephy-web-view.c:494 msgid "_Don’t Save" msgstr "_Ne čuvaj" +#: ../embed/ephy-web-view.c:495 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Sačuvaj" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:506 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Da li želite da sačuvate vašu lozinku za „%s“?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1434 msgid "Deny" msgstr "Zabrani" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1435 msgid "Allow" msgstr "Prihvati" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1447 #, c-format msgid "The page at %s wants to know your location." msgstr "Stranica na %s želi da sazna vašu lokaciju." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1451 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Stranica na %s želi da prikaže obaveštenja radne površi." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1539 #, c-format msgid "Loading “%s”…" msgstr "Učitavam „%s“…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1541 msgid "Loading…" msgstr "Učitavam…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1764 msgid "" "This website presented identification that belongs to a different website." msgstr "Ovaj veb sajt je predstavio raspoznaju koja pripada drugom veb sajtu." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1769 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1016,18 +1031,18 @@ "datum na kalendaru vašeg računara." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1774 msgid "This website’s identification was not issued by a trusted organization." msgstr "Raspoznaju ovog veb sajta nije izdala poverljiva organizacija." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1779 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "Raspoznaja ovog veb sajta ne može biti obrađena. Možda je oštećena." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1784 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1036,7 +1051,7 @@ "izdala." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1789 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1045,7 +1060,7 @@ "šifrovanje." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1794 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1054,13 +1069,13 @@ "na kalendaru vašeg računara." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1830 #, c-format msgid "This might not be the real %s." msgstr "Ovo možda nije stvarni „%s“." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1835 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1071,7 +1086,7 @@ "raspoznajom ovog veb sajta:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1841 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1082,29 +1097,29 @@ "raspoznaju." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1845 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Zakonite banke, prodavnice, i drugi javni sajtovi neće tražiti da uradite " "ovo." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1886 msgid "None specified" msgstr "Ništa nije određeno" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1899 ../embed/ephy-web-view.c:1914 +#: ../embed/ephy-web-view.c:1934 #, c-format msgid "Problem loading “%s”" msgstr "Problem učitavanja „%s“" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1901 msgid "Oops! Unable to display this website." msgstr "Ups! Ne mogu da prikažem ovu veb stranicu." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1902 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1910 msgid "Try again" msgstr "Pokušaj ponovo" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1916 msgid "Oops! There may be a problem." msgstr "Ups! Neprilike na vidiku." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1917 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1135,20 +1150,20 @@ "

Ova stranica je možda dovela do neočekivanog zatvaranja Veba.

Ako se " "ovo desi ponovo, obavestite programere %s-a.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1922 ../embed/ephy-web-view.c:1929 msgid "Reload Anyway" msgstr "Ipak ponovo učitaj" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1926 #, c-format msgid "Problem displaying “%s”" msgstr "Problem prikazivanja „%s“" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1927 msgid "Oops!" msgstr "Ups!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1928 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1157,22 +1172,22 @@ "ili posetite neku drugu stranicu da nastavite." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1936 msgid "Look out!" msgstr "Pazite!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1939 msgid "Load Anyway" msgstr "Ipak učitaj" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2867 msgid "_OK" msgstr "U _redu" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 -#: ../src/bookmarks/ephy-bookmarks-editor.c:819 +#: ../src/bookmarks/ephy-bookmark-properties.c:436 +#: ../src/bookmarks/ephy-bookmarks-editor.c:820 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 msgid "_Cancel" @@ -1194,7 +1209,7 @@ msgid "Images" msgstr "Slike" -#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:637 +#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:638 msgid "All files" msgstr "Sve datoteke" @@ -1227,7 +1242,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Lozinka za %s u obrascu na %s" @@ -1235,7 +1250,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Lozinka u obrascu na „%s“" @@ -1520,29 +1535,29 @@ msgstr[2] "Preostaje još %d meseci" msgstr[3] "Preostaje još %d sekunda" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:305 msgid "Finished" msgstr "Završeno" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:321 #, c-format msgid "Error downloading: %s" msgstr "Greška pri preuzimanju: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:376 ../src/window-commands.c:713 msgid "Cancel" msgstr "Otkaži" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:384 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Otvori" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:389 msgid "Show in folder" msgstr "Prikaži u fascikli" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:593 msgid "Starting…" msgstr "Pokrećem…" @@ -1550,26 +1565,26 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:265 msgid "Cl_ear" msgstr "_Očisti" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Opozovi" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Ponovi" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Prevucite i pustite ovu ikonu kako bi napravili vezu ka ovoj strani" #. Translators: This string is used when counting bookmarks that #. * are similar to each other -#: ../src/bookmarks/ephy-bookmark-properties.c:84 +#: ../src/bookmarks/ephy-bookmark-properties.c:85 #, c-format msgid "%d bookmark is similar" msgid_plural "%d bookmarks are similar" @@ -1578,32 +1593,32 @@ msgstr[2] "%d zabeleški je slično" msgstr[3] "Jedna zabeleška je slična" -#: ../src/bookmarks/ephy-bookmark-properties.c:235 +#: ../src/bookmarks/ephy-bookmark-properties.c:236 msgid "Add Bookmark" msgstr "Dodaj obeleživač" -#: ../src/bookmarks/ephy-bookmark-properties.c:237 +#: ../src/bookmarks/ephy-bookmark-properties.c:238 #, c-format msgid "“%s” Properties" msgstr "Osobine obeleživača „%s“" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:364 msgid "_Title:" msgstr "_Naslov:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:382 msgid "A_ddress:" msgstr "_Adresa:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:395 msgid "T_opics:" msgstr "_Teme:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:418 msgid "Sho_w all topics" msgstr "Prikaži _sve teme" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:439 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1658,48 +1673,48 @@ msgid "Untitled" msgstr "Neimenovana" -#: ../src/bookmarks/ephy-bookmarks-editor.c:75 +#: ../src/bookmarks/ephy-bookmarks-editor.c:76 msgid "Web (RDF)" msgstr "Veb (RDF)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:76 +#: ../src/bookmarks/ephy-bookmarks-editor.c:77 msgid "Mozilla (HTML)" msgstr "Mozila (HTML)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:124 +#: ../src/bookmarks/ephy-bookmarks-editor.c:125 msgid "Remove from this topic" msgstr "Ukloni iz ove teme" #. Toplevel -#: ../src/bookmarks/ephy-bookmarks-editor.c:151 +#: ../src/bookmarks/ephy-bookmarks-editor.c:152 msgid "_File" msgstr "_Datoteka" -#: ../src/bookmarks/ephy-bookmarks-editor.c:152 +#: ../src/bookmarks/ephy-bookmarks-editor.c:153 msgid "_Edit" msgstr "_Uređivanje" -#: ../src/bookmarks/ephy-bookmarks-editor.c:153 +#: ../src/bookmarks/ephy-bookmarks-editor.c:154 msgid "_View" msgstr "P_regled" #. Help. -#: ../src/bookmarks/ephy-bookmarks-editor.c:154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:155 #: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 msgid "_Help" msgstr "Po_moć" #. File Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:158 +#: ../src/bookmarks/ephy-bookmarks-editor.c:159 msgid "_New Topic" msgstr "_Nova tema" -#: ../src/bookmarks/ephy-bookmarks-editor.c:159 +#: ../src/bookmarks/ephy-bookmarks-editor.c:160 msgid "Create a new topic" msgstr "Napravite novu temu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1156 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Otvori u _novom prozoru" @@ -1707,13 +1722,13 @@ msgstr[2] "Otvori u _novim prozorima" msgstr[3] "Otvori u _novom prozoru" -#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +#: ../src/bookmarks/ephy-bookmarks-editor.c:163 msgid "Open the selected bookmark in a new window" msgstr "Otvorite izabrani obeleživač u novom prozoru" # bug: no plural-forms -#: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1159 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Otvori u novom _jezičku" @@ -1721,145 +1736,145 @@ msgstr[2] "Otvori u novim _jezičcima" msgstr[3] "Otvori u novom _jezičku" -#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +#: ../src/bookmarks/ephy-bookmarks-editor.c:166 msgid "Open the selected bookmark in a new tab" msgstr "Otvorite izabrani obeleživač u novom jezičku" -#: ../src/bookmarks/ephy-bookmarks-editor.c:167 +#: ../src/bookmarks/ephy-bookmarks-editor.c:168 msgid "_Rename…" msgstr "_Preimenuj…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:168 +#: ../src/bookmarks/ephy-bookmarks-editor.c:169 msgid "Rename the selected bookmark or topic" msgstr "Preimenujte izabrani obeleživač ili temu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:169 +#: ../src/bookmarks/ephy-bookmarks-editor.c:170 msgid "_Properties" msgstr "_Osobine" -#: ../src/bookmarks/ephy-bookmarks-editor.c:170 +#: ../src/bookmarks/ephy-bookmarks-editor.c:171 msgid "View or modify the properties of the selected bookmark" msgstr "Pregledajte ili izmenite osobine izabranog obeleživača" -#: ../src/bookmarks/ephy-bookmarks-editor.c:172 +#: ../src/bookmarks/ephy-bookmarks-editor.c:173 msgid "_Import Bookmarks…" msgstr "Uvez_i obeleživače…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:173 +#: ../src/bookmarks/ephy-bookmarks-editor.c:174 msgid "Import bookmarks from another browser or a bookmarks file" msgstr "" "Uvezite obeleživače iz nekog drugog veb čitača ili iz datoteke sa " "obeleživačima" -#: ../src/bookmarks/ephy-bookmarks-editor.c:175 +#: ../src/bookmarks/ephy-bookmarks-editor.c:176 msgid "_Export Bookmarks…" msgstr "Izv_ezi obeleživače…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:176 +#: ../src/bookmarks/ephy-bookmarks-editor.c:177 msgid "Export bookmarks to a file" msgstr "Izvezite obeleživače u datoteku" -#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:112 +#: ../src/bookmarks/ephy-bookmarks-editor.c:179 ../src/ephy-window.c:112 msgid "_Close" msgstr "_Zatvori" -#: ../src/bookmarks/ephy-bookmarks-editor.c:179 +#: ../src/bookmarks/ephy-bookmarks-editor.c:180 msgid "Close the bookmarks window" msgstr "Zatvorite prozor sa obeleživačima" #. Edit Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:123 +#: ../src/bookmarks/ephy-bookmarks-editor.c:184 ../src/ephy-window.c:123 msgid "Cu_t" msgstr "_Iseci" -#: ../src/bookmarks/ephy-bookmarks-editor.c:184 +#: ../src/bookmarks/ephy-bookmarks-editor.c:185 msgid "Cut the selection" msgstr "Isecite izabrano" -#: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1169 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Umnoži" -#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +#: ../src/bookmarks/ephy-bookmarks-editor.c:188 msgid "Copy the selection" msgstr "Umnožite izabrano" -#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:127 +#: ../src/bookmarks/ephy-bookmarks-editor.c:190 ../src/ephy-window.c:127 msgid "_Paste" msgstr "_Ubaci" -#: ../src/bookmarks/ephy-bookmarks-editor.c:190 +#: ../src/bookmarks/ephy-bookmarks-editor.c:191 msgid "Paste the clipboard" msgstr "Ubacite sadržaj spiska isečaka" -#: ../src/bookmarks/ephy-bookmarks-editor.c:192 +#: ../src/bookmarks/ephy-bookmarks-editor.c:193 #: ../src/resources/history-dialog.ui.h:12 msgid "_Delete" msgstr "_Obriši" -#: ../src/bookmarks/ephy-bookmarks-editor.c:193 +#: ../src/bookmarks/ephy-bookmarks-editor.c:194 msgid "Delete the selected bookmark or topic" msgstr "Uklonite izabrani obeleživač ili temu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:131 +#: ../src/bookmarks/ephy-bookmarks-editor.c:196 ../src/ephy-window.c:131 msgid "Select _All" msgstr "Izaberi _sve" -#: ../src/bookmarks/ephy-bookmarks-editor.c:196 +#: ../src/bookmarks/ephy-bookmarks-editor.c:197 msgid "Select all bookmarks or text" msgstr "Izaberite sve obeleživače ili sav tekst" #. Help Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:200 +#: ../src/bookmarks/ephy-bookmarks-editor.c:201 msgid "_Contents" msgstr "_Sadržaj" -#: ../src/bookmarks/ephy-bookmarks-editor.c:201 +#: ../src/bookmarks/ephy-bookmarks-editor.c:202 msgid "Display bookmarks help" msgstr "Prikažite pomoć za obeleživače" -#: ../src/bookmarks/ephy-bookmarks-editor.c:203 +#: ../src/bookmarks/ephy-bookmarks-editor.c:204 #: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 msgid "_About" msgstr "_O programu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:204 +#: ../src/bookmarks/ephy-bookmarks-editor.c:205 msgid "Display credits for the web browser creators" msgstr "Prikažite zasluge za tvorce ovog veb čitača" #. View Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:210 +#: ../src/bookmarks/ephy-bookmarks-editor.c:211 msgid "_Title" msgstr "_Naslov" -#: ../src/bookmarks/ephy-bookmarks-editor.c:211 +#: ../src/bookmarks/ephy-bookmarks-editor.c:212 msgid "Show the title column" msgstr "Prikaži naslovnu kolonu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1644 msgid "Address" msgstr "Adresa" -#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +#: ../src/bookmarks/ephy-bookmarks-editor.c:214 msgid "Show the address column" msgstr "Prikaži kolonu sa adresom" -#: ../src/bookmarks/ephy-bookmarks-editor.c:255 +#: ../src/bookmarks/ephy-bookmarks-editor.c:256 msgid "Type a topic" msgstr "Unesi temu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:377 +#: ../src/bookmarks/ephy-bookmarks-editor.c:378 #, c-format msgid "Delete topic “%s”?" msgstr "Da obrišem temu „%s“?" -#: ../src/bookmarks/ephy-bookmarks-editor.c:380 +#: ../src/bookmarks/ephy-bookmarks-editor.c:381 msgid "Delete this topic?" msgstr "Da obrišem ovu temu?" -#: ../src/bookmarks/ephy-bookmarks-editor.c:382 +#: ../src/bookmarks/ephy-bookmarks-editor.c:383 msgid "" "Deleting this topic will cause all its bookmarks to become uncategorized, " "unless they also belong to other topics. The bookmarks will not be deleted." @@ -1868,44 +1883,44 @@ "nerazvrstani, osim ako ne pripadaju drugim temama. Obeleživači neće biti " "uklonjeni." -#: ../src/bookmarks/ephy-bookmarks-editor.c:385 +#: ../src/bookmarks/ephy-bookmarks-editor.c:386 msgid "_Delete Topic" msgstr "_Obriši temu" #. FIXME: proper i18n after freeze -#: ../src/bookmarks/ephy-bookmarks-editor.c:495 -#: ../src/bookmarks/ephy-bookmarks-editor.c:499 +#: ../src/bookmarks/ephy-bookmarks-editor.c:496 +#: ../src/bookmarks/ephy-bookmarks-editor.c:500 msgid "Firefox" msgstr "Fajerfoksa" -#: ../src/bookmarks/ephy-bookmarks-editor.c:504 -#: ../src/bookmarks/ephy-bookmarks-editor.c:508 +#: ../src/bookmarks/ephy-bookmarks-editor.c:505 +#: ../src/bookmarks/ephy-bookmarks-editor.c:509 msgid "Firebird" msgstr "Fajerb'rda" #. Translators: The %s is the name of a Mozilla profile. -#: ../src/bookmarks/ephy-bookmarks-editor.c:513 +#: ../src/bookmarks/ephy-bookmarks-editor.c:514 #, c-format msgid "Mozilla “%s” profile" msgstr "Profil „%s“ iz Mozile" -#: ../src/bookmarks/ephy-bookmarks-editor.c:517 +#: ../src/bookmarks/ephy-bookmarks-editor.c:518 msgid "Galeon" msgstr "Galije" -#: ../src/bookmarks/ephy-bookmarks-editor.c:521 +#: ../src/bookmarks/ephy-bookmarks-editor.c:522 msgid "Konqueror" msgstr "Konkverora" -#: ../src/bookmarks/ephy-bookmarks-editor.c:550 +#: ../src/bookmarks/ephy-bookmarks-editor.c:551 msgid "Import failed" msgstr "Uvoz nije uspeo" -#: ../src/bookmarks/ephy-bookmarks-editor.c:552 +#: ../src/bookmarks/ephy-bookmarks-editor.c:553 msgid "Import Failed" msgstr "Neuspešan uvoz" -#: ../src/bookmarks/ephy-bookmarks-editor.c:555 +#: ../src/bookmarks/ephy-bookmarks-editor.c:556 #, c-format msgid "" "The bookmarks from “%s” could not be imported because the file is corrupted " @@ -1914,62 +1929,62 @@ "Ne mogu da uvezem obeleživače iz „%s“ zato što je datoteka oštećena ili " "nepodržane vrste." -#: ../src/bookmarks/ephy-bookmarks-editor.c:618 +#: ../src/bookmarks/ephy-bookmarks-editor.c:619 msgid "Import Bookmarks from File" msgstr "Uvezi obeleživače iz datoteke" -#: ../src/bookmarks/ephy-bookmarks-editor.c:625 +#: ../src/bookmarks/ephy-bookmarks-editor.c:626 msgid "Firefox/Mozilla bookmarks" msgstr "Obeleživači Fajerfoksa ili Mozile" -#: ../src/bookmarks/ephy-bookmarks-editor.c:629 +#: ../src/bookmarks/ephy-bookmarks-editor.c:630 msgid "Galeon/Konqueror bookmarks" msgstr "Obeleživači Konkverora ili Galije" -#: ../src/bookmarks/ephy-bookmarks-editor.c:633 +#: ../src/bookmarks/ephy-bookmarks-editor.c:634 msgid "Web bookmarks" msgstr "Obeleživači Veba" -#: ../src/bookmarks/ephy-bookmarks-editor.c:757 +#: ../src/bookmarks/ephy-bookmarks-editor.c:758 msgid "Export Bookmarks" msgstr "Izvezi obeleživače" -#: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:765 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1507 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Obeleživači" #. Make a format selection combo & label -#: ../src/bookmarks/ephy-bookmarks-editor.c:770 +#: ../src/bookmarks/ephy-bookmarks-editor.c:771 msgid "File f_ormat:" msgstr "Vrsta _datoteke:" -#: ../src/bookmarks/ephy-bookmarks-editor.c:816 +#: ../src/bookmarks/ephy-bookmarks-editor.c:817 msgid "Import Bookmarks" msgstr "Uvezi obeleživače" -#: ../src/bookmarks/ephy-bookmarks-editor.c:821 +#: ../src/bookmarks/ephy-bookmarks-editor.c:822 msgid "I_mport" msgstr "U_vezi" -#: ../src/bookmarks/ephy-bookmarks-editor.c:837 +#: ../src/bookmarks/ephy-bookmarks-editor.c:838 msgid "Import bookmarks from:" msgstr "Uvezi obeleživače iz:" -#: ../src/bookmarks/ephy-bookmarks-editor.c:857 +#: ../src/bookmarks/ephy-bookmarks-editor.c:858 msgid "File" msgstr "Datoteka" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1165 msgid "_Copy Address" msgstr "_Umnoži adresu" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1563 msgid "Topics" msgstr "Teme" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1633 msgid "Title" msgstr "Naslov" @@ -2032,8 +2047,7 @@ "Ovu radnju ne možete da opozovete. Podaci koje birate za čišćenje biće " "uklonjeni zauvek." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Kolačići" @@ -2364,11 +2378,11 @@ msgid "Other encodings" msgstr "Ostala kodiranja" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:255 msgid "Clear browsing history?" msgstr "Da očistim zapise o pregledu stranica?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:259 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2445,11 +2459,11 @@ "Pokretanje nije uspelo zbog sledeće greške:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Opcije veba" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Zatvorite jezičak" @@ -2586,144 +2600,155 @@ msgstr "Otvori vezu u novom _jezičku" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Otvori vezu u _tajnom prozoru" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Sačuvaj vezu kao…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Umnoži _adresu veze" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Umnoži adresu el. pošte" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Prgledaj sliku u _novom jezičku" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Umnoži adresu sli_ke" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Sačuvaj sliku _kao…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Postavi za _pozadinu" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Otvori video u novom _prozoru" # bug: no plural-forms -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Otvori video u novom _jezičku" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Sačuvaj _video kao…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "Umnoži _adresu snimka" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Otvori audio u novom _prozoru" # bug: no plural-forms -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Otvori audio u novom _jezičku" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Sačuvaj _audio kao…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "Umnoži _adresu audia" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Ima neposlatih izmena u elementima obrasca" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Ukoliko ipak zatvorite dokument, izgubićete te podatke." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Zatvori dokument" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Neke datoteke iz ovom prozoru nisu preuzete" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Ukoliko zatvorite prozor, prekinućete preuzimanje datoteka" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Zatvori prozor i zaustavi preuzimanje" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Sačuvaj kao" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Sačuvaj kao program" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Štampaj" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Obeleživač" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Pronađi" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Uvećano" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Umanjeno" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Nazad" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Napred" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Uvećaj" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Novi _jezičak" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Idi na najposećenije" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Potraži „%s“ na vebu" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Sačuvaj vezu kao" @@ -2848,19 +2873,19 @@ msgid "C_reate" msgstr "_Napravi" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Stupite u vezu sa nama preko:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Doprinosioci:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Prethodni programeri:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2877,7 +2902,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Danilo Šegan \n" @@ -2886,15 +2911,15 @@ "\n" "http://prevod.org — prevod na srpski jezik." -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Veb stranica Gnomovog preglednika" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Da li da uključim pregled sa pokazivačem?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2905,10 +2930,25 @@ "listate sadržaj pomoću tastature. Da li želite da uključite pregledanje sa " "pokazivačem?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Uključi" +#~ msgid "Epiphany" +#~ msgstr "Spoznaja" + +#~ msgid "Toolbar style" +#~ msgstr "Stil trake alata" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Stil trake alata. Dopuštene vrednosti su „“ (koristi podrazumevani stil " +#~ "Gnoma), „both“ (tekst i ikonice), „both-horiz“ (tekst pored ikonica), " +#~ "„icons“ (ikonice), i „text“ (tekst)." + #~ msgid "Size of disk cache" #~ msgstr "Veličina ostave na disku" diff -Nru epiphany-browser-3.16.3/po/sr.po epiphany-browser-3.18.0/po/sr.po --- epiphany-browser-3.16.3/po/sr.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/sr.po 2015-09-22 07:28:20.000000000 +0000 @@ -2,24 +2,26 @@ # Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2015. # This file is distributed under the same license as the epiphany package. # Данило Шеган 2005. -# Милош Поповић , 2010—2011. # Мирослав Николић , 2011—2015. +# Милош Поповић , 2010—20, 2015. +# msgid "" msgstr "" "Project-Id-Version: epiphany\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphan" -"y&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-04 16:39+0000\n" -"PO-Revision-Date: 2015-03-05 19:59+0200\n" -"Last-Translator: Мирослав Николић \n" -"Language-Team: Serbian \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=epiphany&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2015-09-21 15:49+0000\n" +"PO-Revision-Date: 2015-09-21 23:40+0200\n" +"Last-Translator: Милош Поповић \n" +"Language-Team: српски \n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : " -"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Project-Style: gnome\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -49,57 +51,66 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Спознаја" +msgid "GNOME Web" +msgstr "Гномов веб" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "Веб прегледник за Гном" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"Веб прегледник за Гномову радну површ, кога одликује тесно сједињавање са " -"радном површи и једноставно и сагледиво корисничко сучеље које вам омогућава " -"да се усредсредите на ваше веб странице." +"Веб прегледник Гнома, који је направљен тако да се уклопи у радну површину и " +"поседује једноставно и паметно корисничко сучеље које вам омогућава да се " +"усредсредите на ваше веб странице. Ако трагате за једноставним, чистим и " +"лепим прегледником веба, онда је ово прави програм за вас!" + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "Гномов веб се често назива по свом кодном имену, спознаја (Epiphany)." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Веб" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Веб прегледник" # note(slobo): избегавамо веб — то многима ништа не значи иако је технички тачно -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Веб прегледник Спознаја" # note(slobo): ово је tooltip у менију мислим да је боље од „разгледај веб“ # msgstr "Разгледање Интернет простора" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Прегледајте веб" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "веб;прегледник;интернет;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Нови тајновити прозор" @@ -226,18 +237,22 @@ "сваки језичак." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Стил траке алата" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Највећи број веб процеса који се образују у исто време када се користи модел " +"„one-secondary-process-per-web-view“" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Стил траке алата. Допуштене вредности су „“ (користи подразумевани стил " -"Гнома), „both“ (текст и иконице), „both-horiz“ (текст поред иконица), " -"„icons“ (иконице), и „text“ (текст)." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Ова опција поставља ограничење у броју веб процеса који се покрећу у исто " +"време за модел „one-secondary-process-per-web-view“. Подразумевана вредност " +"је „0“ и значи да нема никаквих ограничења." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -548,19 +563,19 @@ msgid "Installed on:" msgstr "Инсталиран је:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Уклони из прегледа" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Најпосећенији" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Уклони из прегледа" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Приватно прегледање" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -570,13 +585,13 @@ "приказане у вашем историјату прегледања а сви причувани подаци ће бити " "очишћени када затворите прозор. Датотеке које сте преузели биће задржане." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Тајни режим скрива вашу активност само од људи који користе овај рачунар." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -591,17 +606,17 @@ msgid "Blank page" msgstr "Празна страница" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Притисните „%s“ да напустите цео екран" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ЕСЦ" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "Ф11" @@ -954,60 +969,60 @@ msgid "Find next occurrence of the search string" msgstr "Пронађите следећи израз у низу за претраживање" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Сачувај" - -#: ../embed/ephy-web-view.c:493 +#: ../embed/ephy-web-view.c:494 msgid "_Don’t Save" msgstr "_Не чувај" +#: ../embed/ephy-web-view.c:495 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Сачувај" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:506 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Да ли желите да сачувате вашу лозинку за „%s“?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1434 msgid "Deny" msgstr "Забрани" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1435 msgid "Allow" msgstr "Прихвати" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1447 #, c-format msgid "The page at %s wants to know your location." msgstr "Страница на %s жели да сазна вашу локацију." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1451 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Страница на %s жели да прикаже обавештења радне површи." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1539 #, c-format msgid "Loading “%s”…" msgstr "Учитавам „%s“…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1541 msgid "Loading…" msgstr "Учитавам…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1764 msgid "" "This website presented identification that belongs to a different website." msgstr "Овај веб сајт је представио распознају која припада другом веб сајту." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1769 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1016,18 +1031,18 @@ "датум на календару вашег рачунара." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1774 msgid "This website’s identification was not issued by a trusted organization." msgstr "Распознају овог веб сајта није издала поверљива организација." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1779 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "Распознаја овог веб сајта не може бити обрађена. Можда је оштећена." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1784 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1036,7 +1051,7 @@ "издала." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1789 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1045,7 +1060,7 @@ "шифровање." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1794 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1054,13 +1069,13 @@ "на календару вашег рачунара." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1830 #, c-format msgid "This might not be the real %s." msgstr "Ово можда није стварни „%s“." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1835 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1071,7 +1086,7 @@ "распознајом овог веб сајта:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1841 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1082,29 +1097,29 @@ "распознају." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1845 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Законите банке, продавнице, и други јавни сајтови неће тражити да урадите " "ово." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1886 msgid "None specified" msgstr "Ништа није одређено" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1899 ../embed/ephy-web-view.c:1914 +#: ../embed/ephy-web-view.c:1934 #, c-format msgid "Problem loading “%s”" msgstr "Проблем учитавања „%s“" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1901 msgid "Oops! Unable to display this website." msgstr "Упс! Не могу да прикажем ову веб страницу." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1902 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1910 msgid "Try again" msgstr "Покушај поново" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1916 msgid "Oops! There may be a problem." msgstr "Упс! Неприлике на видику." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1917 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1135,20 +1150,20 @@ "

Ова страница је можда довела до неочекиваног затварања Веба.

Ако се " "ово деси поново, обавестите програмере %s-а.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1922 ../embed/ephy-web-view.c:1929 msgid "Reload Anyway" msgstr "Ипак поново учитај" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1926 #, c-format msgid "Problem displaying “%s”" msgstr "Проблем приказивања „%s“" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1927 msgid "Oops!" msgstr "Упс!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1928 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1157,22 +1172,22 @@ "или посетите неку другу страницу да наставите." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1936 msgid "Look out!" msgstr "Пазите!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1939 msgid "Load Anyway" msgstr "Ипак учитај" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2867 msgid "_OK" msgstr "У _реду" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 -#: ../src/bookmarks/ephy-bookmarks-editor.c:819 +#: ../src/bookmarks/ephy-bookmark-properties.c:436 +#: ../src/bookmarks/ephy-bookmarks-editor.c:820 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 msgid "_Cancel" @@ -1194,7 +1209,7 @@ msgid "Images" msgstr "Слике" -#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:637 +#: ../lib/ephy-file-chooser.c:242 ../src/bookmarks/ephy-bookmarks-editor.c:638 msgid "All files" msgstr "Све датотеке" @@ -1227,7 +1242,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Лозинка за %s у обрасцу на %s" @@ -1235,7 +1250,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Лозинка у обрасцу на „%s“" @@ -1520,29 +1535,29 @@ msgstr[2] "Преостаје још %d месеци" msgstr[3] "Преостаје још %d секунда" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:305 msgid "Finished" msgstr "Завршено" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:321 #, c-format msgid "Error downloading: %s" msgstr "Грешка при преузимању: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:376 ../src/window-commands.c:713 msgid "Cancel" msgstr "Откажи" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:384 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Отвори" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:389 msgid "Show in folder" msgstr "Прикажи у фасцикли" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:593 msgid "Starting…" msgstr "Покрећем…" @@ -1550,26 +1565,26 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:265 msgid "Cl_ear" msgstr "_Очисти" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Опозови" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Понови" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Превуците и пустите ову икону како би направили везу ка овој страни" #. Translators: This string is used when counting bookmarks that #. * are similar to each other -#: ../src/bookmarks/ephy-bookmark-properties.c:84 +#: ../src/bookmarks/ephy-bookmark-properties.c:85 #, c-format msgid "%d bookmark is similar" msgid_plural "%d bookmarks are similar" @@ -1578,32 +1593,32 @@ msgstr[2] "%d забелешки је слично" msgstr[3] "Једна забелешка је слична" -#: ../src/bookmarks/ephy-bookmark-properties.c:235 +#: ../src/bookmarks/ephy-bookmark-properties.c:236 msgid "Add Bookmark" msgstr "Додај обележивач" -#: ../src/bookmarks/ephy-bookmark-properties.c:237 +#: ../src/bookmarks/ephy-bookmark-properties.c:238 #, c-format msgid "“%s” Properties" msgstr "Особине обележивача „%s“" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:364 msgid "_Title:" msgstr "_Наслов:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:382 msgid "A_ddress:" msgstr "_Адреса:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:395 msgid "T_opics:" msgstr "_Теме:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:418 msgid "Sho_w all topics" msgstr "Прикажи _све теме" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:439 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1658,48 +1673,48 @@ msgid "Untitled" msgstr "Неименована" -#: ../src/bookmarks/ephy-bookmarks-editor.c:75 +#: ../src/bookmarks/ephy-bookmarks-editor.c:76 msgid "Web (RDF)" msgstr "Веб (РДФ)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:76 +#: ../src/bookmarks/ephy-bookmarks-editor.c:77 msgid "Mozilla (HTML)" msgstr "Мозилa (ХТМЛ)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:124 +#: ../src/bookmarks/ephy-bookmarks-editor.c:125 msgid "Remove from this topic" msgstr "Уклони из ове теме" #. Toplevel -#: ../src/bookmarks/ephy-bookmarks-editor.c:151 +#: ../src/bookmarks/ephy-bookmarks-editor.c:152 msgid "_File" msgstr "_Датотека" -#: ../src/bookmarks/ephy-bookmarks-editor.c:152 +#: ../src/bookmarks/ephy-bookmarks-editor.c:153 msgid "_Edit" msgstr "_Уређивање" -#: ../src/bookmarks/ephy-bookmarks-editor.c:153 +#: ../src/bookmarks/ephy-bookmarks-editor.c:154 msgid "_View" msgstr "П_реглед" #. Help. -#: ../src/bookmarks/ephy-bookmarks-editor.c:154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:155 #: ../src/resources/epiphany-application-menu.ui.h:7 ../src/ephy-window.c:189 msgid "_Help" msgstr "По_моћ" #. File Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:158 +#: ../src/bookmarks/ephy-bookmarks-editor.c:159 msgid "_New Topic" msgstr "_Нова тема" -#: ../src/bookmarks/ephy-bookmarks-editor.c:159 +#: ../src/bookmarks/ephy-bookmarks-editor.c:160 msgid "Create a new topic" msgstr "Направите нову тему" -#: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1156 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Отвори у _новом прозору" @@ -1707,13 +1722,13 @@ msgstr[2] "Отвори у _новим прозорима" msgstr[3] "Отвори у _новом прозору" -#: ../src/bookmarks/ephy-bookmarks-editor.c:162 +#: ../src/bookmarks/ephy-bookmarks-editor.c:163 msgid "Open the selected bookmark in a new window" msgstr "Отворите изабрани обележивач у новом прозору" # bug: no plural-forms -#: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1159 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Отвори у новом _језичку" @@ -1721,145 +1736,145 @@ msgstr[2] "Отвори у новим _језичцима" msgstr[3] "Отвори у новом _језичку" -#: ../src/bookmarks/ephy-bookmarks-editor.c:165 +#: ../src/bookmarks/ephy-bookmarks-editor.c:166 msgid "Open the selected bookmark in a new tab" msgstr "Отворите изабрани обележивач у новом језичку" -#: ../src/bookmarks/ephy-bookmarks-editor.c:167 +#: ../src/bookmarks/ephy-bookmarks-editor.c:168 msgid "_Rename…" msgstr "_Преименуј…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:168 +#: ../src/bookmarks/ephy-bookmarks-editor.c:169 msgid "Rename the selected bookmark or topic" msgstr "Преименујте изабрани обележивач или тему" -#: ../src/bookmarks/ephy-bookmarks-editor.c:169 +#: ../src/bookmarks/ephy-bookmarks-editor.c:170 msgid "_Properties" msgstr "_Особине" -#: ../src/bookmarks/ephy-bookmarks-editor.c:170 +#: ../src/bookmarks/ephy-bookmarks-editor.c:171 msgid "View or modify the properties of the selected bookmark" msgstr "Прегледајте или измените особине изабраног обележивача" -#: ../src/bookmarks/ephy-bookmarks-editor.c:172 +#: ../src/bookmarks/ephy-bookmarks-editor.c:173 msgid "_Import Bookmarks…" msgstr "Увез_и обележиваче…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:173 +#: ../src/bookmarks/ephy-bookmarks-editor.c:174 msgid "Import bookmarks from another browser or a bookmarks file" msgstr "" "Увезите обележиваче из неког другог веб читача или из датотеке са " "обележивачима" -#: ../src/bookmarks/ephy-bookmarks-editor.c:175 +#: ../src/bookmarks/ephy-bookmarks-editor.c:176 msgid "_Export Bookmarks…" msgstr "Изв_ези обележиваче…" -#: ../src/bookmarks/ephy-bookmarks-editor.c:176 +#: ../src/bookmarks/ephy-bookmarks-editor.c:177 msgid "Export bookmarks to a file" msgstr "Извезите обележиваче у датотеку" -#: ../src/bookmarks/ephy-bookmarks-editor.c:178 ../src/ephy-window.c:112 +#: ../src/bookmarks/ephy-bookmarks-editor.c:179 ../src/ephy-window.c:112 msgid "_Close" msgstr "_Затвори" -#: ../src/bookmarks/ephy-bookmarks-editor.c:179 +#: ../src/bookmarks/ephy-bookmarks-editor.c:180 msgid "Close the bookmarks window" msgstr "Затворите прозор са обележивачима" #. Edit Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:183 ../src/ephy-window.c:123 +#: ../src/bookmarks/ephy-bookmarks-editor.c:184 ../src/ephy-window.c:123 msgid "Cu_t" msgstr "_Исеци" -#: ../src/bookmarks/ephy-bookmarks-editor.c:184 +#: ../src/bookmarks/ephy-bookmarks-editor.c:185 msgid "Cut the selection" msgstr "Исеците изабрано" -#: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1169 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Умножи" -#: ../src/bookmarks/ephy-bookmarks-editor.c:187 +#: ../src/bookmarks/ephy-bookmarks-editor.c:188 msgid "Copy the selection" msgstr "Умножите изабрано" -#: ../src/bookmarks/ephy-bookmarks-editor.c:189 ../src/ephy-window.c:127 +#: ../src/bookmarks/ephy-bookmarks-editor.c:190 ../src/ephy-window.c:127 msgid "_Paste" msgstr "_Убаци" -#: ../src/bookmarks/ephy-bookmarks-editor.c:190 +#: ../src/bookmarks/ephy-bookmarks-editor.c:191 msgid "Paste the clipboard" msgstr "Убаците садржај списка исечака" -#: ../src/bookmarks/ephy-bookmarks-editor.c:192 +#: ../src/bookmarks/ephy-bookmarks-editor.c:193 #: ../src/resources/history-dialog.ui.h:12 msgid "_Delete" msgstr "_Обриши" -#: ../src/bookmarks/ephy-bookmarks-editor.c:193 +#: ../src/bookmarks/ephy-bookmarks-editor.c:194 msgid "Delete the selected bookmark or topic" msgstr "Уклоните изабрани обележивач или тему" -#: ../src/bookmarks/ephy-bookmarks-editor.c:195 ../src/ephy-window.c:131 +#: ../src/bookmarks/ephy-bookmarks-editor.c:196 ../src/ephy-window.c:131 msgid "Select _All" msgstr "Изабери _све" -#: ../src/bookmarks/ephy-bookmarks-editor.c:196 +#: ../src/bookmarks/ephy-bookmarks-editor.c:197 msgid "Select all bookmarks or text" msgstr "Изаберите све обележиваче или сав текст" #. Help Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:200 +#: ../src/bookmarks/ephy-bookmarks-editor.c:201 msgid "_Contents" msgstr "_Садржај" -#: ../src/bookmarks/ephy-bookmarks-editor.c:201 +#: ../src/bookmarks/ephy-bookmarks-editor.c:202 msgid "Display bookmarks help" msgstr "Прикажите помоћ за обележиваче" -#: ../src/bookmarks/ephy-bookmarks-editor.c:203 +#: ../src/bookmarks/ephy-bookmarks-editor.c:204 #: ../src/resources/epiphany-application-menu.ui.h:8 ../src/ephy-window.c:191 msgid "_About" msgstr "_О програму" -#: ../src/bookmarks/ephy-bookmarks-editor.c:204 +#: ../src/bookmarks/ephy-bookmarks-editor.c:205 msgid "Display credits for the web browser creators" msgstr "Прикажите заслуге за творце овог веб читача" #. View Menu -#: ../src/bookmarks/ephy-bookmarks-editor.c:210 +#: ../src/bookmarks/ephy-bookmarks-editor.c:211 msgid "_Title" msgstr "_Наслов" -#: ../src/bookmarks/ephy-bookmarks-editor.c:211 +#: ../src/bookmarks/ephy-bookmarks-editor.c:212 msgid "Show the title column" msgstr "Прикажи насловну колону" -#: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1644 msgid "Address" msgstr "Адреса" -#: ../src/bookmarks/ephy-bookmarks-editor.c:213 +#: ../src/bookmarks/ephy-bookmarks-editor.c:214 msgid "Show the address column" msgstr "Прикажи колону са адресом" -#: ../src/bookmarks/ephy-bookmarks-editor.c:255 +#: ../src/bookmarks/ephy-bookmarks-editor.c:256 msgid "Type a topic" msgstr "Унеси тему" -#: ../src/bookmarks/ephy-bookmarks-editor.c:377 +#: ../src/bookmarks/ephy-bookmarks-editor.c:378 #, c-format msgid "Delete topic “%s”?" msgstr "Да обришем тему „%s“?" -#: ../src/bookmarks/ephy-bookmarks-editor.c:380 +#: ../src/bookmarks/ephy-bookmarks-editor.c:381 msgid "Delete this topic?" msgstr "Да обришем ову тему?" -#: ../src/bookmarks/ephy-bookmarks-editor.c:382 +#: ../src/bookmarks/ephy-bookmarks-editor.c:383 msgid "" "Deleting this topic will cause all its bookmarks to become uncategorized, " "unless they also belong to other topics. The bookmarks will not be deleted." @@ -1868,44 +1883,44 @@ "неразврстани, осим ако не припадају другим темама. Обележивачи неће бити " "уклоњени." -#: ../src/bookmarks/ephy-bookmarks-editor.c:385 +#: ../src/bookmarks/ephy-bookmarks-editor.c:386 msgid "_Delete Topic" msgstr "_Обриши тему" #. FIXME: proper i18n after freeze -#: ../src/bookmarks/ephy-bookmarks-editor.c:495 -#: ../src/bookmarks/ephy-bookmarks-editor.c:499 +#: ../src/bookmarks/ephy-bookmarks-editor.c:496 +#: ../src/bookmarks/ephy-bookmarks-editor.c:500 msgid "Firefox" msgstr "Фајерфокса" -#: ../src/bookmarks/ephy-bookmarks-editor.c:504 -#: ../src/bookmarks/ephy-bookmarks-editor.c:508 +#: ../src/bookmarks/ephy-bookmarks-editor.c:505 +#: ../src/bookmarks/ephy-bookmarks-editor.c:509 msgid "Firebird" msgstr "Фајерб'рда" #. Translators: The %s is the name of a Mozilla profile. -#: ../src/bookmarks/ephy-bookmarks-editor.c:513 +#: ../src/bookmarks/ephy-bookmarks-editor.c:514 #, c-format msgid "Mozilla “%s” profile" msgstr "Профил „%s“ из Мозиле" -#: ../src/bookmarks/ephy-bookmarks-editor.c:517 +#: ../src/bookmarks/ephy-bookmarks-editor.c:518 msgid "Galeon" msgstr "Галије" -#: ../src/bookmarks/ephy-bookmarks-editor.c:521 +#: ../src/bookmarks/ephy-bookmarks-editor.c:522 msgid "Konqueror" msgstr "Конкверора" -#: ../src/bookmarks/ephy-bookmarks-editor.c:550 +#: ../src/bookmarks/ephy-bookmarks-editor.c:551 msgid "Import failed" msgstr "Увоз није успео" -#: ../src/bookmarks/ephy-bookmarks-editor.c:552 +#: ../src/bookmarks/ephy-bookmarks-editor.c:553 msgid "Import Failed" msgstr "Неуспешан увоз" -#: ../src/bookmarks/ephy-bookmarks-editor.c:555 +#: ../src/bookmarks/ephy-bookmarks-editor.c:556 #, c-format msgid "" "The bookmarks from “%s” could not be imported because the file is corrupted " @@ -1914,62 +1929,62 @@ "Не могу да увезем обележиваче из „%s“ зато што је датотека оштећена или " "неподржане врсте." -#: ../src/bookmarks/ephy-bookmarks-editor.c:618 +#: ../src/bookmarks/ephy-bookmarks-editor.c:619 msgid "Import Bookmarks from File" msgstr "Увези обележиваче из датотеке" -#: ../src/bookmarks/ephy-bookmarks-editor.c:625 +#: ../src/bookmarks/ephy-bookmarks-editor.c:626 msgid "Firefox/Mozilla bookmarks" msgstr "Обележивачи Фајерфокса или Мозиле" -#: ../src/bookmarks/ephy-bookmarks-editor.c:629 +#: ../src/bookmarks/ephy-bookmarks-editor.c:630 msgid "Galeon/Konqueror bookmarks" msgstr "Обележивачи Конкверора или Галије" -#: ../src/bookmarks/ephy-bookmarks-editor.c:633 +#: ../src/bookmarks/ephy-bookmarks-editor.c:634 msgid "Web bookmarks" msgstr "Обележивачи Веба" -#: ../src/bookmarks/ephy-bookmarks-editor.c:757 +#: ../src/bookmarks/ephy-bookmarks-editor.c:758 msgid "Export Bookmarks" msgstr "Извези обележиваче" -#: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:765 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1507 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Обележивачи" #. Make a format selection combo & label -#: ../src/bookmarks/ephy-bookmarks-editor.c:770 +#: ../src/bookmarks/ephy-bookmarks-editor.c:771 msgid "File f_ormat:" msgstr "Врста _датотеке:" -#: ../src/bookmarks/ephy-bookmarks-editor.c:816 +#: ../src/bookmarks/ephy-bookmarks-editor.c:817 msgid "Import Bookmarks" msgstr "Увези обележиваче" -#: ../src/bookmarks/ephy-bookmarks-editor.c:821 +#: ../src/bookmarks/ephy-bookmarks-editor.c:822 msgid "I_mport" msgstr "У_вези" -#: ../src/bookmarks/ephy-bookmarks-editor.c:837 +#: ../src/bookmarks/ephy-bookmarks-editor.c:838 msgid "Import bookmarks from:" msgstr "Увези обележиваче из:" -#: ../src/bookmarks/ephy-bookmarks-editor.c:857 +#: ../src/bookmarks/ephy-bookmarks-editor.c:858 msgid "File" msgstr "Датотека" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1165 msgid "_Copy Address" msgstr "_Умножи адресу" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1563 msgid "Topics" msgstr "Теме" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1633 msgid "Title" msgstr "Наслов" @@ -2032,8 +2047,7 @@ "Ову радњу не можете да опозовете. Подаци које бирате за чишћење биће " "уклоњени заувек." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Колачићи" @@ -2364,11 +2378,11 @@ msgid "Other encodings" msgstr "Остала кодирања" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:255 msgid "Clear browsing history?" msgstr "Да очистим записе о прегледу страница?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:259 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2445,11 +2459,11 @@ "Покретање није успело због следеће грешке:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Опције веба" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Затворите језичак" @@ -2586,144 +2600,155 @@ msgstr "Отвори везу у новом _језичку" #: ../src/ephy-window.c:222 +#| msgid "Open Link in New _Window" +msgid "Open Link in I_ncognito Window" +msgstr "Отвори везу у _тајном прозору" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Сачувај везу као…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Умножи _адресу везе" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Умножи адресу ел. поште" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Пргледај слику у _новом језичку" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Умножи адресу сли_ке" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Сачувај слику _као…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Постави за _позадину" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Отвори видео у новом _прозору" # bug: no plural-forms -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Отвори видео у новом _језичку" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Сачувај _видео као…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "Умножи _адресу снимка" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Отвори аудио у новом _прозору" # bug: no plural-forms -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Отвори аудио у новом _језичку" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Сачувај _аудио као…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "Умножи _адресу аудиа" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Има непослатих измена у елементима обрасца" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Уколико ипак затворите документ, изгубићете те податке." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "_Затвори документ" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Неке датотеке из овом прозору нису преузете" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Уколико затворите прозор, прекинућете преузимање датотека" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Затвори прозор и заустави преузимање" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Сачувај као" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Сачувај као програм" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Штампај" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Обележивач" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Пронађи" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Увећано" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Умањено" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Назад" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Напред" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Увећај" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Нови _језичак" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Иди на најпосећеније" +#: ../src/ephy-window.c:1744 +#, c-format +#| msgid "Search the Web for %s" +msgid "Search the Web for '%s'" +msgstr "Потражи „%s“ на вебу" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Сачувај везу као" @@ -2848,19 +2873,19 @@ msgid "C_reate" msgstr "_Направи" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Ступите у везу са нама преко:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Доприносиоци:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Претходни програмери:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2877,7 +2902,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Данило Шеган \n" @@ -2886,15 +2911,15 @@ "\n" "http://prevod.org — превод на српски језик." -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Веб страница Гномовог прегледника" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Да ли да укључим преглед са показивачем?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2905,10 +2930,25 @@ "листате садржај помоћу тастатуре. Да ли желите да укључите прегледање са " "показивачем?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Укључи" +#~ msgid "Epiphany" +#~ msgstr "Спознаја" + +#~ msgid "Toolbar style" +#~ msgstr "Стил траке алата" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Стил траке алата. Допуштене вредности су „“ (користи подразумевани стил " +#~ "Гнома), „both“ (текст и иконице), „both-horiz“ (текст поред иконица), " +#~ "„icons“ (иконице), и „text“ (текст)." + #~ msgid "Size of disk cache" #~ msgstr "Величина оставе на диску" diff -Nru epiphany-browser-3.16.3/po/sv.po epiphany-browser-3.18.0/po/sv.po --- epiphany-browser-3.16.3/po/sv.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/sv.po 2015-09-08 11:37:53.000000000 +0000 @@ -10,8 +10,8 @@ "Project-Id-Version: epiphany\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-14 04:37+0000\n" -"PO-Revision-Date: 2015-03-08 13:50+0100\n" +"POT-Creation-Date: 2015-08-10 09:19+0000\n" +"PO-Revision-Date: 2015-08-15 19:33+0200\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.7.3\n" +"X-Generator: Poedit 1.8.3\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -49,15 +49,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Webb" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -65,36 +65,43 @@ #: ../data/epiphany.appdata.xml.in.h:3 msgid "" -"The web browser for GNOME, featuring tight integration with the desktop and " -"a simple and intuitive user interface that allows you to focus on your web " -"pages." +"The web browser for GNOME, featuring tight integration with the desktop and a " +"simple and intuitive user interface that allows you to focus on your web pages. " +"If you’re looking for a simple, clean, beautiful view of the web, this is the " +"browser for you." msgstr "" "Webbläsaren för GNOME, med stark integration mot skrivbordet och ett enkelt, " -"intuitivt användargränssnitt som tillåter dig att fokusera på dina webbsidor." - -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 -#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +"intuitivt användargränssnitt som tillåter dig att fokusera på dina webbsidor. Om " +"du letar ett enkelt, stilrent och vackert sätt att se webben på är detta " +"webbläsaren för dig." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Webb hänvisas ofta till med dess kodnamn, Epiphany." + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 ../src/ephy-main.c:312 +#: ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Webb" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Webbläsare" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany webbläsare" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Surfa på nätet" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "webb;webbläsare;internet;nätet;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Nytt inkognito-fönster" @@ -112,8 +119,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:10 #, no-c-format msgid "'https://duckduckgo.com/?q=%s&t=epiphany'" -msgstr "" -"'https://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE'" +msgstr "'https://duckduckgo.com/?q=%s&t=epiphany&kl=se-sv&kad=sv_SE'" #: ../data/org.gnome.epiphany.gschema.xml.h:11 msgid "URL Search" @@ -132,8 +138,8 @@ "String that will be used as user agent, to identify the browser to the web " "servers." msgstr "" -"Sträng som ska användas som användaragent för att identifiera webbläsaren " -"till webbservrarna." +"Sträng som ska användas som användaragent för att identifiera webbläsaren till " +"webbservrarna." #: ../data/org.gnome.epiphany.gschema.xml.h:15 msgid "Automatic downloads" @@ -141,8 +147,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:16 msgid "" -"When files cannot be opened by the browser they are automatically downloaded " -"to the download folder and opened with the appropriate application." +"When files cannot be opened by the browser they are automatically downloaded to " +"the download folder and opened with the appropriate application." msgstr "" "När filer inte kan öppnas av webbläsaren hämtas de automatiskt till " "hämtningskatalogen och öppnas med lämpligt program." @@ -155,8 +161,7 @@ msgid "" "Force new window requests to be opened in tabs instead of using a new window." msgstr "" -"Tvinga ny fönsterbegäran att öppnas i flik istället för att använda nytt " -"fönster." +"Tvinga ny fönsterbegäran att öppnas i flik istället för att använda nytt fönster." #: ../data/org.gnome.epiphany.gschema.xml.h:19 msgid "Remember passwords" @@ -190,25 +195,24 @@ "'never' (the homepage is always shown)." msgstr "" "Definierar hur sessionen återställs vid uppstart. Tillåtna värden är \"always" -"\" (programmets tidigare tillstånd återställs alltid), \"crashed" -"\" (sessionen återställs endast om programmet kraschar) and \"never" -"\" (hemsidan visas alltid)." +"\" (programmets tidigare tillstånd återställs alltid), \"crashed\" (sessionen " +"återställs endast om programmet kraschar) and \"never\" (hemsidan visas alltid)." #: ../data/org.gnome.epiphany.gschema.xml.h:26 msgid "" "Whether to delay loading of tabs that are not immediately visible on session " "restore" msgstr "" -"Huruvida inläsning av flikar som inte är omedelbart synliga ska fördröjas " -"vid sessionsåterställning" +"Huruvida inläsning av flikar som inte är omedelbart synliga ska fördröjas vid " +"sessionsåterställning" #: ../data/org.gnome.epiphany.gschema.xml.h:27 msgid "" "When this option is set to true, tabs will not start loading until the user " "switches to them, upon session restore." msgstr "" -"När detta är sant kommer flikar inte börja läsas in förrän användaren byter " -"till dem då en session återskapats." +"När detta är sant kommer flikar inte börja läsas in förrän användaren byter till " +"dem då en session återskapats." #: ../data/org.gnome.epiphany.gschema.xml.h:28 msgid "Process model" @@ -216,28 +220,32 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:29 msgid "" -"This option allows to set the process model used. Use 'shared-secondary-" -"process' to use a single web process shared by all the tabs and 'one-" -"secondary-process-per-web-view' to use a different web process for each tab." -msgstr "" -"Detta alternativ anger processmodellen som används. Använd \"shared-" -"secondary-process\" för att använda en ensam webbprocess som delas av alla " -"flikar och \"one-secondary-process-per-web-view\" för att använda olika " -"processer för varje flik." +"This option allows to set the process model used. Use 'shared-secondary-process' " +"to use a single web process shared by all the tabs and 'one-secondary-process-" +"per-web-view' to use a different web process for each tab." +msgstr "" +"Detta alternativ anger processmodellen som används. Använd \"shared-secondary-" +"process\" för att använda en ensam webbprocess som delas av alla flikar och " +"\"one-secondary-process-per-web-view\" för att använda olika processer för varje " +"flik." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Stil på verktygsfält" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"Maximalt antal webbprocesser som skapas samtidigt när modellen \"one-secondary-" +"process-per-web-view\" används" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Stil på verktygsfältet. Tillåtna värden är \"\" (använd standardstilen i " -"GNOME), \"both\" (både text och ikoner), \"both-horiz\" (text bredvid " -"ikoner), \"icons\" (ikoner) och \"text\"." +"This option sets a limit to the number of web processes that will be used at the " +"same time for the 'one-secondary-process-per-web-view' model. The default value " +"is '0' and means no limit." +msgstr "" +"Detta alternativ sätter en gräns för antalet webbprocesser som kommer användas " +"samtidigt för modellen \"one-secondary-process-per-web-view\". Standardvärdet är " +"\"0\" och betyder att ingen gräns finns." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -248,8 +256,8 @@ "[Deprecated] This setting is deprecated, use 'tabs-bar-visibility-policy' " "instead." msgstr "" -"[Föråldrad] Denna inställning har fasats ut, använd \"tabs-bar-visibility-" -"policy\" i stället." +"[Föråldrad] Denna inställning har fasats ut, använd \"tabs-bar-visibility-policy" +"\" i stället." #: ../data/org.gnome.epiphany.gschema.xml.h:34 msgid "Visibility of the downloads window" @@ -260,8 +268,8 @@ "Hide or show the downloads window. When hidden, a notification will be shown " "when new downloads are started." msgstr "" -"Dölj eller visa hämtningsfönstret. När dolt kommer en avisering att visas " -"när nya hämtningar startas." +"Dölj eller visa hämtningsfönstret. När dolt kommer en avisering att visas när " +"nya hämtningar startas." #: ../data/org.gnome.epiphany.gschema.xml.h:36 msgid "The visibility policy for the tabs bar." @@ -269,13 +277,13 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:37 msgid "" -"Controls when the tabs bar is shown. Possible values are 'always' (the tabs " -"bar is always shown), 'more-than-one' (the tabs bar is only shown if there's " -"two or more tabs) and 'never' (the tabs bar is never shown)." -msgstr "" -"Kontrollerar när flikraden visas. Möjliga värden är \"always\" (flikraden " -"visas alltid), \"more-than-one\" (Flikraden visas bara om det finns två " -"eller fler flikar) och \"never\" (flikraden visas aldrig)." +"Controls when the tabs bar is shown. Possible values are 'always' (the tabs bar " +"is always shown), 'more-than-one' (the tabs bar is only shown if there's two or " +"more tabs) and 'never' (the tabs bar is never shown)." +msgstr "" +"Kontrollerar när flikraden visas. Möjliga värden är \"always\" (flikraden visas " +"alltid), \"more-than-one\" (Flikraden visas bara om det finns två eller fler " +"flikar) och \"never\" (flikraden visas aldrig)." #: ../data/org.gnome.epiphany.gschema.xml.h:38 msgid "Minimum font size" @@ -295,11 +303,11 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:42 msgid "" -"A value to be used to override sans-serif desktop font when use-gnome-fonts " -"is set." +"A value to be used to override sans-serif desktop font when use-gnome-fonts is " +"set." msgstr "" -"Ett värde som används för att åsidosätta skrivbordets sans serif-typsnitt " -"när use-gnome-fonts är inställt." +"Ett värde som används för att åsidosätta skrivbordets sans serif-typsnitt när " +"use-gnome-fonts är inställt." #: ../data/org.gnome.epiphany.gschema.xml.h:43 msgid "Custom serif font" @@ -307,8 +315,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:44 msgid "" -"A value to be used to override serif desktop font when use-gnome-fonts is " -"set." +"A value to be used to override serif desktop font when use-gnome-fonts is set." msgstr "" "Ett värde som används för att åsidosätta skrivbordets serif-typsnitt när use-" "gnome-fonts är inställt." @@ -319,8 +326,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:46 msgid "" -"A value to be used to override monospace desktop font when use-gnome-fonts " -"is set." +"A value to be used to override monospace desktop font when use-gnome-fonts is " +"set." msgstr "" "Ett värde som används för att åsidosätta skrivbordets typsnitt med fast " "breddslag när use-gnome-fonts är inställt." @@ -362,8 +369,7 @@ msgstr "Standardkodning" #: ../data/org.gnome.epiphany.gschema.xml.h:56 -msgid "" -"Default encoding. Accepted values are the ones WebKitGTK+ can understand." +msgid "Default encoding. Accepted values are the ones WebKitGTK+ can understand." msgstr "Standardkodning. Accepterade värden är de som WebKitGTK+ förstår." #: ../data/org.gnome.epiphany.gschema.xml.h:57 @@ -381,8 +387,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:60 msgid "" -"Where to accept cookies from. Possible values are \"always\", \"no-third-" -"party\" and \"never\"." +"Where to accept cookies from. Possible values are \"always\", \"no-third-party\" " +"and \"never\"." msgstr "" "Var kakor ska accepteras ifrån. Möjliga värden är \"always\" (alltid), \"no-" "third-party\" (ej tredjepart) och \"never\" (aldrig)." @@ -396,8 +402,8 @@ "How to present animated images. Possible values are \"normal\", \"once\" and " "\"disabled\"." msgstr "" -"Hur animerade bilder ska presenteras. Möjliga värden är \"normal\", \"once\" " -"och \"disabled\"." +"Hur animerade bilder ska presenteras. Möjliga värden är \"normal\", \"once\" och " +"\"disabled\"." #: ../data/org.gnome.epiphany.gschema.xml.h:63 msgid "Allow popups" @@ -407,8 +413,8 @@ msgid "" "Allow sites to open new windows using JavaScript (if JavaScript is enabled)." msgstr "" -"Tillåt webbplatser att öppna nya fönster med hjälp av JavaScript (om " -"JavaScript är aktiverat)." +"Tillåt webbplatser att öppna nya fönster med hjälp av JavaScript (om JavaScript " +"är aktiverat)." #: ../data/org.gnome.epiphany.gschema.xml.h:65 msgid "Enable Plugins" @@ -440,8 +446,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:72 msgid "" -"Whether to tell websites that we do not wish to be tracked. Please note that " -"web pages are not forced to follow this setting." +"Whether to tell websites that we do not wish to be tracked. Please note that web " +"pages are not forced to follow this setting." msgstr "" "Huruvida vi säger till webbplatser att vi inte vill spåras. Observera att " "webbplatser inte är tvungna att följa denna inställning." @@ -452,8 +458,7 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:74 msgid "" -"Whether to block the embedded advertisements that web pages might want to " -"show." +"Whether to block the embedded advertisements that web pages might want to show." msgstr "Huruvida inbäddade annonser som webbplatser vill visa ska blockeras." #: ../data/org.gnome.epiphany.gschema.xml.h:75 @@ -462,8 +467,8 @@ #: ../data/org.gnome.epiphany.gschema.xml.h:76 msgid "" -"The path of the folder where to download files to; or \"Downloads\" to use " -"the default downloads folder, or \"Desktop\" to use the desktop folder." +"The path of the folder where to download files to; or \"Downloads\" to use the " +"default downloads folder, or \"Desktop\" to use the desktop folder." msgstr "" "Sökvägen till mappen som filer ska hämtas till, eller \"Downloads\" för att " "använda standardhämtningsmappen, eller \"Desktop\" för att använda " @@ -544,45 +549,43 @@ msgid "Installed on:" msgstr "Installerades:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Ta bort från överblick" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "Mest besökta" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Ta bort från överblick" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Privat surfning" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" -"You are currently browsing incognito. Pages viewed in this mode " -"will not show up in your browsing history and all stored information will be " -"cleared when you close the window. Files you download will be kept." +"You are currently browsing incognito. Pages viewed in this mode will " +"not show up in your browsing history and all stored information will be cleared " +"when you close the window. Files you download will be kept." msgstr "" -"Du surfar nu inkognito. Sidor som visas i detta läge kommer inte " -"att dyka upp i din sidhistorik och all lagrad information kommer att tömmas " -"då du stänger fönstret. Filer som du hämtar kommer att behållas." +"Du surfar nu inkognito. Sidor som visas i detta läge kommer inte att " +"dyka upp i din sidhistorik och all lagrad information kommer att tömmas då du " +"stänger fönstret. Filer som du hämtar kommer att behållas." -#: ../embed/ephy-about-handler.c:555 -msgid "" -"Incognito mode hides your activity only from people using this computer." +#: ../embed/ephy-about-handler.c:579 +msgid "Incognito mode hides your activity only from people using this computer." msgstr "" -"Inkognitoläge döljer din aktivitet endast från personer som använder denna " -"dator." +"Inkognitoläge döljer din aktivitet endast från personer som använder denna dator." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " -"internet service provider, your government, other governments, the websites " -"that you visit, and advertisers on these websites may still be tracking you." +"internet service provider, your government, other governments, the websites that " +"you visit, and advertisers on these websites may still be tracking you." msgstr "" "Det kommer inte att dölja dina aktiviteter från din arbetsgivare om du är på " "jobbet. Din internetleverantör, myndigheter, främmande regeringar, de " -"webbplatser som du besöker och annonsörer på dessa webbplatser kan " -"fortfarande spåra dig." +"webbplatser som du besöker och annonsörer på dessa webbplatser kan fortfarande " +"spåra dig." #. characters #: ../embed/ephy-embed.c:51 @@ -952,230 +955,223 @@ msgid "Find next occurrence of the search string" msgstr "Sök nästa förekomst av söksträngen" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Spara" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "Spara _inte" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Spara" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "Vill du spara ditt lösenord för ”%s”?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Neka" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "Tillåt" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "Sidan på %s vill veta din geografiska plats." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "Sidan på %s vill visa aviseringar på skrivbordet." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "Läser in ”%s”…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Läser in…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 -msgid "" -"This website presented identification that belongs to a different website." +#: ../embed/ephy-web-view.c:1763 +msgid "This website presented identification that belongs to a different website." msgstr "" -"Denna webbplats presenterade identitetshandlingar som tillhör en annan " -"webbplats." +"Denna webbplats presenterade identitetshandlingar som tillhör en annan webbplats." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." msgstr "" -"Denna webbplats identitetshandlingar är för gamla för att lita på. " -"Kontrollera datumet för din dators kalender." +"Denna webbplats identitetshandlingar är för gamla för att lita på. Kontrollera " +"datumet för din dators kalender." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Denna webbplats identitetshandlingar var inte utfärdade av någon betrodd " "organisation." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 -msgid "" -"This website’s identification could not be processed. It may be corrupted." +#: ../embed/ephy-web-view.c:1778 +msgid "This website’s identification could not be processed. It may be corrupted." msgstr "" -"Denna webbplats identitetshandlingar kunde inte behandlas. De kan vara " -"trasiga." +"Denna webbplats identitetshandlingar kunde inte behandlas. De kan vara trasiga." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" -"This website’s identification has been revoked by the trusted organization " -"that issued it." +"This website’s identification has been revoked by the trusted organization that " +"issued it." msgstr "" "Denna webbplats identitetshandlingar har återkallats av den betrodda " "organisation som utfärdade dem." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "" -"Denna webbplats identitetshandlingar kan inte anses vara betrodda då de " -"använder väldigt svag kryptering." +"Denna webbplats identitetshandlingar kan inte anses vara betrodda då de använder " +"väldigt svag kryptering." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" -"This website’s identification is only valid for future dates. Check the date " -"on your computer’s calendar." +"This website’s identification is only valid for future dates. Check the date on " +"your computer’s calendar." msgstr "" -"Denna webbplats identitetshandlingar är endast giltiga för datum i " -"framtiden. Kontrollera datumet för din dators kalender." +"Denna webbplats identitetshandlingar är endast giltiga för datum i framtiden. " +"Kontrollera datumet för din dators kalender." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Detta är inte fastställt att vara den riktiga %s." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" -"When you try to connect securely, websites present identification to prove " -"that your connection has not been maliciously intercepted. There is " -"something wrong with this website’s identification:" -msgstr "" -"När du försöker ansluta säkert, presenterar webbplatsen identitetshandlingar " -"för att bevisa att er anslutning inte har genskjutits och avlyssnas. Det är " -"något fel med den här webbplatsens identitetshandlingar:" +"When you try to connect securely, websites present identification to prove that " +"your connection has not been maliciously intercepted. There is something wrong " +"with this website’s identification:" +msgstr "" +"När du försöker ansluta säkert, presenterar webbplatsen identitetshandlingar för " +"att bevisa att er anslutning inte har genskjutits och avlyssnas. Det är något " +"fel med den här webbplatsens identitetshandlingar:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" -"A third party may have hijacked your connection. You should continue only if " -"you know there is a good reason why this website does not use trusted " -"identification." +"A third party may have hijacked your connection. You should continue only if you " +"know there is a good reason why this website does not use trusted identification." msgstr "" -"Din anslutning kan ha övertagits av en tredjepart. Du bör endast fortsätta " -"om du har en god anledning till att denna webbplats inte använder betrodda " +"Din anslutning kan ha övertagits av en tredjepart. Du bör endast fortsätta om du " +"har en god anledning till att denna webbplats inte använder betrodda " "identitetshandlingar." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" -"Legitima banker, butiker och andra publika webbplatser kommer inte att be " -"dig göra detta." +"Legitima banker, butiker och andra publika webbplatser kommer inte att be dig " +"göra detta." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Inget angivet" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "Problem vid inläsning av ”%s”" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Hoppsan! Kunde inte visa denna webbplats." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" -"

The site at “%s” seems to be unavailable. The precise error was:

%s

It may be temporarily unavailable or moved to a " -"new address. You may wish to verify that your internet connection is working " -"correctly.

" +"

The site at “%s” seems to be unavailable. The precise error was:

" +"%s

It may be temporarily unavailable or moved to a new address. You " +"may wish to verify that your internet connection is working correctly.

" msgstr "" "

Webbplatsen på ”%s” verkar inte vara tillgänglig. Det exakta felet var:

%s

Den kan vara avstängd för tillfället eller har " -"flyttats till en ny adress. Glöm inte att kontrollera att din " -"internetanslutning fungerar som den ska.

" +"flyttats till en ny adress. Glöm inte att kontrollera att din internetanslutning " +"fungerar som den ska.

" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Försök igen" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Hoppsan! Det kan ha uppstått ett problem." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" -"

This site may have caused Web to close unexpectedly.

If this " -"happens again, please report the problem to the %s " -"developers.

" +"

This site may have caused Web to close unexpectedly.

If this happens " +"again, please report the problem to the %s developers.

" msgstr "" "

Denna sida kan ha fått Webb att oväntat stängas.

Rapportera gärna " "problemet till %s-utvecklarna om det händer igen.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Uppdatera ändå" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "Problem med att visa ”%s”" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Hoppsan!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." msgstr "" -"Något gick fel då denna sida skulle visas. Uppdatera sidan eller besök en " -"annan sida för att fortsätta." +"Något gick fel då denna sida skulle visas. Uppdatera sidan eller besök en annan " +"sida för att fortsätta." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Se upp!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Läs in ändå" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_OK" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1231,7 +1227,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "Lösenord för %s i ett formulär på %s" @@ -1239,7 +1235,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "Lösenord i ett formulär på %s" @@ -1264,11 +1260,11 @@ #: ../lib/ephy-gui.c:246 msgid "" -"A file with this name already exists and you don't have permission to " -"overwrite it." +"A file with this name already exists and you don't have permission to overwrite " +"it." msgstr "" -"Det finns redan en fil med detta namn och du har inte rättighet att skriva " -"över den." +"Det finns redan en fil med detta namn och du har inte rättighet att skriva över " +"den." #: ../lib/ephy-gui.c:249 msgid "Cannot Overwrite File" @@ -1285,11 +1281,11 @@ #: ../lib/ephy-nss-glue.c:64 msgid "" -"The passwords from the previous version are locked with a master password. " -"If you want to import them, please enter your master password below." +"The passwords from the previous version are locked with a master password. If " +"you want to import them, please enter your master password below." msgstr "" -"Lösenorden från den tidigare versionen är låsta med ett huvudlösenord. Ange " -"ditt huvudlösenord nedan om du vill importera dem." +"Lösenorden från den tidigare versionen är låsta med ett huvudlösenord. Ange ditt " +"huvudlösenord nedan om du vill importera dem." #: ../lib/ephy-profile-migrator.c:100 msgid "Failed to copy cookies file from Mozilla." @@ -1297,11 +1293,11 @@ #: ../lib/ephy-profile-migrator.c:652 msgid "" -"Web 3.6 deprecated this directory and tried migrating this configuration to " -"~/.config/epiphany" +"Web 3.6 deprecated this directory and tried migrating this configuration to ~/." +"config/epiphany" msgstr "" -"Webb 3.6 fasade ut denna katalog och försökte migrera denna inställning till " -"~/.config/epiphany" +"Webb 3.6 fasade ut denna katalog och försökte migrera denna inställning till ~/." +"config/epiphany" #: ../lib/ephy-profile-migrator.c:1030 msgid "Executes only the n-th migration step" @@ -1326,28 +1322,28 @@ #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am" #: ../lib/ephy-time-helpers.c:223 msgid "Today %I:%M %p" -msgstr "Idag %H.%M" +msgstr "Idag %H:%M" #. Translators: "friendly time" string for the previous day, #. * strftime format. e.g. "Yesterday 12:34 am" #. #: ../lib/ephy-time-helpers.c:236 msgid "Yesterday %I:%M %p" -msgstr "Igår %H.%M" +msgstr "Igår %H:%M" #. Translators: "friendly time" string for a day in the current week, #. * strftime format. e.g. "Wed 12:34 am" #. #: ../lib/ephy-time-helpers.c:252 msgid "%a %I:%M %p" -msgstr "%a %H.%M" +msgstr "%a %H:%M" #. Translators: "friendly time" string for a day in the current year, #. * strftime format. e.g. "Feb 12 12:34 am" #. #: ../lib/ephy-time-helpers.c:264 msgid "%b %d %I:%M %p" -msgstr "%d %b %H.%M" +msgstr "%d %b %H:%M" #. Translators: "friendly time" string for a day in a different year, #. * strftime format. e.g. "Feb 12 1997" @@ -1451,8 +1447,8 @@ #: ../lib/widgets/ephy-certificate-popover.c:113 #, c-format msgid "" -"This web site’s digital identification is not trusted. You may have " -"connected to an attacker pretending to be %s." +"This web site’s digital identification is not trusted. You may have connected to " +"an attacker pretending to be %s." msgstr "" "Denna webbplats digitala identitetshandlingar är inte betrodda. Du kan ha " "anslutit till en angripare som utger sig för att vara %s." @@ -1471,71 +1467,71 @@ msgid "_View Certificate…" msgstr "_Visa Certifikat…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d sekund kvar" msgstr[1] "%d sekunder kvar" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d minut kvar" msgstr[1] "%d minuter kvar" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d timme kvar" msgstr[1] "%d timmar kvar" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d dag kvar" msgstr[1] "%d dagar kvar" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d vecka kvar" msgstr[1] "%d veckor kvar" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d månad kvar" msgstr[1] "%d månader kvar" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Färdig" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "Fel vid hämtning: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Avbryt" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Öppna" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Visa i mapp" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Startar…" @@ -1543,20 +1539,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "T_öm" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Ångra" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Gör om" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Drag och släpp denna ikon för att skapa en länk till denna sida" @@ -1578,25 +1574,24 @@ msgid "“%s” Properties" msgstr "Egenskaper för ”%s”" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Titel:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "A_dress:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "Äm_nen:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Visa _alla ämnen" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 -#: ../src/resources/prefs-dialog.ui.h:40 -#: ../src/resources/prefs-lang-dialog.ui.h:3 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 +#: ../src/resources/prefs-dialog.ui.h:40 ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" msgstr "_Lägg till" @@ -1694,7 +1689,7 @@ msgstr "Skapa ett nytt ämne" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Öppna i nyt_t fönster" @@ -1705,7 +1700,7 @@ msgstr "Öppna det markerade bokmärket i ett nytt fönster" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Öppna i ny _flik" @@ -1765,7 +1760,7 @@ msgstr "Klipp ut markeringen" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopiera" @@ -1826,7 +1821,7 @@ msgstr "Visa titelkolumnen" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adress" @@ -1849,12 +1844,12 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:382 msgid "" -"Deleting this topic will cause all its bookmarks to become uncategorized, " -"unless they also belong to other topics. The bookmarks will not be deleted." +"Deleting this topic will cause all its bookmarks to become uncategorized, unless " +"they also belong to other topics. The bookmarks will not be deleted." msgstr "" "Att ta bort detta ämne kommer att medfölja att alla dess bokmärken blir " -"okategoriserade, såvida de inte även tillhör andra ämnen. Bokmärkena kommer " -"inte att tas bort." +"okategoriserade, såvida de inte även tillhör andra ämnen. Bokmärkena kommer inte " +"att tas bort." #: ../src/bookmarks/ephy-bookmarks-editor.c:385 msgid "_Delete Topic" @@ -1896,11 +1891,11 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:555 #, c-format msgid "" -"The bookmarks from “%s” could not be imported because the file is corrupted " -"or of an unsupported type." +"The bookmarks from “%s” could not be imported because the file is corrupted or " +"of an unsupported type." msgstr "" -"Bokmärkena från ”%s” kunde inte importeras eftersom filen är skadad eller av " -"en typ som inte stöds." +"Bokmärkena från ”%s” kunde inte importeras eftersom filen är skadad eller av en " +"typ som inte stöds." #: ../src/bookmarks/ephy-bookmarks-editor.c:618 msgid "Import Bookmarks from File" @@ -1923,7 +1918,7 @@ msgstr "Exportera bokmärken" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Bokmärken" @@ -1949,15 +1944,15 @@ msgid "File" msgstr "Fil" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "_Kopiera adress" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Ämnen" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Titel" @@ -1989,11 +1984,11 @@ #: ../src/resources/clear-data-dialog.ui.h:5 msgid "" -"You are about to clear personal data that is stored about the web pages you " -"have visited. Check the types of information that you want to remove:" +"You are about to clear personal data that is stored about the web pages you have " +"visited. Check the types of information that you want to remove:" msgstr "" -"Du är på väg att tömma personliga data som lagrats om de webbsidor som du " -"har besökt. Kryssa för de typer av information som du vill ta bort:" +"Du är på väg att tömma personliga data som lagrats om de webbsidor som du har " +"besökt. Kryssa för de typer av information som du vill ta bort:" #: ../src/resources/clear-data-dialog.ui.h:6 msgid "Coo_kies" @@ -2013,25 +2008,22 @@ #: ../src/resources/clear-data-dialog.ui.h:10 msgid "" -"You cannot undo this action. The data you are choosing to clear will be " -"removed forever." +"You cannot undo this action. The data you are choosing to clear will be removed " +"forever." msgstr "" -"Du kan inte ångra denna åtgärd. Det data som du väljer att tömma går inte " -"att återställa." +"Du kan inte ångra denna åtgärd. Det data som du väljer att tömma går inte att " +"återställa." -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Kakor" -#: ../src/resources/cookies-dialog.ui.h:2 -#: ../src/resources/history-dialog.ui.h:2 +#: ../src/resources/cookies-dialog.ui.h:2 ../src/resources/history-dialog.ui.h:2 #: ../src/resources/passwords-dialog.ui.h:2 msgid "C_lear All" msgstr "_Töm allt" -#: ../src/resources/cookies-dialog.ui.h:3 -#: ../src/resources/passwords-dialog.ui.h:4 +#: ../src/resources/cookies-dialog.ui.h:3 ../src/resources/passwords-dialog.ui.h:4 msgid "Site" msgstr "Webbplats" @@ -2125,8 +2117,7 @@ msgid "Add _Bookmark" msgstr "Lägg till b_okmärke" -#: ../src/resources/passwords-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:30 +#: ../src/resources/passwords-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:30 msgid "Passwords" msgstr "Lösenord" @@ -2351,11 +2342,11 @@ msgid "Other encodings" msgstr "Andra kodningar" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Töm surfhistorik?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2432,11 +2423,11 @@ "Uppstart misslyckades på grund av följande fel:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Webbalternativ" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Stäng flik" @@ -2573,142 +2564,151 @@ msgstr "Öppna länk i ny _flik" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Öppna länk i i_nkognitofönster" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "_Spara länk som…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "_Kopiera länkadress" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_Kopiera e-postadress" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "Visa _bild i ny flik" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Kopiera b_ildadress" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Spara bil_d som…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Använd som sk_rivbordsbakgrund" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Öppna video i nyt_t fönster" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Öppna video i ny _flik" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "_Spara video som…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "_Kopiera video-adress" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Öppna ljud i nyt_t fönster" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Öppna ljud i ny _flik" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "_Spara ljud som…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "_Kopiera ljud-adress" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Det finns ändringar i formulärelement som inte skickats" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Om du ändå stänger dokumentet kommer du att förlora den informationen." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Stäng _dokument" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Det pågår fortfarande hämtningar i detta fönster" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Om du stänger detta fönster så kommer hämtningarna att avbrytas" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Stäng fönstret och avbryt hämtningar" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Spara som" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Spara som applikation" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Skriv ut" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Bokmärke" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Sök" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Större" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Mindre" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Bakåt" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "Framåt" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Zooma" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Ny _flik" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "Gå till mest besökta" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "Sök på nätet efter ”%s”" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Spara länk som" @@ -2802,11 +2802,10 @@ #: ../src/window-commands.c:719 msgid "" -"An application with the same name already exists. Replacing it will " -"overwrite it." +"An application with the same name already exists. Replacing it will overwrite it." msgstr "" -"Det finns redan en applikation med detta namn. Om du ersätter den så skrivs " -"den gamla över." +"Det finns redan en applikation med detta namn. Om du ersätter den så skrivs den " +"gamla över." #: ../src/window-commands.c:755 #, c-format @@ -2831,19 +2830,19 @@ msgid "C_reate" msgstr "S_kapa" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Kontakta oss på:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Bidragsgivare:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Tidigare utvecklare:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2860,7 +2859,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Daniel Nylander \n" @@ -2871,28 +2870,43 @@ "Skicka synpunkter på översättningen till\n" "." -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Webbplatsen för Webb" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Aktivera markörläge?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " -"cursor in web pages, allowing you to move around with your keyboard. Do you " -"want to enable caret browsing?" +"cursor in web pages, allowing you to move around with your keyboard. Do you want " +"to enable caret browsing?" msgstr "" -"Tryck F7 för att aktivera markörläge. Denna funktion placerar en flyttbar " -"markör i webbsidor, vilket gör att du kan flytta runt med ditt tangentbord. " -"Vill du aktivera markörläge?" +"Tryck F7 för att aktivera markörläge. Denna funktion placerar en flyttbar markör " +"i webbsidor, vilket gör att du kan flytta runt med ditt tangentbord. Vill du " +"aktivera markörläge?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Aktivera" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Stil på verktygsfält" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Stil på verktygsfältet. Tillåtna värden är \"\" (använd standardstilen i " +#~ "GNOME), \"both\" (både text och ikoner), \"both-horiz\" (text bredvid " +#~ "ikoner), \"icons\" (ikoner) och \"text\"." + #~ msgid "Size of disk cache" #~ msgstr "Storlek på diskcache" diff -Nru epiphany-browser-3.16.3/po/tr.po epiphany-browser-3.18.0/po/tr.po --- epiphany-browser-3.16.3/po/tr.po 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/po/tr.po 2015-09-21 08:20:22.000000000 +0000 @@ -15,16 +15,16 @@ "Project-Id-Version: epiphany\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-22 04:38+0000\n" -"PO-Revision-Date: 2015-03-22 16:03+0200\n" +"POT-Creation-Date: 2015-09-16 15:47+0000\n" +"PO-Revision-Date: 2015-09-16 21:41+0300\n" "Last-Translator: Muhammet Kara \n" -"Language-Team: Turkish \n" +"Language-Team: Türkçe \n" "Language: tr_TR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -54,54 +54,63 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "http://duckduckgo.com/?q=%s&t=epiphany&kl=tr-tr&kad=tr_TR" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" msgstr "GNOME için web tarayıcısı" #: ../data/epiphany.appdata.xml.in.h:3 +#| msgid "" +#| "The web browser for GNOME, featuring tight integration with the desktop " +#| "and a simple and intuitive user interface that allows you to focus on " +#| "your web pages." msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" -"GNOME masaüstü için web tarayıcısı, masaüstü ile sıkı bir bütünleştirmeye " -"sahip, basit ve sezgisel kullanıcı arayüzüyle web sayfalarınıza " -"odaklanmanıza olanak tanır." +"GNOME için web tarayıcısı; masaüstü ile sıkı bir bütünleştirmeye sahip, " +"basit ve sezgisel kullanıcı arayüzüyle web sayfalarınıza odaklanmanıza " +"olanak tanır. Eğer web ortamının sade, temiz, güzel bir görünümünü " +"arıyorsanız, aradığınız tarayıcı budur." + +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web sıklıkla kod adıyla, yani Epiphany olarak anılır." -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "Web" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "Web Tarayıcı" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany Web Tarayıcı" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "Web'e gözat" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;tarayıcı;internet;" -#: ../data/epiphany.desktop.in.in.h:6 -#| msgid "New _Incognito Window" +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "Yeni Gizli Tarama Penceresi" @@ -233,18 +242,22 @@ "secondary-process-per-web-view' ayarını kullanın." #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "Araç çubuğu biçemi" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"\"her-web-görünümü-için-ikincil-bir-süreç\" modeli kullanıldığında aynı anda " +"oluşturulan en yüksek web süreci sayısı" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." -msgstr "" -"Araç çubuğu biçemi. İzin verilen değerler \"\" (GNOME öntanımlı biçemini " -"kullan), \"both\" (yazı ve simgeler), \"both-horiz\" (simge yanında yazı), " -"\"icons\" ve \"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." +msgstr "" +"Bu seçenek, \"her-web-görünümü-için-ikincil-bir-süreç\" modeli için aynı " +"anda kullanılacak web süreçlerinin sayısına sınır koyar. Öntanımlı değeri " +"'0'dır ve sınırsız olduğu anlamına gelir." #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -555,19 +568,19 @@ msgid "Installed on:" msgstr "Kuruldu:" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "Genel görünümden kaldır" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "En Çok Ziyaret Edilen" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "Genel görünümden kaldır" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "Gizli Tarama" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -578,14 +591,14 @@ "bilgiler pencereyi kapattığınızda temizlenecek. İndirdiğiniz dosyalar " "saklanacak." -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "" "Gizli tarama kipi, etkinliklerinizi sadece bu bilgisayarı kullanan " "kişilerden saklar." -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -601,17 +614,17 @@ msgid "Blank page" msgstr "Boş sayfa" -#: ../embed/ephy-embed.c:542 +#: ../embed/ephy-embed.c:548 #, c-format msgid "Press %s to exit fullscreen" msgstr "Tam ekrandan çıkmak için %s tuşuna basın" #. Translators: 'ESC' and 'F11' are keyboard keys. -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "ESC" msgstr "ESC" -#: ../embed/ephy-embed.c:545 +#: ../embed/ephy-embed.c:551 msgid "F11" msgstr "F11" @@ -964,60 +977,60 @@ msgid "Find next occurrence of the search string" msgstr "Arama dizgisinin bir sonraki göründüğü yeri bul" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "_Kaydet" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "_Kaydetme" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "_Kaydet" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "“%s” parolanızı kaydetmek istiyor musunuz?" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "Reddet" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "İzin ver" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "%s sayfası konumunuzu bilmek istiyor." #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "%s konumundaki sayfa, masaüstü bildirimleri göstermek istiyor." #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "“%s” yükleniyor…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "Yükleniyor…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "Bu web sitesi farklı bir web sitesine ait kimlik sundu." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." @@ -1026,19 +1039,19 @@ "takvimindeki tarihi kontrol edin." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "" "Bu web sitesinin kimliği güvenilir bir kuruluş tarafından düzenlenmemiş." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "Bu web sitesinin kimliği işlenemedi. Bozuk olabilir." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." @@ -1047,7 +1060,7 @@ "edildi." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." @@ -1056,7 +1069,7 @@ "kullanıyor." #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." @@ -1065,13 +1078,13 @@ "Bilgisayarınızın takvimindeki tarihi kontrol edin." #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "Bu, gerçekten %s olmayabilir." #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1082,7 +1095,7 @@ "kimliğiyle ilgili bir sorun var:" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1093,29 +1106,29 @@ "devam etmelisiniz." #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "" "Gerçek bankalar, iş yerleri ve diğer kurumsal siteler sizden bunu yapmanızı " "istemezler." -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "Hiçbir şey belirtilmemiş" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "“%s” yükleme sorunu" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "Oops! Bu web sitesi gösterilemiyor." -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "Tekrar dene" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "Oops! Bir sorun olabilir." -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1147,20 +1160,20 @@ "açmış olabilir.

Eğer tekrarlanırsa, lütfen bu hatayı %s geliştiricilerine bildirin.

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "Yine de Yeniden Yükle" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "“%s” görüntüleme sorunu" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "Amanın!" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." @@ -1169,21 +1182,21 @@ "yenileyin ya da başka bir sayfayı ziyaret edin." #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "Dikkat edin!" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "Yine De Yükle" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "_Tamam" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1239,7 +1252,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "%s kullanıcısının %s adresindeki parolası" @@ -1247,7 +1260,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "%s formundaki parola" @@ -1478,65 +1491,65 @@ msgid "_View Certificate…" msgstr "Sertifikayı _Görüntüle..." -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "%d saniye kaldı" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "%d dakika kaldı" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "%d saat kaldı" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "%d gün kaldı" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "%d hafta kaldı" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "%d ay kaldı" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "Bitti" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "İndirilirken hata oluştu: %s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "Vazgeç" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "Aç" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "Klasörde göster" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "Başlatılıyor..." @@ -1544,20 +1557,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "_Temizle" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "_Geri Al" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "_Yinele" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "Bu sayfaya bir bağlantı oluşturmak için simgeyi sürükleyip bırakın" @@ -1578,23 +1591,23 @@ msgid "“%s” Properties" msgstr "“%s” Özellikleri" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "_Başlık:" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "_Adres:" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "_Konular:" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "Tüm konuları _göster" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1690,7 +1703,7 @@ msgstr "Yeni konu oluştur" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "Ye_ni Pencerede Aç" @@ -1700,7 +1713,7 @@ msgstr "Seçili yer imini yeni pencerede aç" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "Yeni S_ekmede Aç" @@ -1760,7 +1773,7 @@ msgstr "Seçimi kes" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "_Kopyala" @@ -1821,7 +1834,7 @@ msgstr "Başlık sütununu göster" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "Adres" @@ -1917,7 +1930,7 @@ msgstr "Yer İmlerini Aktar" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "Yer İmleri" @@ -1943,15 +1956,15 @@ msgid "File" msgstr "Dosya" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "Adresi _Kopyala" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "Konular" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "Başlık" @@ -2345,11 +2358,11 @@ msgid "Other encodings" msgstr "Diğer kodlamalar" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "Tarama geçmişi temizlensin mi?" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2426,11 +2439,11 @@ "Aşağıdaki hatadan dolayı başlangıç başarısız oldu:\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "Web seçenekleri" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "Sekmeyi kapat" @@ -2567,142 +2580,151 @@ msgstr "Bağlantıyı Yeni _Sekmede Aç" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "Bağlantıyı _Gizli Pencerede Aç" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "Bağlantıyı _Farklı Kaydet…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "Bağlantı Adresini _Kopyala" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "_E-posta Adresini Kopyala" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "_Resmi Yeni Sekmede Görüntüle" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" msgstr "Res_min Adresini Kopyala" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" msgstr "Re_smi Farklı Kaydet…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "Duvar Ka_ğıdı Olarak Ayarla" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "Videoyu Yeni _Pencerede Aç" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "Videoyu Yeni _Sekmede Aç" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "Videoyu _Farklı Kaydet…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "Video Adresini _Kopyala" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "Sesi Yeni _Pencerede Aç" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "Sesi Yeni _Sekmede Aç" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "Sesi _Farklı Kaydet…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "Ses Adresini _Kopyala" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "Form bileşenlerinde gönderilmemiş değişiklikler var" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "Eğer dosyayı kapatacak olursanız bu bilgileri kaybedeceksiniz." -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "Belgeyi _Kapat" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "Bu pencerede devam eden indirmeler var" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "Eğer bu pencereyi kapatırsanız, indirmeler iptal edilecek" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "Pencereyi kapat ve indirmeleri iptal et" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "Farklı Kaydet" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "Uygulama Olarak Kaydet" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "Yazdır" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "Yer İmi" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "Bul" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "Daha Büyük" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "Daha Küçük" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "Geri" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "İleri" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "Yakınlaştır" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "Yeni _Sekme" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "En çok ziyaret edilen sayfaya git" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "'%s' için internette ara" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "Bağlantıyı Farklı Kaydet" @@ -2826,19 +2848,19 @@ msgid "C_reate" msgstr "Oluştu_r" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "Bize ulaşmak için:" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "Katkıda Bulunanlar:" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "Geçmişteri geliştiriciler:" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2855,22 +2877,22 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "Barış ÇİÇEK \n" "Erçin EKER \n" "Muhammet Kara " -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "Web Web Sitesi" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "Karet tarama etkinleştirilsin mi?" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2880,10 +2902,25 @@ "web sayfalarına taşınabilir bir imleç yerleştirir, klavyenizle sayfada " "gezinmenizi sağlar. Karet taramayı etkinleştirmek ister misiniz?" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "_Etkinleştir" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "Araç çubuğu biçemi" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "Araç çubuğu biçemi. İzin verilen değerler \"\" (GNOME öntanımlı biçemini " +#~ "kullan), \"both\" (yazı ve simgeler), \"both-horiz\" (simge yanında " +#~ "yazı), \"icons\" ve \"text\"." + #~ msgid "Size of disk cache" #~ msgstr "Sabit disk önbellek boyutu" diff -Nru epiphany-browser-3.16.3/po/zh_TW.po epiphany-browser-3.18.0/po/zh_TW.po --- epiphany-browser-3.16.3/po/zh_TW.po 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/po/zh_TW.po 2015-09-08 11:37:53.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: epiphany 3.3.91\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=epiphany&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-15 04:37+0000\n" -"PO-Revision-Date: 2015-03-15 14:12+0800\n" +"POT-Creation-Date: 2015-08-25 12:39+0800\n" +"PO-Revision-Date: 2015-08-25 12:41+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\n" @@ -22,7 +22,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.7.4\n" +"X-Generator: Poedit 1.8.4\n" #: ../data/default-bookmarks.rdf.in.h:1 msgid "Search the web" @@ -52,15 +52,15 @@ #. duckduckgo must be translated. For such case, the search url #. would be #. https://duckduckgo.com/?q=%s&t=epiphany&kl=fi-fi&kad=fi_FI -#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:244 +#: ../data/default-bookmarks.rdf.in.h:24 ../embed/ephy-embed-utils.c:241 #: ../src/ephy-search-provider.c:289 #, no-c-format msgid "https://duckduckgo.com/?q=%s&t=epiphany" msgstr "https://duckduckgo.com/?q=%s&t=epiphany" #: ../data/epiphany.appdata.xml.in.h:1 -msgid "Epiphany" -msgstr "Epiphany" +msgid "GNOME Web" +msgstr "GNOME Web" #: ../data/epiphany.appdata.xml.in.h:2 msgid "Web browser for GNOME" @@ -70,34 +70,40 @@ msgid "" "The web browser for GNOME, featuring tight integration with the desktop and " "a simple and intuitive user interface that allows you to focus on your web " -"pages." +"pages. If you’re looking for a simple, clean, beautiful view of the web, " +"this is the browser for you." msgstr "" "GNOME 的網頁瀏覽器，帶來與桌面的緊密整合、簡易且直觀的使用者介面，讓您可以專" -"注在您的網頁上。" +"注在您的網頁上。如果您在尋找簡單、乾淨、美觀的網頁環境，這就是為您設計的瀏覽" +"器。" -#: ../data/epiphany.desktop.in.in.h:1 ../embed/ephy-about-handler.c:292 +#: ../data/epiphany.appdata.xml.in.h:4 +msgid "GNOME Web is often referred to by its code name, Epiphany." +msgstr "GNOME Web 亦常被稱為它的代碼名稱， Epiphany。" + +#: ../data/epiphany.desktop.in.h:1 ../embed/ephy-about-handler.c:292 #: ../embed/ephy-about-handler.c:323 ../src/ephy-main.c:67 -#: ../src/ephy-main.c:314 ../src/ephy-main.c:470 ../src/window-commands.c:1519 +#: ../src/ephy-main.c:312 ../src/ephy-main.c:468 ../src/window-commands.c:1517 msgid "Web" msgstr "網頁" -#: ../data/epiphany.desktop.in.in.h:2 +#: ../data/epiphany.desktop.in.h:2 msgid "Web Browser" msgstr "網頁瀏覽器" -#: ../data/epiphany.desktop.in.in.h:3 +#: ../data/epiphany.desktop.in.h:3 msgid "Epiphany Web Browser" msgstr "Epiphany 網頁瀏覽器" -#: ../data/epiphany.desktop.in.in.h:4 +#: ../data/epiphany.desktop.in.h:4 msgid "Browse the web" msgstr "瀏覽網頁" -#: ../data/epiphany.desktop.in.in.h:5 +#: ../data/epiphany.desktop.in.h:5 msgid "web;browser;internet;" msgstr "web;browser;internet;網頁;瀏覽器;網際網路;" -#: ../data/epiphany.desktop.in.in.h:6 +#: ../data/epiphany.desktop.in.h:6 msgid "New Incognito Window" msgstr "新增隱密視窗" @@ -220,17 +226,21 @@ "同的 web 程序。" #: ../data/org.gnome.epiphany.gschema.xml.h:30 -msgid "Toolbar style" -msgstr "工具列樣式" +msgid "" +"Maximum number of web processes created at the same time when using 'one-" +"secondary-process-per-web-view' model" +msgstr "" +"當使用「one-secondary-process-per-web-view」模型時同一時刻能建立的最大網頁程" +"序數目" #: ../data/org.gnome.epiphany.gschema.xml.h:31 msgid "" -"Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" -"\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " -"\"text\"." +"This option sets a limit to the number of web processes that will be used at " +"the same time for the 'one-secondary-process-per-web-view' model. The " +"default value is '0' and means no limit." msgstr "" -"工具列樣式。允許的數值有 \"\" (使用 GNOME 預設樣式)、\"both\" (文字和圖" -"示)、\"both-horiz\" (文字在圖示旁)、\"icons\" 和 \"text\"。" +"這個選項會設定在使用「one-secondary-process-per-web-view」模型時同一時刻能建" +"立的最大網頁程序數目限制。預設數值為「0」，亦即不限制。" #: ../data/org.gnome.epiphany.gschema.xml.h:32 msgid "[Deprecated]" @@ -519,19 +529,19 @@ msgid "Installed on:" msgstr "安裝於：" -#: ../embed/ephy-about-handler.c:474 -msgid "Remove from overview" -msgstr "從概覽中移除" - -#: ../embed/ephy-about-handler.c:489 ../embed/ephy-embed-utils.c:301 +#: ../embed/ephy-about-handler.c:474 ../embed/ephy-embed-utils.c:308 msgid "Most Visited" msgstr "最常瀏覽" -#: ../embed/ephy-about-handler.c:549 ../embed/ephy-about-handler.c:550 +#: ../embed/ephy-about-handler.c:507 +msgid "Remove from overview" +msgstr "從概覽中移除" + +#: ../embed/ephy-about-handler.c:573 ../embed/ephy-about-handler.c:574 msgid "Private Browsing" msgstr "隱密瀏覽" -#: ../embed/ephy-about-handler.c:551 +#: ../embed/ephy-about-handler.c:575 msgid "" "You are currently browsing incognito. Pages viewed in this mode " "will not show up in your browsing history and all stored information will be " @@ -540,12 +550,12 @@ "您現在使用隱密瀏覽。在這個模式中檢視的網頁將不會出現在瀏覽紀錄中，且" "所有儲存的資訊都會在關閉視窗時清除。下載的檔案則會保留下來。" -#: ../embed/ephy-about-handler.c:555 +#: ../embed/ephy-about-handler.c:579 msgid "" "Incognito mode hides your activity only from people using this computer." msgstr "隱密模式只能對使用這臺電腦的其他人隱藏您的活動。" -#: ../embed/ephy-about-handler.c:557 +#: ../embed/ephy-about-handler.c:581 msgid "" "It will not hide your activity from your employer if you are at work. Your " "internet service provider, your government, other governments, the websites " @@ -923,105 +933,105 @@ msgid "Find next occurrence of the search string" msgstr "尋找下一個出現搜尋字串的地方" -#: ../embed/ephy-web-view.c:492 ../lib/ephy-file-chooser.c:194 -msgid "_Save" -msgstr "儲存(_S)" - #: ../embed/ephy-web-view.c:493 msgid "_Don’t Save" msgstr "不要儲存(_D)" +#: ../embed/ephy-web-view.c:494 ../lib/ephy-file-chooser.c:194 +msgid "_Save" +msgstr "儲存(_S)" + #. Translators: The %s the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../embed/ephy-web-view.c:504 +#: ../embed/ephy-web-view.c:505 #, c-format msgid "Do you want to save your password for “%s”?" msgstr "您是否要儲存您在“%s”的密碼？" -#: ../embed/ephy-web-view.c:1416 +#: ../embed/ephy-web-view.c:1433 msgid "Deny" msgstr "禁止" -#: ../embed/ephy-web-view.c:1417 +#: ../embed/ephy-web-view.c:1434 msgid "Allow" msgstr "允許" #. Translators: Geolocation policy for a specific site. -#: ../embed/ephy-web-view.c:1429 +#: ../embed/ephy-web-view.c:1446 #, c-format msgid "The page at %s wants to know your location." msgstr "在 %s 的網頁想要知道您的位置。" #. Translators: Notification policy for a specific site. -#: ../embed/ephy-web-view.c:1433 +#: ../embed/ephy-web-view.c:1450 #, c-format msgid "The page at %s wants to show desktop notifications." msgstr "在 %s 的網頁想要顯示桌面通知。" #. translators: %s here is the address of the web page -#: ../embed/ephy-web-view.c:1519 +#: ../embed/ephy-web-view.c:1538 #, c-format msgid "Loading “%s”…" msgstr "正在載入“%s”…" -#: ../embed/ephy-web-view.c:1521 +#: ../embed/ephy-web-view.c:1540 msgid "Loading…" msgstr "載入中…" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1743 +#: ../embed/ephy-web-view.c:1763 msgid "" "This website presented identification that belongs to a different website." msgstr "這個網站呈現的識別屬於不同的網站。" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1748 +#: ../embed/ephy-web-view.c:1768 msgid "" "This website’s identification is too old to trust. Check the date on your " "computer’s calendar." msgstr "這個網站的識別太老以致難以信任。請檢查您電腦的日期是否正確。" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1753 +#: ../embed/ephy-web-view.c:1773 msgid "This website’s identification was not issued by a trusted organization." msgstr "這個網站的識別並非來自可信任的組織。" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1758 +#: ../embed/ephy-web-view.c:1778 msgid "" "This website’s identification could not be processed. It may be corrupted." msgstr "這個網站的識別無法處理。它可能已損壞。" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1763 +#: ../embed/ephy-web-view.c:1783 msgid "" "This website’s identification has been revoked by the trusted organization " "that issued it." msgstr "這個網站的識別已被發行它的信任組織註銷。" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1768 +#: ../embed/ephy-web-view.c:1788 msgid "" "This website’s identification cannot be trusted because it uses very weak " "encryption." msgstr "這個網站的識別不可信任，因為它使用非常弱的加密。" #. Possible error message when a site presents a bad certificate. -#: ../embed/ephy-web-view.c:1773 +#: ../embed/ephy-web-view.c:1793 msgid "" "This website’s identification is only valid for future dates. Check the date " "on your computer’s calendar." msgstr "這個網站的識別有效日期在未來。請檢查您電腦的日期是否正確。" #. Message when a site's TLS certificate is invalid. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1809 +#: ../embed/ephy-web-view.c:1829 #, c-format msgid "This might not be the real %s." msgstr "這可能不是真正的 %s。" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1814 +#: ../embed/ephy-web-view.c:1834 msgid "" "When you try to connect securely, websites present identification to prove " "that your connection has not been maliciously intercepted. There is " @@ -1031,7 +1041,7 @@ "的識別有些錯誤：" #. Message when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1820 +#: ../embed/ephy-web-view.c:1840 msgid "" "A third party may have hijacked your connection. You should continue only if " "you know there is a good reason why this website does not use trusted " @@ -1041,27 +1051,27 @@ "被信任的識別時才繼續連線。" #. Good advice from Firefox; displays when a site's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1824 +#: ../embed/ephy-web-view.c:1844 msgid "" "Legitimate banks, stores, and other public sites will not ask you to do this." msgstr "合法的銀行、商店和其他的公開網站都不會要求您這麼做。" -#: ../embed/ephy-web-view.c:1865 +#: ../embed/ephy-web-view.c:1885 msgid "None specified" msgstr "沒有指定" #. Page title when a site cannot be loaded. %s is the site's hostname. -#: ../embed/ephy-web-view.c:1878 ../embed/ephy-web-view.c:1893 -#: ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1898 ../embed/ephy-web-view.c:1913 +#: ../embed/ephy-web-view.c:1933 #, c-format msgid "Problem loading “%s”" msgstr "載入“%s”時發生錯誤" -#: ../embed/ephy-web-view.c:1880 +#: ../embed/ephy-web-view.c:1900 msgid "Oops! Unable to display this website." msgstr "噢！無法顯示這個網站。" -#: ../embed/ephy-web-view.c:1881 +#: ../embed/ephy-web-view.c:1901 #, c-format msgid "" "

The site at “%s” seems to be unavailable. The precise error was:" -#: ../embed/ephy-web-view.c:1889 +#: ../embed/ephy-web-view.c:1909 msgid "Try again" msgstr "再試一次" -#: ../embed/ephy-web-view.c:1895 +#: ../embed/ephy-web-view.c:1915 msgid "Oops! There may be a problem." msgstr "噢！可能有問題發生。" -#: ../embed/ephy-web-view.c:1896 +#: ../embed/ephy-web-view.c:1916 #, c-format msgid "" "

This site may have caused Web to close unexpectedly.

If this " @@ -1091,41 +1101,41 @@ "

這個網站可能造成 Web 未預期的關閉。

如果這再次發生，請將這個問題回報" "給 %s 開發團隊。

" -#: ../embed/ephy-web-view.c:1901 ../embed/ephy-web-view.c:1908 +#: ../embed/ephy-web-view.c:1921 ../embed/ephy-web-view.c:1928 msgid "Reload Anyway" msgstr "強制重新載入" -#: ../embed/ephy-web-view.c:1905 +#: ../embed/ephy-web-view.c:1925 #, c-format msgid "Problem displaying “%s”" msgstr "顯示“%s”時發生問題" -#: ../embed/ephy-web-view.c:1906 +#: ../embed/ephy-web-view.c:1926 msgid "Oops!" msgstr "噢！" -#: ../embed/ephy-web-view.c:1907 +#: ../embed/ephy-web-view.c:1927 msgid "" "Something went wrong while displaying this page. Please reload or visit a " "different page to continue." msgstr "顯示這個頁面時有錯誤發生。請重新載入或瀏覽不同的頁面以繼續。" #. Title of error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1915 +#: ../embed/ephy-web-view.c:1935 msgid "Look out!" msgstr "小心" #. Button on error page when a website's TLS certificate is invalid. -#: ../embed/ephy-web-view.c:1918 +#: ../embed/ephy-web-view.c:1938 msgid "Load Anyway" msgstr "強制載入" -#: ../embed/ephy-web-view.c:2819 +#: ../embed/ephy-web-view.c:2863 msgid "_OK" msgstr "確定(_O)" #: ../lib/ephy-file-chooser.c:184 ../lib/ephy-file-chooser.c:193 -#: ../src/bookmarks/ephy-bookmark-properties.c:432 +#: ../src/bookmarks/ephy-bookmark-properties.c:435 #: ../src/bookmarks/ephy-bookmarks-editor.c:819 #: ../src/resources/clear-data-dialog.ui.h:3 #: ../src/resources/prefs-lang-dialog.ui.h:2 ../src/window-commands.c:809 @@ -1181,7 +1191,7 @@ #. * hostname where this is happening. Example: gnome@gmail.com and #. * mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:139 +#: ../lib/ephy-form-auth-data.c:140 #, c-format msgid "Password for %s in a form in %s" msgstr "%s 用於 %s 表單的密碼" @@ -1189,7 +1199,7 @@ #. Translators: The first %s is the hostname where this is happening. #. * Example: mail.google.com. #. -#: ../lib/ephy-form-auth-data.c:145 +#: ../lib/ephy-form-auth-data.c:146 #, c-format msgid "Password in a form in %s" msgstr "用於 %s 表單的密碼" @@ -1247,7 +1257,7 @@ msgid "" "Web 3.6 deprecated this directory and tried migrating this configuration to " "~/.config/epiphany" -msgstr "Web 3.6 已廢棄這個目錄並且嘗試將這個組態轉移到 ~/.config/epiphany" +msgstr "Web 3.6 已廢棄這個目錄並且嘗試將這個設定轉移到 ~/.config/epiphany" #: ../lib/ephy-profile-migrator.c:1030 msgid "Executes only the n-th migration step" @@ -1259,15 +1269,15 @@ #: ../lib/ephy-profile-migrator.c:1034 msgid "Specifies the profile where the migrator should run" -msgstr "指定轉移器應執行的設定組合" +msgstr "指定轉移器應執行的設定檔" #: ../lib/ephy-profile-migrator.c:1047 msgid "Web profile migrator" -msgstr "Web 設定組合轉移器" +msgstr "Web 設定檔轉移器" #: ../lib/ephy-profile-migrator.c:1048 msgid "Web profile migrator options" -msgstr "Web 設定組合轉移器選項" +msgstr "Web 設定檔轉移器選項" #. Translators: "friendly time" string for the current day, strftime format. like "Today 12:34 am" #: ../lib/ephy-time-helpers.c:223 @@ -1415,65 +1425,65 @@ msgid "_View Certificate…" msgstr "檢視憑證(_V)…" -#: ../lib/widgets/ephy-download-widget.c:107 +#: ../lib/widgets/ephy-download-widget.c:106 #, c-format msgid "%d second left" msgid_plural "%d seconds left" msgstr[0] "剩下 %d 秒鐘" -#: ../lib/widgets/ephy-download-widget.c:113 +#: ../lib/widgets/ephy-download-widget.c:112 #, c-format msgid "%d minute left" msgid_plural "%d minutes left" msgstr[0] "剩下 %d 分鐘" -#: ../lib/widgets/ephy-download-widget.c:119 +#: ../lib/widgets/ephy-download-widget.c:118 #, c-format msgid "%d hour left" msgid_plural "%d hours left" msgstr[0] "剩下 %d 小時" -#: ../lib/widgets/ephy-download-widget.c:125 +#: ../lib/widgets/ephy-download-widget.c:124 #, c-format msgid "%d day left" msgid_plural "%d days left" msgstr[0] "剩下 %d 天" -#: ../lib/widgets/ephy-download-widget.c:131 +#: ../lib/widgets/ephy-download-widget.c:130 #, c-format msgid "%d week left" msgid_plural "%d weeks left" msgstr[0] "剩下 %d 週" -#: ../lib/widgets/ephy-download-widget.c:137 +#: ../lib/widgets/ephy-download-widget.c:136 #, c-format msgid "%d month left" msgid_plural "%d months left" msgstr[0] "剩下 %d 月" -#: ../lib/widgets/ephy-download-widget.c:293 +#: ../lib/widgets/ephy-download-widget.c:304 msgid "Finished" msgstr "已完成" -#: ../lib/widgets/ephy-download-widget.c:309 +#: ../lib/widgets/ephy-download-widget.c:320 #, c-format msgid "Error downloading: %s" msgstr "下載時發生錯誤：%s" -#: ../lib/widgets/ephy-download-widget.c:364 ../src/window-commands.c:713 +#: ../lib/widgets/ephy-download-widget.c:375 ../src/window-commands.c:713 msgid "Cancel" msgstr "取消" -#: ../lib/widgets/ephy-download-widget.c:372 ../src/ephy-window.c:1121 +#: ../lib/widgets/ephy-download-widget.c:383 ../src/ephy-window.c:1130 #: ../src/window-commands.c:275 msgid "Open" msgstr "開啟" -#: ../lib/widgets/ephy-download-widget.c:377 +#: ../lib/widgets/ephy-download-widget.c:388 msgid "Show in folder" msgstr "在資料夾顯示" -#: ../lib/widgets/ephy-download-widget.c:586 +#: ../lib/widgets/ephy-download-widget.c:592 msgid "Starting…" msgstr "正在開始…" @@ -1481,20 +1491,20 @@ #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete, #. * Select All, Input Methods and Insert Unicode control character.) #. -#: ../lib/widgets/ephy-location-entry.c:606 ../src/ephy-history-window.c:263 +#: ../lib/widgets/ephy-location-entry.c:605 ../src/ephy-history-window.c:264 msgid "Cl_ear" msgstr "清除(_E)" #. Edit actions. -#: ../lib/widgets/ephy-location-entry.c:625 ../src/ephy-window.c:119 +#: ../lib/widgets/ephy-location-entry.c:624 ../src/ephy-window.c:119 msgid "_Undo" msgstr "復原(_U)" -#: ../lib/widgets/ephy-location-entry.c:632 +#: ../lib/widgets/ephy-location-entry.c:631 msgid "_Redo" msgstr "取消復原(_R)" -#: ../lib/widgets/ephy-location-entry.c:912 +#: ../lib/widgets/ephy-location-entry.c:911 msgid "Drag and drop this icon to create a link to this page" msgstr "拖放這個圖示來建立連至該網頁的連結" @@ -1515,23 +1525,23 @@ msgid "“%s” Properties" msgstr "“%s”屬性" -#: ../src/bookmarks/ephy-bookmark-properties.c:362 +#: ../src/bookmarks/ephy-bookmark-properties.c:363 msgid "_Title:" msgstr "標題(_T)：" -#: ../src/bookmarks/ephy-bookmark-properties.c:379 +#: ../src/bookmarks/ephy-bookmark-properties.c:381 msgid "A_ddress:" msgstr "位址(_D)：" -#: ../src/bookmarks/ephy-bookmark-properties.c:391 +#: ../src/bookmarks/ephy-bookmark-properties.c:394 msgid "T_opics:" msgstr "主題(_O)：" -#: ../src/bookmarks/ephy-bookmark-properties.c:414 +#: ../src/bookmarks/ephy-bookmark-properties.c:417 msgid "Sho_w all topics" msgstr "顯示所有主題(_W)" -#: ../src/bookmarks/ephy-bookmark-properties.c:435 +#: ../src/bookmarks/ephy-bookmark-properties.c:438 #: ../src/resources/prefs-dialog.ui.h:40 #: ../src/resources/prefs-lang-dialog.ui.h:3 msgid "_Add" @@ -1627,7 +1637,7 @@ msgstr "建立新的主題" #: ../src/bookmarks/ephy-bookmarks-editor.c:161 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1154 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1155 msgid "Open in New _Window" msgid_plural "Open in New _Windows" msgstr[0] "在新的視窗中開啟(_W)" @@ -1637,7 +1647,7 @@ msgstr "在新的視窗中開啟已選的書籤" #: ../src/bookmarks/ephy-bookmarks-editor.c:164 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1157 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1158 msgid "Open in New _Tab" msgid_plural "Open in New _Tabs" msgstr[0] "在新的分頁中開啟(_T)" @@ -1696,7 +1706,7 @@ msgstr "剪下選定的內容" #: ../src/bookmarks/ephy-bookmarks-editor.c:186 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1167 ../src/ephy-window.c:125 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1168 ../src/ephy-window.c:125 msgid "_Copy" msgstr "複製(_C)" @@ -1757,7 +1767,7 @@ msgstr "顯示標題欄位" #: ../src/bookmarks/ephy-bookmarks-editor.c:212 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1643 msgid "Address" msgstr "地址" @@ -1805,7 +1815,7 @@ #: ../src/bookmarks/ephy-bookmarks-editor.c:513 #, c-format msgid "Mozilla “%s” profile" -msgstr "Mozilla “%s” 設定組合" +msgstr "Mozilla “%s” 設定檔" #: ../src/bookmarks/ephy-bookmarks-editor.c:517 msgid "Galeon" @@ -1851,7 +1861,7 @@ msgstr "匯出書籤" #: ../src/bookmarks/ephy-bookmarks-editor.c:764 -#: ../src/bookmarks/ephy-bookmarks-editor.c:1495 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1506 #: ../src/bookmarks/ephy-topic-action.c:217 msgid "Bookmarks" msgstr "書籤" @@ -1877,15 +1887,15 @@ msgid "File" msgstr "檔案" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1163 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1164 msgid "_Copy Address" msgstr "複製位址(_C)" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1551 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1562 msgid "Topics" msgstr "主題" -#: ../src/bookmarks/ephy-bookmarks-editor.c:1621 +#: ../src/bookmarks/ephy-bookmarks-editor.c:1632 msgid "Title" msgstr "標題" @@ -1944,8 +1954,7 @@ "removed forever." msgstr "您不可以將這個動作復原。您選擇要清除的資料會永遠移除。" -#: ../src/resources/cookies-dialog.ui.h:1 -#: ../src/resources/prefs-dialog.ui.h:21 +#: ../src/resources/cookies-dialog.ui.h:1 ../src/resources/prefs-dialog.ui.h:21 msgid "Cookies" msgstr "Cookie" @@ -2276,11 +2285,11 @@ msgid "Other encodings" msgstr "其他字元編碼方式" -#: ../src/ephy-history-window.c:253 +#: ../src/ephy-history-window.c:254 msgid "Clear browsing history?" msgstr "是否清除瀏覽記錄？" -#: ../src/ephy-history-window.c:257 +#: ../src/ephy-history-window.c:258 msgid "" "Clearing the browsing history will cause all history links to be permanently " "deleted." @@ -2332,7 +2341,7 @@ #: ../src/ephy-main.c:94 msgid "Profile directory to use in the private instance" -msgstr "在私密實體中使用的設定組合目錄" +msgstr "在私密實體中使用的設定檔目錄" #: ../src/ephy-main.c:94 msgid "DIR" @@ -2355,11 +2364,11 @@ "由於以下原因，因此無法執行：\n" "%s" -#: ../src/ephy-main.c:315 +#: ../src/ephy-main.c:313 msgid "Web options" msgstr "網頁選項" -#: ../src/ephy-notebook.c:615 +#: ../src/ephy-notebook.c:619 msgid "Close tab" msgstr "關閉分頁" @@ -2496,149 +2505,158 @@ msgstr "在新的分頁中開啟連結(_T)" #: ../src/ephy-window.c:222 +msgid "Open Link in I_ncognito Window" +msgstr "在隱密視窗中開啟連結(_N)" + +#: ../src/ephy-window.c:224 msgid "_Save Link As…" msgstr "另存連結(_S)…" -#: ../src/ephy-window.c:224 +#: ../src/ephy-window.c:226 msgid "_Copy Link Address" msgstr "複製連結地址(_C)" -#: ../src/ephy-window.c:226 +#: ../src/ephy-window.c:228 msgid "_Copy E-mail Address" msgstr "複製電子郵件位址(_C)" #. Images. -#: ../src/ephy-window.c:231 +#: ../src/ephy-window.c:233 msgid "View _Image in New Tab" msgstr "在新分頁中檢視影像(_I)" -#: ../src/ephy-window.c:233 +#: ../src/ephy-window.c:235 msgid "Copy I_mage Address" -msgstr "複製圖片地址(_M)" +msgstr "複製影像地址(_M)" -#: ../src/ephy-window.c:235 +#: ../src/ephy-window.c:237 msgid "_Save Image As…" -msgstr "另存圖片(_S)…" +msgstr "另存影像(_S)…" -#: ../src/ephy-window.c:237 +#: ../src/ephy-window.c:239 msgid "Set as _Wallpaper" msgstr "設為桌布(_W)" #. Video. -#: ../src/ephy-window.c:242 +#: ../src/ephy-window.c:244 msgid "Open Video in New _Window" msgstr "在新的視窗中開啟影片(_W)" -#: ../src/ephy-window.c:244 +#: ../src/ephy-window.c:246 msgid "Open Video in New _Tab" msgstr "在新的分頁中開啟影片(_T)" -#: ../src/ephy-window.c:246 +#: ../src/ephy-window.c:248 msgid "_Save Video As…" msgstr "另存影片(_S)…" -#: ../src/ephy-window.c:248 +#: ../src/ephy-window.c:250 msgid "_Copy Video Address" msgstr "複製影片位址(_C)" #. Audio. -#: ../src/ephy-window.c:253 +#: ../src/ephy-window.c:255 msgid "Open Audio in New _Window" msgstr "在新的視窗中開啟音效(_W)" -#: ../src/ephy-window.c:255 +#: ../src/ephy-window.c:257 msgid "Open Audio in New _Tab" msgstr "在新的分頁中開啟音效(_T)" -#: ../src/ephy-window.c:257 +#: ../src/ephy-window.c:259 msgid "_Save Audio As…" msgstr "另存音效(_S)…" -#: ../src/ephy-window.c:259 +#: ../src/ephy-window.c:261 msgid "_Copy Audio Address" msgstr "複製音效位址(_C)" -#: ../src/ephy-window.c:467 +#: ../src/ephy-window.c:473 msgid "There are unsubmitted changes to form elements" msgstr "對表單的元素而言沒有經確認的改變" -#: ../src/ephy-window.c:468 +#: ../src/ephy-window.c:474 msgid "If you close the document anyway, you will lose that information." msgstr "如果您無論無何要關閉此文件，您將會失去未儲存的資訊。" -#: ../src/ephy-window.c:470 +#: ../src/ephy-window.c:476 msgid "Close _Document" msgstr "關閉文件(_D)" -#: ../src/ephy-window.c:485 +#: ../src/ephy-window.c:491 msgid "There are ongoing downloads in this window" msgstr "這個視窗還有進行中的下載" -#: ../src/ephy-window.c:486 +#: ../src/ephy-window.c:492 msgid "If you close this window, the downloads will be cancelled" msgstr "如果您關閉這個視窗，這個下載也會被取消" -#: ../src/ephy-window.c:487 +#: ../src/ephy-window.c:493 msgid "Close window and cancel downloads" msgstr "關閉視窗並取消下載" -#: ../src/ephy-window.c:1123 +#: ../src/ephy-window.c:1132 msgid "Save As" msgstr "另存新檔" -#: ../src/ephy-window.c:1125 +#: ../src/ephy-window.c:1134 msgid "Save As Application" msgstr "儲存為應用程式" -#: ../src/ephy-window.c:1127 +#: ../src/ephy-window.c:1136 msgid "Print" msgstr "列印" -#: ../src/ephy-window.c:1129 +#: ../src/ephy-window.c:1138 msgid "Bookmark" msgstr "加入書籤" -#: ../src/ephy-window.c:1131 +#: ../src/ephy-window.c:1140 msgid "Find" msgstr "尋找" #. Translators: This refers to text size -#: ../src/ephy-window.c:1140 +#: ../src/ephy-window.c:1149 msgid "Larger" msgstr "放大" #. Translators: This refers to text size -#: ../src/ephy-window.c:1143 +#: ../src/ephy-window.c:1152 msgid "Smaller" msgstr "縮小" -#: ../src/ephy-window.c:1165 +#: ../src/ephy-window.c:1174 msgid "Back" msgstr "上一頁" -#: ../src/ephy-window.c:1177 +#: ../src/ephy-window.c:1186 msgid "Forward" msgstr "下一頁" -#: ../src/ephy-window.c:1189 +#: ../src/ephy-window.c:1198 msgid "Zoom" msgstr "縮放" -#: ../src/ephy-window.c:1198 +#: ../src/ephy-window.c:1207 msgid "New _Tab" msgstr "新增分頁(_T)" -#: ../src/ephy-window.c:1206 +#: ../src/ephy-window.c:1215 msgid "Go to most visited" msgstr "移至最常瀏覽" +#: ../src/ephy-window.c:1744 +#, c-format +msgid "Search the Web for '%s'" +msgstr "在網路搜尋「%s」" + #: ../src/popup-commands.c:229 msgid "Save Link As" msgstr "另存連結(_A)…" #: ../src/popup-commands.c:236 msgid "Save Image As" -msgstr "另存圖片" +msgstr "另存影像" #: ../src/popup-commands.c:243 msgid "Save Media As" @@ -2751,19 +2769,19 @@ msgid "C_reate" msgstr "建立(_R)" -#: ../src/window-commands.c:1480 ../src/window-commands.c:1503 +#: ../src/window-commands.c:1478 ../src/window-commands.c:1501 msgid "Contact us at:" msgstr "聯絡我們於：" -#: ../src/window-commands.c:1483 +#: ../src/window-commands.c:1481 msgid "Contributors:" msgstr "貢獻者：" -#: ../src/window-commands.c:1486 +#: ../src/window-commands.c:1484 msgid "Past developers:" msgstr "前度開發人員：" -#: ../src/window-commands.c:1512 +#: ../src/window-commands.c:1510 #, c-format msgid "" "A simple, clean, beautiful view of the web.\n" @@ -2780,7 +2798,7 @@ #. * this translation; in that case, please write each of them on a separate #. * line seperated by newlines (\n). #. -#: ../src/window-commands.c:1535 +#: ../src/window-commands.c:1533 msgid "translator-credits" msgstr "" "如對翻譯有任何意見，請送一封電子郵件給\n" @@ -2791,15 +2809,15 @@ "Ching-Hung Lin , 2004\n" "Abel Cheung , 2003" -#: ../src/window-commands.c:1538 +#: ../src/window-commands.c:1536 msgid "Web Website" msgstr "網頁網站" -#: ../src/window-commands.c:1677 +#: ../src/window-commands.c:1675 msgid "Enable caret browsing mode?" msgstr "是否啟用鍵盤瀏覽？" -#: ../src/window-commands.c:1680 +#: ../src/window-commands.c:1678 msgid "" "Pressing F7 turns caret browsing on or off. This feature places a moveable " "cursor in web pages, allowing you to move around with your keyboard. Do you " @@ -2808,10 +2826,24 @@ "按下 F7 會開啟或關閉鍵盤瀏覽。這個功能會在網頁中放置一個可移動的游標，讓您可" "以使用鍵盤隨處移動。您是否要啟用鍵盤瀏覽？" -#: ../src/window-commands.c:1683 +#: ../src/window-commands.c:1681 msgid "_Enable" msgstr "啟用(_E)" +#~ msgid "Epiphany" +#~ msgstr "Epiphany" + +#~ msgid "Toolbar style" +#~ msgstr "工具列樣式" + +#~ msgid "" +#~ "Toolbar style. Allowed values are \"\" (use GNOME default style), \"both" +#~ "\" (text and icons), \"both-horiz\" (text besides icons), \"icons\", and " +#~ "\"text\"." +#~ msgstr "" +#~ "工具列樣式。允許的數值有 \"\" (使用 GNOME 預設樣式)、\"both\" (文字和圖" +#~ "示)、\"both-horiz\" (文字在圖示旁)、\"icons\" 和 \"text\"。" + #~ msgid "Size of disk cache" #~ msgstr "磁碟快取大小" diff -Nru epiphany-browser-3.16.3/src/bookmarks/ephy-bookmark-properties.c epiphany-browser-3.18.0/src/bookmarks/ephy-bookmark-properties.c --- epiphany-browser-3.16.3/src/bookmarks/ephy-bookmark-properties.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/src/bookmarks/ephy-bookmark-properties.c 2015-09-21 14:53:44.000000000 +0000 @@ -34,6 +34,7 @@ #include "ephy-dnd.h" #include "ephy-prefs.h" #include "ephy-settings.h" +#include "ephy-uri-helpers.h" #include #include @@ -306,6 +307,7 @@ GtkDialog *dialog; gboolean lockdown; const char *tmp; + char *unescaped_url; object = G_OBJECT_CLASS (ephy_bookmark_properties_parent_class)->constructor (type, n_construct_properties, @@ -371,7 +373,8 @@ gtk_editable_set_editable (GTK_EDITABLE (entry), !lockdown); tmp = ephy_node_get_property_string (properties->priv->bookmark, EPHY_NODE_BMK_PROP_LOCATION); - gtk_entry_set_text (GTK_ENTRY (entry), tmp); + unescaped_url = ephy_uri_safe_unescape (tmp); + gtk_entry_set_text (GTK_ENTRY (entry), unescaped_url); g_signal_connect (entry, "changed", G_CALLBACK (location_entry_changed_cb), properties); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); @@ -383,6 +386,7 @@ gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); gtk_grid_attach (GTK_GRID (grid), entry, 1, 1, 1, 1); gtk_widget_set_hexpand (entry, TRUE); + g_free (unescaped_url); entry = ephy_topics_entry_new (priv->bookmarks, priv->bookmark); gtk_editable_set_editable (GTK_EDITABLE (entry), !lockdown); diff -Nru epiphany-browser-3.16.3/src/bookmarks/ephy-bookmarks-editor.c epiphany-browser-3.18.0/src/bookmarks/ephy-bookmarks-editor.c --- epiphany-browser-3.16.3/src/bookmarks/ephy-bookmarks-editor.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/bookmarks/ephy-bookmarks-editor.c 2015-09-21 14:53:44.000000000 +0000 @@ -37,6 +37,7 @@ #include "ephy-settings.h" #include "ephy-shell.h" #include "ephy-initial-state.h" +#include "ephy-uri-helpers.h" #include "ephy-topic-action.h" #include "ephy-window.h" #include "popup-commands.h" @@ -401,7 +402,7 @@ } else if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->key_view))) { - EphyNodePriority priority; + int priority; GList *selected; EphyNode *node; @@ -1021,6 +1022,7 @@ static void ephy_bookmarks_editor_finalize (GObject *object) { + /* FIXME: This should all be done in dispose, not finalize, but got to make sure that's safe. */ EphyBookmarksEditor *editor = EPHY_BOOKMARKS_EDITOR (object); g_object_unref (G_OBJECT (editor->priv->bookmarks_filter)); @@ -1125,7 +1127,7 @@ if (key_focus && selected) { EphyNode *node = selected->data; - EphyNodePriority priority; + int priority; char name[EPHY_TOPIC_ACTION_NAME_BUFFER_SIZE]; priority = ephy_node_get_property_int @@ -1478,6 +1480,16 @@ } static void +unescape_bookmark_uri (EphyNode *node, + GValue *value, + gpointer user_data) +{ + const char *url = g_value_get_string (value); + g_value_take_string (value, ephy_uri_safe_unescape (url)); +} + + +static void ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor) { GtkTreeSelection *selection; @@ -1568,7 +1580,7 @@ G_CALLBACK (view_selection_changed_cb), editor); ephy_node_view_set_priority (EPHY_NODE_VIEW (key_view), - EPHY_NODE_KEYWORD_PROP_PRIORITY); + (EphyNodeViewPriority)EPHY_NODE_KEYWORD_PROP_PRIORITY); ephy_node_view_set_sort (EPHY_NODE_VIEW (key_view), G_TYPE_STRING, EPHY_NODE_KEYWORD_PROP_NAME, GTK_SORT_ASCENDING); gtk_container_add (GTK_CONTAINER (scrolled_window), key_view); @@ -1628,11 +1640,12 @@ gtk_tree_view_column_set_min_width (editor->priv->title_col, 300); gtk_tree_view_column_set_resizable (editor->priv->title_col, TRUE); - url_col_id = ephy_node_view_add_column + url_col_id = ephy_node_view_add_column_full (EPHY_NODE_VIEW (bm_view), _("Address"), G_TYPE_STRING, EPHY_NODE_BMK_PROP_LOCATION, EPHY_NODE_VIEW_SORTABLE | EPHY_NODE_VIEW_ELLIPSIZED, + unescape_bookmark_uri, NULL, NULL, &(editor->priv->address_col)); gtk_tree_view_column_set_min_width (editor->priv->address_col, 300); gtk_tree_view_column_set_resizable (editor->priv->address_col, TRUE); diff -Nru epiphany-browser-3.16.3/src/bookmarks/ephy-bookmarks-export.c epiphany-browser-3.18.0/src/bookmarks/ephy-bookmarks-export.c --- epiphany-browser-3.16.3/src/bookmarks/ephy-bookmarks-export.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/bookmarks/ephy-bookmarks-export.c 2015-08-07 08:41:06.000000000 +0000 @@ -74,7 +74,7 @@ for (i = 0; i < children->len; i++) { EphyNode *kid; - EphyNodePriority priority; + int priority; kid = g_ptr_array_index (children, i); diff -Nru epiphany-browser-3.16.3/src/bookmarks/Makefile.am epiphany-browser-3.18.0/src/bookmarks/Makefile.am --- epiphany-browser-3.16.3/src/bookmarks/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/bookmarks/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -1,6 +1,7 @@ noinst_LTLIBRARIES = libephybookmarks.la AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) INST_H_FILES = \ ephy-bookmarks.h @@ -115,7 +116,5 @@ libephybookmarks_la_LIBADD = CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/src/bookmarks/Makefile.in epiphany-browser-3.18.0/src/bookmarks/Makefile.in --- epiphany-browser-3.16.3/src/bookmarks/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/src/bookmarks/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = src/bookmarks -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -92,6 +110,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 = @@ -142,7 +161,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -190,18 +209,19 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -216,7 +236,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -225,17 +244,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -245,8 +261,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -270,9 +284,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -293,11 +305,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -306,6 +314,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -324,6 +334,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -359,6 +370,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -369,6 +381,7 @@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libephybookmarks.la AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) INST_H_FILES = \ ephy-bookmarks.h @@ -438,8 +451,6 @@ libephybookmarks_la_LIBADD = CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -457,7 +468,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/bookmarks/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/bookmarks/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -767,13 +777,11 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ @@ -861,6 +869,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + ephy-bookmarks-type-builtins.c: stamp-ephy-bookmarks-type-builtins.c Makefile @true diff -Nru epiphany-browser-3.16.3/src/clear-data-dialog.c epiphany-browser-3.18.0/src/clear-data-dialog.c --- epiphany-browser-3.16.3/src/clear-data-dialog.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/src/clear-data-dialog.c 2015-09-21 14:53:44.000000000 +0000 @@ -28,6 +28,7 @@ #include #include +#include "ephy-form-auth-data.h" #include "ephy-history-service.h" #include "ephy-embed-shell.h" @@ -77,8 +78,8 @@ { GHashTable *attributes; - attributes = secret_attributes_build (SECRET_SCHEMA_COMPAT_NETWORK, NULL); - secret_service_clear (NULL, SECRET_SCHEMA_COMPAT_NETWORK, + attributes = secret_attributes_build (EPHY_FORM_PASSWORD_SCHEMA, NULL); + secret_service_clear (NULL, EPHY_FORM_PASSWORD_SCHEMA, attributes, NULL, (GAsyncReadyCallback)secret_service_clear_finish, NULL); diff -Nru epiphany-browser-3.16.3/src/ephy-completion-model.c epiphany-browser-3.18.0/src/ephy-completion-model.c --- epiphany-browser-3.16.3/src/ephy-completion-model.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-completion-model.c 2015-09-22 07:28:20.000000000 +0000 @@ -26,13 +26,15 @@ #include "ephy-favicon-helpers.h" #include "ephy-history-service.h" #include "ephy-shell.h" +#include "ephy-uri-helpers.h" #include enum { PROP_0, PROP_HISTORY_SERVICE, - PROP_BOOKMARKS + PROP_BOOKMARKS, + PROP_USE_MARKUP }; G_DEFINE_TYPE (EphyCompletionModel, ephy_completion_model, GTK_TYPE_LIST_STORE) @@ -44,7 +46,10 @@ GCancellable *cancellable; EphyNode *bookmarks; + EphyNode *smart_bookmarks; GSList *search_terms; + + gboolean use_markup; }; static void @@ -79,8 +84,15 @@ case PROP_HISTORY_SERVICE: self->priv->history_service = EPHY_HISTORY_SERVICE (g_value_get_pointer (value)); break; - case PROP_BOOKMARKS: - self->priv->bookmarks = ephy_bookmarks_get_bookmarks (EPHY_BOOKMARKS (g_value_get_pointer (value))); + case PROP_BOOKMARKS: { + EphyBookmarks *bookmarks = EPHY_BOOKMARKS (g_value_get_pointer (value)); + + self->priv->bookmarks = ephy_bookmarks_get_bookmarks (bookmarks); + self->priv->smart_bookmarks = ephy_bookmarks_get_smart_bookmarks (bookmarks); + } + break; + case PROP_USE_MARKUP: + self->priv->use_markup = g_value_get_boolean (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (self, property_id, pspec); @@ -128,6 +140,14 @@ "The bookmarks", G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); + g_object_class_install_property (object_class, + PROP_USE_MARKUP, + g_param_spec_boolean ("use-markup", + "Whether we should be using markup", + "Whether we should be using markup", + TRUE, + G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); + g_type_class_add_private (object_class, sizeof (EphyCompletionModelPrivate)); } @@ -233,25 +253,51 @@ g_slice_free (IconLoadData, data); } +static gchar * +get_row_text (const gchar *url, const gchar *title, const gchar *subtitle_color) +{ + gchar *unescaped_url; + gchar *text; + + if (!url) + return g_markup_escape_text (title, -1); + + unescaped_url = ephy_uri_safe_unescape (url); + if (g_strcmp0 (url, title) == 0) + text = g_markup_escape_text (unescaped_url, -1); + else + text = g_markup_printf_escaped ("%s\n%s", title, subtitle_color, unescaped_url); + g_free (unescaped_url); + + return text; +} + static void -set_row_in_model (EphyCompletionModel *model, int position, PotentialRow *row) +set_row_in_model (EphyCompletionModel *model, int position, PotentialRow *row, const gchar *subtitle_color) { GtkTreeIter iter; GtkTreePath *path; IconLoadData *data; WebKitFaviconDatabase* database; + gchar *text; EphyEmbedShell *shell = ephy_embed_shell_get_default (); database = webkit_web_context_get_favicon_database (ephy_embed_shell_get_web_context (shell)); + if (model->priv->use_markup) + text = get_row_text (row->location, row->title, subtitle_color); + else + text = g_strdup (row->title); + gtk_list_store_insert_with_values (GTK_LIST_STORE (model), &iter, position, - EPHY_COMPLETION_TEXT_COL, row->title ? row->title : "", + EPHY_COMPLETION_TEXT_COL, text ? text : "", EPHY_COMPLETION_URL_COL, row->location, EPHY_COMPLETION_ACTION_COL, row->location, EPHY_COMPLETION_KEYWORDS_COL, row->keywords ? row->keywords : "", EPHY_COMPLETION_EXTRA_COL, row->is_bookmark, EPHY_COMPLETION_RELEVANCE_COL, row->relevance, -1); + g_free (text); data = g_slice_new (IconLoadData); data->model = GTK_LIST_STORE (g_object_ref(model)); @@ -263,21 +309,55 @@ NULL, icon_loaded_cb, data); } +static gchar * +get_text_column_subtitle_color (void) +{ + GtkWidgetPath *path; + GtkStyleContext *style_context; + GdkRGBA rgba; + + path = gtk_widget_path_new (); + gtk_widget_path_prepend_type (path, GTK_TYPE_ENTRY); + gtk_widget_path_iter_add_class (path, 0, GTK_STYLE_CLASS_ENTRY); + + style_context = gtk_style_context_new (); + gtk_style_context_set_path (style_context, path); + gtk_widget_path_free (path); + + gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY); + gtk_style_context_get_color (style_context, GTK_STATE_FLAG_INSENSITIVE, &rgba); + g_object_unref (style_context); + + return g_strdup_printf ("#%04X%04X%04X", + (guint)(rgba.red * (gdouble)65535), + (guint)(rgba.green * (gdouble)65535), + (guint)(rgba.blue * (gdouble)65535)); +} + static void replace_rows_in_model (EphyCompletionModel *model, GSList *new_rows) { /* This is by far the simplest way of doing, and yet it gives * basically the same result than the other methods... */ int i; + gchar *subtitle_color = NULL; gtk_list_store_clear (GTK_LIST_STORE (model)); + if (!new_rows) + return; + + if (model->priv->use_markup) + subtitle_color = get_text_column_subtitle_color (); + for (i = 0; new_rows != NULL; i++) { PotentialRow *row = (PotentialRow*)new_rows->data; - - set_row_in_model (model, i, row); + + set_row_in_model (model, i, row, subtitle_color); new_rows = new_rows->next; } + + g_free (subtitle_color); } static gboolean @@ -417,14 +497,17 @@ for (i = 0; i < children->len; i++) { EphyNode *kid; const char *keywords, *location, *title; + gboolean is_smart; kid = g_ptr_array_index (children, i); location = ephy_node_get_property_string (kid, EPHY_NODE_BMK_PROP_LOCATION); title = ephy_node_get_property_string (kid, EPHY_NODE_BMK_PROP_TITLE); keywords = ephy_node_get_property_string (kid, EPHY_NODE_BMK_PROP_KEYWORDS); + is_smart = ephy_node_has_child (priv->smart_bookmarks, kid); - if (should_add_bookmark_to_model (model, user_data->search_string, - title, location, keywords)) + /* Smart bookmarks are already added to the completion menu as completion actions */ + if (!is_smart && should_add_bookmark_to_model (model, user_data->search_string, + title, location, keywords)) list = add_to_potential_rows (list, title, location, keywords, 0, TRUE, FALSE); } @@ -587,7 +670,8 @@ EphyCompletionModel * ephy_completion_model_new (EphyHistoryService *history_service, - EphyBookmarks *bookmarks) + EphyBookmarks *bookmarks, + gboolean use_markup) { g_return_val_if_fail (EPHY_IS_HISTORY_SERVICE (history_service), NULL); g_return_val_if_fail (EPHY_IS_BOOKMARKS (bookmarks), NULL); @@ -595,5 +679,6 @@ return g_object_new (EPHY_TYPE_COMPLETION_MODEL, "history-service", history_service, "bookmarks", bookmarks, + "use-markup", use_markup, NULL); } diff -Nru epiphany-browser-3.16.3/src/ephy-completion-model.h epiphany-browser-3.18.0/src/ephy-completion-model.h --- epiphany-browser-3.16.3/src/ephy-completion-model.h 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-completion-model.h 2015-09-22 07:28:20.000000000 +0000 @@ -68,7 +68,8 @@ GType ephy_completion_model_get_type (void); EphyCompletionModel *ephy_completion_model_new (EphyHistoryService *history_service, - EphyBookmarks *bookmarks); + EphyBookmarks *bookmarks, + gboolean use_markup); void ephy_completion_model_update_for_string (EphyCompletionModel *model, const char *string, diff -Nru epiphany-browser-3.16.3/src/ephy-history-window.c epiphany-browser-3.18.0/src/ephy-history-window.c --- epiphany-browser-3.16.3/src/ephy-history-window.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-history-window.c 2015-09-21 14:53:44.000000000 +0000 @@ -29,6 +29,7 @@ #include "ephy-prefs.h" #include "ephy-settings.h" #include "ephy-shell.h" +#include "ephy-uri-helpers.h" #include "ephy-time-helpers.h" #include "ephy-window.h" @@ -52,6 +53,7 @@ GtkTreeViewColumn *name_column; GtkTreeViewColumn *location_column; GtkWidget *date_renderer; + GtkWidget *location_renderer; GtkWidget *remove_button; GtkWidget *open_button; GtkWidget *clear_button; @@ -720,6 +722,7 @@ gtk_widget_class_bind_template_child_private (widget_class, EphyHistoryWindow, name_column); gtk_widget_class_bind_template_child_private (widget_class, EphyHistoryWindow, location_column); gtk_widget_class_bind_template_child_private (widget_class, EphyHistoryWindow, date_renderer); + gtk_widget_class_bind_template_child_private (widget_class, EphyHistoryWindow, location_renderer); gtk_widget_class_bind_template_child_private (widget_class, EphyHistoryWindow, open_menuitem); gtk_widget_class_bind_template_child_private (widget_class, EphyHistoryWindow, copy_location_menuitem); gtk_widget_class_bind_template_child_private (widget_class, EphyHistoryWindow, bookmark_menuitem); @@ -742,7 +745,7 @@ } static void -convert_cell_data_func (GtkTreeViewColumn *column, +convert_date_data_func (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, @@ -765,6 +768,29 @@ } static void +convert_location_data_func (GtkTreeViewColumn *column, + GtkCellRenderer *renderer, + GtkTreeModel *model, + GtkTreeIter *iter, + gpointer user_data) +{ + int col_id = GPOINTER_TO_INT (user_data); + char *url; + char *unescaped_url; + + gtk_tree_model_get (model, iter, + col_id, + &url, + -1); + unescaped_url = ephy_uri_safe_unescape (url); + + g_object_set (renderer, "text", unescaped_url, NULL); + + g_free (url); + g_free (unescaped_url); +} + +static void response_cb (GtkDialog *widget, int response, EphyHistoryWindow *self) @@ -838,10 +864,16 @@ gtk_tree_view_column_set_cell_data_func (GTK_TREE_VIEW_COLUMN (self->priv->date_column), GTK_CELL_RENDERER (self->priv->date_renderer), - (GtkTreeCellDataFunc) convert_cell_data_func, + (GtkTreeCellDataFunc) convert_date_data_func, GINT_TO_POINTER (COLUMN_DATE), NULL); + gtk_tree_view_column_set_cell_data_func (GTK_TREE_VIEW_COLUMN (self->priv->location_column), + GTK_CELL_RENDERER (self->priv->location_renderer), + (GtkTreeCellDataFunc) convert_location_data_func, + GINT_TO_POINTER (COLUMN_LOCATION), + NULL); + g_signal_connect (self, "response", G_CALLBACK (response_cb), self); } diff -Nru epiphany-browser-3.16.3/src/ephy-location-controller.c epiphany-browser-3.18.0/src/ephy-location-controller.c --- epiphany-browser-3.16.3/src/ephy-location-controller.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-location-controller.c 2015-09-22 07:28:20.000000000 +0000 @@ -438,7 +438,7 @@ history_service = EPHY_HISTORY_SERVICE (ephy_embed_shell_get_global_history_service (ephy_embed_shell_get_default ())); bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ()); - model = ephy_completion_model_new (history_service, bookmarks); + model = ephy_completion_model_new (history_service, bookmarks, TRUE); ephy_location_entry_set_completion (priv->location_entry, GTK_TREE_MODEL (model), EPHY_COMPLETION_TEXT_COL, diff -Nru epiphany-browser-3.16.3/src/ephy-lockdown.c epiphany-browser-3.18.0/src/ephy-lockdown.c --- epiphany-browser-3.16.3/src/ephy-lockdown.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-lockdown.c 2015-08-07 08:41:17.000000000 +0000 @@ -71,7 +71,7 @@ if (embed == NULL) return; - address = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); + address = ephy_web_view_get_display_address (ephy_embed_get_web_view (embed)); ephy_window_set_location (window, address); ephy_web_view_set_typed_address (ephy_embed_get_web_view (embed), NULL); } diff -Nru epiphany-browser-3.16.3/src/ephy-main.c epiphany-browser-3.18.0/src/ephy-main.c --- epiphany-browser-3.16.3/src/ephy-main.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-main.c 2015-08-07 08:41:06.000000000 +0000 @@ -238,12 +238,10 @@ int status; EphyFileHelpersFlags flags; -#ifdef ENABLE_NLS /* Initialize the i18n stuff */ - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); -#endif /* check libxml2 API version epiphany was compiled with against the * version we're running with. diff -Nru epiphany-browser-3.16.3/src/ephy-notebook.c epiphany-browser-3.18.0/src/ephy-notebook.c --- epiphany-browser-3.16.3/src/ephy-notebook.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-notebook.c 2015-08-07 08:41:06.000000000 +0000 @@ -509,7 +509,11 @@ static void sync_label (EphyEmbed *embed, GParamSpec *pspec, GtkWidget *label) { - gtk_label_set_text (GTK_LABEL (label), ephy_embed_get_title (embed)); + const char *title; + + title = ephy_embed_get_title (embed); + gtk_label_set_text (GTK_LABEL (label), title); + gtk_widget_set_tooltip_text (label, title); } static void diff -Nru epiphany-browser-3.16.3/src/ephy-search-provider.c epiphany-browser-3.18.0/src/ephy-search-provider.c --- epiphany-browser-3.16.3/src/ephy-search-provider.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-search-provider.c 2015-09-22 07:28:20.000000000 +0000 @@ -367,7 +367,7 @@ filename = g_build_filename (ephy_dot_dir (), EPHY_HISTORY_FILE, NULL); self->history_service = ephy_history_service_new (filename, TRUE); self->bookmarks = ephy_bookmarks_new (); - self->model = ephy_completion_model_new (self->history_service, self->bookmarks); + self->model = ephy_completion_model_new (self->history_service, self->bookmarks, FALSE); g_free (filename); self->cancellable = g_cancellable_new (); diff -Nru epiphany-browser-3.16.3/src/ephy-search-provider-main.c epiphany-browser-3.18.0/src/ephy-search-provider-main.c --- epiphany-browser-3.16.3/src/ephy-search-provider-main.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-search-provider-main.c 2015-09-21 15:29:05.000000000 +0000 @@ -33,13 +33,11 @@ int status; GError *error = NULL; -#if ENABLE_NLS /* Initialize the i18n stuff */ setlocale (LC_ALL, ""); - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); -#endif if (!ephy_file_helpers_init (NULL, 0, &error)) { g_printerr ("%s\n", error->message); diff -Nru epiphany-browser-3.16.3/src/ephy-shell.c epiphany-browser-3.18.0/src/ephy-shell.c --- epiphany-browser-3.16.3/src/ephy-shell.c 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-shell.c 2015-09-08 11:37:53.000000000 +0000 @@ -950,15 +950,6 @@ return retval; } -static gboolean -tab_is_empty (EphyEmbed *embed) -{ - EphyWebView *view = ephy_embed_get_web_view (embed); - - return ((ephy_web_view_get_is_blank (view) || ephy_web_view_is_overview (view)) && - !ephy_web_view_is_loading (view)); -} - typedef struct { EphyShell *shell; EphySession *session; @@ -1035,7 +1026,9 @@ page_flags |= EPHY_NEW_TAB_APPEND_AFTER; else if (data->reuse_empty_tab) { embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (data->window)); - reusing_empty_tab = tab_is_empty (embed); + /* Only load a new page in this embed if it was showing or loading the homepage about:overview */ + if (ephy_web_view_get_visit_type (ephy_embed_get_web_view (embed)) == EPHY_PAGE_VISIT_HOMEPAGE) + reusing_empty_tab = TRUE; } if (!reusing_empty_tab) { diff -Nru epiphany-browser-3.16.3/src/ephy-shell-search-provider-generated.c epiphany-browser-3.18.0/src/ephy-shell-search-provider-generated.c --- epiphany-browser-3.16.3/src/ephy-shell-search-provider-generated.c 2015-07-09 13:27:58.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-shell-search-provider-generated.c 2015-09-22 07:48:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.45.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.45.8. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru epiphany-browser-3.16.3/src/ephy-shell-search-provider-generated.h epiphany-browser-3.18.0/src/ephy-shell-search-provider-generated.h --- epiphany-browser-3.16.3/src/ephy-shell-search-provider-generated.h 2015-07-09 13:27:58.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-shell-search-provider-generated.h 2015-09-22 07:48:18.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.45.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.45.8. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru epiphany-browser-3.16.3/src/ephy-title-box.c epiphany-browser-3.18.0/src/ephy-title-box.c --- epiphany-browser-3.16.3/src/ephy-title-box.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-title-box.c 2015-09-08 11:37:53.000000000 +0000 @@ -140,13 +140,10 @@ { EphyTitleBox *title_box = EPHY_TITLE_BOX (user_data); EphyTitleBoxPrivate *priv = ephy_title_box_get_instance_private (title_box); - const gchar *title; LOG ("focus-in-event web_view %p event %p title-box %p", widget, event, title_box); - title = webkit_web_view_get_title (priv->web_view); - if (title && *title != '\0') - ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_TITLE); + ephy_title_box_set_mode (title_box, EPHY_TITLE_BOX_MODE_TITLE); return GDK_EVENT_PROPAGATE; } @@ -593,6 +590,7 @@ EphyTitleBoxMode mode) { EphyTitleBoxPrivate *priv; + const gchar *title; g_return_if_fail (EPHY_IS_TITLE_BOX (title_box)); @@ -614,6 +612,13 @@ if (priv->mode == mode) return; + if (mode == EPHY_TITLE_BOX_MODE_TITLE) { + /* Don't allow showing title mode if there is no title. */ + title = priv->web_view ? webkit_web_view_get_title (priv->web_view) : NULL; + if (!title || !*title) + return; + } + LOG ("ephy_title_box_set_mode title-box %p mode %u", title_box, mode); priv->mode = mode; diff -Nru epiphany-browser-3.16.3/src/ephy-window.c epiphany-browser-3.18.0/src/ephy-window.c --- epiphany-browser-3.16.3/src/ephy-window.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/ephy-window.c 2015-08-07 08:41:17.000000000 +0000 @@ -219,6 +219,8 @@ G_CALLBACK (popup_cmd_link_in_new_window) }, { "OpenLinkInNewTab", NULL, N_("Open Link in New _Tab"), NULL, NULL, G_CALLBACK (popup_cmd_link_in_new_tab) }, + { "OpenLinkInIncognitoWindow", NULL, N_("Open Link in I_ncognito Window"), NULL, NULL, + G_CALLBACK (popup_cmd_link_in_incognito_window) }, { "DownloadLinkAs", NULL, N_("_Save Link As…"), NULL, NULL, G_CALLBACK (popup_cmd_download_link_as) }, { "CopyLinkAddress", NULL, N_("_Copy Link Address"), NULL, @@ -258,6 +260,10 @@ NULL, G_CALLBACK (popup_cmd_save_media_as) }, { "CopyAudioLocation", NULL, N_("_Copy Audio Address"), NULL, NULL, G_CALLBACK (popup_cmd_copy_media_location) }, + + /* Selection */ + { "SearchSelection", NULL, "_Search Selection", NULL, NULL, + G_CALLBACK (popup_cmd_search_selection) }, }; static const struct @@ -910,6 +916,9 @@ action = gtk_action_group_get_action (action_group, "OpenLinkInNewTab"); ephy_action_change_sensitivity_flags (action, SENS_FLAG_CONTEXT, !link_has_web_scheme); + + action = gtk_action_group_get_action (action_group, "OpenLinkInIncognitoWindow"); + gtk_action_set_sensitive (action, link_has_web_scheme); } static void @@ -1291,7 +1300,7 @@ if (priv->closing) return; - address = ephy_web_view_get_address (view); + address = ephy_web_view_get_display_address (view); typed_address = ephy_web_view_get_typed_address (view); _ephy_window_set_default_actions_sensitive (window, @@ -1623,6 +1632,39 @@ return g_list_reverse (retval); } +static char * +ellipsize_string (const char *string, + glong max_length) +{ + char *ellipsized; + glong length = g_utf8_strlen (string, -1); + + if (length == 0) + return NULL; + + if (length < max_length) + { + ellipsized = g_strdup (string); + } + else + { + char *str = g_utf8_substring (string, 0, max_length); + ellipsized = g_strconcat (str, "…", NULL); + g_free (str); + } + return ellipsized; +} + +static void +parse_context_menu_user_data (WebKitContextMenu *context_menu, + const char** selected_text) +{ + GVariantDict dict; + + g_variant_dict_init (&dict, webkit_context_menu_get_user_data (context_menu)); + g_variant_dict_lookup (&dict, "SelectedText", "&s", selected_text); +} + static gboolean populate_context_menu (WebKitWebView *web_view, WebKitContextMenu *context_menu, @@ -1641,11 +1683,13 @@ GList *spelling_guess_items = NULL; EphyEmbedEvent *embed_event; gboolean is_document = FALSE; - gboolean app_mode; + gboolean app_mode, incognito_mode; gboolean is_image; gboolean is_media = FALSE; gboolean is_video = FALSE; gboolean is_audio = FALSE; + gboolean can_search_selection = FALSE; + const char *selected_text = NULL; is_image = webkit_hit_test_result_context_is_image (hit_test_result); @@ -1685,6 +1729,28 @@ } } + parse_context_menu_user_data (context_menu, &selected_text); + if (selected_text) + { + char* ellipsized = ellipsize_string (selected_text, 32); + if (ellipsized) + { + char* label; + GtkAction *action; + + can_search_selection = TRUE; + action = gtk_action_group_get_action (priv->popups_action_group, + "SearchSelection"); + label = g_strdup_printf (_("Search the Web for '%s'"), ellipsized); + gtk_action_set_label (action, label); + g_object_set_data_full (G_OBJECT (action), "selection", g_strdup (selected_text), + (GDestroyNotify)g_free); + g_free (ellipsized); + g_free (label); + can_search_selection = TRUE; + } + } + webkit_context_menu_remove_all (context_menu); embed_event = ephy_embed_event_new ((GdkEventButton *)event, hit_test_result); @@ -1692,6 +1758,7 @@ g_object_unref (embed_event); app_mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) == EPHY_EMBED_SHELL_MODE_APPLICATION; + incognito_mode = ephy_embed_shell_get_mode (ephy_embed_shell_get_default ()) == EPHY_EMBED_SHELL_MODE_INCOGNITO; update_edit_actions_sensitivity (window, FALSE); @@ -1712,11 +1779,17 @@ priv->popups_action_group, "OpenLinkInNewTab"); add_action_to_context_menu (context_menu, priv->popups_action_group, "OpenLinkInNewWindow"); + if (!incognito_mode) + add_action_to_context_menu (context_menu, + priv->popups_action_group, "OpenLinkInIncognitoWindow"); webkit_context_menu_append (context_menu, webkit_context_menu_item_new_separator ()); } add_action_to_context_menu (context_menu, priv->action_group, "EditCopy"); + if (can_search_selection) + add_action_to_context_menu (context_menu, + priv->popups_action_group, "SearchSelection"); webkit_context_menu_append (context_menu, webkit_context_menu_item_new_separator ()); add_action_to_context_menu (context_menu, @@ -1798,6 +1871,9 @@ add_action_to_context_menu (context_menu, priv->action_group, "EditCopy"); + if (can_search_selection) + add_action_to_context_menu (context_menu, + priv->popups_action_group, "SearchSelection"); if (!app_mode && !is_image && !is_media) { @@ -2450,7 +2526,7 @@ gtk_window_present (GTK_WINDOW (window)); /* make sure the location entry shows the real URL of the tab's page */ - address = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); + address = ephy_web_view_get_display_address (ephy_embed_get_web_view (embed)); ephy_window_set_location (window, address); /* don't suppress alert */ @@ -2923,12 +2999,13 @@ GtkWidget *close_button; GtkWidget *image; - widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); close_button = gtk_button_new (); gtk_container_set_border_width (GTK_CONTAINER (close_button), 6); gtk_widget_set_valign (close_button, GTK_ALIGN_CENTER); gtk_style_context_add_class (gtk_widget_get_style_context (close_button), "image-button"); gtk_style_context_add_class (gtk_widget_get_style_context (close_button), "close"); + gtk_style_context_add_class (gtk_widget_get_style_context (widget), "download-box"); gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); @@ -3790,7 +3867,7 @@ /** * ephy_window_set_location: * @window: an #EphyWindow widget - * @address: new address + * @address: a decoded URI, suitable for display to the user * * Sets the internal #EphyLocationController address to @address. **/ diff -Nru epiphany-browser-3.16.3/src/epiphany.gresource.xml epiphany-browser-3.18.0/src/epiphany.gresource.xml --- epiphany-browser-3.16.3/src/epiphany.gresource.xml 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/epiphany.gresource.xml 2015-08-07 08:41:17.000000000 +0000 @@ -2,7 +2,6 @@ incognito.png - incognito-tinted.png encoding-dialog.ui prefs-dialog.ui prefs-lang-dialog.ui @@ -15,7 +14,6 @@ epiphany-bookmark-editor-ui.xml epiphany.css error.html - overview.html missing-thumbnail.png about.css diff -Nru epiphany-browser-3.16.3/src/epiphany-resources.c epiphany-browser-3.18.0/src/epiphany-resources.c --- epiphany-browser-3.16.3/src/epiphany-resources.c 2015-07-09 13:27:58.000000000 +0000 +++ epiphany-browser-3.18.0/src/epiphany-resources.c 2015-09-22 07:48:18.000000000 +0000 @@ -6,1735 +6,85 @@ # define SECTION #endif -static const SECTION union { const guint8 data[45111]; const double alignment; void * const ptr;} epiphany_resource_data = { { +static const SECTION union { const guint8 data[40090]; const double alignment; void * const ptr;} epiphany_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0x88, 0x02, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x16, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x50, 0x02, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x09, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, - 0x0c, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, + 0x0d, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, - 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, - 0x13, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, - 0xb0, 0xb7, 0x24, 0x30, 0x04, 0x00, 0x00, 0x00, - 0x88, 0x02, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, - 0x90, 0x02, 0x00, 0x00, 0x94, 0x02, 0x00, 0x00, - 0x95, 0x8b, 0x84, 0xb4, 0x06, 0x00, 0x00, 0x00, - 0x94, 0x02, 0x00, 0x00, 0x14, 0x00, 0x76, 0x00, - 0xa8, 0x02, 0x00, 0x00, 0xb7, 0x06, 0x00, 0x00, - 0x2a, 0x3d, 0x8f, 0xff, 0x06, 0x00, 0x00, 0x00, - 0xb7, 0x06, 0x00, 0x00, 0x1c, 0x00, 0x76, 0x00, - 0xd8, 0x06, 0x00, 0x00, 0x7b, 0x0d, 0x00, 0x00, - 0x65, 0x15, 0x99, 0xd4, 0x06, 0x00, 0x00, 0x00, - 0x7b, 0x0d, 0x00, 0x00, 0x0f, 0x00, 0x4c, 0x00, - 0x8c, 0x0d, 0x00, 0x00, 0x98, 0x0d, 0x00, 0x00, - 0x4b, 0x50, 0x90, 0x0b, 0x0c, 0x00, 0x00, 0x00, - 0x98, 0x0d, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, - 0x9c, 0x0d, 0x00, 0x00, 0xa0, 0x0d, 0x00, 0x00, - 0x78, 0x9c, 0xc8, 0x7a, 0x06, 0x00, 0x00, 0x00, - 0xa0, 0x0d, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, - 0xb8, 0x0d, 0x00, 0x00, 0xc7, 0x15, 0x00, 0x00, - 0xfd, 0xcf, 0x01, 0xdf, 0x00, 0x00, 0x00, 0x00, - 0xc7, 0x15, 0x00, 0x00, 0x09, 0x00, 0x4c, 0x00, - 0xd0, 0x15, 0x00, 0x00, 0x0c, 0x16, 0x00, 0x00, - 0xbf, 0xea, 0x1b, 0xdf, 0x03, 0x00, 0x00, 0x00, - 0x0c, 0x16, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, - 0x20, 0x16, 0x00, 0x00, 0x2f, 0x1e, 0x00, 0x00, - 0xb2, 0x46, 0x46, 0x28, 0x06, 0x00, 0x00, 0x00, - 0x2f, 0x1e, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, - 0x40, 0x1e, 0x00, 0x00, 0xc7, 0x25, 0x00, 0x00, - 0xe6, 0x7b, 0x45, 0x07, 0x06, 0x00, 0x00, 0x00, - 0xc7, 0x25, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, - 0xd8, 0x25, 0x00, 0x00, 0xe7, 0x35, 0x00, 0x00, - 0xc5, 0x01, 0x74, 0x8d, 0x06, 0x00, 0x00, 0x00, - 0xe7, 0x35, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, - 0xf8, 0x35, 0x00, 0x00, 0x39, 0x3f, 0x00, 0x00, - 0x9b, 0xea, 0x55, 0x32, 0x06, 0x00, 0x00, 0x00, - 0x39, 0x3f, 0x00, 0x00, 0x15, 0x00, 0x76, 0x00, - 0x50, 0x3f, 0x00, 0x00, 0x2a, 0x44, 0x00, 0x00, + 0x11, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, + 0x12, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, - 0x2a, 0x44, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, - 0x2c, 0x44, 0x00, 0x00, 0x30, 0x44, 0x00, 0x00, - 0x0c, 0xac, 0xa7, 0x6b, 0x06, 0x00, 0x00, 0x00, - 0x30, 0x44, 0x00, 0x00, 0x13, 0x00, 0x76, 0x00, - 0x48, 0x44, 0x00, 0x00, 0x57, 0x4c, 0x00, 0x00, - 0x93, 0x21, 0xa4, 0xca, 0x06, 0x00, 0x00, 0x00, - 0x57, 0x4c, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, - 0x68, 0x4c, 0x00, 0x00, 0x77, 0x54, 0x00, 0x00, - 0xba, 0x36, 0x37, 0xeb, 0x06, 0x00, 0x00, 0x00, - 0x77, 0x54, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, - 0x88, 0x54, 0x00, 0x00, 0x95, 0x75, 0x00, 0x00, - 0xad, 0xf1, 0xdf, 0xa2, 0x06, 0x00, 0x00, 0x00, - 0x95, 0x75, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, - 0xa8, 0x75, 0x00, 0x00, 0xb7, 0x79, 0x00, 0x00, - 0x1c, 0xb2, 0xe8, 0x27, 0x06, 0x00, 0x00, 0x00, - 0xb7, 0x79, 0x00, 0x00, 0x1f, 0x00, 0x76, 0x00, - 0xd8, 0x79, 0x00, 0x00, 0x84, 0x7e, 0x00, 0x00, - 0xaf, 0x93, 0x68, 0x60, 0x06, 0x00, 0x00, 0x00, - 0x84, 0x7e, 0x00, 0x00, 0x14, 0x00, 0x76, 0x00, - 0x98, 0x7e, 0x00, 0x00, 0xd9, 0x9f, 0x00, 0x00, - 0xf4, 0x5e, 0x78, 0x72, 0x06, 0x00, 0x00, 0x00, - 0xd9, 0x9f, 0x00, 0x00, 0x14, 0x00, 0x76, 0x00, - 0xf0, 0x9f, 0x00, 0x00, 0xff, 0xa7, 0x00, 0x00, - 0x32, 0x12, 0x19, 0x7b, 0x03, 0x00, 0x00, 0x00, - 0xff, 0xa7, 0x00, 0x00, 0x0a, 0x00, 0x76, 0x00, - 0x10, 0xa8, 0x00, 0x00, 0x1f, 0xac, 0x00, 0x00, - 0x17, 0x38, 0xe0, 0x94, 0x03, 0x00, 0x00, 0x00, - 0x1f, 0xac, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, - 0x28, 0xac, 0x00, 0x00, 0x37, 0xb0, 0x00, 0x00, - 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, - 0x06, 0x00, 0x00, 0x00, 0x70, 0x72, 0x65, 0x66, - 0x73, 0x2d, 0x6c, 0x61, 0x6e, 0x67, 0x2d, 0x64, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, - 0xfe, 0x0e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xed, 0x57, 0x4d, 0x53, 0xdb, 0x30, - 0x10, 0xbd, 0xf3, 0x2b, 0x54, 0x5d, 0x3b, 0x26, - 0x09, 0x69, 0x19, 0xe8, 0x24, 0x66, 0x5a, 0x3a, - 0xf4, 0xc2, 0x0d, 0x68, 0x8f, 0x1e, 0x59, 0xda, - 0xd8, 0x2a, 0x8a, 0xe4, 0x4a, 0x72, 0x82, 0xff, - 0x7d, 0xd7, 0x76, 0xbe, 0x9d, 0xd8, 0x81, 0x52, - 0xa6, 0x87, 0xde, 0x6c, 0x79, 0x57, 0xda, 0xb7, - 0xef, 0x69, 0x77, 0x3d, 0xba, 0x7a, 0x9a, 0x2a, - 0x32, 0x03, 0xeb, 0xa4, 0xd1, 0x63, 0x3a, 0x38, - 0xed, 0x53, 0x02, 0x9a, 0x1b, 0x21, 0x75, 0x32, - 0xa6, 0x0f, 0xf7, 0x37, 0xc1, 0x05, 0xbd, 0x0a, - 0x4f, 0x46, 0x52, 0x7b, 0xb0, 0x13, 0xc6, 0x21, - 0x1c, 0xbd, 0x0b, 0x02, 0xb2, 0x7a, 0x0d, 0x2c, - 0xfc, 0xca, 0xa5, 0x05, 0x47, 0x12, 0xff, 0xf8, - 0x9e, 0x0c, 0x4f, 0xfb, 0x24, 0x08, 0xc2, 0x91, - 0x89, 0x7f, 0x02, 0xf7, 0x84, 0x2b, 0xe6, 0xdc, - 0x98, 0x7e, 0xf3, 0x8f, 0x5f, 0x25, 0x53, 0x26, - 0xa1, 0x44, 0x8a, 0x31, 0x65, 0x42, 0x44, 0x8a, - 0xe9, 0x24, 0x67, 0x09, 0x44, 0xa2, 0xfe, 0x10, - 0x8e, 0x32, 0x6b, 0x32, 0xb0, 0xbe, 0x20, 0x9a, - 0x4d, 0x61, 0x4c, 0x39, 0xd3, 0xd1, 0xc4, 0xf0, - 0xdc, 0xd1, 0xf0, 0x86, 0x29, 0x07, 0xa3, 0xde, - 0xd2, 0xa0, 0x61, 0x1a, 0x1b, 0x2b, 0xc0, 0x46, - 0x73, 0x29, 0x7c, 0x4a, 0xc3, 0x8f, 0x2d, 0x96, - 0xd6, 0x28, 0xa0, 0x21, 0x64, 0x32, 0x4b, 0x99, - 0x2e, 0x82, 0xcc, 0xc2, 0x04, 0x2c, 0xc2, 0x05, - 0x17, 0x60, 0x50, 0xc1, 0x32, 0xa8, 0x96, 0x1d, - 0x04, 0x38, 0x6f, 0x4d, 0x81, 0x87, 0xf9, 0x34, - 0xca, 0x18, 0x3a, 0x7b, 0x1a, 0xde, 0xdb, 0xbc, - 0xcd, 0xc7, 0x17, 0x19, 0x44, 0xa9, 0x2c, 0x2d, - 0x6b, 0xb4, 0xad, 0xfb, 0x4f, 0x58, 0xae, 0xfc, - 0x12, 0xcc, 0xb0, 0xdf, 0x3f, 0xc2, 0x38, 0x05, - 0x99, 0xa4, 0xb8, 0xfb, 0x87, 0xb3, 0x36, 0xeb, - 0xdc, 0x61, 0x14, 0xc0, 0xca, 0x54, 0xc5, 0xcc, - 0xd2, 0x70, 0xd0, 0x16, 0xb2, 0xf4, 0x98, 0x29, - 0xe2, 0x2d, 0xd3, 0x4e, 0x31, 0xcf, 0x62, 0x85, - 0x8b, 0x05, 0x20, 0x19, 0x9f, 0x85, 0x20, 0xb7, - 0x7b, 0xf2, 0xc4, 0x53, 0xa9, 0x04, 0x29, 0xa1, - 0x22, 0xc1, 0xdc, 0xa3, 0x9a, 0xe8, 0x1e, 0x19, - 0x7c, 0xc9, 0xbd, 0xc7, 0x2f, 0x95, 0x0c, 0x90, - 0x61, 0x0e, 0x2a, 0xae, 0x56, 0x06, 0x4d, 0x01, - 0x28, 0x16, 0x83, 0xda, 0x1b, 0x42, 0x74, 0x5d, - 0x79, 0xb6, 0x84, 0x3f, 0x93, 0x4e, 0xc6, 0x25, - 0xd5, 0x1d, 0xcc, 0x6c, 0x88, 0xec, 0x08, 0xcb, - 0x45, 0xba, 0x3b, 0x6d, 0x2d, 0x70, 0x90, 0x33, - 0x70, 0x6b, 0x87, 0x2e, 0x05, 0x97, 0xd4, 0xe4, - 0x1a, 0x99, 0x51, 0x52, 0x77, 0x47, 0x3d, 0x63, - 0x4a, 0x26, 0x98, 0x5e, 0x0e, 0xe5, 0x2d, 0xdc, - 0x34, 0xec, 0xd5, 0x09, 0xc7, 0x87, 0x8a, 0x8e, - 0x97, 0xb0, 0x52, 0x5e, 0xce, 0x9a, 0x93, 0x67, - 0x51, 0x82, 0xb2, 0xf8, 0xcf, 0xc7, 0xb1, 0x7c, - 0x54, 0xd5, 0x53, 0x33, 0x15, 0x54, 0xaf, 0xb8, - 0x41, 0x6c, 0x9e, 0xf6, 0xf2, 0x82, 0xcb, 0x15, - 0x29, 0x75, 0xd9, 0x08, 0x4a, 0xbb, 0x21, 0x7d, - 0x8d, 0xec, 0x76, 0x25, 0xc0, 0x58, 0x89, 0x60, - 0x58, 0x2d, 0x18, 0xec, 0x0e, 0x5e, 0x72, 0xd6, - 0x76, 0xe1, 0x5c, 0xc6, 0x38, 0x76, 0x0c, 0x1a, - 0x9e, 0x35, 0x6b, 0xc2, 0x2e, 0xda, 0x5a, 0x87, - 0x11, 0xd6, 0x4e, 0x76, 0x58, 0x8c, 0xbb, 0xd0, - 0x37, 0x9c, 0xda, 0x32, 0xd0, 0x85, 0xeb, 0x19, - 0x29, 0x50, 0xac, 0x30, 0xb9, 0x8f, 0x9c, 0x2f, - 0xaa, 0x9e, 0xa1, 0xc5, 0x5e, 0x62, 0x11, 0xf7, - 0x23, 0x02, 0x6f, 0x78, 0xc3, 0x53, 0xc6, 0xb4, - 0xe8, 0x3e, 0x65, 0x22, 0x95, 0xea, 0x24, 0xae, - 0x3c, 0x24, 0x2a, 0x2f, 0x71, 0x23, 0x8e, 0x5d, - 0x43, 0xe3, 0x64, 0xcd, 0xd9, 0x56, 0x23, 0xe8, - 0xad, 0xa2, 0xdc, 0xd2, 0x61, 0x9b, 0xe2, 0x4a, - 0xa9, 0x0d, 0x2e, 0x2f, 0xde, 0x44, 0x6c, 0xc7, - 0xf7, 0xef, 0x17, 0xcb, 0xf2, 0xbc, 0x21, 0xcb, - 0x3d, 0xe0, 0x6f, 0xeb, 0xf2, 0x56, 0xc2, 0xaf, - 0x2a, 0xdd, 0x60, 0xd8, 0xbf, 0x7c, 0x93, 0x04, - 0xa4, 0x8b, 0x02, 0xe2, 0x3c, 0xb3, 0xbe, 0x55, - 0x92, 0x87, 0xea, 0xef, 0x75, 0x6a, 0x8c, 0x03, - 0xc2, 0x88, 0x8a, 0x16, 0xbd, 0xf9, 0xd3, 0xab, - 0x95, 0xb7, 0xa9, 0x86, 0xa9, 0xd1, 0x92, 0x97, - 0x04, 0x25, 0x80, 0xd5, 0x73, 0x39, 0x26, 0xb9, - 0xc8, 0x5b, 0x80, 0x99, 0x84, 0xf9, 0x5f, 0xbc, - 0x1a, 0x5d, 0x56, 0x7f, 0x2c, 0xf9, 0x3b, 0x8e, - 0x53, 0xa1, 0x02, 0xf1, 0x43, 0x6a, 0x61, 0xe6, - 0x35, 0xfd, 0x6e, 0xb1, 0x36, 0xaf, 0xd6, 0x5e, - 0xa7, 0xe4, 0x76, 0x58, 0xa6, 0xf5, 0x99, 0x38, - 0x99, 0x45, 0x99, 0x51, 0x92, 0x17, 0x34, 0xd4, - 0x30, 0xdb, 0x6e, 0x27, 0xbb, 0xea, 0x4e, 0x19, - 0x46, 0xb7, 0x28, 0x0c, 0x52, 0x1f, 0x23, 0xf1, - 0x7b, 0x24, 0xec, 0x3b, 0x12, 0xb6, 0x54, 0xf9, - 0x2e, 0x91, 0x6f, 0x82, 0xb4, 0x9a, 0x41, 0x5d, - 0x74, 0xb8, 0x68, 0xef, 0xef, 0x1b, 0x0e, 0x14, - 0x1c, 0x1c, 0x61, 0x4a, 0x60, 0x77, 0x2b, 0x83, - 0x0a, 0xdd, 0x12, 0x53, 0xb0, 0x72, 0x3c, 0xa3, - 0xbd, 0xb5, 0x1e, 0x1a, 0xbd, 0xf9, 0x68, 0xe1, - 0x76, 0xe0, 0x3b, 0xae, 0xa4, 0xaf, 0x64, 0x3b, - 0x68, 0x97, 0xed, 0x3f, 0x1e, 0xd5, 0x72, 0xa1, - 0xee, 0xcf, 0x41, 0x5d, 0x22, 0xdc, 0xce, 0x3b, - 0xc1, 0xff, 0xc3, 0xcc, 0x68, 0x87, 0x27, 0x04, - 0xe7, 0x38, 0x27, 0x6d, 0x0e, 0xfe, 0xa3, 0xde, - 0x96, 0x69, 0x8b, 0xe7, 0x90, 0x92, 0xc5, 0x00, - 0x57, 0x72, 0x9b, 0xa3, 0x70, 0xd6, 0xb3, 0x6a, - 0x63, 0x97, 0xde, 0x6e, 0x40, 0xeb, 0x88, 0xd7, - 0xbf, 0xb2, 0x27, 0xbf, 0x01, 0xf8, 0xdb, 0x82, - 0xd3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, - 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2d, - 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2d, 0x6d, 0x65, 0x6e, 0x75, - 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x93, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, - 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x61, 0x70, 0x70, 0x2d, 0x6d, - 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x73, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, - 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x4e, 0x65, 0x77, 0x20, 0x57, 0x69, 0x6e, 0x64, - 0x6f, 0x77, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, - 0x70, 0x70, 0x2e, 0x6e, 0x65, 0x77, 0x2d, 0x77, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, - 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, - 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, - 0x6e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, - 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, - 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, - 0x20, 0x5f, 0x49, 0x6e, 0x63, 0x6f, 0x67, 0x6e, - 0x69, 0x74, 0x6f, 0x20, 0x57, 0x69, 0x6e, 0x64, - 0x6f, 0x77, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, - 0x70, 0x70, 0x2e, 0x6e, 0x65, 0x77, 0x2d, 0x69, - 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, - 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, - 0x67, 0x74, 0x3b, 0x69, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, - 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x52, 0x65, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x43, - 0x6c, 0x6f, 0x73, 0x65, 0x64, 0x20, 0x5f, 0x54, - 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, - 0x70, 0x70, 0x2e, 0x72, 0x65, 0x6f, 0x70, 0x65, - 0x6e, 0x2d, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, - 0x2d, 0x74, 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, - 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, - 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x26, - 0x6c, 0x74, 0x3b, 0x53, 0x68, 0x69, 0x66, 0x74, - 0x26, 0x67, 0x74, 0x3b, 0x74, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, - 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x42, 0x6f, 0x6f, - 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x62, - 0x6f, 0x6f, 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x73, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, - 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, - 0x67, 0x74, 0x3b, 0x62, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, - 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, - 0x2e, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, - 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, - 0x67, 0x74, 0x3b, 0x68, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, - 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x50, 0x72, 0x5f, 0x65, 0x66, - 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, - 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, - 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, - 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, - 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x65, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, - 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, - 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x48, - 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x61, 0x70, 0x70, 0x2e, 0x68, 0x65, 0x6c, 0x70, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, - 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x41, 0x62, 0x6f, - 0x75, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, - 0x70, 0x70, 0x2e, 0x61, 0x62, 0x6f, 0x75, 0x74, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, - 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, - 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, - 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, - 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x51, 0x75, 0x69, - 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, - 0x70, 0x2e, 0x71, 0x75, 0x69, 0x74, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, - 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, - 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, - 0x3b, 0x71, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, - 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, - 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x2f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, - 0x61, 0x79, 0x29, 0x70, 0x61, 0x67, 0x65, 0x2d, - 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, - 0x73, 0x2f, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, - 0x14, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, - 0x6f, 0x72, 0x67, 0x2f, 0x00, 0x00, 0x00, 0x00, - 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x2d, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, - 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xf6, 0x2d, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xed, 0x5a, 0x4b, 0x73, 0xdb, 0x36, - 0x10, 0xbe, 0xe7, 0x57, 0xb0, 0xbc, 0x76, 0x18, - 0x4b, 0x4e, 0x93, 0xe9, 0xc1, 0x66, 0xc6, 0x8f, - 0x3c, 0x3c, 0xe3, 0xc6, 0x33, 0xb1, 0xda, 0x1e, - 0x39, 0x10, 0xb9, 0x16, 0x11, 0x83, 0x04, 0x0b, - 0x40, 0x92, 0xd5, 0x5f, 0xdf, 0x05, 0x40, 0x52, - 0x94, 0xc4, 0x97, 0x6d, 0x89, 0x76, 0x3b, 0x3d, - 0xd9, 0x84, 0x16, 0xc4, 0x3e, 0xbe, 0xfd, 0x76, - 0x17, 0xd2, 0xc9, 0xc7, 0x87, 0x84, 0x39, 0x0b, - 0x10, 0x92, 0xf2, 0xf4, 0xd4, 0x1d, 0xbf, 0x1d, - 0xb9, 0x0e, 0xa4, 0x21, 0x8f, 0x68, 0x3a, 0x3b, - 0x75, 0x7f, 0x9f, 0x7c, 0xf6, 0x7e, 0x75, 0x3f, - 0xfa, 0x6f, 0x4e, 0x7e, 0xf2, 0x3c, 0xe7, 0x0b, - 0xa4, 0x20, 0x88, 0x82, 0xc8, 0x59, 0x52, 0x15, - 0x3b, 0x33, 0x46, 0x22, 0x70, 0xde, 0xbd, 0x1d, - 0x7f, 0x78, 0x3b, 0x72, 0x3c, 0x0f, 0x85, 0x68, - 0xaa, 0x40, 0xdc, 0x91, 0x10, 0xfc, 0x13, 0x01, - 0x7f, 0xcd, 0xa9, 0x00, 0xe9, 0x30, 0x3a, 0x3d, - 0x75, 0x67, 0xea, 0xfe, 0x67, 0x77, 0x7d, 0x0a, - 0xee, 0x19, 0xb9, 0x47, 0xfe, 0x09, 0x9f, 0xfe, - 0x80, 0x50, 0x39, 0x21, 0x23, 0x52, 0x9e, 0xba, - 0x5f, 0xd4, 0xfd, 0x35, 0x95, 0xea, 0x56, 0x71, - 0x01, 0xae, 0x43, 0xa3, 0x53, 0x97, 0xe1, 0xa3, - 0x34, 0x8f, 0xfe, 0x49, 0xc8, 0xd9, 0x3c, 0x49, - 0xa5, 0x6f, 0x34, 0xb1, 0x0f, 0x5e, 0x4a, 0x12, - 0x70, 0x2e, 0xcf, 0x26, 0x9f, 0xf4, 0xf1, 0xb9, - 0x84, 0xa3, 0x56, 0x19, 0xe0, 0x89, 0xa8, 0x8b, - 0x3e, 0x62, 0x5b, 0x7a, 0x72, 0x35, 0xb9, 0xae, - 0x13, 0x0f, 0x63, 0x22, 0x88, 0x10, 0x64, 0x55, - 0xb7, 0xe9, 0xfa, 0xe6, 0xe2, 0x6c, 0x72, 0x75, - 0xf3, 0xad, 0x6b, 0xdf, 0x51, 0xa9, 0xe4, 0x91, - 0x35, 0xcd, 0x3f, 0x51, 0x90, 0x64, 0x0c, 0x7d, - 0x56, 0x18, 0xf9, 0x29, 0x8b, 0x57, 0x5f, 0xa9, - 0x36, 0x6a, 0xf5, 0x27, 0x4d, 0x23, 0xbe, 0x74, - 0x9d, 0x8c, 0x08, 0x48, 0x95, 0xb1, 0xff, 0x92, - 0x12, 0xc6, 0x67, 0x68, 0x6d, 0x26, 0x78, 0x06, - 0x42, 0xad, 0x1c, 0x7d, 0xfe, 0xa9, 0x1b, 0x03, - 0x9d, 0xc5, 0x2a, 0xd0, 0x4e, 0x05, 0xa9, 0x5c, - 0xff, 0xfd, 0x68, 0x74, 0x72, 0x54, 0xc8, 0xec, - 0x48, 0x87, 0x24, 0x0d, 0xee, 0x78, 0x38, 0x97, - 0xae, 0xff, 0x99, 0x30, 0x09, 0x2d, 0xa2, 0x53, - 0x2e, 0x22, 0x10, 0xc1, 0x92, 0x46, 0x2a, 0x76, - 0xfd, 0xb6, 0x97, 0x26, 0x3c, 0x22, 0xcc, 0xf5, - 0x27, 0x62, 0xde, 0xf6, 0xbe, 0xa5, 0xb1, 0x29, - 0xc8, 0xb8, 0xa4, 0x0a, 0x43, 0xed, 0xfa, 0x21, - 0x68, 0x4c, 0xb4, 0xec, 0x88, 0xe0, 0x8e, 0xcc, - 0x99, 0x2a, 0x54, 0x18, 0x8f, 0x5a, 0x4d, 0x2b, - 0xa4, 0xad, 0x43, 0x5c, 0xff, 0x43, 0x87, 0xb4, - 0x54, 0x82, 0xaf, 0x02, 0x0d, 0xd7, 0xc0, 0xba, - 0xb9, 0xd3, 0x02, 0x1d, 0xd7, 0x20, 0xd6, 0xe8, - 0xf1, 0x23, 0x13, 0x8d, 0xaa, 0x6c, 0x18, 0x53, - 0x16, 0x39, 0x06, 0xe6, 0x29, 0x61, 0x9e, 0x79, - 0xd4, 0xd1, 0xc1, 0x44, 0x10, 0x53, 0x22, 0xdc, - 0x1a, 0x48, 0x7f, 0x35, 0x1f, 0x9e, 0xe3, 0x87, - 0x06, 0xd2, 0xa5, 0xec, 0x78, 0x37, 0xca, 0x8a, - 0x2a, 0x86, 0xc8, 0x57, 0x82, 0xa4, 0x12, 0x31, - 0x43, 0xa6, 0x0c, 0x17, 0x57, 0x80, 0x61, 0xcc, - 0x11, 0xd3, 0xa2, 0xf6, 0x82, 0x4a, 0x8a, 0xf2, - 0x9d, 0xe6, 0x3d, 0x02, 0x1b, 0x32, 0xe6, 0x4b, - 0x2f, 0x64, 0x5c, 0x82, 0x37, 0x9d, 0x2b, 0xa5, - 0xa3, 0xb9, 0xfd, 0x72, 0xe3, 0x80, 0x1a, 0xa3, - 0xcf, 0xad, 0xbc, 0xb1, 0x38, 0x64, 0x40, 0x44, - 0x50, 0xbc, 0x61, 0xfb, 0x10, 0x46, 0xa6, 0xc0, - 0x6a, 0x6d, 0xbe, 0x08, 0xf4, 0x46, 0xe7, 0x8c, - 0xb1, 0xfd, 0x9a, 0xdd, 0x43, 0x32, 0x47, 0x59, - 0xa7, 0xac, 0x80, 0x10, 0xe8, 0x02, 0xe4, 0x7a, - 0x43, 0x97, 0x4f, 0xe7, 0x12, 0x82, 0x79, 0x8a, - 0x08, 0x60, 0x34, 0xed, 0xd6, 0x7a, 0x41, 0x18, - 0x9d, 0xd5, 0x26, 0x91, 0x54, 0x2b, 0x86, 0x2c, - 0x6b, 0x3c, 0x5e, 0x05, 0xfb, 0x3c, 0x54, 0xa8, - 0x90, 0x47, 0x42, 0x93, 0x7d, 0x47, 0x9b, 0x12, - 0x0a, 0x1e, 0x54, 0x11, 0x4a, 0xcd, 0x56, 0xf9, - 0x4b, 0x4a, 0xae, 0xca, 0x48, 0x78, 0x8f, 0xb4, - 0xbf, 0xa3, 0x86, 0x5e, 0x0f, 0x74, 0x5e, 0xb8, - 0xbe, 0x54, 0x44, 0xa8, 0xaa, 0x22, 0x47, 0xe5, - 0xa6, 0xa3, 0x1c, 0x0c, 0xe5, 0xeb, 0x8a, 0x85, - 0xfa, 0xa4, 0x59, 0x4c, 0xf9, 0x43, 0x5d, 0xbe, - 0x9c, 0xe3, 0xb2, 0xc1, 0x8d, 0xcd, 0x3e, 0x4f, - 0xcb, 0x1d, 0xbb, 0x43, 0xe0, 0x9d, 0x0b, 0x8a, - 0x7e, 0x26, 0x96, 0xb7, 0xb0, 0x56, 0x29, 0x1a, - 0x92, 0x36, 0xec, 0x49, 0x34, 0x1d, 0x2d, 0x77, - 0xfd, 0xe3, 0x6e, 0x8a, 0xb0, 0x01, 0x09, 0x90, - 0x82, 0x88, 0xdb, 0x98, 0x2f, 0xdb, 0xa6, 0x57, - 0x36, 0xb5, 0x79, 0xa0, 0xcb, 0xae, 0x47, 0xb8, - 0x80, 0x91, 0x15, 0x9f, 0xab, 0xc0, 0x00, 0xc3, - 0xf5, 0x21, 0x8d, 0x36, 0x42, 0xdd, 0x85, 0x13, - 0x78, 0xc8, 0x48, 0x1a, 0x75, 0x9f, 0x72, 0x47, - 0x59, 0x77, 0x25, 0xa9, 0x80, 0x6e, 0x4b, 0x8f, - 0x6d, 0xc1, 0xb2, 0xd6, 0x8c, 0xda, 0x81, 0xd9, - 0x48, 0x56, 0x85, 0xdb, 0x11, 0x69, 0xe3, 0x41, - 0x90, 0xb6, 0x59, 0x75, 0xdf, 0x1f, 0x02, 0x93, - 0x1f, 0xfa, 0xd0, 0xf4, 0x2d, 0x12, 0x6c, 0x18, - 0x7f, 0x4a, 0x95, 0x58, 0x59, 0x0f, 0x48, 0xb3, - 0x00, 0x7a, 0x61, 0x3f, 0x9e, 0xe8, 0x0a, 0xb2, - 0xa0, 0x09, 0x11, 0xab, 0x80, 0x86, 0x88, 0x73, - 0xbd, 0x84, 0xc1, 0x8e, 0xa8, 0xf2, 0xee, 0xb0, - 0x8d, 0xf0, 0xe4, 0x2a, 0x99, 0x72, 0x46, 0xc3, - 0xbe, 0xfb, 0x75, 0xba, 0x2c, 0x6c, 0x09, 0xe9, - 0x0e, 0xc1, 0xc6, 0x4e, 0x09, 0xa9, 0xc6, 0xd0, - 0xa2, 0xcf, 0x3e, 0x86, 0xed, 0x6d, 0xcc, 0x99, - 0x8e, 0x9f, 0xe6, 0xd3, 0xda, 0xd2, 0x65, 0xfd, - 0xea, 0xc4, 0xbb, 0x55, 0x5b, 0x22, 0x9f, 0x13, - 0x56, 0x04, 0xcb, 0x88, 0x21, 0x45, 0x90, 0x74, - 0x06, 0x91, 0xeb, 0xe0, 0xdf, 0x88, 0x81, 0xc0, - 0xa8, 0x6b, 0x95, 0xf4, 0x67, 0x81, 0x09, 0x45, - 0x50, 0x4a, 0xd8, 0x08, 0xd6, 0x76, 0x91, 0x72, - 0x49, 0xb2, 0x0c, 0x30, 0x86, 0x29, 0x37, 0xe4, - 0x3e, 0x6c, 0xb2, 0xee, 0x33, 0x07, 0x8f, 0x5f, - 0x20, 0x07, 0x47, 0xcf, 0xc9, 0xc1, 0xc6, 0xf4, - 0x0a, 0x05, 0x67, 0x0c, 0xa2, 0x22, 0x44, 0x26, - 0xc3, 0xf2, 0x35, 0xdb, 0x28, 0xd7, 0x24, 0x99, - 0x51, 0x68, 0xdd, 0xe9, 0xff, 0xd2, 0xda, 0xe0, - 0x6e, 0xcf, 0x05, 0xef, 0x5a, 0xa5, 0xf7, 0x9f, - 0xbf, 0x32, 0x26, 0xba, 0xdd, 0xb7, 0x34, 0x4d, - 0xd3, 0xb6, 0xf1, 0x81, 0xa6, 0x01, 0xa6, 0x9a, - 0x42, 0x4f, 0x16, 0x3e, 0x6f, 0x57, 0xb6, 0xba, - 0xa1, 0xe8, 0xf6, 0xb7, 0x76, 0x34, 0xf9, 0x7d, - 0x22, 0x00, 0xfe, 0xa0, 0x90, 0x7b, 0x5c, 0xe1, - 0xd3, 0x42, 0x3f, 0x0d, 0xe0, 0x0f, 0x1c, 0x92, - 0xb0, 0x9b, 0xf5, 0xcb, 0xb9, 0xb5, 0x45, 0x14, - 0x52, 0x4d, 0x18, 0x79, 0x9e, 0xf7, 0x68, 0xc6, - 0x2d, 0x1f, 0xd8, 0x01, 0xb3, 0x1d, 0xaf, 0x77, - 0xf4, 0x01, 0x22, 0xcf, 0xfa, 0xcc, 0xd3, 0x1a, - 0xed, 0xaa, 0xbd, 0x41, 0x43, 0xb6, 0x23, 0xf4, - 0x32, 0x9c, 0xd6, 0xa5, 0x07, 0x0b, 0x3d, 0x24, - 0x6d, 0x50, 0x51, 0xe1, 0xc0, 0xbc, 0x87, 0x0f, - 0x8c, 0x60, 0x90, 0x0b, 0xf6, 0x67, 0xa4, 0x8d, - 0x33, 0xef, 0x61, 0xd5, 0xe3, 0x40, 0x94, 0xda, - 0xcb, 0x69, 0x02, 0x07, 0x99, 0xbc, 0x3a, 0x6c, - 0xf3, 0x6c, 0x79, 0x16, 0xca, 0x04, 0x15, 0x99, - 0xad, 0xd7, 0xd5, 0x77, 0x75, 0x12, 0x18, 0xd8, - 0x4e, 0xbb, 0x01, 0x85, 0xb7, 0xa5, 0xc0, 0x06, - 0x14, 0xbd, 0xea, 0xc6, 0x1a, 0x08, 0xb9, 0x7e, - 0x82, 0xd3, 0x04, 0xcd, 0x58, 0x73, 0xd0, 0x6a, - 0x8b, 0x46, 0x69, 0x4c, 0xf9, 0xfe, 0x67, 0x95, - 0x8e, 0x2e, 0xd2, 0x2e, 0xf2, 0xec, 0xc2, 0x82, - 0xd2, 0xb6, 0xae, 0xe8, 0xbe, 0x12, 0xa5, 0x3b, - 0x20, 0xa6, 0x7f, 0x9b, 0xe6, 0xc4, 0x20, 0xb4, - 0x13, 0xc1, 0xc5, 0x8d, 0xc0, 0xfb, 0x36, 0xb0, - 0x37, 0xcf, 0xcc, 0x97, 0xa8, 0x49, 0x5b, 0x52, - 0x63, 0x67, 0x71, 0x4f, 0xfa, 0xa4, 0xbf, 0xe4, - 0x42, 0x05, 0xe8, 0x2a, 0xa4, 0x7d, 0xf4, 0x5a, - 0x3f, 0x71, 0x53, 0x5c, 0x5c, 0x1f, 0x67, 0x32, - 0x9c, 0xdd, 0xf4, 0x5d, 0x5a, 0x73, 0x20, 0xb5, - 0x1e, 0x8d, 0x81, 0xb4, 0x9e, 0x0c, 0x72, 0xa1, - 0xc7, 0xa7, 0x41, 0x53, 0xe8, 0x2e, 0x80, 0xb1, - 0xef, 0xa0, 0x07, 0x51, 0x10, 0x13, 0xd3, 0xc6, - 0x94, 0xc1, 0x13, 0xf9, 0xb2, 0xde, 0x4e, 0x94, - 0x12, 0x14, 0xd3, 0x1e, 0x64, 0xe5, 0xff, 0xca, - 0x34, 0x69, 0x88, 0xa8, 0xfc, 0xc0, 0xaf, 0xfc, - 0x2f, 0xbb, 0x06, 0xc2, 0x9e, 0x78, 0xd2, 0x67, - 0xed, 0x17, 0x4f, 0xed, 0x77, 0x67, 0xcd, 0x78, - 0xfa, 0x86, 0x9f, 0x3f, 0x0d, 0x4f, 0xaf, 0x36, - 0xde, 0x21, 0xae, 0x16, 0xe1, 0xd6, 0xe1, 0xac, - 0xe9, 0xbc, 0x50, 0x82, 0x66, 0xe8, 0xe7, 0x96, - 0x71, 0xb0, 0x1b, 0x24, 0xe3, 0x03, 0x83, 0x84, - 0xf1, 0x90, 0x58, 0xb6, 0xdb, 0x27, 0x50, 0x8e, - 0x9f, 0x08, 0x94, 0xeb, 0x5c, 0x9b, 0xff, 0x18, - 0x58, 0x4a, 0x27, 0x97, 0x04, 0x71, 0x18, 0xb0, - 0x1c, 0x3f, 0x01, 0x2c, 0xcd, 0x0b, 0x5d, 0xe3, - 0x4f, 0x07, 0x99, 0x0f, 0x33, 0xfd, 0x4c, 0x38, - 0x67, 0xd3, 0xe2, 0x86, 0x58, 0xd9, 0x87, 0x61, - 0x6e, 0x22, 0xec, 0xf8, 0x6b, 0x22, 0x36, 0xee, - 0xd5, 0x5a, 0xa3, 0x72, 0x57, 0x0a, 0x92, 0xb5, - 0xaa, 0x14, 0x9f, 0x0e, 0xa4, 0x6b, 0xe7, 0xb0, - 0x28, 0x20, 0xe1, 0x0b, 0x28, 0xfa, 0x52, 0x7b, - 0xa1, 0x38, 0xa4, 0x1e, 0x95, 0x5b, 0xee, 0x0d, - 0x55, 0x9e, 0xae, 0xc6, 0x23, 0x6e, 0x22, 0x1e, - 0x11, 0xe5, 0x43, 0xdf, 0x53, 0x6b, 0x1c, 0x60, - 0xbb, 0xda, 0x7c, 0x21, 0xf2, 0xdd, 0x78, 0xc7, - 0x51, 0x31, 0x38, 0xb6, 0x35, 0x85, 0xc8, 0xc9, - 0xc8, 0x0c, 0xa4, 0x73, 0x27, 0x78, 0xd2, 0x79, - 0x51, 0x52, 0x4b, 0x83, 0x9b, 0xc1, 0x2f, 0x45, - 0x9e, 0x4f, 0x7f, 0x57, 0x09, 0x6a, 0xb6, 0x11, - 0x55, 0x6a, 0x56, 0x06, 0xcb, 0x47, 0x7b, 0x11, - 0xa6, 0x87, 0x48, 0xcf, 0x2a, 0xd0, 0xe7, 0x2a, - 0xac, 0x29, 0x93, 0x9f, 0x4e, 0x8d, 0xc3, 0xde, - 0x0c, 0x1d, 0x4e, 0xcf, 0x98, 0x27, 0x7c, 0x06, - 0x29, 0xf0, 0xba, 0x01, 0xbe, 0x3f, 0x49, 0xdf, - 0x42, 0x46, 0x84, 0x9e, 0x00, 0x76, 0x39, 0xd0, - 0x62, 0x70, 0x18, 0xc6, 0x8e, 0x04, 0x59, 0xd6, - 0x48, 0xed, 0xab, 0xe0, 0xed, 0xc9, 0x59, 0xf5, - 0x75, 0xe2, 0xf8, 0x85, 0xea, 0x04, 0x0a, 0xa6, - 0xaf, 0xa2, 0x4a, 0x54, 0x14, 0x19, 0x04, 0x2c, - 0x2f, 0x4e, 0xfc, 0x37, 0x68, 0x70, 0x1d, 0xed, - 0xd3, 0xd4, 0x49, 0x61, 0xe9, 0xa0, 0xa8, 0x7c, - 0x1c, 0xeb, 0x57, 0x43, 0x79, 0x18, 0xce, 0x37, - 0x27, 0xbc, 0x08, 0xe3, 0xcf, 0xb8, 0xf7, 0x63, - 0x9e, 0x64, 0xff, 0xb3, 0xfd, 0xde, 0xd8, 0x7e, - 0x97, 0x26, 0x77, 0x34, 0xa9, 0xf9, 0x26, 0x9d, - 0xa6, 0x1a, 0xfc, 0x5e, 0xde, 0x88, 0x3f, 0xea, - 0xab, 0xf2, 0x97, 0xfe, 0x0a, 0x74, 0xdc, 0xd3, - 0xed, 0xc3, 0x8e, 0x45, 0xff, 0x6e, 0xad, 0x8a, - 0x05, 0xfb, 0x75, 0xbc, 0xbe, 0x1d, 0x98, 0x81, - 0x92, 0x5b, 0xcf, 0x8e, 0x00, 0x99, 0xf1, 0x54, - 0xe2, 0x09, 0x1e, 0x96, 0xb9, 0xea, 0x8f, 0x5e, - 0x70, 0x86, 0xad, 0x4a, 0xfa, 0x5b, 0xcf, 0x7a, - 0xae, 0x2d, 0x7e, 0x25, 0x56, 0xc3, 0x4c, 0xbf, - 0x41, 0x3a, 0xdf, 0xbc, 0x3d, 0x0e, 0x32, 0x9e, - 0xcd, 0xb3, 0x20, 0xd1, 0x1f, 0x0c, 0x5a, 0xc9, - 0xb4, 0x2a, 0xeb, 0xa2, 0x6e, 0x78, 0x52, 0x2b, - 0xa1, 0x2b, 0xfb, 0x20, 0x54, 0xd9, 0xfc, 0x5b, - 0xa1, 0x40, 0xd7, 0x99, 0xa7, 0x57, 0xb5, 0x8d, - 0xb2, 0x53, 0x7c, 0x09, 0x50, 0x53, 0x77, 0x0a, - 0x6b, 0x83, 0xb5, 0xcc, 0x01, 0xae, 0xd5, 0x37, - 0xdd, 0x1c, 0xf2, 0x6c, 0x15, 0x94, 0x77, 0x2f, - 0xaf, 0xc5, 0xdf, 0x17, 0xa8, 0x95, 0xd3, 0xe3, - 0xa2, 0xeb, 0xf9, 0x8e, 0xaf, 0xb7, 0x7f, 0xc8, - 0x08, 0x4c, 0x39, 0xbf, 0x4f, 0x88, 0xb8, 0x7f, - 0x2d, 0xce, 0x3f, 0x8b, 0x22, 0x27, 0x38, 0xcf, - 0x95, 0x3a, 0xa8, 0xef, 0x77, 0x2c, 0x1f, 0xd2, - 0xed, 0x11, 0x76, 0x8c, 0x0a, 0x5e, 0x0d, 0xe2, - 0x2f, 0x8d, 0x3a, 0x07, 0x75, 0xf7, 0x96, 0xc5, - 0xfb, 0x71, 0xf6, 0x7a, 0x61, 0xfd, 0xeb, 0xec, - 0x37, 0xff, 0x00, 0xaa, 0x08, 0xe3, 0x94, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, - 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2f, - 0x13, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x11, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, - 0x08, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, - 0x12, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, - 0x0b, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x0d, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x00, 0x00, 0x6f, 0x76, 0x65, 0x72, - 0x76, 0x69, 0x65, 0x77, 0x2e, 0x68, 0x74, 0x6d, - 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x9a, 0x11, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0x9d, 0x58, 0x6d, 0x53, 0xdb, 0x38, - 0x10, 0xfe, 0xce, 0xaf, 0xd8, 0x86, 0x61, 0x86, - 0xf4, 0xe2, 0xd8, 0x09, 0xa4, 0x4d, 0x43, 0xc2, - 0x4c, 0x4a, 0xa1, 0x65, 0xae, 0x05, 0x26, 0x84, - 0xe9, 0x30, 0x37, 0xf7, 0x41, 0xb1, 0xe5, 0x58, - 0x83, 0x6c, 0xf9, 0x24, 0x39, 0x21, 0xbd, 0xe9, - 0x7f, 0xbf, 0x95, 0xdf, 0x93, 0x98, 0x1e, 0x77, - 0x0e, 0x01, 0x59, 0x5a, 0xed, 0xcb, 0xb3, 0x2f, - 0x5a, 0x31, 0x7e, 0xf3, 0xe9, 0xf6, 0x62, 0xfe, - 0x78, 0x77, 0x09, 0x81, 0x0e, 0xf9, 0xf9, 0xc1, - 0xf8, 0x8d, 0x65, 0x1d, 0x00, 0xcc, 0x03, 0xa6, - 0x20, 0x96, 0x62, 0x29, 0x49, 0x08, 0x38, 0xf4, - 0x25, 0xa5, 0xa0, 0x84, 0xaf, 0xd7, 0x44, 0xd2, - 0x33, 0xd8, 0x88, 0x04, 0x5c, 0x12, 0x81, 0xa4, - 0x1e, 0x53, 0x5a, 0xb2, 0x45, 0xa2, 0x29, 0x30, - 0x0d, 0x24, 0xf2, 0x6c, 0x21, 0x21, 0x14, 0x1e, - 0xf3, 0x37, 0xc8, 0x06, 0xa7, 0x92, 0xc8, 0xa3, - 0x12, 0x74, 0x40, 0x41, 0x53, 0x19, 0x2a, 0x10, - 0x7e, 0xfa, 0xf2, 0xf9, 0xe6, 0x01, 0x3e, 0xd3, - 0x88, 0x4a, 0xc2, 0xe1, 0x2e, 0x59, 0x70, 0xe6, - 0xc2, 0x57, 0xe6, 0xd2, 0x48, 0x51, 0x20, 0x28, - 0xd9, 0xcc, 0xa8, 0x80, 0x7a, 0xb0, 0x30, 0x6c, - 0xcc, 0x86, 0x2b, 0xa3, 0xc1, 0x7d, 0xae, 0x01, - 0x5c, 0x09, 0xe4, 0x4b, 0x34, 0x13, 0xd1, 0x19, - 0x50, 0x86, 0xeb, 0x12, 0x56, 0x54, 0x2a, 0x7c, - 0x87, 0x7e, 0x07, 0x50, 0x85, 0x63, 0xa2, 0x8d, - 0x96, 0x12, 0x44, 0x6c, 0xa8, 0xda, 0xc8, 0x85, - 0x44, 0x1b, 0xe0, 0x44, 0x57, 0xa4, 0xdd, 0x83, - 0x06, 0x4b, 0x2b, 0x83, 0x3c, 0x60, 0x51, 0x2a, - 0x3a, 0x10, 0x31, 0x6a, 0x1f, 0x20, 0x47, 0xb4, - 0x67, 0xcd, 0x38, 0x87, 0x05, 0x85, 0x44, 0x51, - 0x3f, 0xe1, 0x1d, 0xe4, 0x80, 0xb4, 0xf0, 0xfd, - 0x7a, 0xfe, 0xe5, 0xf6, 0x61, 0x0e, 0xd3, 0x9b, - 0x47, 0xf8, 0x3e, 0x9d, 0xcd, 0xa6, 0x37, 0xf3, - 0xc7, 0x33, 0xa4, 0xd5, 0x81, 0xc0, 0x55, 0xba, - 0xa2, 0x19, 0x27, 0x16, 0xc6, 0x9c, 0x21, 0x63, - 0xb4, 0x41, 0x92, 0x48, 0x6f, 0x10, 0x0d, 0x64, - 0xf0, 0xed, 0x72, 0x76, 0xf1, 0x05, 0x77, 0x4c, - 0x3f, 0x5e, 0x7f, 0xbd, 0x9e, 0x3f, 0x1a, 0xf5, - 0xaf, 0xae, 0xe7, 0x37, 0x97, 0xf7, 0xf7, 0x70, - 0x75, 0x3b, 0x83, 0x29, 0xdc, 0x4d, 0x67, 0xf3, - 0xeb, 0x8b, 0x87, 0xaf, 0xd3, 0x19, 0xdc, 0x3d, - 0xcc, 0xee, 0x6e, 0xef, 0x2f, 0xbb, 0x70, 0x4f, - 0x8d, 0x4e, 0x14, 0xb7, 0xff, 0x02, 0x4a, 0x3f, - 0x75, 0x06, 0xe2, 0xe5, 0x51, 0x4d, 0x18, 0x57, - 0xa9, 0xc5, 0x8f, 0xe8, 0x3c, 0x85, 0x7a, 0x71, - 0x0f, 0x02, 0xb2, 0xa2, 0xe8, 0x44, 0x97, 0xb2, - 0x15, 0x6a, 0x45, 0xc0, 0x15, 0xf1, 0xe6, 0xdf, - 0x3d, 0x64, 0xb0, 0xe4, 0x22, 0x5a, 0xa6, 0xf6, - 0x21, 0x6d, 0x05, 0xe0, 0x19, 0x30, 0x1f, 0x22, - 0xa1, 0x3b, 0xb0, 0x96, 0x0c, 0x43, 0x42, 0x8b, - 0x7d, 0xdf, 0xe1, 0xee, 0xca, 0x7b, 0x1d, 0xb8, - 0x8e, 0xdc, 0x6e, 0x07, 0x06, 0x3d, 0x24, 0x22, - 0xd1, 0x13, 0x47, 0xc8, 0xef, 0x35, 0x92, 0x23, - 0x8b, 0x2b, 0xe6, 0x23, 0xfb, 0x2b, 0x2e, 0x84, - 0xec, 0xc0, 0x47, 0xa1, 0xb4, 0x21, 0xff, 0x36, - 0x05, 0xa7, 0xdf, 0xeb, 0x39, 0x56, 0xef, 0xc4, - 0xe9, 0x75, 0xe0, 0xe1, 0x7e, 0xda, 0x3d, 0xb0, - 0x2c, 0x8c, 0x5b, 0x13, 0xbe, 0xf0, 0x1c, 0xf2, - 0x11, 0x27, 0xd1, 0x72, 0xd2, 0x3a, 0x52, 0x2d, - 0xa8, 0x46, 0x1e, 0x93, 0xe9, 0xc0, 0xd0, 0x51, - 0xe2, 0x9d, 0xa3, 0x0e, 0xe3, 0x10, 0x21, 0xc1, - 0xa0, 0xd7, 0xb1, 0x45, 0xff, 0x4a, 0xd8, 0x6a, - 0xd2, 0x72, 0x45, 0xa4, 0x69, 0xa4, 0x2d, 0xbd, - 0x89, 0x69, 0x0b, 0xf2, 0xb7, 0x49, 0x4b, 0xd3, - 0x67, 0x6d, 0x1b, 0xee, 0x67, 0xe0, 0x06, 0x44, - 0x2a, 0xaa, 0x27, 0x89, 0xf6, 0xad, 0x61, 0x0b, - 0xec, 0x94, 0x8f, 0x66, 0x9a, 0xd3, 0xf3, 0x23, - 0x35, 0xb6, 0xb3, 0x91, 0x99, 0x53, 0x7a, 0xc3, - 0xd1, 0x7a, 0x64, 0x94, 0xef, 0x77, 0x95, 0x11, - 0x0e, 0x69, 0x92, 0xc1, 0xdf, 0x38, 0x30, 0xcf, - 0x82, 0xb8, 0x4f, 0x4b, 0x69, 0xb0, 0xb0, 0x5c, - 0xc1, 0x85, 0x1c, 0xc1, 0xa1, 0xff, 0x0e, 0x3f, - 0xa7, 0x67, 0xfb, 0x04, 0x2c, 0x24, 0x4b, 0x3a, - 0x02, 0x6b, 0x4d, 0x17, 0x4f, 0x4c, 0x5b, 0x08, - 0xb6, 0xc7, 0x50, 0xbd, 0xe3, 0x9c, 0xd2, 0x3c, - 0x88, 0x1d, 0x25, 0xb2, 0x53, 0x9f, 0xa1, 0xbe, - 0x46, 0x1f, 0xc4, 0x7b, 0x73, 0x0b, 0xa1, 0xb5, - 0x08, 0xeb, 0xd3, 0xa9, 0x02, 0x16, 0x62, 0x1c, - 0x1f, 0x3b, 0x1d, 0x38, 0xa4, 0xe6, 0x71, 0xdb, - 0x2f, 0x50, 0x20, 0xf0, 0xb9, 0xa6, 0xed, 0x9c, - 0xa0, 0xdd, 0xa0, 0xb2, 0x62, 0x3f, 0x50, 0xe3, - 0x9e, 0xe3, 0x1c, 0xc1, 0x80, 0x86, 0x0d, 0x04, - 0x92, 0xc6, 0x94, 0xe8, 0x11, 0x06, 0x4c, 0x3e, - 0x34, 0x34, 0x3f, 0x4d, 0x88, 0x1e, 0x0a, 0x4c, - 0xd1, 0x15, 0xa3, 0xeb, 0x12, 0xab, 0x98, 0x78, - 0x1e, 0x8b, 0x96, 0x23, 0x70, 0x60, 0x10, 0x3f, - 0x17, 0xcc, 0x42, 0xf2, 0x6c, 0xad, 0x99, 0xa7, - 0x03, 0x94, 0xd3, 0x77, 0x9c, 0xfa, 0x82, 0x5c, - 0xb2, 0xc8, 0x32, 0xc6, 0x8e, 0x80, 0x24, 0x5a, - 0xec, 0x2c, 0x48, 0xb6, 0x0c, 0x76, 0x56, 0x32, - 0x4c, 0x50, 0x40, 0x9d, 0x79, 0x40, 0x33, 0xc2, - 0xc1, 0xe9, 0x1e, 0xf3, 0xed, 0xdd, 0xb1, 0x50, - 0xcc, 0x04, 0x34, 0xce, 0x2e, 0x94, 0xe0, 0x58, - 0x3e, 0x8a, 0x15, 0x04, 0xac, 0xc6, 0x34, 0x17, - 0x5c, 0xbe, 0x67, 0x1a, 0x3a, 0x95, 0xe5, 0x4b, - 0xc9, 0xbc, 0xd2, 0x6a, 0xfb, 0x2d, 0x7c, 0x37, - 0xe6, 0xa5, 0x89, 0x3c, 0xc0, 0x5c, 0x4a, 0xc2, - 0x45, 0x64, 0x12, 0xd9, 0x54, 0x5a, 0x93, 0x5a, - 0x4c, 0x16, 0xc8, 0x28, 0x78, 0x6b, 0x37, 0xa0, - 0xe2, 0xbc, 0xfb, 0xcf, 0xa8, 0x6c, 0x99, 0x55, - 0xc2, 0x5e, 0x69, 0x88, 0x89, 0x1d, 0x5a, 0x58, - 0x9e, 0x75, 0xae, 0x66, 0x13, 0x4d, 0x6a, 0x05, - 0x67, 0xa5, 0x21, 0x86, 0xdc, 0x4a, 0xb3, 0x22, - 0x4d, 0x2f, 0xe3, 0xf3, 0xa8, 0x44, 0x08, 0x4b, - 0x6e, 0xcc, 0xc9, 0x66, 0x84, 0xf5, 0xd6, 0xc4, - 0xb0, 0xb5, 0xe0, 0xc2, 0x7d, 0x2a, 0x16, 0x31, - 0x10, 0x34, 0x73, 0x09, 0xb7, 0x08, 0x67, 0xcb, - 0x68, 0x84, 0x68, 0x96, 0x52, 0xba, 0x45, 0x94, - 0x58, 0x46, 0xa5, 0x52, 0x56, 0x61, 0xfa, 0xb0, - 0x66, 0x79, 0xe1, 0xc7, 0x7e, 0xbf, 0x36, 0x59, - 0xca, 0xd5, 0x64, 0x81, 0x8a, 0xb9, 0x94, 0xf3, - 0x17, 0xa4, 0x42, 0x2e, 0xd6, 0x3c, 0x46, 0xa8, - 0xcf, 0xc5, 0x7a, 0x04, 0x01, 0xf3, 0x3c, 0x1a, - 0xed, 0x41, 0xd5, 0xab, 0x05, 0x28, 0x56, 0x7f, - 0x63, 0x52, 0xcd, 0xe1, 0x55, 0xa0, 0x48, 0x8a, - 0xa7, 0x11, 0x16, 0xde, 0x32, 0x50, 0xb0, 0x00, - 0x16, 0x6b, 0x4e, 0x73, 0xf4, 0xa0, 0x5c, 0x93, - 0x30, 0xc6, 0x81, 0x15, 0x0a, 0x69, 0xd9, 0x79, - 0x95, 0xf5, 0x83, 0x26, 0xe3, 0x9b, 0x40, 0x2f, - 0x6d, 0x41, 0x53, 0x2a, 0xe9, 0x2f, 0x59, 0xee, - 0x63, 0xa9, 0xb4, 0x7c, 0x12, 0x32, 0x8e, 0xec, - 0x2e, 0xf0, 0x5c, 0xc3, 0x2a, 0xcf, 0x79, 0x07, - 0x14, 0xda, 0x63, 0x29, 0x2a, 0x99, 0xbf, 0x45, - 0x99, 0xd7, 0x85, 0x5e, 0xac, 0x8b, 0xe9, 0xa2, - 0xfa, 0xf5, 0xe9, 0xc9, 0xe9, 0xc9, 0xbb, 0xd2, - 0x74, 0x2c, 0x9c, 0x56, 0x25, 0x13, 0x59, 0xb2, - 0x58, 0x31, 0xb5, 0xb5, 0x9c, 0xbb, 0x07, 0x8f, - 0x25, 0x3c, 0xd7, 0x6b, 0x90, 0x14, 0x89, 0xf2, - 0x2a, 0x58, 0x7a, 0x27, 0x83, 0x06, 0x5c, 0xb6, - 0x00, 0x59, 0x08, 0x89, 0x6d, 0x0c, 0x92, 0x22, - 0x1e, 0x98, 0xde, 0x18, 0xdc, 0x87, 0xae, 0xeb, - 0xee, 0xd7, 0xb4, 0x11, 0x24, 0x92, 0x1f, 0xd3, - 0x38, 0xd8, 0x60, 0x49, 0x53, 0xd8, 0x7f, 0xb8, - 0x74, 0x64, 0xdb, 0xd8, 0x13, 0x2d, 0xed, 0x65, - 0x24, 0x42, 0x6a, 0xd3, 0x98, 0xc5, 0x01, 0x76, - 0x22, 0x76, 0xc8, 0x94, 0x42, 0x88, 0xad, 0x52, - 0xd5, 0x6e, 0x1c, 0x2d, 0xdb, 0xb9, 0x25, 0x55, - 0x49, 0xac, 0x57, 0xe0, 0xed, 0x42, 0x5f, 0x9d, - 0x01, 0x78, 0xca, 0xe6, 0x05, 0x1d, 0x0b, 0xf7, - 0xd0, 0x7c, 0x4c, 0x7d, 0xf6, 0xfd, 0xf6, 0x6b, - 0x6b, 0xee, 0xcb, 0x71, 0xb9, 0x03, 0xe7, 0x28, - 0x30, 0xfe, 0x30, 0x3a, 0x8d, 0x7c, 0xe1, 0x26, - 0xaa, 0x09, 0xe9, 0x06, 0xa8, 0x3e, 0x7c, 0xf8, - 0x50, 0x01, 0xf9, 0x6c, 0xa9, 0x80, 0x78, 0xc6, - 0xa3, 0x4e, 0x4a, 0x63, 0xbe, 0x72, 0xb9, 0x20, - 0x78, 0xee, 0xa4, 0x9f, 0xee, 0x49, 0xbb, 0x49, - 0x32, 0x71, 0x8d, 0x4e, 0xff, 0x43, 0x0a, 0xc3, - 0x8e, 0x45, 0xbf, 0x46, 0x96, 0xcb, 0x85, 0xc2, - 0x3c, 0x48, 0x10, 0xc9, 0xa8, 0x94, 0x53, 0x1c, - 0xb8, 0xf5, 0xe4, 0x24, 0xd8, 0x01, 0xf6, 0x07, - 0x4e, 0xa8, 0x5e, 0x59, 0xfc, 0xeb, 0x35, 0x27, - 0xaf, 0xff, 0xf5, 0x29, 0x11, 0x13, 0x97, 0xe9, - 0x4d, 0x2d, 0xcd, 0x7f, 0x58, 0x0c, 0xbb, 0xe6, - 0x67, 0x4c, 0xbf, 0xdd, 0x0c, 0x19, 0x0e, 0x87, - 0x4d, 0xb9, 0x74, 0x5a, 0x71, 0x2b, 0x02, 0xfd, - 0xb4, 0x21, 0xce, 0x6b, 0x73, 0x65, 0xc3, 0xe1, - 0xfb, 0x7b, 0x49, 0x7f, 0x82, 0x28, 0x99, 0xef, - 0x69, 0xf6, 0xdd, 0x4a, 0xb8, 0x6d, 0xdf, 0x39, - 0x75, 0x34, 0x73, 0x30, 0x9b, 0x3b, 0x9b, 0x94, - 0x6e, 0xe8, 0x74, 0xb2, 0x9f, 0x6e, 0xbf, 0xbd, - 0x9d, 0x59, 0x96, 0x89, 0xe5, 0x44, 0x99, 0x12, - 0x75, 0x94, 0x79, 0x64, 0xc7, 0x21, 0x59, 0xe4, - 0xfd, 0xa2, 0x75, 0xaa, 0x2b, 0x32, 0x6c, 0x37, - 0xf3, 0xd8, 0x89, 0xa1, 0x2d, 0x83, 0xea, 0x07, - 0x52, 0x43, 0x63, 0xe6, 0x38, 0xce, 0x0b, 0xe7, - 0x4e, 0xae, 0x59, 0x73, 0xf8, 0x94, 0xbe, 0xed, - 0x55, 0xbb, 0x25, 0x0d, 0x85, 0x69, 0xb7, 0x5f, - 0x38, 0xbe, 0x76, 0x23, 0xcd, 0xe9, 0xbe, 0x1f, - 0x28, 0xa0, 0x04, 0x99, 0xe3, 0x11, 0x8d, 0x07, - 0xca, 0x8e, 0xa7, 0x9d, 0xdd, 0xb6, 0xa4, 0xb7, - 0x5d, 0xb4, 0xf7, 0xa2, 0xab, 0xe1, 0xbc, 0xae, - 0x74, 0x6a, 0xb4, 0xa2, 0xac, 0x89, 0x05, 0x48, - 0xe9, 0x26, 0xd3, 0xcb, 0xfe, 0x91, 0x76, 0xd6, - 0x52, 0xf3, 0xd6, 0x9f, 0x2f, 0xec, 0xcd, 0x9a, - 0x8d, 0x86, 0x14, 0x60, 0x11, 0xde, 0xda, 0x98, - 0x7e, 0x99, 0x5d, 0x33, 0x3c, 0xf9, 0x11, 0x98, - 0x32, 0x29, 0xf7, 0x8e, 0xed, 0xb4, 0xb7, 0x38, - 0x4f, 0xc7, 0xca, 0x95, 0x2c, 0xd6, 0xe9, 0xd8, - 0xc3, 0x22, 0x15, 0x62, 0x89, 0xec, 0x8a, 0xe8, - 0x89, 0x6e, 0x62, 0x2c, 0xc9, 0x0a, 0x26, 0x59, - 0x37, 0x42, 0xa3, 0xdf, 0xf3, 0x99, 0x33, 0x43, - 0xe9, 0x27, 0x91, 0x6b, 0x30, 0xdf, 0x59, 0x3b, - 0x36, 0x57, 0x37, 0xdd, 0xce, 0xa5, 0xdb, 0x36, - 0xcc, 0x52, 0xa0, 0xf0, 0x3e, 0x2c, 0x42, 0x28, - 0x9b, 0xd4, 0x75, 0x80, 0xf7, 0xbb, 0x4f, 0x94, - 0x43, 0x7a, 0x13, 0xc2, 0x6d, 0xd4, 0x4b, 0xe9, - 0xf1, 0x32, 0x94, 0x31, 0xe8, 0xae, 0x03, 0xe6, - 0x06, 0x30, 0x99, 0x60, 0x9b, 0xfa, 0xbe, 0x5d, - 0xda, 0xb2, 0x22, 0x12, 0xd2, 0x3a, 0x8a, 0xc8, - 0x4f, 0x2a, 0x65, 0xb3, 0x30, 0xbd, 0xe4, 0xd4, - 0xbc, 0x15, 0xa8, 0x19, 0x5e, 0x39, 0x2d, 0x02, - 0x4d, 0x94, 0xba, 0x21, 0x21, 0x35, 0x1c, 0x5b, - 0x5b, 0x38, 0xb5, 0x2a, 0xee, 0x88, 0x74, 0xaa, - 0xec, 0x15, 0xea, 0x7a, 0x9b, 0xd3, 0x14, 0x2c, - 0x3a, 0x90, 0x19, 0x56, 0x70, 0xff, 0x79, 0x50, - 0xfc, 0xfe, 0xb9, 0x85, 0x46, 0x03, 0x07, 0x8a, - 0x7a, 0x15, 0xdb, 0x73, 0x59, 0xc6, 0x0e, 0x83, - 0xdb, 0x35, 0x2a, 0x70, 0x23, 0x3c, 0x54, 0x0b, - 0x0c, 0x55, 0x37, 0xc6, 0x46, 0x20, 0xd2, 0x5b, - 0x86, 0x64, 0x70, 0x20, 0x48, 0xe6, 0xef, 0x27, - 0xea, 0x93, 0x84, 0xeb, 0xe3, 0x5c, 0x8d, 0x3a, - 0x8b, 0x9a, 0x8d, 0xbf, 0x4d, 0x5a, 0x50, 0xc4, - 0x67, 0x2b, 0xa3, 0x5c, 0x63, 0x7d, 0x14, 0xeb, - 0x6e, 0x56, 0x9b, 0xbb, 0x21, 0x22, 0x8e, 0xb7, - 0xa3, 0x2f, 0xd8, 0x13, 0x73, 0xbc, 0xd9, 0x97, - 0x81, 0xd3, 0xc5, 0xba, 0xac, 0xbf, 0x65, 0x8b, - 0xa9, 0xda, 0xdd, 0x40, 0x52, 0xbf, 0xac, 0x0d, - 0x18, 0x34, 0x45, 0xa4, 0x8c, 0xed, 0xec, 0x5a, - 0x78, 0x30, 0x5e, 0x08, 0x6f, 0x93, 0x85, 0x91, - 0xc7, 0x56, 0xc0, 0xbc, 0x49, 0x09, 0x6f, 0x7a, - 0x7f, 0xab, 0xcd, 0x9b, 0x16, 0x37, 0x9f, 0xc3, - 0xd9, 0x84, 0xa7, 0x93, 0x65, 0x6f, 0x5c, 0xae, - 0x00, 0x1c, 0xa9, 0x82, 0xc8, 0x4e, 0x78, 0x3e, - 0x3d, 0xb6, 0x91, 0x4d, 0x3a, 0xce, 0x47, 0xa8, - 0x42, 0x2e, 0x7a, 0x6c, 0x67, 0xff, 0x89, 0xf9, - 0x07, 0x35, 0xca, 0x3d, 0x76, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, - 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2e, - 0x63, 0x73, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x77, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x23, 0x65, 0x70, 0x68, 0x79, 0x2d, 0x73, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x2d, 0x66, 0x72, 0x61, - 0x6d, 0x65, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3a, 0x20, 0x73, 0x6f, 0x6c, - 0x69, 0x64, 0x3b, 0x0a, 0x20, 0x20, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, 0x64, - 0x74, 0x68, 0x3a, 0x20, 0x31, 0x70, 0x78, 0x3b, - 0x0a, 0x20, 0x20, 0x70, 0x61, 0x64, 0x64, 0x69, - 0x6e, 0x67, 0x3a, 0x20, 0x34, 0x70, 0x78, 0x3b, - 0x0a, 0x7d, 0x0a, 0x0a, 0x23, 0x65, 0x70, 0x68, - 0x79, 0x2d, 0x74, 0x61, 0x62, 0x2d, 0x63, 0x6c, - 0x6f, 0x73, 0x65, 0x2d, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x2d, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x2d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x2d, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x3a, 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x2d, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x2d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, - 0x74, 0x2d, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, - 0x65, 0x2d, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x3a, 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x2d, - 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x2d, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x2d, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x3a, 0x20, - 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x2d, 0x47, 0x74, - 0x6b, 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x2d, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x2d, 0x70, 0x61, - 0x64, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x20, 0x30, - 0x3b, 0x0a, 0x20, 0x20, 0x2d, 0x47, 0x74, 0x6b, - 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x2d, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x2d, 0x6c, 0x69, 0x6e, - 0x65, 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, - 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x6d, 0x61, - 0x72, 0x67, 0x69, 0x6e, 0x3a, 0x20, 0x30, 0x3b, - 0x0a, 0x20, 0x20, 0x70, 0x61, 0x64, 0x64, 0x69, - 0x6e, 0x67, 0x3a, 0x20, 0x30, 0x3b, 0x0a, 0x7d, - 0x0a, 0x0a, 0x2e, 0x70, 0x72, 0x69, 0x6d, 0x61, - 0x72, 0x79, 0x2d, 0x74, 0x6f, 0x6f, 0x6c, 0x62, - 0x61, 0x72, 0x2e, 0x74, 0x6f, 0x6f, 0x6c, 0x62, - 0x61, 0x72, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, - 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x3a, 0x20, 0x30, - 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, - 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x72, 0x69, - 0x67, 0x68, 0x74, 0x3a, 0x20, 0x30, 0x3b, 0x0a, - 0x7d, 0x0a, 0x0a, 0x23, 0x66, 0x75, 0x6c, 0x6c, - 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x2d, 0x70, - 0x6f, 0x70, 0x75, 0x70, 0x20, 0x7b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, - 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x61, 0x6c, 0x70, - 0x68, 0x61, 0x20, 0x28, 0x62, 0x6c, 0x61, 0x63, - 0x6b, 0x2c, 0x20, 0x30, 0x2e, 0x37, 0x29, 0x3b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6c, - 0x6f, 0x72, 0x3a, 0x20, 0x77, 0x68, 0x69, 0x74, - 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, - 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x20, - 0x31, 0x32, 0x70, 0x78, 0x3b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x2d, 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x3a, - 0x20, 0x31, 0x30, 0x70, 0x78, 0x3b, 0x0a, 0x7d, - 0x0a, 0x0a, 0x45, 0x70, 0x68, 0x79, 0x54, 0x6f, - 0x6f, 0x6c, 0x62, 0x61, 0x72, 0x2e, 0x69, 0x6e, - 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, - 0x6d, 0x6f, 0x64, 0x65, 0x20, 0x7b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, - 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, - 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, - 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, - 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x20, - 0x75, 0x72, 0x6c, 0x28, 0x22, 0x72, 0x65, 0x73, - 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x2f, 0x2f, - 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x6e, 0x6f, 0x6d, - 0x65, 0x2f, 0x65, 0x70, 0x69, 0x70, 0x68, 0x61, - 0x6e, 0x79, 0x2f, 0x69, 0x6e, 0x63, 0x6f, 0x67, - 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x74, 0x69, 0x6e, - 0x74, 0x65, 0x64, 0x2e, 0x70, 0x6e, 0x67, 0x22, - 0x29, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x2d, - 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, - 0x28, 0x74, 0x6f, 0x20, 0x62, 0x6f, 0x74, 0x74, - 0x6f, 0x6d, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x23, 0x65, 0x34, 0x65, 0x63, 0x66, - 0x35, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x23, 0x63, 0x35, 0x63, 0x66, 0x64, 0x38, - 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, - 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, - 0x64, 0x2d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x3a, 0x20, 0x6e, 0x6f, 0x2d, 0x72, 0x65, 0x70, - 0x65, 0x61, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, - 0x75, 0x6e, 0x64, 0x2d, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x36, 0x65, - 0x78, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x2c, 0x20, 0x30, 0x20, 0x30, 0x3b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x73, 0x69, - 0x7a, 0x65, 0x3a, 0x20, 0x61, 0x75, 0x74, 0x6f, - 0x20, 0x31, 0x38, 0x30, 0x25, 0x3b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, - 0x20, 0x73, 0x68, 0x61, 0x64, 0x65, 0x28, 0x23, - 0x63, 0x35, 0x63, 0x66, 0x64, 0x38, 0x2c, 0x20, - 0x30, 0x2e, 0x39, 0x30, 0x29, 0x3b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, - 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x6e, - 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, - 0x45, 0x70, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, - 0x62, 0x61, 0x72, 0x2e, 0x69, 0x6e, 0x63, 0x6f, - 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, - 0x64, 0x65, 0x20, 0x2a, 0x3a, 0x69, 0x6e, 0x73, - 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, - 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, - 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, - 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, - 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, - 0x72, 0x65, 0x6e, 0x74, 0x3b, 0x0a, 0x7d, 0x0a, - 0x0a, 0x45, 0x70, 0x68, 0x79, 0x54, 0x6f, 0x6f, - 0x6c, 0x62, 0x61, 0x72, 0x2e, 0x69, 0x6e, 0x63, - 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, - 0x6f, 0x64, 0x65, 0x20, 0x45, 0x70, 0x68, 0x79, - 0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x43, 0x6c, - 0x69, 0x63, 0x6b, 0x61, 0x62, 0x6c, 0x65, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2c, 0x0a, 0x45, - 0x70, 0x68, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x62, - 0x61, 0x72, 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, - 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, - 0x65, 0x20, 0x3e, 0x20, 0x2e, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x20, 0x7b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, - 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, - 0x67, 0x65, 0x3a, 0x20, 0x6c, 0x69, 0x6e, 0x65, - 0x61, 0x72, 0x2d, 0x67, 0x72, 0x61, 0x64, 0x69, - 0x65, 0x6e, 0x74, 0x28, 0x74, 0x6f, 0x20, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x2c, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x23, 0x65, 0x34, - 0x65, 0x63, 0x66, 0x35, 0x2c, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x23, 0x63, 0x35, 0x63, - 0x66, 0x64, 0x38, 0x29, 0x3b, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, - 0x73, 0x68, 0x61, 0x64, 0x65, 0x28, 0x23, 0x63, - 0x35, 0x63, 0x66, 0x64, 0x38, 0x2c, 0x20, 0x30, - 0x2e, 0x39, 0x30, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, - 0x0a, 0x45, 0x70, 0x68, 0x79, 0x54, 0x69, 0x74, - 0x6c, 0x65, 0x42, 0x6f, 0x78, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x2d, 0x47, 0x74, 0x6b, - 0x57, 0x69, 0x64, 0x67, 0x65, 0x74, 0x2d, 0x77, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2d, 0x64, 0x72, - 0x61, 0x67, 0x67, 0x69, 0x6e, 0x67, 0x3a, 0x20, - 0x74, 0x72, 0x75, 0x65, 0x3b, 0x0a, 0x7d, 0x0a, - 0x0a, 0x2e, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x69, - 0x6e, 0x67, 0x2d, 0x62, 0x61, 0x72, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, - 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, - 0x65, 0x6d, 0x65, 0x5f, 0x62, 0x61, 0x73, 0x65, - 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, - 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x2d, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, - 0x31, 0x70, 0x78, 0x3b, 0x0a, 0x20, 0x20, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3a, 0x20, 0x73, 0x6f, 0x6c, - 0x69, 0x64, 0x20, 0x73, 0x6f, 0x6c, 0x69, 0x64, - 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x20, - 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, - 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x3b, - 0x0a, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x2d, 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, - 0x3a, 0x20, 0x33, 0x70, 0x78, 0x20, 0x33, 0x70, - 0x78, 0x20, 0x30, 0x20, 0x30, 0x3b, 0x0a, 0x7d, - 0x0a, 0x0a, 0x2e, 0x66, 0x6c, 0x6f, 0x61, 0x74, - 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x61, 0x72, 0x2e, - 0x6c, 0x65, 0x66, 0x74, 0x20, 0x7b, 0x20, 0x2f, - 0x2a, 0x20, 0x61, 0x78, 0x65, 0x73, 0x20, 0x6c, - 0x65, 0x66, 0x74, 0x20, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x62, - 0x6f, 0x72, 0x64, 0x65, 0x72, 0x20, 0x72, 0x61, - 0x64, 0x69, 0x75, 0x73, 0x20, 0x2a, 0x2f, 0x0a, - 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, - 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x62, 0x6f, 0x72, - 0x64, 0x65, 0x72, 0x2d, 0x74, 0x6f, 0x70, 0x2d, - 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x72, 0x61, 0x64, - 0x69, 0x75, 0x73, 0x3a, 0x20, 0x30, 0x3b, 0x0a, - 0x7d, 0x0a, 0x2e, 0x66, 0x6c, 0x6f, 0x61, 0x74, - 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x61, 0x72, 0x2e, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x7b, 0x20, - 0x2f, 0x2a, 0x20, 0x61, 0x78, 0x65, 0x73, 0x20, - 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x62, 0x6f, - 0x72, 0x64, 0x65, 0x72, 0x20, 0x61, 0x6e, 0x64, - 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x20, - 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x20, 0x2a, - 0x2f, 0x0a, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x2d, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x2d, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3a, 0x20, - 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x20, 0x20, - 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x74, - 0x6f, 0x70, 0x2d, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x2d, 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x3a, - 0x20, 0x30, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x2e, - 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x69, 0x6e, 0x67, - 0x2d, 0x62, 0x61, 0x72, 0x3a, 0x62, 0x61, 0x63, - 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, - 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, - 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, 0x65, - 0x6d, 0x65, 0x5f, 0x75, 0x6e, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x61, 0x73, - 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, - 0x0a, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, - 0x20, 0x40, 0x75, 0x6e, 0x66, 0x6f, 0x63, 0x75, - 0x73, 0x65, 0x64, 0x5f, 0x62, 0x6f, 0x72, 0x64, - 0x65, 0x72, 0x73, 0x3b, 0x0a, 0x7d, 0x0a, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x70, - 0x72, 0x65, 0x66, 0x73, 0x2d, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0x91, 0x99, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xed, 0x5d, 0x41, 0x77, 0xdb, 0x36, - 0x12, 0xbe, 0xe7, 0x57, 0x60, 0x79, 0xc8, 0x65, - 0x57, 0xb6, 0x25, 0x3b, 0xb6, 0x93, 0xd8, 0xea, - 0x4b, 0xd3, 0x24, 0xed, 0x5b, 0xb7, 0x9b, 0x17, - 0x3b, 0xcd, 0xdb, 0x13, 0x1e, 0x44, 0x8e, 0x24, - 0xd4, 0x20, 0xc1, 0x02, 0x90, 0x64, 0xf5, 0xb4, - 0xbf, 0x66, 0x7f, 0xd8, 0xfe, 0x92, 0x05, 0x40, - 0x4a, 0xb6, 0x28, 0x89, 0x22, 0x19, 0x89, 0x26, - 0x25, 0xfa, 0x64, 0x49, 0x00, 0x88, 0x99, 0xf9, - 0x66, 0x30, 0x18, 0x0e, 0x30, 0x57, 0x3f, 0x3c, - 0xf8, 0x0c, 0x8d, 0x41, 0x48, 0xca, 0x83, 0x6b, - 0xa7, 0x7d, 0x74, 0xe2, 0x20, 0x08, 0x5c, 0xee, - 0xd1, 0x60, 0x70, 0xed, 0x7c, 0xbd, 0xfb, 0xd8, - 0xba, 0x74, 0x7e, 0xe8, 0xbe, 0xb8, 0xfa, 0x5b, - 0xab, 0x85, 0x3e, 0x41, 0x00, 0x82, 0x28, 0xf0, - 0xd0, 0x84, 0xaa, 0x21, 0x1a, 0x30, 0xe2, 0x01, - 0x3a, 0x3d, 0x6a, 0x9f, 0x1f, 0x9d, 0xa0, 0x56, - 0x4b, 0x37, 0xa2, 0x81, 0x02, 0xd1, 0x27, 0x2e, - 0x74, 0xaf, 0x04, 0xfc, 0x39, 0xa2, 0x02, 0x24, - 0x62, 0xb4, 0x77, 0xed, 0x0c, 0xd4, 0xfd, 0xdf, - 0x9d, 0xc7, 0xa7, 0x9c, 0xea, 0xa7, 0x1c, 0x77, - 0xaf, 0x78, 0xef, 0x0f, 0x70, 0x15, 0x72, 0x19, - 0x91, 0xf2, 0xda, 0xf9, 0xa4, 0xee, 0xdf, 0x79, - 0x7f, 0x8c, 0xa4, 0xf2, 0x21, 0x50, 0x0e, 0xa2, - 0xde, 0xb5, 0x43, 0xe6, 0x9f, 0xdb, 0x4e, 0xf7, - 0x2a, 0x14, 0x3c, 0x04, 0xa1, 0xa6, 0x28, 0x20, - 0x3e, 0x5c, 0x3b, 0x8c, 0x4f, 0x40, 0x38, 0xdd, - 0xf6, 0xd5, 0xf1, 0xec, 0x87, 0xa5, 0x26, 0xa3, - 0x30, 0xb4, 0x4d, 0x4e, 0x4e, 0x52, 0x1a, 0x8d, - 0x09, 0x1b, 0x81, 0xd3, 0xbd, 0x48, 0x69, 0x22, - 0x15, 0x84, 0x98, 0x06, 0xae, 0x00, 0x3b, 0xb7, - 0xd4, 0x67, 0x86, 0x64, 0x00, 0x0b, 0x6d, 0x17, - 0x9e, 0x7d, 0x1c, 0xd1, 0x9c, 0x8b, 0xf6, 0x8e, - 0x93, 0x42, 0x98, 0xf9, 0x7b, 0xe6, 0x99, 0xdf, - 0x50, 0xa9, 0x6e, 0x15, 0x17, 0x10, 0x4d, 0x9c, - 0xe9, 0x8f, 0xd2, 0x7c, 0x34, 0x32, 0x73, 0x39, - 0x1b, 0xf9, 0x81, 0xec, 0x5a, 0xfc, 0x44, 0x1f, - 0x5a, 0xe6, 0x69, 0xf6, 0x91, 0x06, 0x34, 0x71, - 0x0b, 0xa4, 0xa6, 0xa1, 0x9e, 0xc2, 0xc0, 0x1d, - 0x12, 0x41, 0x84, 0x20, 0x53, 0x83, 0x8f, 0x64, - 0x1f, 0x3d, 0xaa, 0x7b, 0x8f, 0x46, 0x82, 0xe5, - 0xed, 0x98, 0xa1, 0xcb, 0xf1, 0x7c, 0xa6, 0x73, - 0x42, 0x15, 0xf8, 0x21, 0xd3, 0x70, 0x9f, 0x91, - 0xfa, 0x59, 0x40, 0x5f, 0xfe, 0x44, 0x09, 0xe3, - 0x03, 0x07, 0x85, 0x44, 0x68, 0x26, 0x59, 0xfa, - 0xe3, 0xaf, 0x96, 0xf8, 0xe9, 0x92, 0x00, 0xf7, - 0xb9, 0x3b, 0x92, 0x4e, 0xf7, 0x23, 0x61, 0x12, - 0x52, 0x58, 0xdf, 0xe3, 0xc2, 0x03, 0x81, 0x27, - 0xd4, 0x53, 0x43, 0xa7, 0x9b, 0x26, 0x50, 0xc1, - 0x99, 0x06, 0x2b, 0x84, 0x34, 0x1c, 0x92, 0x60, - 0xda, 0x0a, 0xf5, 0x9c, 0x40, 0xcf, 0xc4, 0x05, - 0x99, 0xd2, 0xc9, 0xe7, 0x1e, 0x61, 0x4e, 0xf7, - 0x4e, 0x8c, 0xd2, 0x26, 0x31, 0xa1, 0x81, 0xc7, - 0x27, 0x38, 0xe4, 0x92, 0x2a, 0xad, 0xa6, 0x4e, - 0xd7, 0x05, 0xa3, 0xcf, 0x29, 0x3d, 0x3c, 0x90, - 0x4a, 0xf0, 0x29, 0x36, 0xe6, 0x00, 0x47, 0x1c, - 0xd9, 0xf8, 0x14, 0xea, 0xf2, 0x00, 0x9b, 0x7f, - 0x9d, 0xae, 0xb6, 0x0a, 0x19, 0x09, 0x30, 0x12, - 0xc3, 0x43, 0x6a, 0x86, 0xf7, 0x2c, 0xb7, 0x9f, - 0xb6, 0x75, 0x87, 0x94, 0x79, 0xc8, 0xda, 0x9e, - 0x80, 0xb0, 0x96, 0xfd, 0x78, 0xed, 0x0c, 0x41, - 0x5b, 0x27, 0xd1, 0x23, 0x5a, 0x4d, 0x96, 0x21, - 0xfb, 0xb3, 0xfd, 0xf1, 0x47, 0xfd, 0xa3, 0x85, - 0xec, 0xbc, 0xed, 0x0a, 0x33, 0xa3, 0xa8, 0xd2, - 0x1c, 0x47, 0x4a, 0x90, 0x40, 0x6a, 0x34, 0x90, - 0x1e, 0xd3, 0x5f, 0x4e, 0x41, 0x0b, 0xf5, 0x73, - 0xa6, 0xa9, 0x8f, 0xa9, 0xa4, 0x3d, 0x23, 0xb3, - 0x0d, 0x7c, 0xc9, 0x81, 0x16, 0x39, 0xe4, 0x93, - 0x96, 0xcb, 0xb8, 0x84, 0x56, 0x6f, 0xa4, 0x94, - 0x11, 0x55, 0x72, 0xf0, 0x39, 0x88, 0x8f, 0x2d, - 0x3b, 0xd6, 0x31, 0x69, 0xdc, 0xe3, 0x0f, 0xab, - 0xf8, 0xf3, 0xa3, 0xfe, 0xda, 0x72, 0x26, 0xe2, - 0x76, 0xcb, 0xb4, 0x5b, 0x61, 0x86, 0x76, 0x40, - 0x5b, 0x76, 0x4d, 0xe0, 0x82, 0x6a, 0xbc, 0x91, - 0x08, 0xaa, 0x7a, 0x69, 0x51, 0xd4, 0x25, 0x2c, - 0x8d, 0x6b, 0x21, 0x71, 0xf5, 0xa2, 0xe6, 0x74, - 0x3b, 0x9b, 0xc1, 0x43, 0x5c, 0x33, 0x2c, 0xd6, - 0x88, 0x26, 0x2b, 0xd9, 0x63, 0xb9, 0x9e, 0x64, - 0xd2, 0x93, 0x4e, 0x69, 0xbc, 0xda, 0xc4, 0x81, - 0x1c, 0xcc, 0x62, 0x64, 0xca, 0x47, 0x0a, 0x4b, - 0x35, 0xb5, 0x46, 0x21, 0xf0, 0x56, 0x42, 0x40, - 0xd3, 0x7d, 0xaf, 0x09, 0x5f, 0xea, 0x0d, 0x0f, - 0x21, 0x09, 0xbc, 0xcd, 0x4f, 0xe9, 0x53, 0xb6, - 0xd9, 0x78, 0x98, 0x87, 0x60, 0xa3, 0xa6, 0x4b, - 0xf3, 0x48, 0x36, 0x9c, 0x9b, 0x97, 0xc5, 0xe5, - 0x65, 0x3e, 0xcb, 0x05, 0xc4, 0xae, 0x60, 0xfe, - 0x6f, 0x5c, 0x41, 0x8f, 0xf3, 0xfb, 0x88, 0xf7, - 0xc6, 0x7e, 0x48, 0x1c, 0xcc, 0xbe, 0xdb, 0x06, - 0x44, 0x37, 0xb4, 0xcc, 0x8e, 0x50, 0xa3, 0xa7, - 0x38, 0x6a, 0xbe, 0x82, 0xcb, 0xeb, 0xe8, 0x9b, - 0xc3, 0x6a, 0x60, 0xdd, 0x2d, 0x86, 0xed, 0xba, - 0x1c, 0x29, 0x6a, 0xd9, 0xfa, 0xd7, 0xee, 0xec, - 0x42, 0x01, 0xdb, 0x97, 0xb9, 0xf8, 0x30, 0xa2, - 0xe5, 0xb2, 0xa0, 0x2c, 0xba, 0x8c, 0x51, 0x6d, - 0x5f, 0x9e, 0x56, 0x9b, 0xa6, 0xf3, 0x2c, 0x24, - 0xdd, 0x90, 0x1e, 0xb0, 0xd8, 0xfb, 0x33, 0xff, - 0xb6, 0x4f, 0x4f, 0x4e, 0x4a, 0x21, 0x6b, 0x48, - 0x18, 0x1d, 0x68, 0x8a, 0xa4, 0x22, 0x42, 0xa5, - 0x1a, 0x4a, 0x3b, 0xc1, 0x15, 0x8b, 0xf8, 0x4f, - 0x7c, 0x12, 0x30, 0x4e, 0xbc, 0x85, 0x25, 0x9c, - 0x28, 0x25, 0xa8, 0x5e, 0x5a, 0x41, 0x3e, 0xf9, - 0x7f, 0xe6, 0x25, 0x01, 0x1d, 0x0c, 0xb5, 0x8f, - 0x6e, 0xb7, 0x0d, 0x46, 0x5f, 0x98, 0x67, 0xfd, - 0xc7, 0xa7, 0x7d, 0x4a, 0x36, 0xbd, 0xdf, 0x6b, - 0x51, 0x17, 0x11, 0xf9, 0xfa, 0xa2, 0x46, 0x88, - 0x4c, 0x3a, 0xba, 0x44, 0x0c, 0x68, 0x80, 0x2d, - 0x1c, 0x92, 0xd6, 0x6b, 0x23, 0xf5, 0x5e, 0x0c, - 0x05, 0x1c, 0x39, 0x55, 0x78, 0xf8, 0x2c, 0x06, - 0x67, 0xa8, 0x3f, 0xfd, 0xc5, 0xf5, 0xc7, 0x6c, - 0x26, 0xa7, 0x93, 0x53, 0x3f, 0x93, 0x44, 0x46, - 0x9a, 0x51, 0x06, 0x95, 0xeb, 0x75, 0x10, 0xcf, - 0x94, 0x10, 0xf5, 0xb5, 0x36, 0x81, 0x78, 0x93, - 0xb6, 0xa5, 0x97, 0x80, 0x47, 0x81, 0x6e, 0xc4, - 0x68, 0x00, 0x29, 0x7e, 0xef, 0x76, 0x34, 0x6f, - 0x53, 0xab, 0xbc, 0xaa, 0xa7, 0xf7, 0x93, 0x2e, - 0x0c, 0x2d, 0x91, 0xc7, 0x8f, 0x3f, 0xd6, 0xcc, - 0x5c, 0xbc, 0x1f, 0x82, 0x1b, 0xbb, 0xc0, 0x71, - 0xa8, 0x62, 0xa4, 0xb8, 0xaf, 0xe1, 0xeb, 0xe2, - 0x19, 0xba, 0x24, 0x76, 0x4d, 0xa3, 0xd9, 0xee, - 0x24, 0x3b, 0x14, 0xde, 0xe1, 0xd9, 0x58, 0x84, - 0xb1, 0x29, 0xd2, 0xbd, 0x02, 0x34, 0x1b, 0x14, - 0x34, 0x3e, 0x28, 0xdb, 0xf6, 0x66, 0x6b, 0x43, - 0x4b, 0x01, 0x2e, 0xd0, 0x31, 0x48, 0xec, 0x41, - 0x9f, 0x8c, 0x98, 0xda, 0x2c, 0x84, 0x0d, 0x08, - 0x4d, 0x6e, 0xa1, 0x05, 0x99, 0x60, 0xbd, 0xf1, - 0xd6, 0x04, 0x2b, 0x2e, 0x2a, 0x04, 0xe8, 0x76, - 0x3a, 0x38, 0x9e, 0x0b, 0xb3, 0x15, 0x9d, 0xd6, - 0x49, 0x2d, 0xa7, 0x95, 0xc9, 0x21, 0x38, 0xdf, - 0x43, 0x07, 0xf5, 0xb2, 0x26, 0xde, 0xe9, 0x2d, - 0x10, 0xe1, 0x0e, 0x1b, 0xd7, 0x34, 0x42, 0xe2, - 0xa1, 0x3a, 0xa6, 0xd2, 0xa2, 0x00, 0x43, 0xa0, - 0x87, 0x00, 0xeb, 0x96, 0xb6, 0x4b, 0xe1, 0x44, - 0x71, 0x2f, 0x73, 0x71, 0xc6, 0x95, 0xf0, 0x31, - 0x3f, 0xd8, 0xb9, 0xbc, 0xd9, 0xda, 0xc2, 0xed, - 0x07, 0xe0, 0xf3, 0x40, 0xfb, 0x3c, 0x13, 0xea, - 0x0d, 0x40, 0x0b, 0x75, 0x91, 0x66, 0x97, 0xfb, - 0x3d, 0x5e, 0x23, 0xcf, 0x74, 0xd9, 0xcb, 0x33, - 0x04, 0xac, 0x81, 0xa0, 0x25, 0xae, 0x14, 0x81, - 0xfa, 0xdc, 0x33, 0xd0, 0x79, 0x7c, 0xa7, 0x54, - 0x88, 0xa5, 0x1b, 0xe6, 0xd3, 0xb8, 0x20, 0x87, - 0xe7, 0xb0, 0xb5, 0xb7, 0x11, 0x2a, 0xb9, 0x7c, - 0xb5, 0x8f, 0xc1, 0xbb, 0xce, 0xeb, 0x4e, 0x4d, - 0xdc, 0xa3, 0x6f, 0xd0, 0x43, 0xef, 0x79, 0xa0, - 0x34, 0x77, 0x2a, 0xec, 0x23, 0xed, 0xdc, 0x54, - 0x27, 0x40, 0x79, 0x7e, 0x58, 0x6e, 0xd2, 0x52, - 0x38, 0x22, 0xe4, 0xe1, 0x28, 0x94, 0x98, 0x30, - 0xc6, 0x27, 0x85, 0xe3, 0x10, 0xa6, 0x33, 0xb2, - 0x23, 0x21, 0x1c, 0xbd, 0x18, 0xdf, 0xaf, 0xb8, - 0x43, 0x56, 0xe5, 0xab, 0x6c, 0x7c, 0x62, 0x6b, - 0xc1, 0x2b, 0xaf, 0xc7, 0xb8, 0x7b, 0xbf, 0x0d, - 0xb8, 0x60, 0xe2, 0x59, 0x45, 0x90, 0x36, 0x81, - 0xa6, 0xc1, 0x4b, 0x9d, 0xe2, 0x59, 0x99, 0xf1, - 0x02, 0x81, 0x91, 0x3b, 0x0e, 0xd9, 0x48, 0x5b, - 0xaa, 0xc2, 0x71, 0xce, 0x0f, 0x76, 0x14, 0x34, - 0x1b, 0xa6, 0x81, 0x4a, 0x95, 0xa0, 0xd2, 0x69, - 0x3c, 0xe9, 0x1c, 0xd3, 0xca, 0xca, 0xad, 0xc5, - 0x4c, 0xa4, 0x28, 0x07, 0x4f, 0xab, 0x84, 0x93, - 0xc9, 0x25, 0x2d, 0xe9, 0x35, 0xf9, 0x7a, 0x85, - 0x8d, 0x72, 0x5f, 0x59, 0x2e, 0x7c, 0xea, 0xfe, - 0x78, 0x0d, 0xf6, 0x0a, 0x38, 0x77, 0x7d, 0xed, - 0xe8, 0x6a, 0xaf, 0x26, 0xf0, 0xf4, 0xf6, 0x9b, - 0x71, 0x21, 0x0f, 0x3e, 0x2f, 0x64, 0xfc, 0x7d, - 0x81, 0xb0, 0xbc, 0xd3, 0x4c, 0x63, 0x56, 0xe6, - 0xbd, 0x55, 0x4d, 0x36, 0x56, 0x1f, 0x79, 0xc2, - 0x7f, 0x39, 0xe8, 0x2d, 0x55, 0xe7, 0xc0, 0x37, - 0x54, 0x66, 0xf9, 0x1f, 0x04, 0xdc, 0x07, 0x1c, - 0xd9, 0xa0, 0x82, 0x3e, 0x0f, 0xfe, 0x2a, 0x01, - 0xc9, 0xa9, 0x54, 0xe0, 0xa3, 0x3e, 0xdf, 0x37, - 0x07, 0xb9, 0x64, 0x6f, 0x66, 0xd7, 0x81, 0xae, - 0x3b, 0x23, 0xb8, 0x48, 0xfc, 0x9a, 0xbb, 0x8a, - 0xfb, 0xb1, 0xec, 0xad, 0x40, 0x4b, 0xd1, 0x87, - 0x00, 0x0b, 0xbd, 0xe9, 0x76, 0xba, 0xa7, 0xa9, - 0x6d, 0xe2, 0xb4, 0xfd, 0x84, 0x1b, 0x92, 0x7c, - 0xaa, 0x6d, 0x84, 0xd7, 0xbc, 0xcf, 0x58, 0xca, - 0xb0, 0x9f, 0xe0, 0x9d, 0xe9, 0x96, 0x31, 0xac, - 0x4f, 0x55, 0x4b, 0x6a, 0x2d, 0xb1, 0x9c, 0x5d, - 0xa7, 0x4e, 0x65, 0x28, 0xc2, 0xa6, 0xf0, 0x38, - 0x37, 0x79, 0xf7, 0xb7, 0x7a, 0xa6, 0x28, 0x95, - 0x71, 0x46, 0x5f, 0xa2, 0xb6, 0xb9, 0xb1, 0xcf, - 0xa0, 0xaf, 0xb0, 0x5e, 0x2f, 0x88, 0x3b, 0x4c, - 0x3f, 0xa3, 0x22, 0xcc, 0x52, 0x33, 0x6f, 0x99, - 0x36, 0x9b, 0x29, 0xe6, 0xa1, 0xd1, 0x00, 0xe3, - 0xbb, 0xdd, 0xfd, 0x13, 0x7f, 0xfc, 0xe5, 0xe6, - 0xa6, 0x98, 0x26, 0x2c, 0x89, 0x0c, 0x04, 0xed, - 0x37, 0x32, 0xdb, 0x85, 0xcc, 0x14, 0x0f, 0x33, - 0x8d, 0xd8, 0xe3, 0xca, 0x58, 0xa4, 0x67, 0x85, - 0x81, 0xcf, 0x03, 0xde, 0xa0, 0x60, 0xd7, 0x28, - 0xe8, 0x64, 0x47, 0xc1, 0x69, 0x19, 0x28, 0x48, - 0x3a, 0xf4, 0xa7, 0x75, 0x49, 0x24, 0x31, 0x18, - 0xb0, 0x96, 0xcb, 0xba, 0x5e, 0x6f, 0x72, 0xc9, - 0xf8, 0x21, 0x9d, 0x7b, 0x65, 0xf1, 0xfa, 0xac, - 0x36, 0x49, 0x3b, 0xc5, 0xd8, 0xbc, 0x03, 0xeb, - 0x57, 0x11, 0xc9, 0xbd, 0xaa, 0x89, 0xe4, 0x7e, - 0xd5, 0x36, 0xdd, 0xb8, 0x7e, 0xf0, 0x9d, 0xd2, - 0xdb, 0x92, 0xd5, 0xda, 0xb1, 0xf4, 0xaa, 0x1e, - 0x30, 0x6c, 0xc2, 0xab, 0xdb, 0x0a, 0x60, 0x54, - 0xe4, 0x8c, 0x51, 0x56, 0x73, 0x51, 0x97, 0xf4, - 0x83, 0x5b, 0x73, 0xee, 0xb2, 0x89, 0x92, 0x99, - 0x10, 0x81, 0x94, 0x7a, 0x27, 0xae, 0x85, 0x4f, - 0x03, 0x73, 0xd6, 0xb1, 0xda, 0x67, 0x66, 0x3a, - 0x67, 0xbb, 0x0e, 0x98, 0x59, 0x76, 0xd8, 0x20, - 0xd9, 0xaa, 0xe8, 0xfc, 0x7a, 0x40, 0x99, 0x00, - 0x59, 0x14, 0x6d, 0x41, 0xd1, 0xa1, 0x5e, 0x39, - 0x04, 0x50, 0x4d, 0x98, 0xac, 0xc2, 0x2a, 0xf0, - 0x73, 0xe2, 0x2c, 0xb8, 0x11, 0x3d, 0x78, 0x54, - 0x95, 0xf6, 0x62, 0x26, 0xf5, 0x0c, 0xf8, 0x5a, - 0xc5, 0x4d, 0x80, 0x35, 0x9a, 0x71, 0xfe, 0x88, - 0xee, 0x07, 0xdd, 0x0f, 0xdd, 0xce, 0x91, 0xfa, - 0xbf, 0xff, 0xfc, 0xb7, 0x54, 0xb0, 0x9a, 0x96, - 0x59, 0xf7, 0xc2, 0xb9, 0x37, 0xcf, 0x35, 0x3d, - 0x69, 0xd6, 0x24, 0xc5, 0x1e, 0xc0, 0xb4, 0xf2, - 0x85, 0xf7, 0x73, 0xbf, 0x6c, 0x3f, 0x7b, 0xe6, - 0x97, 0xed, 0xf6, 0xf5, 0x23, 0x7a, 0x49, 0xfc, - 0xf0, 0x2d, 0x5a, 0x72, 0xb2, 0x8a, 0x32, 0x67, - 0xa7, 0x2f, 0xe7, 0x43, 0x41, 0xc7, 0xc4, 0x9d, - 0x36, 0xef, 0xe4, 0x6d, 0x06, 0xea, 0xc5, 0x1e, - 0xa4, 0x45, 0xcf, 0x49, 0xda, 0xdd, 0x71, 0x9b, - 0x1c, 0x19, 0xd9, 0x75, 0x89, 0x7d, 0xbd, 0xe7, - 0xfc, 0x9e, 0xc2, 0x61, 0xa7, 0x0e, 0x3c, 0x7d, - 0x49, 0x40, 0x02, 0x63, 0x10, 0xdc, 0x88, 0x2b, - 0x05, 0x3c, 0xac, 0x5f, 0xed, 0x00, 0x08, 0xc7, - 0x7c, 0x2d, 0xdb, 0xc1, 0xda, 0xfa, 0x6e, 0x40, - 0x6a, 0x7c, 0x11, 0x36, 0x9b, 0x07, 0xa3, 0xee, - 0x3d, 0x78, 0x0e, 0x1a, 0x6a, 0xf9, 0x31, 0x10, - 0x5a, 0xa5, 0x03, 0xbc, 0x92, 0x65, 0x78, 0xde, - 0x34, 0x62, 0x77, 0xe2, 0x32, 0x36, 0x39, 0x21, - 0x61, 0x08, 0x9a, 0xdf, 0x01, 0xb7, 0xf0, 0x29, - 0x19, 0x31, 0xf9, 0xaf, 0x3e, 0x6a, 0x57, 0xd2, - 0x87, 0xdb, 0xce, 0xf1, 0x83, 0xcb, 0xc3, 0xca, - 0x96, 0xf9, 0x42, 0x3c, 0xca, 0x17, 0x12, 0xca, - 0xd9, 0x84, 0x4c, 0x65, 0xae, 0x6d, 0xd4, 0x3b, - 0xdb, 0x05, 0x11, 0xd7, 0x85, 0xb0, 0xd9, 0xee, - 0x57, 0xd9, 0xb8, 0x2f, 0x49, 0x3b, 0xe0, 0x58, - 0x0d, 0xa9, 0xf0, 0xcc, 0xf5, 0x87, 0x6a, 0x9a, - 0x47, 0xea, 0xff, 0x0a, 0xd8, 0x14, 0xe1, 0xbe, - 0xe0, 0x3e, 0xd2, 0x93, 0x02, 0x89, 0xf4, 0x3e, - 0x1e, 0x19, 0x09, 0x1f, 0x16, 0x02, 0x12, 0xcd, - 0x07, 0x82, 0x8f, 0x42, 0xa7, 0x1b, 0x29, 0x51, - 0x9d, 0x0f, 0x0e, 0x2c, 0xdf, 0x89, 0xd5, 0xae, - 0x89, 0x13, 0x87, 0x5c, 0xee, 0xdb, 0x03, 0x2c, - 0xd7, 0xce, 0x17, 0x73, 0xc3, 0xa5, 0x44, 0x8a, - 0xa3, 0x97, 0x7f, 0x8e, 0xb8, 0x7a, 0x6b, 0x31, - 0xbb, 0x0a, 0xb2, 0xd1, 0xcf, 0x28, 0x7a, 0x03, - 0x85, 0x2c, 0x3a, 0x50, 0xec, 0xb3, 0x1c, 0x39, - 0xdd, 0x97, 0x4c, 0xbd, 0x95, 0x3e, 0x61, 0xec, - 0xe5, 0x40, 0xbd, 0xfd, 0xc8, 0x05, 0x82, 0x07, - 0xbd, 0xb7, 0x63, 0xf0, 0x0f, 0x14, 0x70, 0x15, - 0x8d, 0x37, 0x3f, 0x3a, 0xa3, 0x1f, 0xa7, 0x47, - 0x50, 0x43, 0x30, 0xc9, 0x82, 0xe6, 0x21, 0xa6, - 0xf3, 0xf1, 0xbc, 0xf7, 0x06, 0x5c, 0x6a, 0x0b, - 0x7e, 0x6f, 0xf0, 0xb3, 0xe9, 0xf0, 0xf6, 0x82, - 0xa1, 0xef, 0x74, 0xea, 0x70, 0xec, 0x20, 0xbb, - 0x49, 0x82, 0xf1, 0xaa, 0x20, 0x7c, 0xca, 0xfa, - 0xf3, 0x9b, 0xe9, 0x71, 0x88, 0xcb, 0x4f, 0xe5, - 0x8d, 0xcf, 0x69, 0x13, 0x56, 0x2b, 0xf9, 0x50, - 0xf7, 0xd9, 0x1e, 0x1e, 0xe9, 0xbe, 0xa8, 0x49, - 0xf4, 0xe0, 0x4e, 0x44, 0x22, 0x3b, 0xe4, 0xf0, - 0xc1, 0xd2, 0xcb, 0x44, 0x8f, 0x9b, 0xeb, 0x6d, - 0xb1, 0x32, 0xbc, 0x29, 0x9c, 0x7a, 0x7f, 0x07, - 0x8c, 0xa1, 0x09, 0xf4, 0xa2, 0x65, 0xfb, 0x17, - 0xe4, 0x71, 0xbb, 0xf4, 0x4e, 0x48, 0xa0, 0xcc, - 0xea, 0xde, 0x03, 0x64, 0xc7, 0x07, 0xaf, 0x39, - 0x89, 0x28, 0x72, 0x7a, 0x0f, 0xed, 0x4e, 0x0d, - 0xd2, 0xfc, 0x2b, 0x9a, 0xeb, 0x93, 0xf1, 0x46, - 0xd2, 0xd7, 0x7b, 0x16, 0x4f, 0xee, 0x3c, 0x73, - 0x3c, 0xf9, 0xb4, 0x5d, 0x97, 0xbc, 0xd5, 0xcf, - 0x9a, 0x86, 0x09, 0x17, 0x5e, 0x13, 0x51, 0x5e, - 0x8c, 0x28, 0x87, 0x33, 0xbe, 0x7c, 0x47, 0x4c, - 0x79, 0xce, 0xdb, 0xc3, 0x89, 0x2a, 0x27, 0xd9, - 0xd6, 0xc4, 0x95, 0x2b, 0x1c, 0x57, 0x5e, 0xf2, - 0x84, 0x4c, 0x61, 0x1a, 0xbf, 0x07, 0xe2, 0x89, - 0x18, 0x8b, 0xfa, 0x43, 0x5f, 0xe2, 0xa1, 0x50, - 0xb8, 0xca, 0xc0, 0x1c, 0xda, 0xbe, 0xb7, 0x71, - 0x68, 0x32, 0x4f, 0xeb, 0x74, 0x1b, 0x0e, 0xcd, - 0x79, 0x67, 0x2f, 0xef, 0x0d, 0x7b, 0x75, 0x5e, - 0x9b, 0xc4, 0x5d, 0x2e, 0xc0, 0x43, 0x3f, 0xe9, - 0x2f, 0x9b, 0xf4, 0x5d, 0x53, 0xff, 0xc8, 0x80, - 0xf2, 0xe2, 0xac, 0x5e, 0x97, 0xdd, 0x6f, 0xe1, - 0xdd, 0xdd, 0xcd, 0xee, 0x2e, 0x26, 0x35, 0x25, - 0xc8, 0xbe, 0x01, 0xf2, 0x47, 0x52, 0x21, 0x6d, - 0xbb, 0xd1, 0x83, 0x05, 0x2d, 0xa2, 0x81, 0x54, - 0x40, 0x3c, 0xc4, 0xfb, 0x28, 0x82, 0xb1, 0xde, - 0x7a, 0xbb, 0xc4, 0x34, 0x88, 0x3e, 0xbe, 0x40, - 0x9b, 0xfe, 0x3c, 0xae, 0x37, 0xf0, 0x76, 0xef, - 0xce, 0xc5, 0x3d, 0xea, 0x73, 0x81, 0x2c, 0xce, - 0x65, 0x54, 0x93, 0xcf, 0xac, 0x0e, 0x68, 0x22, - 0x48, 0x78, 0x84, 0xde, 0x05, 0x9e, 0xde, 0xf1, - 0xdb, 0x19, 0x6c, 0x1e, 0xd5, 0xde, 0x7e, 0xf5, - 0xd8, 0xdb, 0xc4, 0x04, 0x88, 0xeb, 0x72, 0x53, - 0x38, 0x4c, 0xc1, 0x5c, 0x85, 0xcc, 0xe9, 0x92, - 0x23, 0x5b, 0x49, 0x2d, 0x79, 0x52, 0x25, 0x56, - 0xc9, 0xb4, 0x6a, 0x38, 0x66, 0xdc, 0x0c, 0x2b, - 0xd1, 0x43, 0xcb, 0xe6, 0x33, 0xb5, 0x4c, 0x75, - 0x36, 0x73, 0xfa, 0xfb, 0xa4, 0x90, 0x86, 0xff, - 0x9b, 0x8f, 0x90, 0x16, 0x8f, 0x96, 0x35, 0x10, - 0x81, 0x64, 0xa4, 0xef, 0xba, 0xab, 0xe4, 0xc6, - 0x51, 0xd4, 0x44, 0x91, 0xa3, 0x0a, 0xdc, 0x24, - 0xba, 0x85, 0xfd, 0x80, 0x25, 0x10, 0xcf, 0x28, - 0xc3, 0x86, 0xb2, 0x02, 0x5b, 0x82, 0xf7, 0x0c, - 0x1b, 0x3e, 0x7d, 0x9e, 0x31, 0xc8, 0x58, 0xc6, - 0xda, 0xef, 0x0a, 0xaa, 0xf1, 0xc6, 0x30, 0xb3, - 0x53, 0xbf, 0x73, 0x1f, 0xa7, 0xf6, 0x77, 0xff, - 0x9f, 0x6d, 0x2d, 0x6b, 0xb6, 0xb3, 0x8b, 0xac, - 0xd9, 0x57, 0xcf, 0x9c, 0x35, 0xfb, 0x39, 0xca, - 0x41, 0x2d, 0x98, 0x2b, 0xdb, 0x29, 0x2d, 0x57, - 0x96, 0x91, 0x60, 0x30, 0x8a, 0x76, 0xe3, 0x4d, - 0xb2, 0x6c, 0xfb, 0xd5, 0xf9, 0x5e, 0xee, 0x05, - 0xce, 0xea, 0x72, 0x88, 0xef, 0x43, 0x5c, 0xec, - 0xf8, 0xa0, 0x23, 0x8c, 0x4f, 0x6e, 0xfb, 0xb1, - 0xbc, 0xb9, 0xe8, 0x94, 0x74, 0xc5, 0x4f, 0xcd, - 0xae, 0xef, 0x79, 0x5a, 0x48, 0x2b, 0xf2, 0x52, - 0xf0, 0xac, 0x58, 0x76, 0x89, 0x55, 0x0e, 0xb6, - 0x50, 0xf5, 0x0e, 0xb0, 0x9d, 0xfd, 0xf6, 0xca, - 0x21, 0x98, 0x62, 0xd5, 0xb4, 0x3f, 0xcd, 0x50, - 0x34, 0x78, 0xa9, 0x70, 0xc2, 0x12, 0x27, 0xf3, - 0xd7, 0x4e, 0x28, 0x7a, 0x52, 0xfe, 0xb8, 0x78, - 0x45, 0x84, 0xd5, 0xb3, 0xde, 0x8d, 0xfc, 0x6b, - 0x71, 0x7f, 0x52, 0x13, 0x28, 0xdc, 0x41, 0x2d, - 0xc6, 0xf6, 0x7e, 0x16, 0x18, 0xa8, 0x4b, 0xfd, - 0xa5, 0x9b, 0xd8, 0x55, 0x3d, 0x68, 0xe7, 0xe0, - 0x93, 0xa0, 0x5e, 0x5c, 0x91, 0x58, 0xff, 0x57, - 0x0e, 0x22, 0xc7, 0x19, 0x03, 0x2e, 0x99, 0x57, - 0xfb, 0xa4, 0x0f, 0xb1, 0x6d, 0xcf, 0xe0, 0xd6, - 0x15, 0x9c, 0x31, 0xf0, 0xbe, 0xd9, 0x5a, 0x01, - 0xf1, 0x4d, 0x71, 0xf1, 0x77, 0x51, 0xfd, 0x80, - 0x4e, 0x19, 0x57, 0x84, 0x0d, 0x33, 0xf2, 0x2d, - 0x2b, 0x7f, 0x87, 0x11, 0x0d, 0x3d, 0x13, 0x63, - 0xe2, 0x8c, 0xba, 0x7a, 0x81, 0xb7, 0xe9, 0xa5, - 0xa9, 0x55, 0xaf, 0x89, 0xa6, 0x36, 0x8e, 0x71, - 0xd0, 0x20, 0x0b, 0xf3, 0xee, 0x04, 0xc0, 0xef, - 0x14, 0x26, 0x8f, 0xfb, 0x43, 0xac, 0xf4, 0x57, - 0x63, 0xf3, 0x55, 0x29, 0x4c, 0x23, 0xda, 0xcd, - 0x91, 0x78, 0x7d, 0x89, 0xf6, 0xd5, 0x55, 0xe2, - 0x25, 0x30, 0x70, 0x23, 0xd5, 0x5a, 0x4d, 0xd3, - 0xed, 0xbc, 0x41, 0xe4, 0x5a, 0xc7, 0x34, 0xb5, - 0x1e, 0x3b, 0x1e, 0xa7, 0x5c, 0x94, 0x9d, 0x6f, - 0xd5, 0x3f, 0xc9, 0x78, 0xa3, 0x5a, 0x6a, 0x88, - 0x36, 0xde, 0x1c, 0xa7, 0xf2, 0xca, 0x1a, 0xb8, - 0xa2, 0xa9, 0x96, 0xbf, 0x27, 0xae, 0x4b, 0x18, - 0x47, 0xb1, 0xca, 0xd2, 0x2e, 0xd9, 0xcd, 0xa4, - 0xff, 0x8b, 0x57, 0x2a, 0x2c, 0xad, 0x1e, 0x59, - 0xc2, 0xb2, 0x16, 0xc3, 0xc4, 0xf3, 0x8a, 0x5c, - 0xaa, 0xf0, 0xce, 0xf3, 0x9a, 0x5b, 0x14, 0x6a, - 0x90, 0x8a, 0x63, 0x65, 0x2c, 0xf4, 0x66, 0x66, - 0x0c, 0xb8, 0x58, 0x0a, 0x82, 0xee, 0xd9, 0x48, - 0xba, 0xa2, 0xe7, 0x77, 0x96, 0x24, 0x3d, 0x0a, - 0x8b, 0x48, 0xf9, 0x6b, 0xd8, 0x48, 0xb8, 0xa2, - 0x07, 0x67, 0x96, 0x24, 0x6c, 0x0a, 0x4d, 0x17, - 0x91, 0xb1, 0x29, 0x5f, 0xde, 0x48, 0xb9, 0xea, - 0x47, 0x61, 0x32, 0xc7, 0x48, 0xca, 0xf7, 0x96, - 0x9a, 0x3b, 0x7b, 0xb6, 0x7d, 0x8a, 0x67, 0x1f, - 0x0b, 0x33, 0xd6, 0x26, 0xbb, 0x2a, 0x34, 0x87, - 0x4d, 0x6c, 0x66, 0x66, 0xe2, 0x2c, 0x4f, 0x3e, - 0x4b, 0x73, 0xf0, 0x27, 0x7f, 0xe2, 0x52, 0x63, - 0xd2, 0xf0, 0x13, 0xcf, 0xf8, 0x59, 0x38, 0xe5, - 0x35, 0x2e, 0x39, 0x26, 0xb3, 0x4a, 0xa7, 0x39, - 0xee, 0xd3, 0x64, 0xc7, 0x96, 0x5e, 0x3a, 0x2d, - 0x5f, 0xa2, 0x6d, 0xee, 0x14, 0x8d, 0xf3, 0x67, - 0x4e, 0xd1, 0x98, 0xc5, 0x93, 0x0b, 0xe6, 0x68, - 0x9c, 0x6e, 0x2b, 0x47, 0xa3, 0xe2, 0x0e, 0xc7, - 0xfc, 0x0b, 0x05, 0x7e, 0xa8, 0x39, 0x08, 0xab, - 0x02, 0xae, 0xf4, 0x2f, 0xf8, 0x14, 0x9d, 0xd7, - 0x5e, 0x55, 0x34, 0x7c, 0x5d, 0x6e, 0x69, 0xf4, - 0xd2, 0x51, 0xce, 0xfe, 0x99, 0xab, 0xf8, 0xaa, - 0x7b, 0x9a, 0x8e, 0x57, 0xb7, 0x5a, 0x3a, 0x7b, - 0x93, 0x6c, 0x97, 0x92, 0x93, 0x67, 0xd6, 0xa8, - 0xf9, 0x14, 0x1e, 0xe9, 0xb5, 0x91, 0xc5, 0x3e, - 0x71, 0xa1, 0xfb, 0xe2, 0xff, 0x44, 0x74, 0x6d, - 0x4b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, - 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2d, - 0x75, 0x69, 0x2e, 0x78, 0x6d, 0x6c, 0x00, 0x00, - 0x31, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x50, 0x02, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, + 0x54, 0x02, 0x00, 0x00, 0x58, 0x02, 0x00, 0x00, + 0xc5, 0x01, 0x74, 0x8d, 0x09, 0x00, 0x00, 0x00, + 0x58, 0x02, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, + 0x68, 0x02, 0x00, 0x00, 0xa9, 0x0b, 0x00, 0x00, + 0x95, 0x8b, 0x84, 0xb4, 0x09, 0x00, 0x00, 0x00, + 0xa9, 0x0b, 0x00, 0x00, 0x14, 0x00, 0x76, 0x00, + 0xc0, 0x0b, 0x00, 0x00, 0xcf, 0x0f, 0x00, 0x00, + 0x2a, 0x3d, 0x8f, 0xff, 0x09, 0x00, 0x00, 0x00, + 0xcf, 0x0f, 0x00, 0x00, 0x1c, 0x00, 0x76, 0x00, + 0xf0, 0x0f, 0x00, 0x00, 0x93, 0x16, 0x00, 0x00, + 0x32, 0x12, 0x19, 0x7b, 0x11, 0x00, 0x00, 0x00, + 0x93, 0x16, 0x00, 0x00, 0x0a, 0x00, 0x76, 0x00, + 0xa0, 0x16, 0x00, 0x00, 0xaf, 0x1a, 0x00, 0x00, + 0x0c, 0xac, 0xa7, 0x6b, 0x09, 0x00, 0x00, 0x00, + 0xaf, 0x1a, 0x00, 0x00, 0x13, 0x00, 0x76, 0x00, + 0xc8, 0x1a, 0x00, 0x00, 0xd7, 0x22, 0x00, 0x00, + 0xb0, 0xb7, 0x24, 0x30, 0x10, 0x00, 0x00, 0x00, + 0xd7, 0x22, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, + 0xe0, 0x22, 0x00, 0x00, 0xe4, 0x22, 0x00, 0x00, + 0x78, 0x9c, 0xc8, 0x7a, 0x09, 0x00, 0x00, 0x00, + 0xe4, 0x22, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, + 0xf8, 0x22, 0x00, 0x00, 0x07, 0x2b, 0x00, 0x00, + 0xad, 0xf1, 0xdf, 0xa2, 0x09, 0x00, 0x00, 0x00, + 0x07, 0x2b, 0x00, 0x00, 0x12, 0x00, 0x76, 0x00, + 0x20, 0x2b, 0x00, 0x00, 0x2f, 0x2f, 0x00, 0x00, + 0xfd, 0xcf, 0x01, 0xdf, 0x06, 0x00, 0x00, 0x00, + 0x2f, 0x2f, 0x00, 0x00, 0x09, 0x00, 0x4c, 0x00, + 0x38, 0x2f, 0x00, 0x00, 0x70, 0x2f, 0x00, 0x00, + 0xba, 0x36, 0x37, 0xeb, 0x09, 0x00, 0x00, 0x00, + 0x70, 0x2f, 0x00, 0x00, 0x0d, 0x00, 0x76, 0x00, + 0x80, 0x2f, 0x00, 0x00, 0x8d, 0x50, 0x00, 0x00, + 0x93, 0x21, 0xa4, 0xca, 0x09, 0x00, 0x00, 0x00, + 0x8d, 0x50, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, + 0xa0, 0x50, 0x00, 0x00, 0xaf, 0x58, 0x00, 0x00, + 0x17, 0x38, 0xe0, 0x94, 0x11, 0x00, 0x00, 0x00, + 0xaf, 0x58, 0x00, 0x00, 0x09, 0x00, 0x76, 0x00, + 0xb8, 0x58, 0x00, 0x00, 0xc7, 0x60, 0x00, 0x00, + 0xf4, 0x5e, 0x78, 0x72, 0x09, 0x00, 0x00, 0x00, + 0xc7, 0x60, 0x00, 0x00, 0x14, 0x00, 0x76, 0x00, + 0xe0, 0x60, 0x00, 0x00, 0xef, 0x68, 0x00, 0x00, + 0x1c, 0xb2, 0xe8, 0x27, 0x09, 0x00, 0x00, 0x00, + 0xef, 0x68, 0x00, 0x00, 0x1f, 0x00, 0x76, 0x00, + 0x10, 0x69, 0x00, 0x00, 0xbc, 0x6d, 0x00, 0x00, + 0xe6, 0x7b, 0x45, 0x07, 0x09, 0x00, 0x00, 0x00, + 0xbc, 0x6d, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, + 0xd0, 0x6d, 0x00, 0x00, 0xdf, 0x7d, 0x00, 0x00, + 0x4b, 0x50, 0x90, 0x0b, 0x00, 0x00, 0x00, 0x00, + 0xdf, 0x7d, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0xe4, 0x7d, 0x00, 0x00, 0xe8, 0x7d, 0x00, 0x00, + 0x65, 0x15, 0x99, 0xd4, 0x09, 0x00, 0x00, 0x00, + 0xe8, 0x7d, 0x00, 0x00, 0x0f, 0x00, 0x4c, 0x00, + 0xf8, 0x7d, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, + 0xb2, 0x46, 0x46, 0x28, 0x09, 0x00, 0x00, 0x00, + 0x00, 0x7e, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, + 0x10, 0x7e, 0x00, 0x00, 0xa8, 0x97, 0x00, 0x00, + 0x9b, 0xea, 0x55, 0x32, 0x09, 0x00, 0x00, 0x00, + 0xa8, 0x97, 0x00, 0x00, 0x15, 0x00, 0x76, 0x00, + 0xc0, 0x97, 0x00, 0x00, 0x9a, 0x9c, 0x00, 0x00, + 0x2f, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x65, 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, + 0x2d, 0x75, 0x69, 0x2e, 0x78, 0x6d, 0x6c, 0x00, + 0x31, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x75, @@ -1954,244 +304,566 @@ 0x67, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x42, 0x6f, - 0x6f, 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x53, - 0x65, 0x70, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x73, 0x65, - 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, 0x69, - 0x6c, 0x65, 0x53, 0x65, 0x70, 0x36, 0x22, 0x2f, - 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x56, 0x69, 0x65, - 0x77, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, - 0x67, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, - 0x69, 0x65, 0x77, 0x45, 0x6e, 0x63, 0x6f, 0x64, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x6c, - 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, - 0x72, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x56, 0x69, 0x65, 0x77, 0x45, 0x6e, 0x63, 0x6f, - 0x64, 0x69, 0x6e, 0x67, 0x50, 0x6c, 0x61, 0x63, - 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, - 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, - 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x56, 0x69, 0x65, 0x77, 0x50, 0x61, 0x67, - 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4d, - 0x65, 0x6e, 0x75, 0x22, 0x20, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, 0x69, 0x65, - 0x77, 0x50, 0x61, 0x67, 0x65, 0x53, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, - 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, - 0x69, 0x6c, 0x65, 0x53, 0x65, 0x70, 0x37, 0x22, - 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, - 0x74, 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x4d, 0x65, - 0x6e, 0x75, 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, - 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, - 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x69, 0x74, 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x41, - 0x62, 0x6f, 0x75, 0x74, 0x4d, 0x65, 0x6e, 0x75, - 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x41, 0x62, - 0x6f, 0x75, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, - 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, 0x69, - 0x6c, 0x65, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x57, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x4d, 0x65, 0x6e, - 0x75, 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x3d, 0x22, 0x46, 0x69, 0x6c, 0x65, 0x43, - 0x6c, 0x6f, 0x73, 0x65, 0x54, 0x61, 0x62, 0x22, - 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, - 0x74, 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x46, 0x69, 0x6c, 0x65, 0x51, 0x75, - 0x69, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, - 0x46, 0x69, 0x6c, 0x65, 0x51, 0x75, 0x69, 0x74, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x6f, 0x70, - 0x75, 0x70, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, - 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x6c, - 0x77, 0x61, 0x79, 0x73, 0x53, 0x74, 0x6f, 0x70, - 0x41, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x20, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, - 0x69, 0x65, 0x77, 0x41, 0x6c, 0x77, 0x61, 0x79, - 0x73, 0x53, 0x74, 0x6f, 0x70, 0x22, 0x2f, 0x3e, - 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x42, 0x72, 0x6f, 0x77, 0x73, - 0x65, 0x57, 0x69, 0x74, 0x68, 0x43, 0x61, 0x72, - 0x65, 0x74, 0x41, 0x63, 0x63, 0x65, 0x6c, 0x22, - 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, - 0x22, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x57, - 0x69, 0x74, 0x68, 0x43, 0x61, 0x72, 0x65, 0x74, - 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x75, 0x69, 0x3e, - 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, - 0x29, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, - 0x2d, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, - 0x69, 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, - 0xca, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, - 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a, - 0xf4, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x04, 0x47, 0x49, - 0x44, 0x41, 0x54, 0x58, 0x85, 0xcd, 0x57, 0xcf, - 0x6f, 0x5b, 0x45, 0x10, 0xfe, 0x66, 0xf6, 0xc5, - 0x8e, 0x93, 0xd8, 0x29, 0x49, 0x4c, 0xe4, 0x50, - 0x54, 0x4a, 0x4a, 0x50, 0xa9, 0xaa, 0xaa, 0x48, - 0x88, 0x03, 0x4d, 0x78, 0x60, 0x2b, 0x51, 0x8e, - 0x55, 0x95, 0x9e, 0xe0, 0x06, 0xfc, 0x51, 0xed, - 0x05, 0x4e, 0x48, 0x44, 0x80, 0x38, 0x54, 0x91, - 0xa5, 0xc4, 0x7a, 0x72, 0x2e, 0x1c, 0x90, 0xe8, - 0xa1, 0x04, 0x82, 0x00, 0x35, 0x05, 0x9a, 0x84, - 0x34, 0x3f, 0xea, 0xc4, 0xd8, 0x8e, 0x77, 0x77, - 0x38, 0xf4, 0xf9, 0xb1, 0x7e, 0x71, 0x9a, 0x14, - 0x84, 0xcc, 0x5c, 0xde, 0xdb, 0x37, 0x3b, 0xf3, - 0x7d, 0x33, 0x3b, 0x3b, 0xbb, 0x8f, 0x44, 0x04, - 0xdd, 0x14, 0xee, 0x2a, 0x3a, 0x00, 0xef, 0x59, - 0x26, 0x17, 0x8b, 0xc5, 0x5c, 0x32, 0x99, 0x7c, - 0x15, 0xc0, 0x39, 0x00, 0x69, 0x11, 0x49, 0x03, - 0x00, 0x11, 0xed, 0x03, 0xd8, 0x07, 0xb0, 0xd6, - 0x68, 0x34, 0x56, 0x67, 0x66, 0x66, 0xd6, 0x4f, - 0xeb, 0x93, 0x4e, 0xb3, 0x04, 0xe5, 0x72, 0xf9, - 0xa2, 0xd6, 0x3a, 0xcf, 0xcc, 0xc3, 0xa7, 0x71, - 0x6a, 0xad, 0xdd, 0x66, 0xe6, 0x45, 0xdf, 0xf7, - 0x7f, 0xf8, 0x57, 0x04, 0x82, 0x20, 0x38, 0x03, - 0xe0, 0x06, 0x80, 0xb3, 0xa7, 0x01, 0xee, 0x40, - 0xe4, 0x81, 0xb5, 0xf6, 0x8b, 0x42, 0xa1, 0xf0, - 0xf8, 0x99, 0x09, 0x04, 0x41, 0xf0, 0x92, 0x88, - 0xdc, 0x24, 0xa2, 0xd4, 0x3f, 0x01, 0x77, 0xa4, - 0xaa, 0xb5, 0xfe, 0xac, 0x50, 0x28, 0x3c, 0x38, - 0x35, 0x81, 0x10, 0xfc, 0x7d, 0x22, 0x6a, 0x2b, - 0x52, 0x11, 0xb1, 0x22, 0xf2, 0x93, 0xb5, 0x76, - 0x9d, 0x88, 0x1e, 0x2a, 0xa5, 0x1e, 0x02, 0x80, - 0x31, 0x66, 0x8c, 0x99, 0x73, 0x22, 0x32, 0x46, - 0x44, 0x17, 0xe2, 0x76, 0x00, 0x0c, 0x33, 0x7f, - 0x32, 0x35, 0x35, 0xf5, 0xeb, 0x89, 0x04, 0xee, - 0xdc, 0xb9, 0xf3, 0x5c, 0x5f, 0x5f, 0xdf, 0x87, - 0x1d, 0x22, 0xdf, 0x6c, 0x34, 0x1a, 0x5f, 0x9d, - 0x54, 0x60, 0xa5, 0x52, 0xe9, 0x75, 0x22, 0xca, - 0x13, 0x51, 0x5f, 0x4c, 0x55, 0xd5, 0x5a, 0xdf, - 0x8e, 0x2f, 0xc7, 0x91, 0x6d, 0x98, 0x4a, 0xa5, - 0x6e, 0xb8, 0xe0, 0x22, 0x22, 0xc6, 0x98, 0xf2, - 0xd6, 0xd6, 0xd6, 0xed, 0x93, 0xc0, 0x17, 0x16, - 0x16, 0x32, 0x22, 0x32, 0x68, 0xad, 0xfd, 0xd6, - 0x18, 0xf3, 0x5b, 0x4c, 0xdd, 0xef, 0x79, 0xde, - 0xf5, 0xb8, 0x4d, 0x5b, 0x06, 0x96, 0x96, 0x96, - 0x5e, 0x53, 0x4a, 0xcd, 0xb9, 0x13, 0xb4, 0xd6, - 0x5f, 0x17, 0x0a, 0x85, 0xe2, 0xd3, 0x80, 0x01, - 0x20, 0x08, 0x82, 0x01, 0x63, 0xcc, 0x65, 0x97, - 0x3c, 0x33, 0x9f, 0xb7, 0xd6, 0x9e, 0x65, 0xfe, - 0x3b, 0x4e, 0x63, 0xcc, 0xa7, 0xf9, 0x7c, 0xfe, - 0xc7, 0xd6, 0xb8, 0xad, 0x0f, 0x28, 0xa5, 0xde, - 0x75, 0xc7, 0xd6, 0xda, 0xaa, 0x52, 0x4a, 0x2f, - 0x2e, 0x2e, 0x5e, 0xdc, 0xdd, 0xdd, 0xfd, 0x79, - 0x6e, 0x6e, 0xee, 0xd0, 0xd5, 0xdf, 0xba, 0x75, - 0xab, 0x67, 0x62, 0x62, 0x62, 0x94, 0x88, 0x72, - 0xd6, 0xda, 0x34, 0x11, 0xb5, 0x91, 0x32, 0xc6, - 0xac, 0x31, 0xf3, 0x10, 0x80, 0x68, 0x39, 0x42, - 0x8c, 0x88, 0x40, 0x44, 0xad, 0x58, 0x2c, 0xe6, - 0x00, 0x44, 0xfb, 0x5c, 0x9e, 0xa4, 0x66, 0x55, - 0x44, 0x84, 0x99, 0x73, 0x43, 0x43, 0x43, 0x57, - 0x5c, 0xe7, 0xa5, 0x52, 0xe9, 0xdc, 0xf8, 0xf8, - 0xf8, 0x35, 0x6b, 0xed, 0x84, 0x31, 0x26, 0xdd, - 0x29, 0x2b, 0x44, 0x64, 0x5b, 0x3e, 0x9c, 0xcf, - 0xa3, 0x0b, 0x0b, 0x0b, 0xd9, 0x23, 0x04, 0xc2, - 0x0e, 0xe7, 0x1a, 0x6f, 0x03, 0xa8, 0x3a, 0x9f, - 0xda, 0xb6, 0x91, 0xe7, 0x79, 0x7d, 0xd4, 0x1e, - 0xf2, 0x9e, 0x52, 0xaa, 0x46, 0x44, 0x0d, 0x77, - 0x9e, 0x88, 0x1c, 0x88, 0xc8, 0xae, 0xb5, 0x36, - 0xfa, 0x96, 0x4a, 0xa5, 0x22, 0x2c, 0xb7, 0x08, - 0xcf, 0xb5, 0x5e, 0xc2, 0xc9, 0x07, 0x8e, 0xee, - 0x20, 0x9f, 0xcf, 0x6f, 0xba, 0x8e, 0xad, 0xb5, - 0xa2, 0x94, 0x6a, 0x8a, 0x48, 0x8d, 0x99, 0x2b, - 0xcc, 0xbc, 0xa2, 0xb5, 0xae, 0x1a, 0x63, 0xee, - 0x01, 0xd0, 0x68, 0x97, 0x7d, 0xb7, 0x0e, 0x5c, - 0x2c, 0xb7, 0x06, 0xda, 0xd2, 0xa8, 0xb5, 0x3e, - 0x60, 0x66, 0x84, 0x4b, 0xe0, 0x66, 0x02, 0x00, - 0x10, 0xb6, 0xd9, 0xb6, 0x56, 0x1b, 0x04, 0xc1, - 0x4a, 0xa5, 0x52, 0x49, 0xf5, 0xf4, 0xf4, 0xdc, - 0xed, 0xed, 0xed, 0xbd, 0x2a, 0x22, 0x0a, 0x00, - 0x98, 0x79, 0xc3, 0x05, 0x15, 0x91, 0xc1, 0x23, - 0x04, 0x44, 0x24, 0x2a, 0xa2, 0x10, 0xf8, 0xb1, - 0x88, 0x7c, 0xb7, 0xb3, 0xb3, 0xf3, 0x28, 0x9b, - 0xcd, 0x9e, 0x8f, 0x13, 0x68, 0x49, 0xb9, 0x5c, - 0x7e, 0xd1, 0x5a, 0x2b, 0x61, 0xd4, 0x3a, 0x93, - 0xc9, 0x68, 0x00, 0x5a, 0x29, 0xb5, 0x62, 0x8c, - 0xb9, 0x64, 0xad, 0xe5, 0xc3, 0xc3, 0xc3, 0xfb, - 0x89, 0x44, 0xe2, 0xcd, 0x96, 0x0d, 0x11, 0x65, - 0x3a, 0x65, 0x00, 0xc0, 0x93, 0xf4, 0x87, 0x04, - 0x54, 0x32, 0x99, 0x1c, 0x05, 0xf0, 0x08, 0xc0, - 0xfd, 0x4e, 0xe0, 0x41, 0x10, 0x78, 0xd6, 0xda, - 0x57, 0x8e, 0xe1, 0xf6, 0x0b, 0x80, 0xbb, 0x44, - 0x74, 0x05, 0xc0, 0xce, 0x71, 0x01, 0x44, 0x0b, - 0x13, 0x1e, 0xa9, 0xae, 0x0c, 0x34, 0x9b, 0xcd, - 0x91, 0x6c, 0x36, 0x7b, 0x35, 0x9d, 0x4e, 0x13, - 0x3a, 0x88, 0xe7, 0x79, 0x1d, 0xab, 0x3f, 0x0c, - 0x44, 0x7c, 0xdf, 0xdf, 0x6b, 0x36, 0x9b, 0xdf, - 0x28, 0xa5, 0xce, 0xb8, 0x3a, 0x11, 0xa9, 0x1c, - 0x21, 0x80, 0x27, 0xe7, 0x39, 0x5a, 0xc5, 0xe2, - 0x79, 0xde, 0x40, 0xe8, 0x28, 0xb3, 0xbf, 0xbf, - 0x7f, 0xa9, 0x13, 0x48, 0xbd, 0x5e, 0x3f, 0x96, - 0x80, 0xd6, 0xda, 0x02, 0xc0, 0xf4, 0xf4, 0x74, - 0x55, 0x44, 0xc6, 0x5c, 0x1d, 0x11, 0x45, 0xed, - 0xd8, 0x25, 0xb0, 0x16, 0xf3, 0x31, 0xe0, 0xbc, - 0xef, 0x75, 0x02, 0x49, 0x24, 0x12, 0xfd, 0x00, - 0xea, 0xcc, 0x5c, 0xf1, 0x3c, 0x6f, 0x8b, 0x88, - 0x8c, 0xa3, 0xdb, 0x8d, 0x40, 0x98, 0x73, 0x31, - 0xd3, 0x08, 0x2b, 0xaa, 0x81, 0x46, 0xa3, 0xb1, - 0x9a, 0x4c, 0x26, 0xdf, 0x6e, 0x8d, 0x45, 0x64, - 0x18, 0x40, 0x3f, 0x80, 0x6a, 0x32, 0x99, 0xdc, - 0x44, 0x07, 0x99, 0x9a, 0x9a, 0xfa, 0xde, 0x1d, - 0x2f, 0x2d, 0x2d, 0xbd, 0x41, 0x44, 0x69, 0x66, - 0xfe, 0xd3, 0xf7, 0xfd, 0x03, 0x00, 0x58, 0x5e, - 0x5e, 0xce, 0x11, 0xd1, 0x05, 0x77, 0x5e, 0xad, - 0x56, 0x5b, 0x8d, 0xc8, 0xb5, 0x5e, 0xc2, 0x83, - 0x66, 0xbb, 0x35, 0x0e, 0x9b, 0xcc, 0xb8, 0x52, - 0x4a, 0x12, 0x89, 0x44, 0x7c, 0x5f, 0x77, 0x14, - 0x66, 0x3e, 0x0c, 0x9f, 0xbf, 0x03, 0xc0, 0xfc, - 0xfc, 0xbc, 0xd2, 0x5a, 0x5f, 0x8f, 0x1d, 0xcf, - 0x9b, 0xb3, 0xb3, 0xb3, 0x5b, 0x47, 0x08, 0x00, - 0x80, 0x31, 0xa6, 0x14, 0x73, 0x38, 0x68, 0x8c, - 0x19, 0xa9, 0x54, 0x2a, 0x2f, 0x9f, 0x86, 0x80, - 0x52, 0xea, 0x50, 0x44, 0x1e, 0xb5, 0xce, 0xfd, - 0x6c, 0x36, 0xfb, 0x0e, 0x11, 0x65, 0xdd, 0x39, - 0x71, 0x8c, 0x23, 0xf7, 0x81, 0x52, 0xa9, 0xf4, - 0x01, 0x33, 0xbf, 0xe0, 0x18, 0x08, 0x33, 0xdf, - 0xab, 0xd7, 0xeb, 0x8b, 0xb3, 0xb3, 0xb3, 0x15, - 0x3c, 0x45, 0x96, 0x97, 0x97, 0x73, 0x1b, 0x1b, - 0x1b, 0x7f, 0x00, 0xc0, 0xc8, 0xc8, 0x88, 0x0f, - 0xe0, 0xad, 0x58, 0xbb, 0x5e, 0xf3, 0x7d, 0xff, - 0xe3, 0xb6, 0x20, 0xe3, 0x4e, 0x6a, 0xb5, 0xda, - 0xe7, 0x22, 0x52, 0x73, 0xa2, 0x22, 0x22, 0xba, - 0xdc, 0xdb, 0xdb, 0xfb, 0x5e, 0x78, 0x60, 0x1d, - 0x2b, 0x93, 0x93, 0x93, 0xeb, 0x99, 0x4c, 0xe6, - 0xf9, 0xe1, 0xe1, 0xe1, 0x8f, 0x88, 0xe8, 0x5a, - 0x0c, 0xbc, 0xaa, 0xb5, 0xfe, 0x32, 0x6e, 0xf3, - 0xff, 0xbb, 0x92, 0xc5, 0x48, 0x74, 0xe7, 0x52, - 0xea, 0x90, 0xe8, 0xde, 0xb5, 0xdc, 0x95, 0xae, - 0xfd, 0x98, 0xc4, 0xa5, 0x6b, 0xbf, 0x66, 0xff, - 0xa5, 0x74, 0xfd, 0xef, 0xf8, 0x2f, 0x86, 0x0b, - 0x49, 0x8a, 0xdb, 0x71, 0xb2, 0x1b, 0x00, 0x00, - 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, - 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, - 0x79, 0x29, 0x2f, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x73, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x6f, 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x53, + 0x65, 0x70, 0x31, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x73, 0x65, + 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, 0x69, + 0x6c, 0x65, 0x53, 0x65, 0x70, 0x36, 0x22, 0x2f, + 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x56, 0x69, 0x65, + 0x77, 0x45, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, + 0x67, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, + 0x69, 0x65, 0x77, 0x45, 0x6e, 0x63, 0x6f, 0x64, + 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x6c, + 0x61, 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, + 0x72, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x56, 0x69, 0x65, 0x77, 0x45, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x50, 0x6c, 0x61, 0x63, + 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, + 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, + 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x56, 0x69, 0x65, 0x77, 0x50, 0x61, 0x67, + 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x4d, + 0x65, 0x6e, 0x75, 0x22, 0x20, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, 0x69, 0x65, + 0x77, 0x50, 0x61, 0x67, 0x65, 0x53, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, + 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, + 0x69, 0x6c, 0x65, 0x53, 0x65, 0x70, 0x37, 0x22, + 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, + 0x74, 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x4d, 0x65, + 0x6e, 0x75, 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, + 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, + 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x69, 0x74, 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x41, + 0x62, 0x6f, 0x75, 0x74, 0x4d, 0x65, 0x6e, 0x75, + 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x41, 0x62, + 0x6f, 0x75, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, + 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, 0x69, + 0x6c, 0x65, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x57, + 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x4d, 0x65, 0x6e, + 0x75, 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x3d, 0x22, 0x46, 0x69, 0x6c, 0x65, 0x43, + 0x6c, 0x6f, 0x73, 0x65, 0x54, 0x61, 0x62, 0x22, + 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, + 0x74, 0x65, 0x6d, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x46, 0x69, 0x6c, 0x65, 0x51, 0x75, + 0x69, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x46, 0x69, 0x6c, 0x65, 0x51, 0x75, 0x69, 0x74, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x6f, 0x70, + 0x75, 0x70, 0x3e, 0x3c, 0x61, 0x63, 0x63, 0x65, + 0x6c, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x41, 0x6c, + 0x77, 0x61, 0x79, 0x73, 0x53, 0x74, 0x6f, 0x70, + 0x41, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x20, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, + 0x69, 0x65, 0x77, 0x41, 0x6c, 0x77, 0x61, 0x79, + 0x73, 0x53, 0x74, 0x6f, 0x70, 0x22, 0x2f, 0x3e, + 0x3c, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x65, 0x72, + 0x61, 0x74, 0x6f, 0x72, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x42, 0x72, 0x6f, 0x77, 0x73, + 0x65, 0x57, 0x69, 0x74, 0x68, 0x43, 0x61, 0x72, + 0x65, 0x74, 0x41, 0x63, 0x63, 0x65, 0x6c, 0x22, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x57, + 0x69, 0x74, 0x68, 0x43, 0x61, 0x72, 0x65, 0x74, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x75, 0x69, 0x3e, + 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, + 0x29, 0x70, 0x72, 0x65, 0x66, 0x73, 0x2d, 0x6c, + 0x61, 0x6e, 0x67, 0x2d, 0x64, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0xfe, 0x0e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x57, 0x4d, 0x53, 0xdb, 0x30, + 0x10, 0xbd, 0xf3, 0x2b, 0x54, 0x5d, 0x3b, 0x26, + 0x09, 0x69, 0x19, 0xe8, 0x24, 0x66, 0x5a, 0x3a, + 0xf4, 0xc2, 0x0d, 0x68, 0x8f, 0x1e, 0x59, 0xda, + 0xd8, 0x2a, 0x8a, 0xe4, 0x4a, 0x72, 0x82, 0xff, + 0x7d, 0xd7, 0x76, 0xbe, 0x9d, 0xd8, 0x81, 0x52, + 0xa6, 0x87, 0xde, 0x6c, 0x79, 0x57, 0xda, 0xb7, + 0xef, 0x69, 0x77, 0x3d, 0xba, 0x7a, 0x9a, 0x2a, + 0x32, 0x03, 0xeb, 0xa4, 0xd1, 0x63, 0x3a, 0x38, + 0xed, 0x53, 0x02, 0x9a, 0x1b, 0x21, 0x75, 0x32, + 0xa6, 0x0f, 0xf7, 0x37, 0xc1, 0x05, 0xbd, 0x0a, + 0x4f, 0x46, 0x52, 0x7b, 0xb0, 0x13, 0xc6, 0x21, + 0x1c, 0xbd, 0x0b, 0x02, 0xb2, 0x7a, 0x0d, 0x2c, + 0xfc, 0xca, 0xa5, 0x05, 0x47, 0x12, 0xff, 0xf8, + 0x9e, 0x0c, 0x4f, 0xfb, 0x24, 0x08, 0xc2, 0x91, + 0x89, 0x7f, 0x02, 0xf7, 0x84, 0x2b, 0xe6, 0xdc, + 0x98, 0x7e, 0xf3, 0x8f, 0x5f, 0x25, 0x53, 0x26, + 0xa1, 0x44, 0x8a, 0x31, 0x65, 0x42, 0x44, 0x8a, + 0xe9, 0x24, 0x67, 0x09, 0x44, 0xa2, 0xfe, 0x10, + 0x8e, 0x32, 0x6b, 0x32, 0xb0, 0xbe, 0x20, 0x9a, + 0x4d, 0x61, 0x4c, 0x39, 0xd3, 0xd1, 0xc4, 0xf0, + 0xdc, 0xd1, 0xf0, 0x86, 0x29, 0x07, 0xa3, 0xde, + 0xd2, 0xa0, 0x61, 0x1a, 0x1b, 0x2b, 0xc0, 0x46, + 0x73, 0x29, 0x7c, 0x4a, 0xc3, 0x8f, 0x2d, 0x96, + 0xd6, 0x28, 0xa0, 0x21, 0x64, 0x32, 0x4b, 0x99, + 0x2e, 0x82, 0xcc, 0xc2, 0x04, 0x2c, 0xc2, 0x05, + 0x17, 0x60, 0x50, 0xc1, 0x32, 0xa8, 0x96, 0x1d, + 0x04, 0x38, 0x6f, 0x4d, 0x81, 0x87, 0xf9, 0x34, + 0xca, 0x18, 0x3a, 0x7b, 0x1a, 0xde, 0xdb, 0xbc, + 0xcd, 0xc7, 0x17, 0x19, 0x44, 0xa9, 0x2c, 0x2d, + 0x6b, 0xb4, 0xad, 0xfb, 0x4f, 0x58, 0xae, 0xfc, + 0x12, 0xcc, 0xb0, 0xdf, 0x3f, 0xc2, 0x38, 0x05, + 0x99, 0xa4, 0xb8, 0xfb, 0x87, 0xb3, 0x36, 0xeb, + 0xdc, 0x61, 0x14, 0xc0, 0xca, 0x54, 0xc5, 0xcc, + 0xd2, 0x70, 0xd0, 0x16, 0xb2, 0xf4, 0x98, 0x29, + 0xe2, 0x2d, 0xd3, 0x4e, 0x31, 0xcf, 0x62, 0x85, + 0x8b, 0x05, 0x20, 0x19, 0x9f, 0x85, 0x20, 0xb7, + 0x7b, 0xf2, 0xc4, 0x53, 0xa9, 0x04, 0x29, 0xa1, + 0x22, 0xc1, 0xdc, 0xa3, 0x9a, 0xe8, 0x1e, 0x19, + 0x7c, 0xc9, 0xbd, 0xc7, 0x2f, 0x95, 0x0c, 0x90, + 0x61, 0x0e, 0x2a, 0xae, 0x56, 0x06, 0x4d, 0x01, + 0x28, 0x16, 0x83, 0xda, 0x1b, 0x42, 0x74, 0x5d, + 0x79, 0xb6, 0x84, 0x3f, 0x93, 0x4e, 0xc6, 0x25, + 0xd5, 0x1d, 0xcc, 0x6c, 0x88, 0xec, 0x08, 0xcb, + 0x45, 0xba, 0x3b, 0x6d, 0x2d, 0x70, 0x90, 0x33, + 0x70, 0x6b, 0x87, 0x2e, 0x05, 0x97, 0xd4, 0xe4, + 0x1a, 0x99, 0x51, 0x52, 0x77, 0x47, 0x3d, 0x63, + 0x4a, 0x26, 0x98, 0x5e, 0x0e, 0xe5, 0x2d, 0xdc, + 0x34, 0xec, 0xd5, 0x09, 0xc7, 0x87, 0x8a, 0x8e, + 0x97, 0xb0, 0x52, 0x5e, 0xce, 0x9a, 0x93, 0x67, + 0x51, 0x82, 0xb2, 0xf8, 0xcf, 0xc7, 0xb1, 0x7c, + 0x54, 0xd5, 0x53, 0x33, 0x15, 0x54, 0xaf, 0xb8, + 0x41, 0x6c, 0x9e, 0xf6, 0xf2, 0x82, 0xcb, 0x15, + 0x29, 0x75, 0xd9, 0x08, 0x4a, 0xbb, 0x21, 0x7d, + 0x8d, 0xec, 0x76, 0x25, 0xc0, 0x58, 0x89, 0x60, + 0x58, 0x2d, 0x18, 0xec, 0x0e, 0x5e, 0x72, 0xd6, + 0x76, 0xe1, 0x5c, 0xc6, 0x38, 0x76, 0x0c, 0x1a, + 0x9e, 0x35, 0x6b, 0xc2, 0x2e, 0xda, 0x5a, 0x87, + 0x11, 0xd6, 0x4e, 0x76, 0x58, 0x8c, 0xbb, 0xd0, + 0x37, 0x9c, 0xda, 0x32, 0xd0, 0x85, 0xeb, 0x19, + 0x29, 0x50, 0xac, 0x30, 0xb9, 0x8f, 0x9c, 0x2f, + 0xaa, 0x9e, 0xa1, 0xc5, 0x5e, 0x62, 0x11, 0xf7, + 0x23, 0x02, 0x6f, 0x78, 0xc3, 0x53, 0xc6, 0xb4, + 0xe8, 0x3e, 0x65, 0x22, 0x95, 0xea, 0x24, 0xae, + 0x3c, 0x24, 0x2a, 0x2f, 0x71, 0x23, 0x8e, 0x5d, + 0x43, 0xe3, 0x64, 0xcd, 0xd9, 0x56, 0x23, 0xe8, + 0xad, 0xa2, 0xdc, 0xd2, 0x61, 0x9b, 0xe2, 0x4a, + 0xa9, 0x0d, 0x2e, 0x2f, 0xde, 0x44, 0x6c, 0xc7, + 0xf7, 0xef, 0x17, 0xcb, 0xf2, 0xbc, 0x21, 0xcb, + 0x3d, 0xe0, 0x6f, 0xeb, 0xf2, 0x56, 0xc2, 0xaf, + 0x2a, 0xdd, 0x60, 0xd8, 0xbf, 0x7c, 0x93, 0x04, + 0xa4, 0x8b, 0x02, 0xe2, 0x3c, 0xb3, 0xbe, 0x55, + 0x92, 0x87, 0xea, 0xef, 0x75, 0x6a, 0x8c, 0x03, + 0xc2, 0x88, 0x8a, 0x16, 0xbd, 0xf9, 0xd3, 0xab, + 0x95, 0xb7, 0xa9, 0x86, 0xa9, 0xd1, 0x92, 0x97, + 0x04, 0x25, 0x80, 0xd5, 0x73, 0x39, 0x26, 0xb9, + 0xc8, 0x5b, 0x80, 0x99, 0x84, 0xf9, 0x5f, 0xbc, + 0x1a, 0x5d, 0x56, 0x7f, 0x2c, 0xf9, 0x3b, 0x8e, + 0x53, 0xa1, 0x02, 0xf1, 0x43, 0x6a, 0x61, 0xe6, + 0x35, 0xfd, 0x6e, 0xb1, 0x36, 0xaf, 0xd6, 0x5e, + 0xa7, 0xe4, 0x76, 0x58, 0xa6, 0xf5, 0x99, 0x38, + 0x99, 0x45, 0x99, 0x51, 0x92, 0x17, 0x34, 0xd4, + 0x30, 0xdb, 0x6e, 0x27, 0xbb, 0xea, 0x4e, 0x19, + 0x46, 0xb7, 0x28, 0x0c, 0x52, 0x1f, 0x23, 0xf1, + 0x7b, 0x24, 0xec, 0x3b, 0x12, 0xb6, 0x54, 0xf9, + 0x2e, 0x91, 0x6f, 0x82, 0xb4, 0x9a, 0x41, 0x5d, + 0x74, 0xb8, 0x68, 0xef, 0xef, 0x1b, 0x0e, 0x14, + 0x1c, 0x1c, 0x61, 0x4a, 0x60, 0x77, 0x2b, 0x83, + 0x0a, 0xdd, 0x12, 0x53, 0xb0, 0x72, 0x3c, 0xa3, + 0xbd, 0xb5, 0x1e, 0x1a, 0xbd, 0xf9, 0x68, 0xe1, + 0x76, 0xe0, 0x3b, 0xae, 0xa4, 0xaf, 0x64, 0x3b, + 0x68, 0x97, 0xed, 0x3f, 0x1e, 0xd5, 0x72, 0xa1, + 0xee, 0xcf, 0x41, 0x5d, 0x22, 0xdc, 0xce, 0x3b, + 0xc1, 0xff, 0xc3, 0xcc, 0x68, 0x87, 0x27, 0x04, + 0xe7, 0x38, 0x27, 0x6d, 0x0e, 0xfe, 0xa3, 0xde, + 0x96, 0x69, 0x8b, 0xe7, 0x90, 0x92, 0xc5, 0x00, + 0x57, 0x72, 0x9b, 0xa3, 0x70, 0xd6, 0xb3, 0x6a, + 0x63, 0x97, 0xde, 0x6e, 0x40, 0xeb, 0x88, 0xd7, + 0xbf, 0xb2, 0x27, 0xbf, 0x01, 0xf8, 0xdb, 0x82, + 0xd3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, + 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2d, + 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x2d, 0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x93, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x61, 0x70, 0x70, 0x2d, 0x6d, + 0x65, 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x73, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, + 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x4e, 0x65, 0x77, 0x20, 0x57, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x2e, 0x6e, 0x65, 0x77, 0x2d, 0x77, + 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, + 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, + 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, + 0x6e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, + 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, + 0x20, 0x5f, 0x49, 0x6e, 0x63, 0x6f, 0x67, 0x6e, + 0x69, 0x74, 0x6f, 0x20, 0x57, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x2e, 0x6e, 0x65, 0x77, 0x2d, 0x69, + 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, + 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, + 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, + 0x67, 0x74, 0x3b, 0x69, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x52, 0x65, 0x6f, 0x70, 0x65, 0x6e, 0x20, 0x43, + 0x6c, 0x6f, 0x73, 0x65, 0x64, 0x20, 0x5f, 0x54, + 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x2e, 0x72, 0x65, 0x6f, 0x70, 0x65, + 0x6e, 0x2d, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, + 0x2d, 0x74, 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, + 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, + 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x26, + 0x6c, 0x74, 0x3b, 0x53, 0x68, 0x69, 0x66, 0x74, + 0x26, 0x67, 0x74, 0x3b, 0x74, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, + 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x42, 0x6f, 0x6f, + 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x62, + 0x6f, 0x6f, 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x73, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, + 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, + 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, + 0x67, 0x74, 0x3b, 0x62, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, + 0x2e, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, + 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, + 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, + 0x67, 0x74, 0x3b, 0x68, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, + 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x50, 0x72, 0x5f, 0x65, 0x66, + 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, + 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, + 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, + 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, + 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x65, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x48, + 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x61, 0x70, 0x70, 0x2e, 0x68, 0x65, 0x6c, 0x70, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x41, 0x62, 0x6f, + 0x75, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x2e, 0x61, 0x62, 0x6f, 0x75, 0x74, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x51, 0x75, 0x69, + 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, + 0x70, 0x2e, 0x71, 0x75, 0x69, 0x74, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, + 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, + 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, + 0x3b, 0x71, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, + 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x2f, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, + 0x61, 0x79, 0x29, 0x65, 0x72, 0x72, 0x6f, 0x72, + 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, 0x00, 0x00, + 0xd1, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0x85, 0x53, 0xdb, 0x6e, 0xdb, 0x38, + 0x10, 0x7d, 0xf7, 0x57, 0x4c, 0x05, 0x04, 0x48, + 0x01, 0xcb, 0xb2, 0x12, 0x14, 0xd8, 0xc4, 0x17, + 0x40, 0x71, 0xec, 0xc6, 0x80, 0xe3, 0x04, 0xb6, + 0xdc, 0xd4, 0x4f, 0x0b, 0x5a, 0xa2, 0x2c, 0x36, + 0x34, 0xa9, 0x92, 0x94, 0x6d, 0x75, 0xd1, 0x0f, + 0xea, 0x6f, 0xf4, 0xcb, 0x3a, 0xa4, 0x84, 0x3a, + 0x4d, 0xbb, 0xbb, 0x2f, 0xd2, 0x90, 0x73, 0xe6, + 0xcc, 0xcc, 0x99, 0x61, 0xff, 0xcd, 0xed, 0xc3, + 0x28, 0x5e, 0x3f, 0x8e, 0x21, 0x37, 0x3b, 0x0e, + 0x8f, 0xab, 0x9b, 0xd9, 0x74, 0x04, 0x9e, 0x1f, + 0x04, 0x4f, 0x97, 0xa3, 0x20, 0xb8, 0x8d, 0x6f, + 0xe1, 0xe3, 0x5d, 0x7c, 0x3f, 0x83, 0xb0, 0xd3, + 0x85, 0xa5, 0x51, 0x2c, 0x31, 0x41, 0x30, 0x9e, + 0x7b, 0xe0, 0xe5, 0xc6, 0x14, 0xd7, 0x41, 0x70, + 0x38, 0x1c, 0x3a, 0x87, 0xcb, 0x8e, 0x54, 0xdb, + 0x20, 0x5e, 0x04, 0x47, 0xcb, 0x12, 0xda, 0xb0, + 0xc6, 0xf4, 0xb5, 0x8b, 0xe9, 0xa4, 0x26, 0xf5, + 0x86, 0xad, 0xfe, 0x1b, 0xdf, 0x6f, 0x01, 0x8c, + 0x64, 0x51, 0x29, 0xb6, 0xcd, 0x0d, 0x7c, 0xff, + 0x06, 0x17, 0xdd, 0xb0, 0xdb, 0xb6, 0xdf, 0x10, + 0x3e, 0x30, 0xc1, 0x12, 0x56, 0x6a, 0xb8, 0xa5, + 0x05, 0xfb, 0xf2, 0x45, 0xf2, 0x16, 0x82, 0xe3, + 0x9c, 0x69, 0x28, 0x94, 0xdc, 0x2a, 0xb2, 0x03, + 0x34, 0x33, 0x45, 0x29, 0x68, 0x99, 0x99, 0x03, + 0x51, 0xb4, 0x07, 0x95, 0x2c, 0x21, 0x21, 0x02, + 0x14, 0x4d, 0x99, 0xcd, 0xb5, 0x29, 0x0d, 0x05, + 0x66, 0x80, 0x88, 0x34, 0x90, 0x0a, 0x76, 0x32, + 0x65, 0x59, 0x85, 0x34, 0x78, 0x55, 0x8a, 0x94, + 0x2a, 0x30, 0x39, 0x05, 0x43, 0xd5, 0x4e, 0x83, + 0xcc, 0xdc, 0xe1, 0xfd, 0x7c, 0x05, 0xef, 0xa9, + 0xa0, 0x8a, 0x60, 0xff, 0xe5, 0x86, 0xb3, 0x04, + 0x66, 0x2c, 0xa1, 0x42, 0x53, 0x20, 0x98, 0xd9, + 0xde, 0xe8, 0x9c, 0xa6, 0xb0, 0xb1, 0x34, 0x36, + 0x60, 0x62, 0x2b, 0x58, 0x36, 0x15, 0xc0, 0x44, + 0x22, 0x2f, 0x31, 0x4c, 0x8a, 0x1e, 0x50, 0x86, + 0x7e, 0x05, 0x7b, 0xaa, 0x34, 0x9e, 0xe1, 0xa2, + 0x0d, 0x58, 0xc2, 0x39, 0x31, 0xb6, 0x4a, 0x05, + 0xb2, 0xb0, 0xa8, 0xb7, 0xc8, 0x42, 0x44, 0x05, + 0x9c, 0x98, 0x13, 0xb4, 0xf3, 0xa7, 0x4e, 0x4f, + 0x0d, 0xa5, 0xc0, 0x84, 0x4b, 0x9d, 0xcb, 0x02, + 0xab, 0xcf, 0x91, 0x11, 0xfb, 0x39, 0x30, 0xce, + 0x61, 0x43, 0xa1, 0xd4, 0x34, 0x2b, 0x79, 0x1b, + 0x19, 0x10, 0x0b, 0x4f, 0xd3, 0xf8, 0xee, 0x61, + 0x15, 0x43, 0x34, 0x5f, 0xc3, 0x53, 0xb4, 0x58, + 0x44, 0xf3, 0x78, 0xdd, 0x43, 0xac, 0xc9, 0x25, + 0x7a, 0xe9, 0x9e, 0xd6, 0x4c, 0x6c, 0x57, 0x70, + 0x86, 0xc4, 0xd8, 0x83, 0x22, 0xc2, 0x54, 0xa8, + 0x06, 0x12, 0xdc, 0x8f, 0x17, 0xa3, 0x3b, 0x8c, + 0x88, 0x6e, 0xa6, 0xb3, 0x69, 0xbc, 0xb6, 0xe5, + 0x4f, 0xa6, 0xf1, 0x7c, 0xbc, 0x5c, 0xc2, 0xe4, + 0x61, 0x01, 0x11, 0x3c, 0x46, 0x8b, 0x78, 0x3a, + 0x5a, 0xcd, 0xa2, 0x05, 0xee, 0xca, 0xe2, 0xf1, + 0x61, 0x39, 0xee, 0xc0, 0x92, 0xda, 0x9a, 0x28, + 0x86, 0xff, 0x87, 0x94, 0x99, 0x1b, 0x06, 0xea, + 0x95, 0x52, 0x43, 0x18, 0xd7, 0xae, 0xe3, 0x35, + 0x0e, 0x4f, 0x63, 0x5d, 0x3c, 0x85, 0x9c, 0xec, + 0x29, 0x0e, 0x31, 0xa1, 0x6c, 0x8f, 0x55, 0x11, + 0x48, 0x70, 0x47, 0xfe, 0x7f, 0x42, 0x56, 0x4b, + 0x2e, 0xc5, 0xd6, 0xf5, 0x87, 0xd8, 0x93, 0x80, + 0x3d, 0x60, 0x19, 0x08, 0x69, 0xda, 0x70, 0x50, + 0x0c, 0x57, 0xc2, 0xc8, 0xdf, 0x67, 0x87, 0xd1, + 0xa7, 0xe9, 0xb5, 0x61, 0x2a, 0x92, 0x4e, 0x1b, + 0xde, 0x85, 0x08, 0x22, 0xe2, 0x99, 0xa3, 0xe4, + 0xb8, 0xf0, 0x94, 0x22, 0xc5, 0x84, 0x65, 0x48, + 0x3f, 0xe1, 0x52, 0xaa, 0x36, 0xdc, 0x48, 0x6d, + 0x2c, 0xfc, 0x3e, 0x82, 0xee, 0x45, 0x18, 0x76, + 0xfd, 0xf0, 0xb2, 0x1b, 0xb6, 0x61, 0xb5, 0x8c, + 0x3a, 0x2d, 0xdf, 0xc7, 0x25, 0x77, 0x2f, 0xe9, + 0xb8, 0xe3, 0x42, 0x0f, 0xfe, 0xf0, 0x4a, 0xc2, + 0xab, 0xab, 0xab, 0xfa, 0x71, 0x78, 0x16, 0x74, + 0xcd, 0x89, 0xd8, 0x0e, 0xbc, 0x33, 0xed, 0xc1, + 0xc9, 0x4a, 0x99, 0x72, 0x86, 0x25, 0xa3, 0x24, + 0x1d, 0x62, 0xa1, 0xfd, 0x1d, 0xea, 0x06, 0x96, + 0xce, 0xa7, 0x9f, 0x4b, 0xb6, 0x1f, 0x78, 0x89, + 0x14, 0x86, 0x0a, 0xe3, 0x9b, 0xaa, 0xa0, 0x1e, + 0x34, 0xa7, 0x81, 0x67, 0xe8, 0xd1, 0x04, 0x96, + 0xbe, 0x07, 0x49, 0x4e, 0x94, 0xa6, 0x66, 0x50, + 0x9a, 0xcc, 0xff, 0xcb, 0x83, 0xc0, 0xf1, 0x18, + 0x66, 0x38, 0x1d, 0x9e, 0xe9, 0x7e, 0x50, 0x5b, + 0xf6, 0x4e, 0x9b, 0x8a, 0xa3, 0x44, 0x48, 0xd4, + 0xc4, 0x27, 0x1a, 0x93, 0x5b, 0x8c, 0xf3, 0x38, + 0xcc, 0x0b, 0x53, 0x27, 0x8a, 0x15, 0xe6, 0x25, + 0xfe, 0x13, 0xd9, 0x93, 0xfa, 0xd6, 0xb3, 0x08, + 0x80, 0xac, 0x14, 0x89, 0x55, 0x15, 0xb8, 0x24, + 0xe9, 0xdf, 0xb8, 0xef, 0x07, 0x52, 0x9d, 0xbf, + 0x75, 0xae, 0x7f, 0xdc, 0x17, 0xe0, 0x4c, 0x3b, + 0xe3, 0x6b, 0x4d, 0xee, 0x82, 0xb1, 0xdf, 0xa0, + 0x6e, 0xb8, 0xbf, 0x91, 0x69, 0x05, 0x09, 0x27, + 0x5a, 0x37, 0x4a, 0x20, 0x2a, 0x65, 0x7b, 0x60, + 0x69, 0xdd, 0x39, 0x61, 0xb8, 0x0f, 0x4d, 0xb2, + 0x57, 0x2e, 0x94, 0xe1, 0xa7, 0xc3, 0x39, 0xf3, + 0xd0, 0xf5, 0x82, 0xbf, 0x97, 0xb7, 0x36, 0xa4, + 0x49, 0x40, 0x8f, 0x05, 0x8a, 0xef, 0xd6, 0xe0, + 0x97, 0xc8, 0x9f, 0x45, 0x36, 0x21, 0x01, 0xc6, + 0x0c, 0x5b, 0xff, 0x42, 0x82, 0x8f, 0x0f, 0xf7, + 0x62, 0x23, 0x8f, 0xaf, 0x28, 0xfa, 0xb5, 0x03, + 0xa4, 0x48, 0x70, 0x73, 0x9f, 0x07, 0xde, 0x49, + 0xac, 0xeb, 0x5f, 0xd4, 0xa9, 0x15, 0xaf, 0xd1, + 0xc3, 0xdf, 0xd3, 0xbe, 0x3a, 0x34, 0x06, 0x06, + 0xa0, 0x52, 0x4e, 0x38, 0x9c, 0xf9, 0xb0, 0xf5, + 0x03, 0x5a, 0x51, 0xcf, 0xda, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x70, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x73, + 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, + 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1a, 0x29, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x78, 0xda, 0xd5, 0x5a, 0x6d, 0x6f, 0xdb, 0x36, 0x10, 0xfe, 0xde, 0x5f, 0xa1, 0xe9, 0xeb, 0xa0, @@ -2449,204 +1121,227 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x63, - 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x73, 0x2d, 0x64, - 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, - 0x58, 0x15, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xcd, 0x58, 0x4b, 0x8f, 0xdb, 0x36, - 0x10, 0xbe, 0xe7, 0x57, 0xa8, 0xbc, 0x16, 0x5a, - 0xdb, 0x49, 0x13, 0xf4, 0x60, 0x2b, 0xd8, 0x47, - 0x93, 0x00, 0x2d, 0x50, 0x20, 0x76, 0x5b, 0xf4, - 0x44, 0xd0, 0xd2, 0xac, 0xc5, 0x9a, 0x26, 0x55, - 0x92, 0xb2, 0xd7, 0xf9, 0xf5, 0x19, 0x92, 0xb2, - 0x56, 0x96, 0x65, 0xc9, 0x8b, 0xdd, 0x2e, 0x7a, - 0x13, 0xe9, 0x19, 0x72, 0x1e, 0xdf, 0xcc, 0x7c, - 0xf4, 0xf4, 0xe3, 0xc3, 0x46, 0x44, 0x5b, 0xd0, - 0x86, 0x2b, 0x39, 0x23, 0x93, 0xab, 0x31, 0x89, - 0x40, 0xa6, 0x2a, 0xe3, 0x72, 0x35, 0x23, 0x7f, - 0x2c, 0x3e, 0xc5, 0x3f, 0x93, 0x8f, 0xc9, 0x9b, - 0xe9, 0x0f, 0x71, 0x1c, 0x7d, 0x06, 0x09, 0x9a, - 0x59, 0xc8, 0xa2, 0x1d, 0xb7, 0x79, 0xb4, 0x12, - 0x2c, 0x83, 0xe8, 0xdd, 0xd5, 0xe4, 0xc3, 0xd5, - 0x38, 0x8a, 0x63, 0x14, 0xe2, 0xd2, 0x82, 0xbe, - 0x67, 0x29, 0x24, 0x53, 0x0d, 0xff, 0x96, 0x5c, - 0x83, 0x89, 0x04, 0x5f, 0xce, 0xc8, 0xca, 0xae, - 0x7f, 0x24, 0x8f, 0xb7, 0xa0, 0xce, 0x98, 0x8c, - 0x92, 0xa9, 0x5a, 0xfe, 0x03, 0xa9, 0x8d, 0x52, - 0xc1, 0x8c, 0x99, 0x91, 0xcf, 0x76, 0xfd, 0x1b, - 0x37, 0x76, 0x6e, 0x95, 0x06, 0x12, 0xf1, 0x6c, - 0x46, 0x04, 0x2e, 0x8d, 0x5f, 0x26, 0xd3, 0x54, - 0x89, 0x72, 0x23, 0x4d, 0xe2, 0x2d, 0x09, 0x8b, - 0x58, 0xb2, 0x0d, 0x44, 0x5f, 0x7e, 0x9f, 0x2f, - 0xdc, 0xf5, 0x95, 0x44, 0x64, 0xf7, 0x05, 0xe0, - 0x8d, 0x69, 0xce, 0x34, 0xd3, 0x9a, 0xed, 0xdd, - 0x45, 0x5d, 0x3a, 0xf4, 0xd7, 0x5f, 0xfe, 0x7e, - 0xaa, 0xde, 0xdd, 0xf5, 0xe2, 0xfa, 0x54, 0x67, - 0xae, 0xca, 0xe2, 0x56, 0xa9, 0x35, 0x07, 0xa7, - 0x33, 0xaa, 0x2d, 0x1d, 0x05, 0xff, 0x92, 0xa9, - 0x85, 0x4d, 0x21, 0x30, 0x70, 0x07, 0x4f, 0x83, - 0xb0, 0xb9, 0xe3, 0x4c, 0xa8, 0x15, 0x89, 0x0a, - 0xa6, 0x41, 0x5a, 0x1f, 0x80, 0x6a, 0x2b, 0x99, - 0x16, 0x5a, 0x15, 0xa0, 0xed, 0x3e, 0x72, 0xf7, - 0xce, 0x48, 0x0e, 0x7c, 0x95, 0x5b, 0xea, 0xa2, - 0x0a, 0xc6, 0x92, 0xe4, 0xfd, 0x78, 0x3c, 0x1d, - 0x1d, 0x64, 0x4e, 0xa4, 0x53, 0x26, 0xe9, 0xbd, - 0x4a, 0x4b, 0x43, 0x92, 0x4f, 0x4c, 0x18, 0xe8, - 0x11, 0x5d, 0x2a, 0x9d, 0x81, 0xa6, 0x3b, 0x9e, - 0xd9, 0x9c, 0x24, 0x7d, 0x87, 0x6e, 0x54, 0xc6, - 0x04, 0x49, 0x16, 0xba, 0xec, 0x3b, 0x6f, 0xc7, - 0x65, 0xa6, 0x76, 0xb4, 0x50, 0x86, 0x5b, 0xcc, - 0x35, 0x49, 0x52, 0x70, 0xa0, 0xe8, 0xd1, 0xc8, - 0xe0, 0x9e, 0x95, 0xc2, 0x1e, 0x4c, 0x78, 0xd7, - 0xeb, 0xd9, 0x41, 0x38, 0xc4, 0x83, 0x24, 0x1f, - 0x06, 0xa4, 0x8d, 0xd5, 0x6a, 0x4f, 0x1d, 0x5c, - 0x69, 0x88, 0xf2, 0xa0, 0x03, 0x2e, 0xa5, 0x34, - 0xe7, 0x4e, 0x32, 0xf3, 0xc9, 0x68, 0xca, 0xa6, - 0x39, 0x17, 0x59, 0xe4, 0x61, 0x2e, 0x99, 0x88, - 0xfd, 0xd2, 0x25, 0x07, 0x0b, 0x41, 0x2f, 0x99, - 0x26, 0x1d, 0x90, 0xfe, 0xe2, 0x7f, 0xbc, 0xc1, - 0x1f, 0x3d, 0xa4, 0x6b, 0xd9, 0xc9, 0x69, 0x92, - 0x2d, 0xb7, 0x02, 0x91, 0x6f, 0x35, 0x93, 0x06, - 0xe1, 0xc2, 0x96, 0x02, 0x37, 0xf7, 0x80, 0x59, - 0xac, 0x00, 0xd3, 0x63, 0xf6, 0x96, 0x1b, 0x8e, - 0xf2, 0x83, 0xee, 0x3d, 0x01, 0x1a, 0x26, 0x57, - 0xbb, 0x38, 0x15, 0xca, 0x40, 0xbc, 0x2c, 0xad, - 0x75, 0xc9, 0x6c, 0x1f, 0xee, 0x03, 0xd0, 0xe1, - 0xf4, 0x4d, 0x90, 0xf7, 0x1e, 0xa7, 0x02, 0x98, - 0xa6, 0x87, 0x13, 0xda, 0x97, 0x08, 0xb6, 0x04, - 0xd1, 0xed, 0x33, 0x75, 0x8a, 0xd1, 0xb5, 0x10, - 0x2f, 0xeb, 0xf6, 0x05, 0x92, 0x15, 0xca, 0x06, - 0x65, 0x35, 0xa4, 0xc0, 0xb7, 0x60, 0x1e, 0x15, - 0x86, 0x62, 0x5a, 0x1a, 0xa0, 0xa5, 0x44, 0x04, - 0x08, 0x2e, 0x87, 0xad, 0xde, 0x32, 0xc1, 0x57, - 0x9d, 0x35, 0x64, 0xec, 0x5e, 0x60, 0x97, 0xf5, - 0x11, 0x6f, 0x82, 0xbd, 0x4c, 0x2d, 0x1a, 0x14, - 0xb3, 0xd4, 0x17, 0xdf, 0xe8, 0x58, 0xc2, 0xc2, - 0x83, 0x3d, 0xa4, 0xd2, 0x35, 0xaa, 0xea, 0x90, - 0xba, 0x4d, 0x15, 0x2c, 0x5d, 0x63, 0xdb, 0x3f, - 0x31, 0xc3, 0xed, 0x53, 0x57, 0x17, 0x24, 0x31, - 0x96, 0x69, 0xdb, 0x34, 0x64, 0x54, 0x2b, 0x8d, - 0x2a, 0x30, 0xd4, 0xc7, 0x1d, 0x36, 0xba, 0x8b, - 0x66, 0xbb, 0x54, 0x0f, 0x5d, 0xf5, 0x72, 0x83, - 0xdb, 0x1e, 0x37, 0xa1, 0xfa, 0x62, 0x27, 0xf7, - 0x96, 0xbc, 0x06, 0xde, 0x95, 0xe6, 0x18, 0x67, - 0x16, 0xda, 0x16, 0xce, 0x2a, 0xcb, 0x53, 0xd6, - 0x87, 0x3d, 0x83, 0xae, 0xa3, 0xe7, 0x24, 0x79, - 0x3b, 0xdc, 0x22, 0x42, 0x42, 0x28, 0xb6, 0x20, - 0x46, 0xce, 0xd6, 0x4b, 0xdb, 0xf5, 0x86, 0xd2, - 0xeb, 0x44, 0x40, 0xb0, 0xbd, 0x2a, 0x2d, 0xf5, - 0xb8, 0x20, 0x09, 0xc8, 0xec, 0x28, 0xd3, 0x43, - 0x30, 0x81, 0x87, 0x82, 0xc9, 0x6c, 0xf8, 0x96, - 0x7b, 0x2e, 0x86, 0xe7, 0x48, 0x03, 0x73, 0x2d, - 0x3b, 0xda, 0x82, 0xf5, 0xa4, 0x19, 0xf7, 0xe3, - 0xf2, 0x6c, 0xaf, 0x3a, 0x44, 0x1d, 0x81, 0x36, - 0x79, 0x95, 0x30, 0x1f, 0xcf, 0xdc, 0xf7, 0xcf, - 0x81, 0xe4, 0x39, 0xa7, 0xe6, 0xa9, 0x56, 0x42, - 0x40, 0xf6, 0x97, 0x1f, 0xc7, 0xc1, 0x3f, 0x53, - 0xed, 0x85, 0x11, 0xdd, 0xe1, 0xaa, 0x37, 0xe8, - 0x91, 0x63, 0xfc, 0xd4, 0x3b, 0x5b, 0xdb, 0x8c, - 0xa4, 0x7f, 0x6e, 0xbf, 0x7c, 0x9f, 0xce, 0x83, - 0x3b, 0x38, 0x49, 0x91, 0x6c, 0x08, 0x9e, 0xee, - 0x49, 0x22, 0x61, 0xdb, 0xcb, 0x34, 0x4c, 0xce, - 0x1c, 0x37, 0x09, 0xa8, 0xe2, 0xb2, 0x8f, 0xeb, - 0x70, 0x49, 0x53, 0x85, 0x35, 0x2c, 0x2f, 0xe4, - 0x25, 0x4d, 0x85, 0x03, 0x37, 0x69, 0x69, 0x9c, - 0x4b, 0xd5, 0x42, 0x03, 0xfc, 0xc9, 0xa1, 0x4a, - 0x52, 0x1a, 0x26, 0x3d, 0xb5, 0xb8, 0xbb, 0x75, - 0xbb, 0xaf, 0x10, 0x4a, 0x64, 0x76, 0x38, 0x83, - 0x93, 0x9a, 0x6d, 0xf7, 0x85, 0x10, 0x47, 0x72, - 0x9a, 0xd3, 0x40, 0x71, 0x5b, 0x25, 0x67, 0x70, - 0x56, 0x31, 0x51, 0x09, 0xae, 0x61, 0x1f, 0x17, - 0xc8, 0xff, 0x4d, 0x8c, 0x49, 0x41, 0x32, 0x15, - 0xe5, 0xd8, 0x1b, 0x04, 0x68, 0xc4, 0xb4, 0x8b, - 0xd4, 0xb1, 0x93, 0x14, 0xa5, 0xa9, 0x97, 0xa6, - 0x95, 0x74, 0x88, 0xd2, 0x09, 0x53, 0x36, 0x3b, - 0x56, 0x14, 0x80, 0x61, 0x92, 0xca, 0x0f, 0xb7, - 0xce, 0x5e, 0x6b, 0x40, 0x40, 0x98, 0x7f, 0x67, - 0xa2, 0x3d, 0xaf, 0x05, 0x7c, 0xc8, 0x0f, 0x56, - 0xc4, 0x4d, 0xc5, 0x8e, 0x10, 0x91, 0x64, 0x83, - 0x33, 0x9e, 0x17, 0x02, 0xce, 0x7a, 0x8d, 0x8f, - 0x07, 0xb9, 0x82, 0xec, 0xd8, 0xdb, 0xda, 0xcb, - 0xfa, 0x7c, 0x5a, 0xcb, 0x5d, 0xe6, 0x67, 0xf7, - 0x48, 0xed, 0xc1, 0xd2, 0x6d, 0xc8, 0xcf, 0x91, - 0x7b, 0x21, 0x67, 0x1d, 0x65, 0x8f, 0x71, 0xe7, - 0xdf, 0xd8, 0x25, 0x90, 0x42, 0x39, 0x3f, 0xf0, - 0x58, 0x69, 0xb1, 0xeb, 0x7e, 0xeb, 0xa5, 0xd1, - 0x67, 0xb9, 0xec, 0x9c, 0xdb, 0x7e, 0x4e, 0xe5, - 0xbb, 0xe3, 0x65, 0xf6, 0x28, 0x6d, 0x2b, 0x2c, - 0x52, 0x8e, 0x93, 0x67, 0x72, 0x49, 0xbd, 0xdd, - 0x82, 0x10, 0x5f, 0xc1, 0x71, 0x30, 0xd0, 0x0b, - 0x64, 0x44, 0x55, 0xdd, 0xe1, 0xae, 0xae, 0x76, - 0x1d, 0x4f, 0x9a, 0xb8, 0xb8, 0x33, 0x6b, 0x35, - 0x47, 0xc2, 0x04, 0xa6, 0xf1, 0xdd, 0x20, 0x53, - 0xbe, 0x00, 0xea, 0x1f, 0x92, 0xc6, 0xb7, 0xe9, - 0xe1, 0x43, 0xe7, 0x37, 0x86, 0x26, 0xeb, 0x40, - 0x38, 0x2e, 0x1b, 0xac, 0xcf, 0x9d, 0x97, 0x0b, - 0xa5, 0x5c, 0xd7, 0xad, 0xc0, 0x15, 0x16, 0xff, - 0xd1, 0xdc, 0xec, 0x60, 0xb9, 0x5c, 0x3a, 0xe6, - 0x1c, 0x57, 0xf7, 0x36, 0x69, 0x6c, 0xeb, 0x5c, - 0x8e, 0xed, 0x98, 0x3a, 0x90, 0x5e, 0x08, 0x0b, - 0xe7, 0x56, 0xf3, 0xd9, 0xa2, 0x61, 0xa3, 0xb6, - 0x40, 0xfd, 0x45, 0x67, 0xde, 0x2e, 0x97, 0xba, - 0x68, 0x40, 0xba, 0x98, 0x6f, 0x61, 0x98, 0x1a, - 0x3c, 0x89, 0xac, 0x9d, 0x7b, 0x39, 0x7d, 0xf5, - 0xa6, 0xbf, 0xd8, 0x2b, 0xc4, 0x47, 0xd2, 0x7d, - 0x86, 0x11, 0x11, 0x87, 0xc8, 0xc4, 0x66, 0xbf, - 0x59, 0xba, 0xc1, 0xdb, 0xd7, 0x04, 0x30, 0x78, - 0xd8, 0x30, 0xa9, 0xaf, 0x95, 0x2e, 0x4b, 0xef, - 0xb0, 0x23, 0x62, 0x45, 0xd9, 0x1c, 0xa2, 0xd0, - 0x1c, 0x21, 0x8b, 0xd2, 0xd3, 0xb7, 0xee, 0x71, - 0x8f, 0xc5, 0x3b, 0xd7, 0xed, 0x1e, 0x7b, 0x92, - 0x2d, 0x5a, 0x8b, 0x3d, 0xb1, 0xc5, 0x3e, 0x97, - 0xdd, 0xe6, 0x6a, 0xa3, 0x56, 0x20, 0x41, 0x75, - 0x0d, 0xde, 0x9e, 0xd7, 0xd2, 0xff, 0x95, 0x55, - 0x4f, 0x5e, 0xc8, 0xfe, 0x97, 0xed, 0x5d, 0x93, - 0x27, 0xbe, 0x41, 0xc3, 0x53, 0x2a, 0x46, 0x2e, - 0xb7, 0x02, 0x6b, 0x5a, 0xeb, 0x08, 0x27, 0x60, - 0xa1, 0xa4, 0xc1, 0x1b, 0x62, 0x7c, 0x68, 0x35, - 0xff, 0xb0, 0xc0, 0x96, 0xde, 0x94, 0x4c, 0x5a, - 0x6b, 0xd7, 0xe6, 0x0f, 0x7f, 0xee, 0xe1, 0xe7, - 0xe3, 0xff, 0x9f, 0x6f, 0xbe, 0x03, 0xbd, 0x03, - 0xd2, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x67, + 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, 0x00, + 0x09, 0x00, 0x00, 0x00, 0x68, 0x69, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x2d, 0x64, 0x69, 0x61, 0x6c, + 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0xf6, 0x2d, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x5a, 0x4b, 0x73, 0xdb, 0x36, + 0x10, 0xbe, 0xe7, 0x57, 0xb0, 0xbc, 0x76, 0x18, + 0x4b, 0x4e, 0x93, 0xe9, 0xc1, 0x66, 0xc6, 0x8f, + 0x3c, 0x3c, 0xe3, 0xc6, 0x33, 0xb1, 0xda, 0x1e, + 0x39, 0x10, 0xb9, 0x16, 0x11, 0x83, 0x04, 0x0b, + 0x40, 0x92, 0xd5, 0x5f, 0xdf, 0x05, 0x40, 0x52, + 0x94, 0xc4, 0x97, 0x6d, 0x89, 0x76, 0x3b, 0x3d, + 0xd9, 0x84, 0x16, 0xc4, 0x3e, 0xbe, 0xfd, 0x76, + 0x17, 0xd2, 0xc9, 0xc7, 0x87, 0x84, 0x39, 0x0b, + 0x10, 0x92, 0xf2, 0xf4, 0xd4, 0x1d, 0xbf, 0x1d, + 0xb9, 0x0e, 0xa4, 0x21, 0x8f, 0x68, 0x3a, 0x3b, + 0x75, 0x7f, 0x9f, 0x7c, 0xf6, 0x7e, 0x75, 0x3f, + 0xfa, 0x6f, 0x4e, 0x7e, 0xf2, 0x3c, 0xe7, 0x0b, + 0xa4, 0x20, 0x88, 0x82, 0xc8, 0x59, 0x52, 0x15, + 0x3b, 0x33, 0x46, 0x22, 0x70, 0xde, 0xbd, 0x1d, + 0x7f, 0x78, 0x3b, 0x72, 0x3c, 0x0f, 0x85, 0x68, + 0xaa, 0x40, 0xdc, 0x91, 0x10, 0xfc, 0x13, 0x01, + 0x7f, 0xcd, 0xa9, 0x00, 0xe9, 0x30, 0x3a, 0x3d, + 0x75, 0x67, 0xea, 0xfe, 0x67, 0x77, 0x7d, 0x0a, + 0xee, 0x19, 0xb9, 0x47, 0xfe, 0x09, 0x9f, 0xfe, + 0x80, 0x50, 0x39, 0x21, 0x23, 0x52, 0x9e, 0xba, + 0x5f, 0xd4, 0xfd, 0x35, 0x95, 0xea, 0x56, 0x71, + 0x01, 0xae, 0x43, 0xa3, 0x53, 0x97, 0xe1, 0xa3, + 0x34, 0x8f, 0xfe, 0x49, 0xc8, 0xd9, 0x3c, 0x49, + 0xa5, 0x6f, 0x34, 0xb1, 0x0f, 0x5e, 0x4a, 0x12, + 0x70, 0x2e, 0xcf, 0x26, 0x9f, 0xf4, 0xf1, 0xb9, + 0x84, 0xa3, 0x56, 0x19, 0xe0, 0x89, 0xa8, 0x8b, + 0x3e, 0x62, 0x5b, 0x7a, 0x72, 0x35, 0xb9, 0xae, + 0x13, 0x0f, 0x63, 0x22, 0x88, 0x10, 0x64, 0x55, + 0xb7, 0xe9, 0xfa, 0xe6, 0xe2, 0x6c, 0x72, 0x75, + 0xf3, 0xad, 0x6b, 0xdf, 0x51, 0xa9, 0xe4, 0x91, + 0x35, 0xcd, 0x3f, 0x51, 0x90, 0x64, 0x0c, 0x7d, + 0x56, 0x18, 0xf9, 0x29, 0x8b, 0x57, 0x5f, 0xa9, + 0x36, 0x6a, 0xf5, 0x27, 0x4d, 0x23, 0xbe, 0x74, + 0x9d, 0x8c, 0x08, 0x48, 0x95, 0xb1, 0xff, 0x92, + 0x12, 0xc6, 0x67, 0x68, 0x6d, 0x26, 0x78, 0x06, + 0x42, 0xad, 0x1c, 0x7d, 0xfe, 0xa9, 0x1b, 0x03, + 0x9d, 0xc5, 0x2a, 0xd0, 0x4e, 0x05, 0xa9, 0x5c, + 0xff, 0xfd, 0x68, 0x74, 0x72, 0x54, 0xc8, 0xec, + 0x48, 0x87, 0x24, 0x0d, 0xee, 0x78, 0x38, 0x97, + 0xae, 0xff, 0x99, 0x30, 0x09, 0x2d, 0xa2, 0x53, + 0x2e, 0x22, 0x10, 0xc1, 0x92, 0x46, 0x2a, 0x76, + 0xfd, 0xb6, 0x97, 0x26, 0x3c, 0x22, 0xcc, 0xf5, + 0x27, 0x62, 0xde, 0xf6, 0xbe, 0xa5, 0xb1, 0x29, + 0xc8, 0xb8, 0xa4, 0x0a, 0x43, 0xed, 0xfa, 0x21, + 0x68, 0x4c, 0xb4, 0xec, 0x88, 0xe0, 0x8e, 0xcc, + 0x99, 0x2a, 0x54, 0x18, 0x8f, 0x5a, 0x4d, 0x2b, + 0xa4, 0xad, 0x43, 0x5c, 0xff, 0x43, 0x87, 0xb4, + 0x54, 0x82, 0xaf, 0x02, 0x0d, 0xd7, 0xc0, 0xba, + 0xb9, 0xd3, 0x02, 0x1d, 0xd7, 0x20, 0xd6, 0xe8, + 0xf1, 0x23, 0x13, 0x8d, 0xaa, 0x6c, 0x18, 0x53, + 0x16, 0x39, 0x06, 0xe6, 0x29, 0x61, 0x9e, 0x79, + 0xd4, 0xd1, 0xc1, 0x44, 0x10, 0x53, 0x22, 0xdc, + 0x1a, 0x48, 0x7f, 0x35, 0x1f, 0x9e, 0xe3, 0x87, + 0x06, 0xd2, 0xa5, 0xec, 0x78, 0x37, 0xca, 0x8a, + 0x2a, 0x86, 0xc8, 0x57, 0x82, 0xa4, 0x12, 0x31, + 0x43, 0xa6, 0x0c, 0x17, 0x57, 0x80, 0x61, 0xcc, + 0x11, 0xd3, 0xa2, 0xf6, 0x82, 0x4a, 0x8a, 0xf2, + 0x9d, 0xe6, 0x3d, 0x02, 0x1b, 0x32, 0xe6, 0x4b, + 0x2f, 0x64, 0x5c, 0x82, 0x37, 0x9d, 0x2b, 0xa5, + 0xa3, 0xb9, 0xfd, 0x72, 0xe3, 0x80, 0x1a, 0xa3, + 0xcf, 0xad, 0xbc, 0xb1, 0x38, 0x64, 0x40, 0x44, + 0x50, 0xbc, 0x61, 0xfb, 0x10, 0x46, 0xa6, 0xc0, + 0x6a, 0x6d, 0xbe, 0x08, 0xf4, 0x46, 0xe7, 0x8c, + 0xb1, 0xfd, 0x9a, 0xdd, 0x43, 0x32, 0x47, 0x59, + 0xa7, 0xac, 0x80, 0x10, 0xe8, 0x02, 0xe4, 0x7a, + 0x43, 0x97, 0x4f, 0xe7, 0x12, 0x82, 0x79, 0x8a, + 0x08, 0x60, 0x34, 0xed, 0xd6, 0x7a, 0x41, 0x18, + 0x9d, 0xd5, 0x26, 0x91, 0x54, 0x2b, 0x86, 0x2c, + 0x6b, 0x3c, 0x5e, 0x05, 0xfb, 0x3c, 0x54, 0xa8, + 0x90, 0x47, 0x42, 0x93, 0x7d, 0x47, 0x9b, 0x12, + 0x0a, 0x1e, 0x54, 0x11, 0x4a, 0xcd, 0x56, 0xf9, + 0x4b, 0x4a, 0xae, 0xca, 0x48, 0x78, 0x8f, 0xb4, + 0xbf, 0xa3, 0x86, 0x5e, 0x0f, 0x74, 0x5e, 0xb8, + 0xbe, 0x54, 0x44, 0xa8, 0xaa, 0x22, 0x47, 0xe5, + 0xa6, 0xa3, 0x1c, 0x0c, 0xe5, 0xeb, 0x8a, 0x85, + 0xfa, 0xa4, 0x59, 0x4c, 0xf9, 0x43, 0x5d, 0xbe, + 0x9c, 0xe3, 0xb2, 0xc1, 0x8d, 0xcd, 0x3e, 0x4f, + 0xcb, 0x1d, 0xbb, 0x43, 0xe0, 0x9d, 0x0b, 0x8a, + 0x7e, 0x26, 0x96, 0xb7, 0xb0, 0x56, 0x29, 0x1a, + 0x92, 0x36, 0xec, 0x49, 0x34, 0x1d, 0x2d, 0x77, + 0xfd, 0xe3, 0x6e, 0x8a, 0xb0, 0x01, 0x09, 0x90, + 0x82, 0x88, 0xdb, 0x98, 0x2f, 0xdb, 0xa6, 0x57, + 0x36, 0xb5, 0x79, 0xa0, 0xcb, 0xae, 0x47, 0xb8, + 0x80, 0x91, 0x15, 0x9f, 0xab, 0xc0, 0x00, 0xc3, + 0xf5, 0x21, 0x8d, 0x36, 0x42, 0xdd, 0x85, 0x13, + 0x78, 0xc8, 0x48, 0x1a, 0x75, 0x9f, 0x72, 0x47, + 0x59, 0x77, 0x25, 0xa9, 0x80, 0x6e, 0x4b, 0x8f, + 0x6d, 0xc1, 0xb2, 0xd6, 0x8c, 0xda, 0x81, 0xd9, + 0x48, 0x56, 0x85, 0xdb, 0x11, 0x69, 0xe3, 0x41, + 0x90, 0xb6, 0x59, 0x75, 0xdf, 0x1f, 0x02, 0x93, + 0x1f, 0xfa, 0xd0, 0xf4, 0x2d, 0x12, 0x6c, 0x18, + 0x7f, 0x4a, 0x95, 0x58, 0x59, 0x0f, 0x48, 0xb3, + 0x00, 0x7a, 0x61, 0x3f, 0x9e, 0xe8, 0x0a, 0xb2, + 0xa0, 0x09, 0x11, 0xab, 0x80, 0x86, 0x88, 0x73, + 0xbd, 0x84, 0xc1, 0x8e, 0xa8, 0xf2, 0xee, 0xb0, + 0x8d, 0xf0, 0xe4, 0x2a, 0x99, 0x72, 0x46, 0xc3, + 0xbe, 0xfb, 0x75, 0xba, 0x2c, 0x6c, 0x09, 0xe9, + 0x0e, 0xc1, 0xc6, 0x4e, 0x09, 0xa9, 0xc6, 0xd0, + 0xa2, 0xcf, 0x3e, 0x86, 0xed, 0x6d, 0xcc, 0x99, + 0x8e, 0x9f, 0xe6, 0xd3, 0xda, 0xd2, 0x65, 0xfd, + 0xea, 0xc4, 0xbb, 0x55, 0x5b, 0x22, 0x9f, 0x13, + 0x56, 0x04, 0xcb, 0x88, 0x21, 0x45, 0x90, 0x74, + 0x06, 0x91, 0xeb, 0xe0, 0xdf, 0x88, 0x81, 0xc0, + 0xa8, 0x6b, 0x95, 0xf4, 0x67, 0x81, 0x09, 0x45, + 0x50, 0x4a, 0xd8, 0x08, 0xd6, 0x76, 0x91, 0x72, + 0x49, 0xb2, 0x0c, 0x30, 0x86, 0x29, 0x37, 0xe4, + 0x3e, 0x6c, 0xb2, 0xee, 0x33, 0x07, 0x8f, 0x5f, + 0x20, 0x07, 0x47, 0xcf, 0xc9, 0xc1, 0xc6, 0xf4, + 0x0a, 0x05, 0x67, 0x0c, 0xa2, 0x22, 0x44, 0x26, + 0xc3, 0xf2, 0x35, 0xdb, 0x28, 0xd7, 0x24, 0x99, + 0x51, 0x68, 0xdd, 0xe9, 0xff, 0xd2, 0xda, 0xe0, + 0x6e, 0xcf, 0x05, 0xef, 0x5a, 0xa5, 0xf7, 0x9f, + 0xbf, 0x32, 0x26, 0xba, 0xdd, 0xb7, 0x34, 0x4d, + 0xd3, 0xb6, 0xf1, 0x81, 0xa6, 0x01, 0xa6, 0x9a, + 0x42, 0x4f, 0x16, 0x3e, 0x6f, 0x57, 0xb6, 0xba, + 0xa1, 0xe8, 0xf6, 0xb7, 0x76, 0x34, 0xf9, 0x7d, + 0x22, 0x00, 0xfe, 0xa0, 0x90, 0x7b, 0x5c, 0xe1, + 0xd3, 0x42, 0x3f, 0x0d, 0xe0, 0x0f, 0x1c, 0x92, + 0xb0, 0x9b, 0xf5, 0xcb, 0xb9, 0xb5, 0x45, 0x14, + 0x52, 0x4d, 0x18, 0x79, 0x9e, 0xf7, 0x68, 0xc6, + 0x2d, 0x1f, 0xd8, 0x01, 0xb3, 0x1d, 0xaf, 0x77, + 0xf4, 0x01, 0x22, 0xcf, 0xfa, 0xcc, 0xd3, 0x1a, + 0xed, 0xaa, 0xbd, 0x41, 0x43, 0xb6, 0x23, 0xf4, + 0x32, 0x9c, 0xd6, 0xa5, 0x07, 0x0b, 0x3d, 0x24, + 0x6d, 0x50, 0x51, 0xe1, 0xc0, 0xbc, 0x87, 0x0f, + 0x8c, 0x60, 0x90, 0x0b, 0xf6, 0x67, 0xa4, 0x8d, + 0x33, 0xef, 0x61, 0xd5, 0xe3, 0x40, 0x94, 0xda, + 0xcb, 0x69, 0x02, 0x07, 0x99, 0xbc, 0x3a, 0x6c, + 0xf3, 0x6c, 0x79, 0x16, 0xca, 0x04, 0x15, 0x99, + 0xad, 0xd7, 0xd5, 0x77, 0x75, 0x12, 0x18, 0xd8, + 0x4e, 0xbb, 0x01, 0x85, 0xb7, 0xa5, 0xc0, 0x06, + 0x14, 0xbd, 0xea, 0xc6, 0x1a, 0x08, 0xb9, 0x7e, + 0x82, 0xd3, 0x04, 0xcd, 0x58, 0x73, 0xd0, 0x6a, + 0x8b, 0x46, 0x69, 0x4c, 0xf9, 0xfe, 0x67, 0x95, + 0x8e, 0x2e, 0xd2, 0x2e, 0xf2, 0xec, 0xc2, 0x82, + 0xd2, 0xb6, 0xae, 0xe8, 0xbe, 0x12, 0xa5, 0x3b, + 0x20, 0xa6, 0x7f, 0x9b, 0xe6, 0xc4, 0x20, 0xb4, + 0x13, 0xc1, 0xc5, 0x8d, 0xc0, 0xfb, 0x36, 0xb0, + 0x37, 0xcf, 0xcc, 0x97, 0xa8, 0x49, 0x5b, 0x52, + 0x63, 0x67, 0x71, 0x4f, 0xfa, 0xa4, 0xbf, 0xe4, + 0x42, 0x05, 0xe8, 0x2a, 0xa4, 0x7d, 0xf4, 0x5a, + 0x3f, 0x71, 0x53, 0x5c, 0x5c, 0x1f, 0x67, 0x32, + 0x9c, 0xdd, 0xf4, 0x5d, 0x5a, 0x73, 0x20, 0xb5, + 0x1e, 0x8d, 0x81, 0xb4, 0x9e, 0x0c, 0x72, 0xa1, + 0xc7, 0xa7, 0x41, 0x53, 0xe8, 0x2e, 0x80, 0xb1, + 0xef, 0xa0, 0x07, 0x51, 0x10, 0x13, 0xd3, 0xc6, + 0x94, 0xc1, 0x13, 0xf9, 0xb2, 0xde, 0x4e, 0x94, + 0x12, 0x14, 0xd3, 0x1e, 0x64, 0xe5, 0xff, 0xca, + 0x34, 0x69, 0x88, 0xa8, 0xfc, 0xc0, 0xaf, 0xfc, + 0x2f, 0xbb, 0x06, 0xc2, 0x9e, 0x78, 0xd2, 0x67, + 0xed, 0x17, 0x4f, 0xed, 0x77, 0x67, 0xcd, 0x78, + 0xfa, 0x86, 0x9f, 0x3f, 0x0d, 0x4f, 0xaf, 0x36, + 0xde, 0x21, 0xae, 0x16, 0xe1, 0xd6, 0xe1, 0xac, + 0xe9, 0xbc, 0x50, 0x82, 0x66, 0xe8, 0xe7, 0x96, + 0x71, 0xb0, 0x1b, 0x24, 0xe3, 0x03, 0x83, 0x84, + 0xf1, 0x90, 0x58, 0xb6, 0xdb, 0x27, 0x50, 0x8e, + 0x9f, 0x08, 0x94, 0xeb, 0x5c, 0x9b, 0xff, 0x18, + 0x58, 0x4a, 0x27, 0x97, 0x04, 0x71, 0x18, 0xb0, + 0x1c, 0x3f, 0x01, 0x2c, 0xcd, 0x0b, 0x5d, 0xe3, + 0x4f, 0x07, 0x99, 0x0f, 0x33, 0xfd, 0x4c, 0x38, + 0x67, 0xd3, 0xe2, 0x86, 0x58, 0xd9, 0x87, 0x61, + 0x6e, 0x22, 0xec, 0xf8, 0x6b, 0x22, 0x36, 0xee, + 0xd5, 0x5a, 0xa3, 0x72, 0x57, 0x0a, 0x92, 0xb5, + 0xaa, 0x14, 0x9f, 0x0e, 0xa4, 0x6b, 0xe7, 0xb0, + 0x28, 0x20, 0xe1, 0x0b, 0x28, 0xfa, 0x52, 0x7b, + 0xa1, 0x38, 0xa4, 0x1e, 0x95, 0x5b, 0xee, 0x0d, + 0x55, 0x9e, 0xae, 0xc6, 0x23, 0x6e, 0x22, 0x1e, + 0x11, 0xe5, 0x43, 0xdf, 0x53, 0x6b, 0x1c, 0x60, + 0xbb, 0xda, 0x7c, 0x21, 0xf2, 0xdd, 0x78, 0xc7, + 0x51, 0x31, 0x38, 0xb6, 0x35, 0x85, 0xc8, 0xc9, + 0xc8, 0x0c, 0xa4, 0x73, 0x27, 0x78, 0xd2, 0x79, + 0x51, 0x52, 0x4b, 0x83, 0x9b, 0xc1, 0x2f, 0x45, + 0x9e, 0x4f, 0x7f, 0x57, 0x09, 0x6a, 0xb6, 0x11, + 0x55, 0x6a, 0x56, 0x06, 0xcb, 0x47, 0x7b, 0x11, + 0xa6, 0x87, 0x48, 0xcf, 0x2a, 0xd0, 0xe7, 0x2a, + 0xac, 0x29, 0x93, 0x9f, 0x4e, 0x8d, 0xc3, 0xde, + 0x0c, 0x1d, 0x4e, 0xcf, 0x98, 0x27, 0x7c, 0x06, + 0x29, 0xf0, 0xba, 0x01, 0xbe, 0x3f, 0x49, 0xdf, + 0x42, 0x46, 0x84, 0x9e, 0x00, 0x76, 0x39, 0xd0, + 0x62, 0x70, 0x18, 0xc6, 0x8e, 0x04, 0x59, 0xd6, + 0x48, 0xed, 0xab, 0xe0, 0xed, 0xc9, 0x59, 0xf5, + 0x75, 0xe2, 0xf8, 0x85, 0xea, 0x04, 0x0a, 0xa6, + 0xaf, 0xa2, 0x4a, 0x54, 0x14, 0x19, 0x04, 0x2c, + 0x2f, 0x4e, 0xfc, 0x37, 0x68, 0x70, 0x1d, 0xed, + 0xd3, 0xd4, 0x49, 0x61, 0xe9, 0xa0, 0xa8, 0x7c, + 0x1c, 0xeb, 0x57, 0x43, 0x79, 0x18, 0xce, 0x37, + 0x27, 0xbc, 0x08, 0xe3, 0xcf, 0xb8, 0xf7, 0x63, + 0x9e, 0x64, 0xff, 0xb3, 0xfd, 0xde, 0xd8, 0x7e, + 0x97, 0x26, 0x77, 0x34, 0xa9, 0xf9, 0x26, 0x9d, + 0xa6, 0x1a, 0xfc, 0x5e, 0xde, 0x88, 0x3f, 0xea, + 0xab, 0xf2, 0x97, 0xfe, 0x0a, 0x74, 0xdc, 0xd3, + 0xed, 0xc3, 0x8e, 0x45, 0xff, 0x6e, 0xad, 0x8a, + 0x05, 0xfb, 0x75, 0xbc, 0xbe, 0x1d, 0x98, 0x81, + 0x92, 0x5b, 0xcf, 0x8e, 0x00, 0x99, 0xf1, 0x54, + 0xe2, 0x09, 0x1e, 0x96, 0xb9, 0xea, 0x8f, 0x5e, + 0x70, 0x86, 0xad, 0x4a, 0xfa, 0x5b, 0xcf, 0x7a, + 0xae, 0x2d, 0x7e, 0x25, 0x56, 0xc3, 0x4c, 0xbf, + 0x41, 0x3a, 0xdf, 0xbc, 0x3d, 0x0e, 0x32, 0x9e, + 0xcd, 0xb3, 0x20, 0xd1, 0x1f, 0x0c, 0x5a, 0xc9, + 0xb4, 0x2a, 0xeb, 0xa2, 0x6e, 0x78, 0x52, 0x2b, + 0xa1, 0x2b, 0xfb, 0x20, 0x54, 0xd9, 0xfc, 0x5b, + 0xa1, 0x40, 0xd7, 0x99, 0xa7, 0x57, 0xb5, 0x8d, + 0xb2, 0x53, 0x7c, 0x09, 0x50, 0x53, 0x77, 0x0a, + 0x6b, 0x83, 0xb5, 0xcc, 0x01, 0xae, 0xd5, 0x37, + 0xdd, 0x1c, 0xf2, 0x6c, 0x15, 0x94, 0x77, 0x2f, + 0xaf, 0xc5, 0xdf, 0x17, 0xa8, 0x95, 0xd3, 0xe3, + 0xa2, 0xeb, 0xf9, 0x8e, 0xaf, 0xb7, 0x7f, 0xc8, + 0x08, 0x4c, 0x39, 0xbf, 0x4f, 0x88, 0xb8, 0x7f, + 0x2d, 0xce, 0x3f, 0x8b, 0x22, 0x27, 0x38, 0xcf, + 0x95, 0x3a, 0xa8, 0xef, 0x77, 0x2c, 0x1f, 0xd2, + 0xed, 0x11, 0x76, 0x8c, 0x0a, 0x5e, 0x0d, 0xe2, + 0x2f, 0x8d, 0x3a, 0x07, 0x75, 0xf7, 0x96, 0xc5, + 0xfb, 0x71, 0xf6, 0x7a, 0x61, 0xfd, 0xeb, 0xec, + 0x37, 0xff, 0x00, 0xaa, 0x08, 0xe3, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2688,6 +1383,118 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, + 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2d, + 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, + 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x9c, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x58, 0xcb, 0x72, 0xd3, 0x30, + 0x14, 0xdd, 0xf7, 0x2b, 0x84, 0xb6, 0x8c, 0x9b, + 0x47, 0x43, 0xa7, 0xc3, 0x24, 0xee, 0xd0, 0x81, + 0xc2, 0x82, 0x15, 0xb4, 0xc3, 0xd2, 0x73, 0x2d, + 0xdd, 0xc4, 0xa2, 0x8a, 0x64, 0x24, 0x39, 0x8f, + 0xbf, 0x47, 0xb6, 0x93, 0x34, 0x89, 0x53, 0x3b, + 0x0d, 0x25, 0x2d, 0x4c, 0x77, 0xb6, 0x7c, 0x24, + 0xdd, 0x7b, 0xce, 0x7d, 0xc8, 0xea, 0x5f, 0xce, + 0xc6, 0x92, 0x4c, 0xd0, 0x58, 0xa1, 0xd5, 0x80, + 0x76, 0x4e, 0xdb, 0x94, 0xa0, 0x62, 0x9a, 0x0b, + 0x35, 0x1a, 0xd0, 0xdb, 0x9b, 0xeb, 0xe0, 0x82, + 0x5e, 0x86, 0x27, 0x7d, 0xa1, 0x1c, 0x9a, 0x21, + 0x30, 0x0c, 0xfb, 0x6f, 0x82, 0x80, 0xac, 0x5e, + 0x03, 0x83, 0xbf, 0x32, 0x61, 0xd0, 0x92, 0x91, + 0xbb, 0x7b, 0x4b, 0xce, 0x4e, 0xdb, 0x24, 0x08, + 0xc2, 0xbe, 0x8e, 0x7f, 0x22, 0x73, 0x84, 0x49, + 0xb0, 0x76, 0x40, 0x3f, 0xbb, 0xbb, 0x8f, 0x02, + 0xa4, 0x1e, 0x51, 0x22, 0xf8, 0x80, 0x2e, 0xd7, + 0x8f, 0x78, 0x39, 0x18, 0xf6, 0x53, 0xa3, 0x53, + 0x34, 0x6e, 0x4e, 0x14, 0x8c, 0x71, 0x40, 0x19, + 0xa8, 0x68, 0xa8, 0x59, 0x66, 0x69, 0x78, 0x0d, + 0xd2, 0x62, 0xbf, 0xb5, 0x04, 0x54, 0xa0, 0xb1, + 0x36, 0x1c, 0x4d, 0x34, 0x15, 0xdc, 0x25, 0x34, + 0x6c, 0xd7, 0x20, 0x8d, 0x96, 0x48, 0x43, 0x4c, + 0x45, 0x9a, 0x80, 0x9a, 0x07, 0x4b, 0x23, 0x02, + 0x96, 0x68, 0x6d, 0xd1, 0xd4, 0xcc, 0x1c, 0x6b, + 0x0e, 0x92, 0x86, 0x37, 0x26, 0xab, 0xb3, 0x84, + 0xe3, 0x10, 0x32, 0xe9, 0x96, 0xa6, 0xf4, 0xda, + 0xed, 0x3d, 0xc0, 0x09, 0x8a, 0x51, 0xe2, 0x3c, + 0xba, 0x5b, 0x87, 0x76, 0xf3, 0x14, 0xa3, 0xc4, + 0x73, 0x4e, 0xc3, 0x92, 0xb2, 0x75, 0x2c, 0x4b, + 0x84, 0xe4, 0x24, 0x87, 0x78, 0xa0, 0x70, 0x12, + 0x63, 0x30, 0x74, 0x87, 0x02, 0x5f, 0x10, 0x3c, + 0x53, 0x57, 0xfe, 0x63, 0x21, 0x42, 0x52, 0xbc, + 0x96, 0xd8, 0xed, 0xed, 0xf2, 0x55, 0x28, 0x71, + 0x06, 0x94, 0x95, 0xe0, 0x20, 0x96, 0x7e, 0x70, + 0x8e, 0x5e, 0x8d, 0x1b, 0x9c, 0x39, 0xf2, 0x69, + 0xc1, 0x5c, 0x8d, 0xc1, 0x13, 0x61, 0x45, 0x9c, + 0xd3, 0xdd, 0xc0, 0xd9, 0x23, 0x84, 0xb6, 0x89, + 0x9e, 0x06, 0x4c, 0x7a, 0xa9, 0x82, 0x38, 0x73, + 0x4e, 0xab, 0xea, 0xe2, 0xad, 0xd2, 0x67, 0xff, + 0x50, 0x70, 0xb2, 0xa4, 0xa6, 0x88, 0x55, 0x05, + 0x32, 0x28, 0x5e, 0xbd, 0x71, 0xb1, 0x9e, 0xed, + 0x22, 0xe8, 0xca, 0x0f, 0x17, 0xd4, 0x94, 0x1c, + 0x07, 0x39, 0xee, 0xac, 0x4d, 0x8f, 0xe1, 0x9c, + 0x36, 0x02, 0x95, 0x03, 0x27, 0x72, 0xb7, 0x7c, + 0x32, 0x3a, 0xc1, 0x40, 0xd6, 0x91, 0x91, 0x02, + 0xf3, 0x0a, 0xd0, 0xb0, 0x5b, 0x8d, 0x84, 0x6d, + 0x77, 0x81, 0xe5, 0xcb, 0x46, 0x60, 0x10, 0x76, + 0x7a, 0x5d, 0x90, 0xb9, 0xed, 0xfb, 0xda, 0xa4, + 0x5a, 0x0a, 0x9a, 0x1c, 0x7b, 0x04, 0x07, 0x12, + 0xe6, 0x3a, 0x73, 0x91, 0x75, 0xf3, 0x22, 0x4f, + 0x15, 0xdf, 0x29, 0xad, 0x77, 0xfc, 0xce, 0x7b, + 0x5e, 0x99, 0x8d, 0xb3, 0x14, 0x14, 0x6f, 0xde, + 0x65, 0x28, 0x64, 0x73, 0x2a, 0xe7, 0x9b, 0x44, + 0x79, 0x46, 0x55, 0xec, 0xd8, 0x06, 0x6a, 0x2b, + 0x4a, 0xd1, 0x36, 0xd2, 0xb7, 0xb5, 0xb2, 0x72, + 0x23, 0x12, 0xeb, 0x62, 0x2e, 0x0f, 0xb6, 0x4e, + 0xaf, 0x77, 0x94, 0x68, 0xdb, 0xac, 0x99, 0xef, + 0xfe, 0x46, 0x5c, 0x76, 0x2e, 0x2a, 0x81, 0xd9, + 0xec, 0xfd, 0xc5, 0xcb, 0xce, 0xb5, 0xf3, 0x7d, + 0x5c, 0xfa, 0x06, 0x5c, 0xe8, 0x32, 0xa7, 0x4a, + 0xd7, 0x20, 0x73, 0x7a, 0xec, 0x77, 0x63, 0xd1, + 0xb2, 0x6c, 0x6d, 0x6f, 0x90, 0x59, 0x8c, 0x96, + 0xf9, 0x96, 0xa6, 0x08, 0xbe, 0xec, 0xb2, 0x3d, + 0x52, 0xeb, 0x00, 0x6a, 0x1a, 0x90, 0x06, 0x19, + 0x8a, 0x09, 0xda, 0x68, 0xd1, 0x9d, 0x9a, 0x6d, + 0xc8, 0x4d, 0xcf, 0x94, 0x0f, 0x26, 0x29, 0x54, + 0xb3, 0x25, 0x09, 0x48, 0x31, 0xf2, 0x04, 0x58, + 0x07, 0xc6, 0xd5, 0x35, 0x47, 0x03, 0xd3, 0x48, + 0x28, 0xee, 0x85, 0x71, 0xda, 0x54, 0x97, 0x7d, + 0x88, 0xfb, 0xaf, 0x10, 0xa3, 0x2c, 0x59, 0x97, + 0xf9, 0x63, 0xf7, 0x28, 0xf1, 0x24, 0xcb, 0x5d, + 0x77, 0x74, 0xcb, 0xe8, 0xc3, 0x52, 0xfb, 0xc3, + 0x29, 0x04, 0xe7, 0x8c, 0xf0, 0x91, 0x83, 0x76, + 0xed, 0x79, 0x31, 0x75, 0x5a, 0x1e, 0x1e, 0xc8, + 0x04, 0x64, 0x56, 0xa4, 0xb5, 0xe4, 0xb4, 0xe5, + 0x6b, 0xce, 0xfa, 0x9c, 0x4a, 0x4f, 0x7c, 0xe2, + 0x4a, 0xda, 0x84, 0xfa, 0xe3, 0x0a, 0xb9, 0x2d, + 0x6a, 0xa7, 0xdb, 0x3b, 0x3f, 0x8a, 0xae, 0xfb, + 0x46, 0xeb, 0x18, 0xcc, 0x48, 0xa8, 0xa8, 0x80, + 0xd5, 0x57, 0xd3, 0x87, 0x23, 0xe5, 0xd6, 0x22, + 0x71, 0x09, 0xae, 0x4e, 0xde, 0xc4, 0xa6, 0xc8, + 0xc4, 0x50, 0x20, 0x27, 0xf1, 0xbc, 0xf8, 0xc2, + 0xbd, 0xd1, 0x63, 0x5f, 0xb7, 0x6a, 0x96, 0x9f, + 0x1a, 0x48, 0x6b, 0x0e, 0x45, 0xc7, 0xe9, 0x9c, + 0x2b, 0xb9, 0x3b, 0xf5, 0x72, 0xff, 0x6b, 0x61, + 0xb8, 0x6a, 0x55, 0x63, 0x50, 0x19, 0xc8, 0x68, + 0x71, 0x88, 0xfc, 0xef, 0xda, 0xd5, 0xc2, 0xbd, + 0xd7, 0x5e, 0xf5, 0x44, 0xbd, 0x6a, 0x0b, 0x3e, + 0x32, 0x3a, 0xf3, 0x49, 0xba, 0x7d, 0x28, 0x38, + 0xa4, 0xbb, 0x75, 0x9e, 0xbb, 0xbb, 0xe5, 0x45, + 0x0b, 0x08, 0x17, 0xc3, 0x21, 0x1a, 0x1f, 0xa2, + 0xab, 0xe2, 0xf5, 0xfe, 0xb5, 0xdb, 0x1d, 0x5c, + 0x66, 0xbe, 0x33, 0xa3, 0xa5, 0x44, 0xfe, 0xc3, + 0x87, 0x94, 0x9e, 0x96, 0x6a, 0xdb, 0xc5, 0x98, + 0x3f, 0xb0, 0x17, 0x83, 0x47, 0xc8, 0xae, 0xa4, + 0xdc, 0x33, 0x06, 0x13, 0xa5, 0x5a, 0x0a, 0x36, + 0xa7, 0xa1, 0xc2, 0x49, 0xed, 0x25, 0x89, 0x4d, + 0xc0, 0x1b, 0xb7, 0xf8, 0x6b, 0x12, 0xaa, 0xae, + 0x61, 0xfa, 0x6e, 0xc9, 0xb4, 0xff, 0x4b, 0x55, + 0xf7, 0xf7, 0x1f, 0x67, 0x9b, 0xb7, 0x25, 0x0b, + 0x7a, 0x52, 0x09, 0x0c, 0x13, 0x2f, 0x34, 0x9a, + 0xd6, 0x01, 0x9a, 0x36, 0x38, 0xf9, 0x4c, 0x0d, + 0xed, 0x65, 0x5a, 0xf5, 0x4c, 0xdd, 0xbf, 0x3a, + 0x70, 0x7f, 0xd1, 0x78, 0xf2, 0x1b, 0xd1, 0x62, + 0x93, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -2709,9 +1516,17 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x69, - 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, - 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, + 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2f, + 0x0d, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x12, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, + 0x11, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x0f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, + 0x6f, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0xfd, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, @@ -3676,210 +2491,264 @@ 0xaa, 0xed, 0x1a, 0x26, 0x7c, 0xd7, 0xaa, 0xeb, 0x76, 0x31, 0x18, 0xd8, 0xe1, 0x14, 0xbc, 0x54, 0x35, 0x97, 0x50, 0x21, 0x4a, 0x62, 0x00, 0x00, - 0x10, 0xd6, 0xc3, 0x27, 0x08, 0xc9, 0xb1, 0xb2, - 0x1b, 0x41, 0x86, 0xc1, 0x4c, 0x09, 0x75, 0x5e, - 0xd7, 0xdf, 0xbb, 0x2f, 0x51, 0xa9, 0xc7, 0x43, - 0x20, 0x10, 0xb0, 0x65, 0x82, 0x62, 0xe9, 0x0a, - 0xca, 0xa4, 0xad, 0x2f, 0xbb, 0x5f, 0x02, 0x03, - 0x3b, 0xa4, 0xa0, 0x86, 0x26, 0x57, 0xd3, 0xce, - 0x52, 0xf4, 0x57, 0x32, 0x03, 0x00, 0x32, 0x33, - 0x41, 0x32, 0x4d, 0x5a, 0x39, 0x1f, 0x07, 0x13, - 0x60, 0x7c, 0x04, 0xc2, 0x73, 0x82, 0x39, 0x3c, - 0x34, 0x24, 0x37, 0x97, 0x7b, 0x66, 0x08, 0x06, - 0x83, 0x53, 0xab, 0xab, 0xc5, 0x72, 0x49, 0xd4, - 0x04, 0xc6, 0xc5, 0x96, 0xa2, 0x74, 0x8d, 0xc2, - 0x78, 0xd3, 0x61, 0x63, 0x7f, 0x29, 0xfe, 0xf2, - 0x47, 0x28, 0xa9, 0x01, 0x00, 0xd9, 0x35, 0x81, - 0x48, 0x6e, 0x40, 0x65, 0x7c, 0xfb, 0x86, 0x01, - 0x6c, 0x65, 0x50, 0x8c, 0x08, 0x5b, 0x39, 0x29, - 0xb6, 0x67, 0x4b, 0xab, 0x99, 0xfd, 0x91, 0x14, - 0x89, 0x44, 0x8e, 0x25, 0x87, 0x3c, 0x95, 0x19, - 0x8b, 0xb3, 0x39, 0x79, 0x16, 0xc3, 0x4a, 0x79, - 0x7b, 0xf3, 0x6c, 0x22, 0xe9, 0xb8, 0xd0, 0xea, - 0x33, 0x7f, 0x3c, 0x25, 0x37, 0x00, 0x20, 0xf3, - 0x76, 0x90, 0x92, 0x43, 0x4f, 0x97, 0xfa, 0x15, - 0xd1, 0x24, 0x43, 0xc8, 0x94, 0x56, 0x7b, 0x07, - 0xc0, 0x2e, 0x10, 0x06, 0xb2, 0x65, 0x56, 0x06, - 0x46, 0x8a, 0x2d, 0x64, 0x53, 0xae, 0xd7, 0x32, - 0xa1, 0x36, 0x9b, 0x7b, 0x77, 0x1e, 0x32, 0x51, - 0x49, 0x27, 0xc3, 0x42, 0x1e, 0xbe, 0x52, 0x41, - 0xc0, 0x7a, 0xbb, 0xa8, 0xbe, 0xb4, 0x1c, 0xfe, - 0x08, 0x65, 0x31, 0x00, 0x20, 0xf3, 0x7c, 0x9c, - 0x39, 0x6b, 0xda, 0x7d, 0x4c, 0x74, 0x0b, 0x2a, - 0x72, 0x82, 0xf8, 0xb9, 0x80, 0x89, 0xf9, 0x81, - 0xbe, 0xde, 0x7d, 0xb7, 0x97, 0x6b, 0x9d, 0x53, - 0x36, 0x03, 0x18, 0x21, 0xbb, 0x6d, 0xbc, 0x16, - 0xe6, 0xc3, 0xce, 0xff, 0xbb, 0xd2, 0xcb, 0xcc, - 0xab, 0xcc, 0xee, 0xf0, 0xa9, 0x52, 0x76, 0x03, - 0x00, 0x32, 0x8e, 0x9f, 0x64, 0x97, 0xcf, 0x00, - 0x5c, 0x34, 0xff, 0xfd, 0x9f, 0x01, 0x00, 0xda, - 0xc2, 0x29, 0x71, 0x89, 0x91, 0x84, 0x15, 0x66, - 0x29, 0x6b, 0xcd, 0xa0, 0x11, 0x7c, 0x3e, 0xdf, - 0x07, 0x0e, 0x51, 0x75, 0x1e, 0x31, 0xaf, 0xc1, - 0xe7, 0xf0, 0x74, 0xaf, 0x84, 0x30, 0x31, 0xaf, - 0x71, 0x88, 0xaa, 0xf3, 0x26, 0x43, 0xf9, 0xc0, - 0x24, 0xcd, 0x00, 0xa3, 0xc9, 0x7a, 0x16, 0x3d, - 0x8c, 0x12, 0xb9, 0x97, 0x7d, 0x8e, 0x78, 0x9b, - 0x24, 0xdd, 0x68, 0xc4, 0x99, 0xa3, 0x14, 0x4c, - 0xca, 0x0c, 0x30, 0x9a, 0x86, 0x86, 0xa6, 0x2e, - 0x87, 0xa8, 0x3e, 0x93, 0x89, 0x6e, 0x45, 0x09, - 0xbc, 0x8d, 0x3f, 0x07, 0xec, 0x63, 0xa2, 0x5b, - 0x1d, 0xa2, 0xfa, 0xcc, 0xc9, 0x56, 0x3e, 0x50, - 0x81, 0x19, 0x60, 0x34, 0xb1, 0x58, 0xf0, 0x4b, - 0x92, 0xec, 0x0f, 0x95, 0x22, 0xee, 0xe0, 0x48, - 0x84, 0x99, 0x36, 0x08, 0x4e, 0xdd, 0xd4, 0xd0, - 0xd0, 0xf2, 0x87, 0x4a, 0xc9, 0x50, 0x51, 0x03, - 0x18, 0x21, 0x9a, 0xd0, 0x7c, 0x00, 0xbe, 0x8f, - 0x12, 0x84, 0xa1, 0x1d, 0x21, 0xbc, 0x02, 0xe0, - 0x07, 0x5e, 0xb7, 0x3f, 0x52, 0x69, 0x41, 0x0e, - 0x0b, 0x03, 0x18, 0x21, 0xda, 0xa9, 0x9d, 0x07, - 0xc6, 0x1d, 0x00, 0xbc, 0x95, 0x96, 0xa5, 0x4c, - 0x44, 0x41, 0xb8, 0xc7, 0x5b, 0xef, 0xdf, 0x54, - 0x69, 0x41, 0x46, 0x38, 0xac, 0x0c, 0x60, 0x84, - 0x8e, 0x44, 0xc7, 0x42, 0x01, 0x79, 0x07, 0x80, - 0xf3, 0x71, 0xe4, 0x6f, 0x22, 0x31, 0x80, 0x97, - 0x24, 0xc4, 0x3d, 0xf9, 0x42, 0xb4, 0x2b, 0xc9, - 0x61, 0x69, 0x00, 0x23, 0x24, 0x12, 0xa1, 0xe3, - 0x25, 0xe8, 0x8a, 0x6c, 0x9d, 0x01, 0x4b, 0xd5, - 0x31, 0x2a, 0xc0, 0x76, 0x02, 0x9e, 0x14, 0xe0, - 0x75, 0xb9, 0x32, 0x73, 0x1c, 0x2e, 0x1c, 0xd6, - 0x06, 0x30, 0x9a, 0x98, 0xae, 0x9d, 0x23, 0x25, - 0xae, 0x24, 0x60, 0x25, 0x0e, 0xdf, 0x5d, 0xc5, - 0x5e, 0x06, 0x9e, 0x15, 0x02, 0x4f, 0x36, 0xb8, - 0xfc, 0x56, 0x52, 0xf0, 0x4f, 0x1a, 0x47, 0x8c, - 0x01, 0x8c, 0x10, 0x08, 0x04, 0x9c, 0x75, 0xb3, - 0x6b, 0x96, 0x02, 0x70, 0x13, 0xc3, 0x93, 0xf5, - 0xab, 0x37, 0xed, 0xdb, 0x68, 0x91, 0x14, 0x18, - 0x6f, 0x64, 0x73, 0xef, 0x26, 0xfa, 0x7b, 0x06, - 0xbb, 0xcc, 0x94, 0xc9, 0xa2, 0xa8, 0xb7, 0x00, - 0x00, 0x00, 0x6e, 0x49, 0x44, 0x41, 0x54, 0x93, - 0xab, 0x24, 0x47, 0x9c, 0x01, 0x8c, 0x47, 0xd3, - 0xb4, 0x5a, 0x9b, 0x93, 0x97, 0x83, 0xc8, 0x43, - 0x8c, 0x73, 0x40, 0x98, 0x0f, 0x60, 0x66, 0x99, - 0x86, 0xeb, 0x03, 0x63, 0x1b, 0x13, 0x7e, 0x0b, - 0xe6, 0x78, 0x7a, 0x98, 0x36, 0x8f, 0x64, 0xdd, - 0x3e, 0x52, 0x39, 0xe2, 0x0d, 0x20, 0x17, 0xda, - 0xcb, 0xda, 0x51, 0xf6, 0x14, 0x4e, 0x65, 0x60, - 0x3e, 0x01, 0xf3, 0xc1, 0x38, 0x09, 0x40, 0x2d, - 0x03, 0xd3, 0x09, 0xa8, 0xc5, 0x67, 0xc7, 0xbe, - 0xd3, 0xb3, 0x97, 0xec, 0x05, 0x61, 0x00, 0x8c, - 0x01, 0x06, 0x06, 0xb2, 0xd5, 0x54, 0x07, 0x40, - 0x78, 0x97, 0x81, 0x6d, 0x04, 0x6c, 0x4b, 0xd9, - 0xb1, 0xdd, 0x68, 0x64, 0xf2, 0x91, 0xc0, 0xff, - 0x07, 0x05, 0x08, 0x61, 0x1f, 0xce, 0x99, 0xa8, - 0xde, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, - 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, - 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, 0x6e, 0x63, - 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, - 0x9c, 0x14, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xed, 0x58, 0xcb, 0x72, 0xd3, 0x30, - 0x14, 0xdd, 0xf7, 0x2b, 0x84, 0xb6, 0x8c, 0x9b, - 0x47, 0x43, 0xa7, 0xc3, 0x24, 0xee, 0xd0, 0x81, - 0xc2, 0x82, 0x15, 0xb4, 0xc3, 0xd2, 0x73, 0x2d, - 0xdd, 0xc4, 0xa2, 0x8a, 0x64, 0x24, 0x39, 0x8f, - 0xbf, 0x47, 0xb6, 0x93, 0x34, 0x89, 0x53, 0x3b, - 0x0d, 0x25, 0x2d, 0x4c, 0x77, 0xb6, 0x7c, 0x24, - 0xdd, 0x7b, 0xce, 0x7d, 0xc8, 0xea, 0x5f, 0xce, - 0xc6, 0x92, 0x4c, 0xd0, 0x58, 0xa1, 0xd5, 0x80, - 0x76, 0x4e, 0xdb, 0x94, 0xa0, 0x62, 0x9a, 0x0b, - 0x35, 0x1a, 0xd0, 0xdb, 0x9b, 0xeb, 0xe0, 0x82, - 0x5e, 0x86, 0x27, 0x7d, 0xa1, 0x1c, 0x9a, 0x21, - 0x30, 0x0c, 0xfb, 0x6f, 0x82, 0x80, 0xac, 0x5e, - 0x03, 0x83, 0xbf, 0x32, 0x61, 0xd0, 0x92, 0x91, - 0xbb, 0x7b, 0x4b, 0xce, 0x4e, 0xdb, 0x24, 0x08, - 0xc2, 0xbe, 0x8e, 0x7f, 0x22, 0x73, 0x84, 0x49, - 0xb0, 0x76, 0x40, 0x3f, 0xbb, 0xbb, 0x8f, 0x02, - 0xa4, 0x1e, 0x51, 0x22, 0xf8, 0x80, 0x2e, 0xd7, - 0x8f, 0x78, 0x39, 0x18, 0xf6, 0x53, 0xa3, 0x53, - 0x34, 0x6e, 0x4e, 0x14, 0x8c, 0x71, 0x40, 0x19, - 0xa8, 0x68, 0xa8, 0x59, 0x66, 0x69, 0x78, 0x0d, - 0xd2, 0x62, 0xbf, 0xb5, 0x04, 0x54, 0xa0, 0xb1, - 0x36, 0x1c, 0x4d, 0x34, 0x15, 0xdc, 0x25, 0x34, - 0x6c, 0xd7, 0x20, 0x8d, 0x96, 0x48, 0x43, 0x4c, - 0x45, 0x9a, 0x80, 0x9a, 0x07, 0x4b, 0x23, 0x02, - 0x96, 0x68, 0x6d, 0xd1, 0xd4, 0xcc, 0x1c, 0x6b, - 0x0e, 0x92, 0x86, 0x37, 0x26, 0xab, 0xb3, 0x84, - 0xe3, 0x10, 0x32, 0xe9, 0x96, 0xa6, 0xf4, 0xda, - 0xed, 0x3d, 0xc0, 0x09, 0x8a, 0x51, 0xe2, 0x3c, - 0xba, 0x5b, 0x87, 0x76, 0xf3, 0x14, 0xa3, 0xc4, - 0x73, 0x4e, 0xc3, 0x92, 0xb2, 0x75, 0x2c, 0x4b, - 0x84, 0xe4, 0x24, 0x87, 0x78, 0xa0, 0x70, 0x12, - 0x63, 0x30, 0x74, 0x87, 0x02, 0x5f, 0x10, 0x3c, - 0x53, 0x57, 0xfe, 0x63, 0x21, 0x42, 0x52, 0xbc, - 0x96, 0xd8, 0xed, 0xed, 0xf2, 0x55, 0x28, 0x71, - 0x06, 0x94, 0x95, 0xe0, 0x20, 0x96, 0x7e, 0x70, - 0x8e, 0x5e, 0x8d, 0x1b, 0x9c, 0x39, 0xf2, 0x69, - 0xc1, 0x5c, 0x8d, 0xc1, 0x13, 0x61, 0x45, 0x9c, - 0xd3, 0xdd, 0xc0, 0xd9, 0x23, 0x84, 0xb6, 0x89, - 0x9e, 0x06, 0x4c, 0x7a, 0xa9, 0x82, 0x38, 0x73, - 0x4e, 0xab, 0xea, 0xe2, 0xad, 0xd2, 0x67, 0xff, - 0x50, 0x70, 0xb2, 0xa4, 0xa6, 0x88, 0x55, 0x05, - 0x32, 0x28, 0x5e, 0xbd, 0x71, 0xb1, 0x9e, 0xed, - 0x22, 0xe8, 0xca, 0x0f, 0x17, 0xd4, 0x94, 0x1c, - 0x07, 0x39, 0xee, 0xac, 0x4d, 0x8f, 0xe1, 0x9c, - 0x36, 0x02, 0x95, 0x03, 0x27, 0x72, 0xb7, 0x7c, - 0x32, 0x3a, 0xc1, 0x40, 0xd6, 0x91, 0x91, 0x02, - 0xf3, 0x0a, 0xd0, 0xb0, 0x5b, 0x8d, 0x84, 0x6d, - 0x77, 0x81, 0xe5, 0xcb, 0x46, 0x60, 0x10, 0x76, - 0x7a, 0x5d, 0x90, 0xb9, 0xed, 0xfb, 0xda, 0xa4, - 0x5a, 0x0a, 0x9a, 0x1c, 0x7b, 0x04, 0x07, 0x12, - 0xe6, 0x3a, 0x73, 0x91, 0x75, 0xf3, 0x22, 0x4f, - 0x15, 0xdf, 0x29, 0xad, 0x77, 0xfc, 0xce, 0x7b, - 0x5e, 0x99, 0x8d, 0xb3, 0x14, 0x14, 0x6f, 0xde, - 0x65, 0x28, 0x64, 0x73, 0x2a, 0xe7, 0x9b, 0x44, - 0x79, 0x46, 0x55, 0xec, 0xd8, 0x06, 0x6a, 0x2b, - 0x4a, 0xd1, 0x36, 0xd2, 0xb7, 0xb5, 0xb2, 0x72, - 0x23, 0x12, 0xeb, 0x62, 0x2e, 0x0f, 0xb6, 0x4e, - 0xaf, 0x77, 0x94, 0x68, 0xdb, 0xac, 0x99, 0xef, - 0xfe, 0x46, 0x5c, 0x76, 0x2e, 0x2a, 0x81, 0xd9, - 0xec, 0xfd, 0xc5, 0xcb, 0xce, 0xb5, 0xf3, 0x7d, - 0x5c, 0xfa, 0x06, 0x5c, 0xe8, 0x32, 0xa7, 0x4a, - 0xd7, 0x20, 0x73, 0x7a, 0xec, 0x77, 0x63, 0xd1, - 0xb2, 0x6c, 0x6d, 0x6f, 0x90, 0x59, 0x8c, 0x96, - 0xf9, 0x96, 0xa6, 0x08, 0xbe, 0xec, 0xb2, 0x3d, - 0x52, 0xeb, 0x00, 0x6a, 0x1a, 0x90, 0x06, 0x19, - 0x8a, 0x09, 0xda, 0x68, 0xd1, 0x9d, 0x9a, 0x6d, - 0xc8, 0x4d, 0xcf, 0x94, 0x0f, 0x26, 0x29, 0x54, - 0xb3, 0x25, 0x09, 0x48, 0x31, 0xf2, 0x04, 0x58, - 0x07, 0xc6, 0xd5, 0x35, 0x47, 0x03, 0xd3, 0x48, - 0x28, 0xee, 0x85, 0x71, 0xda, 0x54, 0x97, 0x7d, - 0x88, 0xfb, 0xaf, 0x10, 0xa3, 0x2c, 0x59, 0x97, - 0xf9, 0x63, 0xf7, 0x28, 0xf1, 0x24, 0xcb, 0x5d, - 0x77, 0x74, 0xcb, 0xe8, 0xc3, 0x52, 0xfb, 0xc3, - 0x29, 0x04, 0xe7, 0x8c, 0xf0, 0x91, 0x83, 0x76, - 0xed, 0x79, 0x31, 0x75, 0x5a, 0x1e, 0x1e, 0xc8, - 0x04, 0x64, 0x56, 0xa4, 0xb5, 0xe4, 0xb4, 0xe5, - 0x6b, 0xce, 0xfa, 0x9c, 0x4a, 0x4f, 0x7c, 0xe2, - 0x4a, 0xda, 0x84, 0xfa, 0xe3, 0x0a, 0xb9, 0x2d, - 0x6a, 0xa7, 0xdb, 0x3b, 0x3f, 0x8a, 0xae, 0xfb, - 0x46, 0xeb, 0x18, 0xcc, 0x48, 0xa8, 0xa8, 0x80, - 0xd5, 0x57, 0xd3, 0x87, 0x23, 0xe5, 0xd6, 0x22, - 0x71, 0x09, 0xae, 0x4e, 0xde, 0xc4, 0xa6, 0xc8, - 0xc4, 0x50, 0x20, 0x27, 0xf1, 0xbc, 0xf8, 0xc2, - 0xbd, 0xd1, 0x63, 0x5f, 0xb7, 0x6a, 0x96, 0x9f, - 0x1a, 0x48, 0x6b, 0x0e, 0x45, 0xc7, 0xe9, 0x9c, - 0x2b, 0xb9, 0x3b, 0xf5, 0x72, 0xff, 0x6b, 0x61, - 0xb8, 0x6a, 0x55, 0x63, 0x50, 0x19, 0xc8, 0x68, - 0x71, 0x88, 0xfc, 0xef, 0xda, 0xd5, 0xc2, 0xbd, - 0xd7, 0x5e, 0xf5, 0x44, 0xbd, 0x6a, 0x0b, 0x3e, - 0x32, 0x3a, 0xf3, 0x49, 0xba, 0x7d, 0x28, 0x38, - 0xa4, 0xbb, 0x75, 0x9e, 0xbb, 0xbb, 0xe5, 0x45, - 0x0b, 0x08, 0x17, 0xc3, 0x21, 0x1a, 0x1f, 0xa2, - 0xab, 0xe2, 0xf5, 0xfe, 0xb5, 0xdb, 0x1d, 0x5c, - 0x66, 0xbe, 0x33, 0xa3, 0xa5, 0x44, 0xfe, 0xc3, - 0x87, 0x94, 0x9e, 0x96, 0x6a, 0xdb, 0xc5, 0x98, - 0x3f, 0xb0, 0x17, 0x83, 0x47, 0xc8, 0xae, 0xa4, - 0xdc, 0x33, 0x06, 0x13, 0xa5, 0x5a, 0x0a, 0x36, - 0xa7, 0xa1, 0xc2, 0x49, 0xed, 0x25, 0x89, 0x4d, - 0xc0, 0x1b, 0xb7, 0xf8, 0x6b, 0x12, 0xaa, 0xae, - 0x61, 0xfa, 0x6e, 0xc9, 0xb4, 0xff, 0x4b, 0x55, - 0xf7, 0xf7, 0x1f, 0x67, 0x9b, 0xb7, 0x25, 0x0b, - 0x7a, 0x52, 0x09, 0x0c, 0x13, 0x2f, 0x34, 0x9a, - 0xd6, 0x01, 0x9a, 0x36, 0x38, 0xf9, 0x4c, 0x0d, - 0xed, 0x65, 0x5a, 0xf5, 0x4c, 0xdd, 0xbf, 0x3a, - 0x70, 0x7f, 0xd1, 0x78, 0xf2, 0x1b, 0xd1, 0x62, - 0x93, 0xea, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0xd6, 0xc3, 0x27, 0x08, 0xc9, 0xb1, 0xb2, + 0x1b, 0x41, 0x86, 0xc1, 0x4c, 0x09, 0x75, 0x5e, + 0xd7, 0xdf, 0xbb, 0x2f, 0x51, 0xa9, 0xc7, 0x43, + 0x20, 0x10, 0xb0, 0x65, 0x82, 0x62, 0xe9, 0x0a, + 0xca, 0xa4, 0xad, 0x2f, 0xbb, 0x5f, 0x02, 0x03, + 0x3b, 0xa4, 0xa0, 0x86, 0x26, 0x57, 0xd3, 0xce, + 0x52, 0xf4, 0x57, 0x32, 0x03, 0x00, 0x32, 0x33, + 0x41, 0x32, 0x4d, 0x5a, 0x39, 0x1f, 0x07, 0x13, + 0x60, 0x7c, 0x04, 0xc2, 0x73, 0x82, 0x39, 0x3c, + 0x34, 0x24, 0x37, 0x97, 0x7b, 0x66, 0x08, 0x06, + 0x83, 0x53, 0xab, 0xab, 0xc5, 0x72, 0x49, 0xd4, + 0x04, 0xc6, 0xc5, 0x96, 0xa2, 0x74, 0x8d, 0xc2, + 0x78, 0xd3, 0x61, 0x63, 0x7f, 0x29, 0xfe, 0xf2, + 0x47, 0x28, 0xa9, 0x01, 0x00, 0xd9, 0x35, 0x81, + 0x48, 0x6e, 0x40, 0x65, 0x7c, 0xfb, 0x86, 0x01, + 0x6c, 0x65, 0x50, 0x8c, 0x08, 0x5b, 0x39, 0x29, + 0xb6, 0x67, 0x4b, 0xab, 0x99, 0xfd, 0x91, 0x14, + 0x89, 0x44, 0x8e, 0x25, 0x87, 0x3c, 0x95, 0x19, + 0x8b, 0xb3, 0x39, 0x79, 0x16, 0xc3, 0x4a, 0x79, + 0x7b, 0xf3, 0x6c, 0x22, 0xe9, 0xb8, 0xd0, 0xea, + 0x33, 0x7f, 0x3c, 0x25, 0x37, 0x00, 0x20, 0xf3, + 0x76, 0x90, 0x92, 0x43, 0x4f, 0x97, 0xfa, 0x15, + 0xd1, 0x24, 0x43, 0xc8, 0x94, 0x56, 0x7b, 0x07, + 0xc0, 0x2e, 0x10, 0x06, 0xb2, 0x65, 0x56, 0x06, + 0x46, 0x8a, 0x2d, 0x64, 0x53, 0xae, 0xd7, 0x32, + 0xa1, 0x36, 0x9b, 0x7b, 0x77, 0x1e, 0x32, 0x51, + 0x49, 0x27, 0xc3, 0x42, 0x1e, 0xbe, 0x52, 0x41, + 0xc0, 0x7a, 0xbb, 0xa8, 0xbe, 0xb4, 0x1c, 0xfe, + 0x08, 0x65, 0x31, 0x00, 0x20, 0xf3, 0x7c, 0x9c, + 0x39, 0x6b, 0xda, 0x7d, 0x4c, 0x74, 0x0b, 0x2a, + 0x72, 0x82, 0xf8, 0xb9, 0x80, 0x89, 0xf9, 0x81, + 0xbe, 0xde, 0x7d, 0xb7, 0x97, 0x6b, 0x9d, 0x53, + 0x36, 0x03, 0x18, 0x21, 0xbb, 0x6d, 0xbc, 0x16, + 0xe6, 0xc3, 0xce, 0xff, 0xbb, 0xd2, 0xcb, 0xcc, + 0xab, 0xcc, 0xee, 0xf0, 0xa9, 0x52, 0x76, 0x03, + 0x00, 0x32, 0x8e, 0x9f, 0x64, 0x97, 0xcf, 0x00, + 0x5c, 0x34, 0xff, 0xfd, 0x9f, 0x01, 0x00, 0xda, + 0xc2, 0x29, 0x71, 0x89, 0x91, 0x84, 0x15, 0x66, + 0x29, 0x6b, 0xcd, 0xa0, 0x11, 0x7c, 0x3e, 0xdf, + 0x07, 0x0e, 0x51, 0x75, 0x1e, 0x31, 0xaf, 0xc1, + 0xe7, 0xf0, 0x74, 0xaf, 0x84, 0x30, 0x31, 0xaf, + 0x71, 0x88, 0xaa, 0xf3, 0x26, 0x43, 0xf9, 0xc0, + 0x24, 0xcd, 0x00, 0xa3, 0xc9, 0x7a, 0x16, 0x3d, + 0x8c, 0x12, 0xb9, 0x97, 0x7d, 0x8e, 0x78, 0x9b, + 0x24, 0xdd, 0x68, 0xc4, 0x99, 0xa3, 0x14, 0x4c, + 0xca, 0x0c, 0x30, 0x9a, 0x86, 0x86, 0xa6, 0x2e, + 0x87, 0xa8, 0x3e, 0x93, 0x89, 0x6e, 0x45, 0x09, + 0xbc, 0x8d, 0x3f, 0x07, 0xec, 0x63, 0xa2, 0x5b, + 0x1d, 0xa2, 0xfa, 0xcc, 0xc9, 0x56, 0x3e, 0x50, + 0x81, 0x19, 0x60, 0x34, 0xb1, 0x58, 0xf0, 0x4b, + 0x92, 0xec, 0x0f, 0x95, 0x22, 0xee, 0xe0, 0x48, + 0x84, 0x99, 0x36, 0x08, 0x4e, 0xdd, 0xd4, 0xd0, + 0xd0, 0xf2, 0x87, 0x4a, 0xc9, 0x50, 0x51, 0x03, + 0x18, 0x21, 0x9a, 0xd0, 0x7c, 0x00, 0xbe, 0x8f, + 0x12, 0x84, 0xa1, 0x1d, 0x21, 0xbc, 0x02, 0xe0, + 0x07, 0x5e, 0xb7, 0x3f, 0x52, 0x69, 0x41, 0x0e, + 0x0b, 0x03, 0x18, 0x21, 0xda, 0xa9, 0x9d, 0x07, + 0xc6, 0x1d, 0x00, 0xbc, 0x95, 0x96, 0xa5, 0x4c, + 0x44, 0x41, 0xb8, 0xc7, 0x5b, 0xef, 0xdf, 0x54, + 0x69, 0x41, 0x46, 0x38, 0xac, 0x0c, 0x60, 0x84, + 0x8e, 0x44, 0xc7, 0x42, 0x01, 0x79, 0x07, 0x80, + 0xf3, 0x71, 0xe4, 0x6f, 0x22, 0x31, 0x80, 0x97, + 0x24, 0xc4, 0x3d, 0xf9, 0x42, 0xb4, 0x2b, 0xc9, + 0x61, 0x69, 0x00, 0x23, 0x24, 0x12, 0xa1, 0xe3, + 0x25, 0xe8, 0x8a, 0x6c, 0x9d, 0x01, 0x4b, 0xd5, + 0x31, 0x2a, 0xc0, 0x76, 0x02, 0x9e, 0x14, 0xe0, + 0x75, 0xb9, 0x32, 0x73, 0x1c, 0x2e, 0x1c, 0xd6, + 0x06, 0x30, 0x9a, 0x98, 0xae, 0x9d, 0x23, 0x25, + 0xae, 0x24, 0x60, 0x25, 0x0e, 0xdf, 0x5d, 0xc5, + 0x5e, 0x06, 0x9e, 0x15, 0x02, 0x4f, 0x36, 0xb8, + 0xfc, 0x56, 0x52, 0xf0, 0x4f, 0x1a, 0x47, 0x8c, + 0x01, 0x8c, 0x10, 0x08, 0x04, 0x9c, 0x75, 0xb3, + 0x6b, 0x96, 0x02, 0x70, 0x13, 0xc3, 0x93, 0xf5, + 0xab, 0x37, 0xed, 0xdb, 0x68, 0x91, 0x14, 0x18, + 0x6f, 0x64, 0x73, 0xef, 0x26, 0xfa, 0x7b, 0x06, + 0xbb, 0xcc, 0x94, 0xc9, 0xa2, 0xa8, 0xb7, 0x00, + 0x00, 0x00, 0x6e, 0x49, 0x44, 0x41, 0x54, 0x93, + 0xab, 0x24, 0x47, 0x9c, 0x01, 0x8c, 0x47, 0xd3, + 0xb4, 0x5a, 0x9b, 0x93, 0x97, 0x83, 0xc8, 0x43, + 0x8c, 0x73, 0x40, 0x98, 0x0f, 0x60, 0x66, 0x99, + 0x86, 0xeb, 0x03, 0x63, 0x1b, 0x13, 0x7e, 0x0b, + 0xe6, 0x78, 0x7a, 0x98, 0x36, 0x8f, 0x64, 0xdd, + 0x3e, 0x52, 0x39, 0xe2, 0x0d, 0x20, 0x17, 0xda, + 0xcb, 0xda, 0x51, 0xf6, 0x14, 0x4e, 0x65, 0x60, + 0x3e, 0x01, 0xf3, 0xc1, 0x38, 0x09, 0x40, 0x2d, + 0x03, 0xd3, 0x09, 0xa8, 0xc5, 0x67, 0xc7, 0xbe, + 0xd3, 0xb3, 0x97, 0xec, 0x05, 0x61, 0x00, 0x8c, + 0x01, 0x06, 0x06, 0xb2, 0xd5, 0x54, 0x07, 0x40, + 0x78, 0x97, 0x81, 0x6d, 0x04, 0x6c, 0x4b, 0xd9, + 0xb1, 0xdd, 0x68, 0x64, 0xf2, 0x91, 0xc0, 0xff, + 0x07, 0x05, 0x08, 0x61, 0x1f, 0xce, 0x99, 0xa8, + 0xde, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, + 0x44, 0xae, 0x42, 0x60, 0x82, 0x00, 0x00, 0x28, + 0x75, 0x75, 0x61, 0x79, 0x29, 0x63, 0x6f, 0x6f, + 0x6b, 0x69, 0x65, 0x73, 0x2d, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, + 0x58, 0x15, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xcd, 0x58, 0x4b, 0x8f, 0xdb, 0x36, + 0x10, 0xbe, 0xe7, 0x57, 0xa8, 0xbc, 0x16, 0x5a, + 0xdb, 0x49, 0x13, 0xf4, 0x60, 0x2b, 0xd8, 0x47, + 0x93, 0x00, 0x2d, 0x50, 0x20, 0x76, 0x5b, 0xf4, + 0x44, 0xd0, 0xd2, 0xac, 0xc5, 0x9a, 0x26, 0x55, + 0x92, 0xb2, 0xd7, 0xf9, 0xf5, 0x19, 0x92, 0xb2, + 0x56, 0x96, 0x65, 0xc9, 0x8b, 0xdd, 0x2e, 0x7a, + 0x13, 0xe9, 0x19, 0x72, 0x1e, 0xdf, 0xcc, 0x7c, + 0xf4, 0xf4, 0xe3, 0xc3, 0x46, 0x44, 0x5b, 0xd0, + 0x86, 0x2b, 0x39, 0x23, 0x93, 0xab, 0x31, 0x89, + 0x40, 0xa6, 0x2a, 0xe3, 0x72, 0x35, 0x23, 0x7f, + 0x2c, 0x3e, 0xc5, 0x3f, 0x93, 0x8f, 0xc9, 0x9b, + 0xe9, 0x0f, 0x71, 0x1c, 0x7d, 0x06, 0x09, 0x9a, + 0x59, 0xc8, 0xa2, 0x1d, 0xb7, 0x79, 0xb4, 0x12, + 0x2c, 0x83, 0xe8, 0xdd, 0xd5, 0xe4, 0xc3, 0xd5, + 0x38, 0x8a, 0x63, 0x14, 0xe2, 0xd2, 0x82, 0xbe, + 0x67, 0x29, 0x24, 0x53, 0x0d, 0xff, 0x96, 0x5c, + 0x83, 0x89, 0x04, 0x5f, 0xce, 0xc8, 0xca, 0xae, + 0x7f, 0x24, 0x8f, 0xb7, 0xa0, 0xce, 0x98, 0x8c, + 0x92, 0xa9, 0x5a, 0xfe, 0x03, 0xa9, 0x8d, 0x52, + 0xc1, 0x8c, 0x99, 0x91, 0xcf, 0x76, 0xfd, 0x1b, + 0x37, 0x76, 0x6e, 0x95, 0x06, 0x12, 0xf1, 0x6c, + 0x46, 0x04, 0x2e, 0x8d, 0x5f, 0x26, 0xd3, 0x54, + 0x89, 0x72, 0x23, 0x4d, 0xe2, 0x2d, 0x09, 0x8b, + 0x58, 0xb2, 0x0d, 0x44, 0x5f, 0x7e, 0x9f, 0x2f, + 0xdc, 0xf5, 0x95, 0x44, 0x64, 0xf7, 0x05, 0xe0, + 0x8d, 0x69, 0xce, 0x34, 0xd3, 0x9a, 0xed, 0xdd, + 0x45, 0x5d, 0x3a, 0xf4, 0xd7, 0x5f, 0xfe, 0x7e, + 0xaa, 0xde, 0xdd, 0xf5, 0xe2, 0xfa, 0x54, 0x67, + 0xae, 0xca, 0xe2, 0x56, 0xa9, 0x35, 0x07, 0xa7, + 0x33, 0xaa, 0x2d, 0x1d, 0x05, 0xff, 0x92, 0xa9, + 0x85, 0x4d, 0x21, 0x30, 0x70, 0x07, 0x4f, 0x83, + 0xb0, 0xb9, 0xe3, 0x4c, 0xa8, 0x15, 0x89, 0x0a, + 0xa6, 0x41, 0x5a, 0x1f, 0x80, 0x6a, 0x2b, 0x99, + 0x16, 0x5a, 0x15, 0xa0, 0xed, 0x3e, 0x72, 0xf7, + 0xce, 0x48, 0x0e, 0x7c, 0x95, 0x5b, 0xea, 0xa2, + 0x0a, 0xc6, 0x92, 0xe4, 0xfd, 0x78, 0x3c, 0x1d, + 0x1d, 0x64, 0x4e, 0xa4, 0x53, 0x26, 0xe9, 0xbd, + 0x4a, 0x4b, 0x43, 0x92, 0x4f, 0x4c, 0x18, 0xe8, + 0x11, 0x5d, 0x2a, 0x9d, 0x81, 0xa6, 0x3b, 0x9e, + 0xd9, 0x9c, 0x24, 0x7d, 0x87, 0x6e, 0x54, 0xc6, + 0x04, 0x49, 0x16, 0xba, 0xec, 0x3b, 0x6f, 0xc7, + 0x65, 0xa6, 0x76, 0xb4, 0x50, 0x86, 0x5b, 0xcc, + 0x35, 0x49, 0x52, 0x70, 0xa0, 0xe8, 0xd1, 0xc8, + 0xe0, 0x9e, 0x95, 0xc2, 0x1e, 0x4c, 0x78, 0xd7, + 0xeb, 0xd9, 0x41, 0x38, 0xc4, 0x83, 0x24, 0x1f, + 0x06, 0xa4, 0x8d, 0xd5, 0x6a, 0x4f, 0x1d, 0x5c, + 0x69, 0x88, 0xf2, 0xa0, 0x03, 0x2e, 0xa5, 0x34, + 0xe7, 0x4e, 0x32, 0xf3, 0xc9, 0x68, 0xca, 0xa6, + 0x39, 0x17, 0x59, 0xe4, 0x61, 0x2e, 0x99, 0x88, + 0xfd, 0xd2, 0x25, 0x07, 0x0b, 0x41, 0x2f, 0x99, + 0x26, 0x1d, 0x90, 0xfe, 0xe2, 0x7f, 0xbc, 0xc1, + 0x1f, 0x3d, 0xa4, 0x6b, 0xd9, 0xc9, 0x69, 0x92, + 0x2d, 0xb7, 0x02, 0x91, 0x6f, 0x35, 0x93, 0x06, + 0xe1, 0xc2, 0x96, 0x02, 0x37, 0xf7, 0x80, 0x59, + 0xac, 0x00, 0xd3, 0x63, 0xf6, 0x96, 0x1b, 0x8e, + 0xf2, 0x83, 0xee, 0x3d, 0x01, 0x1a, 0x26, 0x57, + 0xbb, 0x38, 0x15, 0xca, 0x40, 0xbc, 0x2c, 0xad, + 0x75, 0xc9, 0x6c, 0x1f, 0xee, 0x03, 0xd0, 0xe1, + 0xf4, 0x4d, 0x90, 0xf7, 0x1e, 0xa7, 0x02, 0x98, + 0xa6, 0x87, 0x13, 0xda, 0x97, 0x08, 0xb6, 0x04, + 0xd1, 0xed, 0x33, 0x75, 0x8a, 0xd1, 0xb5, 0x10, + 0x2f, 0xeb, 0xf6, 0x05, 0x92, 0x15, 0xca, 0x06, + 0x65, 0x35, 0xa4, 0xc0, 0xb7, 0x60, 0x1e, 0x15, + 0x86, 0x62, 0x5a, 0x1a, 0xa0, 0xa5, 0x44, 0x04, + 0x08, 0x2e, 0x87, 0xad, 0xde, 0x32, 0xc1, 0x57, + 0x9d, 0x35, 0x64, 0xec, 0x5e, 0x60, 0x97, 0xf5, + 0x11, 0x6f, 0x82, 0xbd, 0x4c, 0x2d, 0x1a, 0x14, + 0xb3, 0xd4, 0x17, 0xdf, 0xe8, 0x58, 0xc2, 0xc2, + 0x83, 0x3d, 0xa4, 0xd2, 0x35, 0xaa, 0xea, 0x90, + 0xba, 0x4d, 0x15, 0x2c, 0x5d, 0x63, 0xdb, 0x3f, + 0x31, 0xc3, 0xed, 0x53, 0x57, 0x17, 0x24, 0x31, + 0x96, 0x69, 0xdb, 0x34, 0x64, 0x54, 0x2b, 0x8d, + 0x2a, 0x30, 0xd4, 0xc7, 0x1d, 0x36, 0xba, 0x8b, + 0x66, 0xbb, 0x54, 0x0f, 0x5d, 0xf5, 0x72, 0x83, + 0xdb, 0x1e, 0x37, 0xa1, 0xfa, 0x62, 0x27, 0xf7, + 0x96, 0xbc, 0x06, 0xde, 0x95, 0xe6, 0x18, 0x67, + 0x16, 0xda, 0x16, 0xce, 0x2a, 0xcb, 0x53, 0xd6, + 0x87, 0x3d, 0x83, 0xae, 0xa3, 0xe7, 0x24, 0x79, + 0x3b, 0xdc, 0x22, 0x42, 0x42, 0x28, 0xb6, 0x20, + 0x46, 0xce, 0xd6, 0x4b, 0xdb, 0xf5, 0x86, 0xd2, + 0xeb, 0x44, 0x40, 0xb0, 0xbd, 0x2a, 0x2d, 0xf5, + 0xb8, 0x20, 0x09, 0xc8, 0xec, 0x28, 0xd3, 0x43, + 0x30, 0x81, 0x87, 0x82, 0xc9, 0x6c, 0xf8, 0x96, + 0x7b, 0x2e, 0x86, 0xe7, 0x48, 0x03, 0x73, 0x2d, + 0x3b, 0xda, 0x82, 0xf5, 0xa4, 0x19, 0xf7, 0xe3, + 0xf2, 0x6c, 0xaf, 0x3a, 0x44, 0x1d, 0x81, 0x36, + 0x79, 0x95, 0x30, 0x1f, 0xcf, 0xdc, 0xf7, 0xcf, + 0x81, 0xe4, 0x39, 0xa7, 0xe6, 0xa9, 0x56, 0x42, + 0x40, 0xf6, 0x97, 0x1f, 0xc7, 0xc1, 0x3f, 0x53, + 0xed, 0x85, 0x11, 0xdd, 0xe1, 0xaa, 0x37, 0xe8, + 0x91, 0x63, 0xfc, 0xd4, 0x3b, 0x5b, 0xdb, 0x8c, + 0xa4, 0x7f, 0x6e, 0xbf, 0x7c, 0x9f, 0xce, 0x83, + 0x3b, 0x38, 0x49, 0x91, 0x6c, 0x08, 0x9e, 0xee, + 0x49, 0x22, 0x61, 0xdb, 0xcb, 0x34, 0x4c, 0xce, + 0x1c, 0x37, 0x09, 0xa8, 0xe2, 0xb2, 0x8f, 0xeb, + 0x70, 0x49, 0x53, 0x85, 0x35, 0x2c, 0x2f, 0xe4, + 0x25, 0x4d, 0x85, 0x03, 0x37, 0x69, 0x69, 0x9c, + 0x4b, 0xd5, 0x42, 0x03, 0xfc, 0xc9, 0xa1, 0x4a, + 0x52, 0x1a, 0x26, 0x3d, 0xb5, 0xb8, 0xbb, 0x75, + 0xbb, 0xaf, 0x10, 0x4a, 0x64, 0x76, 0x38, 0x83, + 0x93, 0x9a, 0x6d, 0xf7, 0x85, 0x10, 0x47, 0x72, + 0x9a, 0xd3, 0x40, 0x71, 0x5b, 0x25, 0x67, 0x70, + 0x56, 0x31, 0x51, 0x09, 0xae, 0x61, 0x1f, 0x17, + 0xc8, 0xff, 0x4d, 0x8c, 0x49, 0x41, 0x32, 0x15, + 0xe5, 0xd8, 0x1b, 0x04, 0x68, 0xc4, 0xb4, 0x8b, + 0xd4, 0xb1, 0x93, 0x14, 0xa5, 0xa9, 0x97, 0xa6, + 0x95, 0x74, 0x88, 0xd2, 0x09, 0x53, 0x36, 0x3b, + 0x56, 0x14, 0x80, 0x61, 0x92, 0xca, 0x0f, 0xb7, + 0xce, 0x5e, 0x6b, 0x40, 0x40, 0x98, 0x7f, 0x67, + 0xa2, 0x3d, 0xaf, 0x05, 0x7c, 0xc8, 0x0f, 0x56, + 0xc4, 0x4d, 0xc5, 0x8e, 0x10, 0x91, 0x64, 0x83, + 0x33, 0x9e, 0x17, 0x02, 0xce, 0x7a, 0x8d, 0x8f, + 0x07, 0xb9, 0x82, 0xec, 0xd8, 0xdb, 0xda, 0xcb, + 0xfa, 0x7c, 0x5a, 0xcb, 0x5d, 0xe6, 0x67, 0xf7, + 0x48, 0xed, 0xc1, 0xd2, 0x6d, 0xc8, 0xcf, 0x91, + 0x7b, 0x21, 0x67, 0x1d, 0x65, 0x8f, 0x71, 0xe7, + 0xdf, 0xd8, 0x25, 0x90, 0x42, 0x39, 0x3f, 0xf0, + 0x58, 0x69, 0xb1, 0xeb, 0x7e, 0xeb, 0xa5, 0xd1, + 0x67, 0xb9, 0xec, 0x9c, 0xdb, 0x7e, 0x4e, 0xe5, + 0xbb, 0xe3, 0x65, 0xf6, 0x28, 0x6d, 0x2b, 0x2c, + 0x52, 0x8e, 0x93, 0x67, 0x72, 0x49, 0xbd, 0xdd, + 0x82, 0x10, 0x5f, 0xc1, 0x71, 0x30, 0xd0, 0x0b, + 0x64, 0x44, 0x55, 0xdd, 0xe1, 0xae, 0xae, 0x76, + 0x1d, 0x4f, 0x9a, 0xb8, 0xb8, 0x33, 0x6b, 0x35, + 0x47, 0xc2, 0x04, 0xa6, 0xf1, 0xdd, 0x20, 0x53, + 0xbe, 0x00, 0xea, 0x1f, 0x92, 0xc6, 0xb7, 0xe9, + 0xe1, 0x43, 0xe7, 0x37, 0x86, 0x26, 0xeb, 0x40, + 0x38, 0x2e, 0x1b, 0xac, 0xcf, 0x9d, 0x97, 0x0b, + 0xa5, 0x5c, 0xd7, 0xad, 0xc0, 0x15, 0x16, 0xff, + 0xd1, 0xdc, 0xec, 0x60, 0xb9, 0x5c, 0x3a, 0xe6, + 0x1c, 0x57, 0xf7, 0x36, 0x69, 0x6c, 0xeb, 0x5c, + 0x8e, 0xed, 0x98, 0x3a, 0x90, 0x5e, 0x08, 0x0b, + 0xe7, 0x56, 0xf3, 0xd9, 0xa2, 0x61, 0xa3, 0xb6, + 0x40, 0xfd, 0x45, 0x67, 0xde, 0x2e, 0x97, 0xba, + 0x68, 0x40, 0xba, 0x98, 0x6f, 0x61, 0x98, 0x1a, + 0x3c, 0x89, 0xac, 0x9d, 0x7b, 0x39, 0x7d, 0xf5, + 0xa6, 0xbf, 0xd8, 0x2b, 0xc4, 0x47, 0xd2, 0x7d, + 0x86, 0x11, 0x11, 0x87, 0xc8, 0xc4, 0x66, 0xbf, + 0x59, 0xba, 0xc1, 0xdb, 0xd7, 0x04, 0x30, 0x78, + 0xd8, 0x30, 0xa9, 0xaf, 0x95, 0x2e, 0x4b, 0xef, + 0xb0, 0x23, 0x62, 0x45, 0xd9, 0x1c, 0xa2, 0xd0, + 0x1c, 0x21, 0x8b, 0xd2, 0xd3, 0xb7, 0xee, 0x71, + 0x8f, 0xc5, 0x3b, 0xd7, 0xed, 0x1e, 0x7b, 0x92, + 0x2d, 0x5a, 0x8b, 0x3d, 0xb1, 0xc5, 0x3e, 0x97, + 0xdd, 0xe6, 0x6a, 0xa3, 0x56, 0x20, 0x41, 0x75, + 0x0d, 0xde, 0x9e, 0xd7, 0xd2, 0xff, 0x95, 0x55, + 0x4f, 0x5e, 0xc8, 0xfe, 0x97, 0xed, 0x5d, 0x93, + 0x27, 0xbe, 0x41, 0xc3, 0x53, 0x2a, 0x46, 0x2e, + 0xb7, 0x02, 0x6b, 0x5a, 0xeb, 0x08, 0x27, 0x60, + 0xa1, 0xa4, 0xc1, 0x1b, 0x62, 0x7c, 0x68, 0x35, + 0xff, 0xb0, 0xc0, 0x96, 0xde, 0x94, 0x4c, 0x5a, + 0x6b, 0xd7, 0xe6, 0x0f, 0x7f, 0xee, 0xe1, 0xe7, + 0xe3, 0xff, 0x9f, 0x6f, 0xbe, 0x03, 0xbd, 0x03, + 0xd2, 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -3901,1230 +2770,343 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, - 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2d, - 0x62, 0x6f, 0x6f, 0x6b, 0x6d, 0x61, 0x72, 0x6b, - 0x2d, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x2d, - 0x75, 0x69, 0x2e, 0x78, 0x6d, 0x6c, 0x00, 0x00, - 0x9c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x75, - 0x69, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x62, - 0x61, 0x72, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, - 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x22, - 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, - 0x22, 0x46, 0x69, 0x6c, 0x65, 0x22, 0x3e, 0x3c, - 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, - 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, - 0x22, 0x4e, 0x65, 0x77, 0x54, 0x6f, 0x70, 0x69, - 0x63, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, - 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, - 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, - 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x3d, 0x22, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x6e, - 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x2f, - 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, - 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x3d, 0x22, 0x4f, 0x70, 0x65, 0x6e, 0x49, - 0x6e, 0x54, 0x61, 0x62, 0x22, 0x2f, 0x3e, 0x3c, - 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x52, 0x65, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, - 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, - 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x3d, 0x22, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, - 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x49, - 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x2f, 0x3e, - 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, - 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x3d, 0x22, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, - 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, - 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, - 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, - 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, - 0x22, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x22, 0x2f, - 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, - 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x45, 0x64, 0x69, 0x74, - 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 0x64, - 0x69, 0x74, 0x22, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, - 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x43, 0x75, - 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, - 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x43, 0x6f, - 0x70, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, - 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x50, - 0x61, 0x73, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, - 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, - 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, - 0x22, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x22, - 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, - 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, - 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x41, 0x6c, - 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, - 0x6e, 0x75, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x56, - 0x69, 0x65, 0x77, 0x4d, 0x65, 0x6e, 0x75, 0x22, - 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, - 0x22, 0x56, 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, - 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, - 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, - 0x22, 0x56, 0x69, 0x65, 0x77, 0x54, 0x69, 0x74, - 0x6c, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, - 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, - 0x69, 0x65, 0x77, 0x41, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, - 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, - 0x75, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x48, 0x65, 0x6c, 0x70, 0x4d, 0x65, 0x6e, 0x75, - 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x22, 0x3e, - 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, - 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x2f, - 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, - 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x41, - 0x62, 0x6f, 0x75, 0x74, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x2f, - 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x61, 0x72, 0x3e, - 0x3c, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x45, 0x70, 0x68, - 0x79, 0x42, 0x6f, 0x6f, 0x6b, 0x6d, 0x61, 0x72, - 0x6b, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x50, - 0x6f, 0x70, 0x75, 0x70, 0x22, 0x20, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x50, 0x6f, - 0x70, 0x75, 0x70, 0x41, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x4f, 0x70, 0x65, - 0x6e, 0x49, 0x6e, 0x57, 0x69, 0x6e, 0x64, 0x6f, - 0x77, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, - 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x4f, 0x70, - 0x65, 0x6e, 0x49, 0x6e, 0x54, 0x61, 0x62, 0x22, - 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, - 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, - 0x43, 0x6f, 0x70, 0x79, 0x22, 0x2f, 0x3e, 0x3c, - 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x52, 0x65, 0x6e, - 0x61, 0x6d, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, - 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, - 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x2f, - 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, - 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x50, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, - 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x6f, - 0x70, 0x75, 0x70, 0x3e, 0x3c, 0x70, 0x6f, 0x70, - 0x75, 0x70, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x45, 0x70, 0x68, 0x79, 0x42, 0x6f, 0x6f, - 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x4b, 0x65, 0x79, - 0x77, 0x6f, 0x72, 0x64, 0x50, 0x6f, 0x70, 0x75, - 0x70, 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x3d, 0x22, 0x50, 0x6f, 0x70, 0x75, 0x70, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, - 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x3d, 0x22, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x44, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, - 0x70, 0x6f, 0x70, 0x75, 0x70, 0x3e, 0x3c, 0x2f, - 0x75, 0x69, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, - 0x75, 0x61, 0x79, 0x29, 0x69, 0x6e, 0x63, 0x6f, - 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x74, 0x69, - 0x6e, 0x74, 0x65, 0x64, 0x2e, 0x70, 0x6e, 0x67, - 0x31, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, - 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, - 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, - 0x08, 0x06, 0x00, 0x00, 0x00, 0xc3, 0x3e, 0x61, - 0xcb, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, - 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, - 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, - 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, - 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, - 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, - 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, - 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, - 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, - 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x20, 0x00, 0x49, - 0x44, 0x41, 0x54, 0x78, 0x9c, 0xed, 0x9d, 0x7b, - 0x78, 0x54, 0xd5, 0xb9, 0xff, 0xbf, 0xef, 0xda, - 0x33, 0xb9, 0x20, 0x04, 0x41, 0x2c, 0x02, 0x5e, - 0x10, 0x66, 0x02, 0x72, 0x7a, 0x7a, 0x8a, 0x58, - 0x91, 0x64, 0x12, 0x23, 0x2a, 0x8a, 0x26, 0x03, - 0x5a, 0xe3, 0xbd, 0x5e, 0xaa, 0x56, 0xed, 0xe9, - 0xf1, 0x1c, 0x6b, 0xeb, 0xd1, 0x8a, 0xf5, 0xd0, - 0x7a, 0x3b, 0xc5, 0xe7, 0xd7, 0x96, 0x5f, 0x4f, - 0xad, 0x1c, 0xf5, 0x27, 0x16, 0xeb, 0x65, 0x54, - 0x92, 0xc9, 0x70, 0x51, 0x04, 0x87, 0x64, 0x26, - 0x14, 0x6b, 0xaa, 0xc7, 0xe3, 0x49, 0xc9, 0xcc, - 0x24, 0xa0, 0x72, 0xad, 0x0a, 0x1a, 0x90, 0x5c, - 0x66, 0xef, 0xf5, 0x9e, 0x3f, 0x66, 0x82, 0x21, - 0x99, 0xcb, 0xda, 0x7b, 0xcf, 0x24, 0xe0, 0xaf, - 0x9f, 0xe7, 0xf1, 0xf1, 0x61, 0x66, 0xed, 0xb5, - 0xde, 0xec, 0xf7, 0x9d, 0xb5, 0xd7, 0x5e, 0xeb, - 0xbd, 0x10, 0x33, 0xe3, 0xab, 0xc6, 0x9a, 0xa6, - 0xd8, 0xf1, 0x71, 0x18, 0xa5, 0x20, 0x6d, 0x1a, - 0xc0, 0xd3, 0x00, 0x4c, 0x61, 0x46, 0x09, 0x80, - 0x51, 0x44, 0x28, 0x01, 0x50, 0x02, 0x42, 0x09, - 0x18, 0xa3, 0x00, 0x00, 0x84, 0xfd, 0x60, 0x74, - 0x02, 0xe8, 0xe4, 0xc4, 0xff, 0xf7, 0x13, 0xa1, - 0x13, 0x40, 0x07, 0x40, 0x6d, 0x60, 0xa3, 0xcd, - 0x09, 0x2d, 0x32, 0xbf, 0xc2, 0xf5, 0xf1, 0xb0, - 0xfd, 0x51, 0x79, 0x82, 0x8e, 0x76, 0x03, 0x58, - 0xb3, 0x39, 0x56, 0xa2, 0xc7, 0xb9, 0x92, 0x19, - 0xe7, 0x82, 0x70, 0x16, 0x80, 0x69, 0x00, 0xc6, - 0xe4, 0x69, 0xb8, 0x7d, 0x00, 0xda, 0xc0, 0xf8, - 0x23, 0x11, 0xd6, 0x3b, 0x9c, 0xd4, 0x38, 0x7f, - 0xb6, 0xab, 0x33, 0x4f, 0x63, 0x0d, 0x09, 0x47, - 0x9d, 0x01, 0xf8, 0x5a, 0x5b, 0x0b, 0x8a, 0x3e, - 0xd1, 0x3c, 0x10, 0x62, 0x2e, 0x03, 0xe7, 0x02, - 0x38, 0x03, 0x80, 0x63, 0x98, 0xc4, 0xd1, 0x01, - 0xbc, 0x4d, 0xc0, 0x7a, 0x48, 0xb9, 0xa1, 0x7b, - 0x9c, 0x11, 0xaa, 0x9d, 0x31, 0xa3, 0x77, 0x98, - 0x64, 0xb1, 0xc4, 0x51, 0x63, 0x00, 0x0d, 0xe1, - 0xd8, 0x59, 0x0c, 0xbe, 0x8e, 0x18, 0x57, 0x30, - 0x30, 0x76, 0xb8, 0xe5, 0x49, 0x05, 0x01, 0x7b, - 0x99, 0xf0, 0x22, 0x81, 0x9e, 0xad, 0x29, 0x77, - 0xfd, 0x71, 0xb8, 0xe5, 0x51, 0xe1, 0x88, 0x36, - 0x80, 0xd5, 0xcd, 0x5b, 0x4f, 0x89, 0x4b, 0xfd, - 0x5a, 0x02, 0x5d, 0x07, 0x70, 0xe9, 0x70, 0xcb, - 0x63, 0x0e, 0x8a, 0x30, 0xf8, 0x59, 0xa7, 0x70, - 0xac, 0xb8, 0xa8, 0xec, 0xd4, 0x0f, 0x86, 0x5b, - 0x9a, 0x74, 0x1c, 0x91, 0x06, 0x50, 0xd7, 0x14, - 0x39, 0x53, 0x80, 0xee, 0x03, 0xa1, 0x06, 0x00, - 0x0d, 0xb7, 0x3c, 0x36, 0x61, 0x30, 0x1a, 0x24, - 0xf8, 0xa1, 0x85, 0x15, 0xa5, 0x6f, 0x0d, 0xb7, - 0x30, 0x03, 0x39, 0xa2, 0x0c, 0xa0, 0xa1, 0x29, - 0x76, 0x36, 0x13, 0xdf, 0x07, 0xe0, 0xfc, 0xe1, - 0x96, 0x25, 0x4f, 0xac, 0x23, 0xa6, 0x87, 0x6a, - 0x2a, 0x5c, 0x1b, 0x87, 0x5b, 0x90, 0x3e, 0x8e, - 0x08, 0x03, 0x08, 0x34, 0xc7, 0xe6, 0x49, 0x89, - 0x9f, 0x02, 0x5c, 0x3e, 0xdc, 0xb2, 0x0c, 0x0d, - 0x14, 0x16, 0x02, 0x3f, 0xab, 0x2e, 0x73, 0xbd, - 0x3e, 0xec, 0x92, 0x0c, 0xa7, 0x01, 0x04, 0xc2, - 0x1d, 0x27, 0x4b, 0xe8, 0x4b, 0xc1, 0xb4, 0x60, - 0xd8, 0x84, 0x18, 0x4e, 0x88, 0xeb, 0x05, 0x1c, - 0x77, 0x54, 0x97, 0x4f, 0xf9, 0x70, 0xf8, 0x44, - 0x18, 0x06, 0x03, 0x08, 0x06, 0x83, 0x8e, 0x4e, - 0x6d, 0xd2, 0x9d, 0x20, 0x3c, 0x00, 0xe0, 0x98, - 0x21, 0x17, 0xe0, 0xc8, 0xe2, 0x0b, 0x30, 0x16, - 0x97, 0x18, 0x3b, 0x7e, 0x59, 0x55, 0x55, 0xa5, - 0x0f, 0xf5, 0xe0, 0x43, 0x6e, 0x00, 0x81, 0x70, - 0xc4, 0x63, 0x30, 0x3d, 0x4e, 0xc0, 0xd7, 0x87, - 0x74, 0xe0, 0x23, 0x1c, 0x06, 0xde, 0xd7, 0x88, - 0x6f, 0xaf, 0x2e, 0x2f, 0x0d, 0x0d, 0xe5, 0xb8, - 0x43, 0x66, 0x00, 0xc1, 0x60, 0xd0, 0xd1, 0xe9, - 0x9c, 0xf4, 0x30, 0x18, 0x3f, 0xc2, 0xd1, 0xbf, - 0xb2, 0xcf, 0x17, 0x0c, 0xc2, 0x63, 0x25, 0xf1, - 0x1d, 0x3f, 0x19, 0xaa, 0xd9, 0x60, 0x48, 0x0c, - 0xa0, 0xbe, 0xb1, 0xfd, 0x24, 0x12, 0xc6, 0x0b, - 0x00, 0x95, 0xe5, 0x7d, 0xb0, 0xaf, 0x04, 0xdc, - 0xcc, 0x52, 0xbb, 0x72, 0x41, 0xe5, 0xd4, 0x8f, - 0xf2, 0x3d, 0x92, 0xc8, 0xf7, 0x00, 0x0d, 0xa1, - 0x68, 0xb5, 0x10, 0xf2, 0xdd, 0xbf, 0x29, 0xdf, - 0x0c, 0x54, 0x26, 0x84, 0x7c, 0xb7, 0x21, 0x14, - 0xad, 0xce, 0xfb, 0x48, 0xf9, 0x9a, 0x01, 0x7c, - 0x3e, 0x68, 0x85, 0x13, 0xa3, 0x8f, 0xfc, 0x6d, - 0xca, 0xb7, 0x05, 0x83, 0xf0, 0x58, 0xcf, 0x4e, - 0xf7, 0xbd, 0xb5, 0xb5, 0x30, 0xf2, 0x31, 0x40, - 0x5e, 0x0c, 0x20, 0x18, 0xdc, 0x56, 0xf4, 0xb9, - 0x43, 0x7f, 0x9e, 0xc0, 0x0b, 0x73, 0xde, 0xb9, - 0x79, 0xba, 0x18, 0x68, 0x27, 0x20, 0x0a, 0xc6, - 0x1e, 0x10, 0x3a, 0x19, 0xe8, 0x14, 0x8c, 0x4e, - 0x16, 0xdc, 0x09, 0x00, 0x24, 0xa9, 0x44, 0x12, - 0x4a, 0x08, 0x28, 0x01, 0xa3, 0x04, 0x84, 0xf1, - 0x0c, 0xb8, 0x09, 0x98, 0x0a, 0xa0, 0x78, 0x98, - 0xe5, 0x07, 0x83, 0xea, 0x46, 0xeb, 0x8e, 0xab, - 0xaa, 0xaa, 0x26, 0x77, 0xe7, 0xba, 0xef, 0x9c, - 0x1b, 0x80, 0xef, 0x8d, 0x8e, 0xd1, 0x85, 0x45, - 0x46, 0x3d, 0x80, 0xb3, 0x73, 0xda, 0xb1, 0x1a, - 0xbd, 0x00, 0x36, 0x01, 0x78, 0x43, 0x30, 0x6f, - 0x32, 0x58, 0x8b, 0x2c, 0xa8, 0x9c, 0xba, 0x1d, - 0x80, 0xd5, 0x3f, 0x92, 0xea, 0x1b, 0xdb, 0x4f, - 0xd4, 0xc8, 0x28, 0x95, 0x44, 0x73, 0x00, 0x9c, - 0x07, 0x60, 0x0e, 0x80, 0x82, 0x1c, 0xc9, 0x6b, - 0x86, 0x8d, 0x3d, 0xdd, 0xda, 0x82, 0xda, 0xf3, - 0xa6, 0x7c, 0x9e, 0xcb, 0x4e, 0x73, 0x6a, 0x00, - 0xab, 0x83, 0xdb, 0x4e, 0xd0, 0x1d, 0xf1, 0x35, - 0x00, 0xbe, 0x99, 0xb3, 0x4e, 0xb3, 0xb3, 0x0b, - 0xc0, 0x4b, 0x80, 0x58, 0x2b, 0x8a, 0x47, 0x34, - 0x56, 0xcf, 0x9a, 0x70, 0x30, 0x9f, 0x83, 0x05, - 0x5a, 0x76, 0x8d, 0x90, 0x5d, 0x07, 0x2b, 0x01, - 0x79, 0x21, 0x80, 0xcb, 0x01, 0x4c, 0xc8, 0xe7, - 0x78, 0x03, 0x78, 0xd7, 0xa1, 0x3b, 0xe7, 0x5f, - 0x54, 0x35, 0x79, 0x77, 0xae, 0x3a, 0xcc, 0x99, - 0x01, 0xd4, 0x05, 0xb7, 0x4c, 0x16, 0x0e, 0xed, - 0x0d, 0x24, 0xa6, 0xcd, 0x7c, 0x73, 0x00, 0xa0, - 0x57, 0x41, 0xbc, 0xa2, 0x67, 0xa7, 0x7b, 0x43, - 0xbe, 0x9e, 0x8f, 0xd9, 0x48, 0xae, 0x73, 0xe6, - 0x82, 0xe9, 0x5a, 0x80, 0x2f, 0x05, 0x30, 0x72, - 0x08, 0x86, 0x6d, 0x97, 0xba, 0x71, 0xde, 0xc2, - 0xaa, 0xe9, 0xdb, 0x72, 0xd1, 0x59, 0x4e, 0x0c, - 0x20, 0xf9, 0xcb, 0x0f, 0x21, 0xff, 0xca, 0xff, - 0x88, 0x18, 0x4b, 0x68, 0xc4, 0xc8, 0xa7, 0xf2, - 0xfd, 0x4b, 0x37, 0x4b, 0xa0, 0x65, 0xd7, 0x08, - 0x3e, 0x78, 0xe0, 0x26, 0x26, 0xfc, 0x18, 0xc0, - 0x49, 0x79, 0x1e, 0xae, 0xdd, 0xa1, 0x3b, 0x3d, - 0xb9, 0x98, 0x09, 0x6c, 0x1b, 0x40, 0xf2, 0x99, - 0x1f, 0x44, 0x7e, 0xa7, 0xfd, 0x76, 0x66, 0x7e, - 0x74, 0xcf, 0x88, 0xfd, 0xcb, 0xbf, 0x37, 0x6b, - 0x56, 0x3c, 0x8f, 0xe3, 0xd8, 0x66, 0x59, 0x4b, - 0x8b, 0x73, 0xfc, 0xc1, 0x51, 0xd7, 0x13, 0xd1, - 0x3d, 0xc8, 0xef, 0x0f, 0xe2, 0xdd, 0x9e, 0x6e, - 0xad, 0xca, 0xee, 0x9a, 0xc0, 0x96, 0x01, 0x04, - 0x83, 0xdb, 0x8a, 0x3a, 0x1d, 0xf1, 0xb5, 0xc8, - 0xdf, 0x82, 0xef, 0x63, 0x80, 0xee, 0xe9, 0xd9, - 0xe5, 0x5a, 0x3e, 0x5c, 0xd3, 0xbc, 0x55, 0x7c, - 0x3e, 0x68, 0x85, 0x13, 0x62, 0xd7, 0x03, 0xfc, - 0x28, 0x80, 0xe3, 0xf3, 0x34, 0xcc, 0xc6, 0x12, - 0xdd, 0x79, 0xa1, 0x9d, 0xb7, 0x03, 0xcb, 0x06, - 0xe0, 0xf3, 0x41, 0x2b, 0x98, 0x10, 0x7b, 0x39, - 0x4f, 0xaf, 0x7a, 0x12, 0x84, 0x27, 0x34, 0x2e, - 0xbc, 0xef, 0x62, 0xcf, 0xc9, 0xfb, 0xf2, 0xd0, - 0xff, 0x90, 0xb1, 0x2a, 0xf4, 0xe1, 0x18, 0x83, - 0x7a, 0x1e, 0x02, 0xe3, 0x56, 0xe4, 0x61, 0xe3, - 0x8d, 0x41, 0x75, 0xbd, 0xbb, 0x5c, 0x97, 0x59, - 0xfd, 0x81, 0x58, 0x36, 0x00, 0x7f, 0x38, 0xfa, - 0x0b, 0x30, 0x7e, 0x6c, 0xe9, 0xe2, 0x0c, 0x30, - 0xf0, 0x3e, 0x43, 0xdc, 0xb0, 0xd0, 0x33, 0xb5, - 0xc5, 0x6e, 0x5f, 0xfe, 0x4d, 0xed, 0x2e, 0x8e, - 0xe3, 0x6b, 0x06, 0xf5, 0x6e, 0xbd, 0xb4, 0xe2, - 0xb4, 0x5d, 0x66, 0xaf, 0x7f, 0xb5, 0xe9, 0x2f, - 0x13, 0x9c, 0x42, 0xfb, 0xa6, 0x4e, 0x5a, 0xcb, - 0x25, 0x65, 0x53, 0xff, 0x6a, 0x47, 0x96, 0xfa, - 0x50, 0xc7, 0x8d, 0x04, 0xe3, 0x29, 0xe4, 0x63, - 0x53, 0x8c, 0xb0, 0xc4, 0x5b, 0xee, 0xbe, 0xdb, - 0xd2, 0xa5, 0x56, 0x0c, 0xa0, 0x21, 0x14, 0xad, - 0x66, 0xc0, 0x8f, 0x1c, 0xff, 0x31, 0x44, 0xf4, - 0x64, 0xb7, 0x28, 0xba, 0xa3, 0x76, 0xce, 0x89, - 0x5d, 0x76, 0xfb, 0xaa, 0x0f, 0x45, 0x2e, 0x21, - 0xd0, 0xef, 0x91, 0x38, 0x6e, 0xee, 0x11, 0xe0, - 0xd9, 0xd5, 0x9e, 0xd2, 0xff, 0x52, 0xbf, 0x3e, - 0x7a, 0x23, 0x01, 0x4f, 0x27, 0xff, 0xb9, 0x87, - 0xa4, 0xbc, 0xba, 0xa6, 0x72, 0xda, 0x06, 0x2b, - 0xb2, 0xbc, 0x1a, 0x8c, 0x9d, 0xe8, 0x70, 0xf0, - 0xdb, 0x00, 0xc6, 0x5b, 0xb9, 0x5e, 0x01, 0x26, - 0xc0, 0x5b, 0xe3, 0x71, 0x07, 0xcc, 0x5e, 0x68, - 0x7a, 0x4a, 0xaa, 0x6f, 0x6c, 0x3f, 0x09, 0xc0, - 0x72, 0xe4, 0x56, 0xf9, 0xfb, 0x99, 0x70, 0x4d, - 0x4d, 0xb9, 0xeb, 0x96, 0x5c, 0x28, 0x1f, 0x00, - 0x08, 0xf4, 0x3b, 0x7c, 0xe9, 0x6b, 0x50, 0x28, - 0x41, 0x2f, 0xa8, 0x5e, 0x5b, 0x17, 0xdc, 0x76, - 0x2c, 0x01, 0xbf, 0xee, 0xf7, 0xd1, 0x78, 0x90, - 0xb8, 0xcb, 0x8a, 0x1c, 0xbe, 0x4d, 0xdb, 0x8b, - 0x9d, 0x0e, 0xae, 0x43, 0xfe, 0x94, 0x0f, 0x24, - 0x74, 0xb1, 0x3c, 0xa9, 0x1b, 0x53, 0x98, 0x32, - 0x80, 0x60, 0x30, 0xe8, 0x20, 0x61, 0xbc, 0x90, - 0x63, 0xb7, 0xec, 0x36, 0x21, 0xb5, 0x59, 0x0b, - 0xca, 0xdd, 0x7f, 0xc8, 0x55, 0x87, 0xbe, 0xd6, - 0xd6, 0x02, 0x00, 0x5f, 0x1b, 0xf0, 0xf1, 0x74, - 0x7f, 0xb8, 0x6d, 0x9a, 0xca, 0xf5, 0x9a, 0x53, - 0x9f, 0x07, 0x24, 0xa3, 0x86, 0x92, 0x48, 0xc2, - 0xc9, 0x56, 0x64, 0x29, 0x32, 0xba, 0x9e, 0x64, - 0x60, 0x96, 0x95, 0x6b, 0xcd, 0xc0, 0xc0, 0x58, - 0x12, 0xc6, 0x0b, 0xc1, 0x60, 0xd0, 0x54, 0x8c, - 0x84, 0x29, 0x03, 0xe8, 0x74, 0x4e, 0x7a, 0x38, - 0xb7, 0xa7, 0x7a, 0xf4, 0xb6, 0xd0, 0xd9, 0x53, - 0x5d, 0x39, 0x25, 0x9a, 0xbb, 0x3e, 0x81, 0x64, - 0x70, 0xc6, 0xa0, 0xa3, 0x54, 0x66, 0xa1, 0x24, - 0x3b, 0x4b, 0xbe, 0x68, 0xf0, 0xa7, 0x14, 0x33, - 0x2b, 0x87, 0xbf, 0x29, 0x7a, 0x37, 0x03, 0x57, - 0x9b, 0xbd, 0xce, 0x3a, 0x54, 0x96, 0xd0, 0x91, - 0x3a, 0xca, 0x06, 0x10, 0x08, 0x47, 0x3c, 0xc9, - 0x93, 0xbd, 0x9c, 0xc0, 0xc0, 0xfa, 0x1e, 0xbd, - 0xf7, 0x9c, 0xea, 0xaa, 0xd2, 0x4f, 0x72, 0xd5, - 0xe7, 0x00, 0xc2, 0x03, 0x3f, 0x20, 0x35, 0xa7, - 0x53, 0x02, 0xe1, 0xc2, 0x41, 0x1f, 0xb2, 0x5c, - 0x6d, 0x66, 0xf0, 0x86, 0x70, 0x64, 0x3e, 0x08, - 0x8f, 0x98, 0xb9, 0x26, 0x27, 0x30, 0x7e, 0x14, - 0x08, 0x47, 0x3c, 0xaa, 0xcd, 0x95, 0x0c, 0x20, - 0x18, 0x0c, 0x3a, 0x0c, 0xa6, 0xc7, 0x91, 0xbb, - 0xe7, 0xfe, 0xca, 0xde, 0xb1, 0xf1, 0x8b, 0x6a, - 0xab, 0x66, 0x1c, 0xc8, 0xd6, 0xd0, 0xb7, 0x69, - 0x7b, 0x71, 0x7d, 0x53, 0xec, 0x32, 0x7f, 0x28, - 0xfa, 0x73, 0x7f, 0x53, 0xdb, 0x37, 0x94, 0x47, - 0x20, 0x1e, 0x64, 0x00, 0x00, 0x65, 0x35, 0x00, - 0x7f, 0xb8, 0x6d, 0x16, 0x52, 0x3c, 0xaf, 0x75, - 0x43, 0xac, 0x51, 0x1d, 0xda, 0x1f, 0x6e, 0x9b, - 0xc6, 0xa0, 0xe7, 0x61, 0x66, 0x86, 0x25, 0xfe, - 0x93, 0x72, 0xdb, 0x2c, 0x3d, 0x19, 0x4c, 0x8f, - 0xab, 0x3e, 0x0a, 0x94, 0x04, 0xec, 0xd4, 0x26, - 0xdd, 0x99, 0x2b, 0x1f, 0x3e, 0x06, 0xd6, 0xf7, - 0x8c, 0x8d, 0x5f, 0xa9, 0x1a, 0x43, 0x57, 0x20, - 0xbb, 0xfe, 0x9d, 0x88, 0x7d, 0x00, 0x16, 0x81, - 0xc4, 0x66, 0x7f, 0x53, 0xe4, 0x4a, 0xa5, 0x81, - 0x0c, 0x91, 0xc2, 0x00, 0x30, 0xcd, 0xb7, 0xa9, - 0x35, 0xe3, 0xfa, 0x85, 0xa5, 0x36, 0x78, 0xfa, - 0x27, 0xfa, 0xef, 0x4b, 0xab, 0x5c, 0xdb, 0x55, - 0x86, 0x5d, 0xd5, 0x14, 0xbb, 0x00, 0x2c, 0xd6, - 0x83, 0x31, 0x5a, 0x49, 0x4e, 0x00, 0x60, 0x7a, - 0xa4, 0x67, 0x8c, 0xee, 0x61, 0x60, 0xbd, 0xf2, - 0x35, 0x19, 0x20, 0xe0, 0xeb, 0x9d, 0xda, 0xa4, - 0x3b, 0x55, 0xda, 0x66, 0x35, 0x80, 0x40, 0xb8, - 0xe3, 0xe4, 0xa4, 0xf7, 0x6e, 0x0e, 0xa0, 0xb7, - 0x7b, 0xf5, 0xf8, 0x42, 0x55, 0xe5, 0xd7, 0x05, - 0xb7, 0x4c, 0x26, 0xc6, 0x0f, 0xfa, 0x7d, 0x54, - 0x04, 0xa2, 0x65, 0xfe, 0xcd, 0x5b, 0xb3, 0xae, - 0xa8, 0x7b, 0xf6, 0xb8, 0xde, 0x03, 0x30, 0x70, - 0x86, 0xa1, 0x22, 0xc3, 0x99, 0x71, 0x1d, 0x40, - 0xc4, 0xf3, 0x07, 0x7e, 0xc6, 0xcc, 0x4a, 0xd3, - 0x7f, 0x5d, 0x28, 0xfa, 0x73, 0x03, 0xbc, 0x16, - 0xc0, 0x24, 0x95, 0xf6, 0x49, 0x02, 0xef, 0x54, - 0xb8, 0x16, 0xd5, 0xce, 0x98, 0xd1, 0xdb, 0xab, - 0xc7, 0x17, 0x02, 0xf4, 0xb6, 0x89, 0x6b, 0xd3, - 0x43, 0x78, 0x20, 0x10, 0xee, 0xc8, 0xba, 0x70, - 0xcd, 0x6a, 0x00, 0x12, 0xfa, 0x52, 0xe4, 0xc6, - 0x75, 0xbb, 0x4d, 0xe8, 0x72, 0xbe, 0xca, 0xb4, - 0xdf, 0x87, 0x63, 0xd4, 0xe8, 0xbf, 0x62, 0xf0, - 0x59, 0xfe, 0x28, 0x8a, 0xeb, 0x59, 0x9f, 0xad, - 0xb5, 0xb5, 0x30, 0x18, 0xd8, 0x3c, 0xf8, 0x9b, - 0xf4, 0xeb, 0x80, 0x40, 0x30, 0x32, 0x0e, 0xc0, - 0x99, 0x03, 0x3f, 0x27, 0x89, 0xac, 0x06, 0xe0, - 0x0f, 0xb5, 0x5f, 0x28, 0x80, 0x45, 0x26, 0x1f, - 0x92, 0x5b, 0x9c, 0x4e, 0xba, 0xe6, 0x01, 0x40, - 0x02, 0x40, 0x6d, 0xd5, 0x8c, 0x03, 0x42, 0x97, - 0xf3, 0x01, 0xb4, 0x99, 0xea, 0x25, 0x35, 0xc7, - 0x24, 0x75, 0x97, 0x91, 0x8c, 0x06, 0x10, 0x68, - 0x8e, 0xcd, 0xcb, 0x51, 0xd0, 0xc6, 0x7e, 0x21, - 0xb5, 0x1a, 0xb3, 0x0b, 0xbe, 0xc4, 0x89, 0x1f, - 0x0f, 0x8a, 0x9e, 0x61, 0xe0, 0x06, 0x7f, 0xb8, - 0xed, 0x8c, 0x6c, 0xd7, 0x8b, 0x14, 0xeb, 0x00, - 0xa6, 0xf4, 0x6f, 0x31, 0xd2, 0x29, 0x2e, 0xc0, - 0xc0, 0x7b, 0x42, 0xf8, 0xbc, 0x44, 0xee, 0x68, - 0xce, 0x34, 0x8e, 0x6f, 0xd3, 0xf6, 0x62, 0x40, - 0x2e, 0xcf, 0x26, 0xcf, 0x00, 0x3e, 0x13, 0x52, - 0xf3, 0x0e, 0xcc, 0x2f, 0x50, 0x5d, 0x55, 0xfa, - 0x89, 0x90, 0x5a, 0x0d, 0x80, 0xfd, 0x26, 0xfb, - 0x1b, 0x0c, 0xd3, 0x82, 0x40, 0x73, 0x6c, 0x5e, - 0xa6, 0x26, 0x19, 0x0d, 0x20, 0x11, 0xae, 0x65, - 0x1f, 0x26, 0xdc, 0x66, 0xf5, 0x55, 0xcf, 0x90, - 0xf4, 0x43, 0x24, 0xe2, 0xf0, 0xfb, 0x43, 0x60, - 0xfa, 0x75, 0xaa, 0xf6, 0x87, 0x35, 0xa2, 0x14, - 0xeb, 0x00, 0xc6, 0xb7, 0x96, 0xb5, 0xb4, 0x38, - 0x53, 0xb6, 0xe7, 0x14, 0xaf, 0x7f, 0x8c, 0x75, - 0xd9, 0x5c, 0xb4, 0x0b, 0xb9, 0xfb, 0x37, 0x18, - 0xbc, 0xef, 0x90, 0x09, 0x83, 0x99, 0xae, 0x4c, - 0x77, 0x4f, 0xaa, 0x2b, 0xa7, 0x44, 0x99, 0x70, - 0x9b, 0x89, 0xfe, 0xd2, 0x92, 0x4d, 0x87, 0x69, - 0x0d, 0xa0, 0xa1, 0x29, 0x76, 0x76, 0x2e, 0x62, - 0xf5, 0x88, 0xe8, 0x49, 0x3b, 0x9b, 0x3c, 0x97, - 0x54, 0xba, 0xff, 0x02, 0xe0, 0x3f, 0x52, 0xf4, - 0x5c, 0xe6, 0x0f, 0xc7, 0xae, 0xc9, 0x74, 0xad, - 0xa6, 0xe1, 0x8f, 0x48, 0x4e, 0xaf, 0xfd, 0x28, - 0x1e, 0xdf, 0x55, 0x72, 0xfa, 0xc0, 0xb6, 0x8b, - 0x01, 0xc1, 0x8c, 0x0b, 0x06, 0x7e, 0xce, 0xc8, - 0x3c, 0xfd, 0xaf, 0x0c, 0x77, 0x78, 0x88, 0xf9, - 0xc6, 0x4c, 0x6d, 0x06, 0x42, 0x84, 0x7b, 0x16, - 0x54, 0xb8, 0x5e, 0xcb, 0xd4, 0x66, 0x41, 0xb9, - 0xfb, 0x0f, 0x44, 0xf4, 0xa4, 0x99, 0x7e, 0x53, - 0xc3, 0xe5, 0x09, 0x5d, 0xa6, 0x91, 0x25, 0xdd, - 0x59, 0x80, 0x3f, 0x14, 0x7d, 0x1d, 0x36, 0xa3, - 0x74, 0x19, 0x78, 0xbf, 0x57, 0x2b, 0x3e, 0xd3, - 0xee, 0xf6, 0x6e, 0x5d, 0x70, 0xdb, 0xb1, 0xc2, - 0x11, 0x8f, 0x02, 0x18, 0x37, 0xe0, 0xab, 0x1d, - 0x45, 0x07, 0xbb, 0xa6, 0xcd, 0x9b, 0xf7, 0x8d, - 0x2f, 0xd2, 0x5d, 0xeb, 0x0f, 0x45, 0xdf, 0x05, - 0xf0, 0x0f, 0x87, 0xc9, 0xc5, 0x58, 0x4d, 0x84, - 0x28, 0x08, 0xbd, 0x90, 0xf8, 0x98, 0x80, 0x8f, - 0x99, 0xc4, 0x71, 0x80, 0x7c, 0x6c, 0xe0, 0x9f, - 0xa0, 0xb3, 0x3e, 0x29, 0xdd, 0x41, 0x92, 0xaf, - 0xb5, 0xb5, 0xa0, 0x70, 0xaf, 0xf3, 0x63, 0x00, - 0x25, 0xca, 0x7f, 0x0c, 0xf1, 0x0a, 0x6f, 0x79, - 0xe9, 0x77, 0x54, 0x9a, 0xfa, 0x36, 0x6d, 0x2f, - 0x2e, 0x30, 0xba, 0xde, 0xca, 0xc1, 0x1b, 0xd8, - 0x3a, 0xaf, 0xc7, 0x9d, 0xf2, 0x51, 0x90, 0xd2, - 0x00, 0xea, 0x9a, 0x22, 0x67, 0x0a, 0xa2, 0x14, - 0x0b, 0x28, 0x53, 0x48, 0x09, 0x71, 0x66, 0x2e, - 0x4e, 0xf5, 0x00, 0xc0, 0x1f, 0x8e, 0xde, 0x06, - 0xc6, 0xe3, 0x29, 0xbe, 0x7a, 0xd0, 0xeb, 0x71, - 0xdf, 0x3f, 0xe0, 0x33, 0xf2, 0x37, 0x46, 0x2b, - 0x20, 0x78, 0x2e, 0x88, 0x6e, 0x06, 0x9b, 0x5a, - 0x95, 0xf7, 0xa7, 0xd5, 0xeb, 0x71, 0xff, 0x5d, - 0x06, 0x99, 0x36, 0x82, 0x51, 0xa9, 0xdc, 0x1b, - 0xe3, 0x4f, 0x25, 0x86, 0xb3, 0xd2, 0xcc, 0xf9, - 0x7d, 0x5d, 0xa8, 0x7d, 0x96, 0x80, 0x7c, 0x0b, - 0x36, 0x8f, 0x92, 0x25, 0xf3, 0xec, 0x54, 0xf9, - 0x09, 0x52, 0x1a, 0x80, 0xbf, 0x29, 0x5a, 0x0f, - 0x82, 0xd7, 0xce, 0x80, 0x20, 0x3c, 0xee, 0x2d, - 0x77, 0x7f, 0x3f, 0x53, 0x93, 0xba, 0xe6, 0xd8, - 0x54, 0x00, 0x58, 0x58, 0xe6, 0x6a, 0xcf, 0xd6, - 0x5d, 0xc2, 0xc1, 0x22, 0xda, 0x82, 0x01, 0xbf, - 0x66, 0x00, 0xdd, 0x52, 0x37, 0x4e, 0x5b, 0x58, - 0x35, 0x7d, 0x9b, 0x3f, 0xdc, 0x36, 0x91, 0x24, - 0xdd, 0xc0, 0x44, 0xdf, 0x45, 0x8e, 0xbc, 0x71, - 0x08, 0x08, 0x32, 0xd1, 0x93, 0x25, 0x71, 0xc7, - 0x2b, 0xfd, 0x15, 0xe7, 0x6f, 0x6e, 0xbb, 0x1b, - 0x52, 0xfc, 0xbb, 0x7a, 0x4f, 0xbc, 0x5b, 0x68, - 0x38, 0x03, 0x05, 0xa3, 0xf6, 0xe9, 0x5d, 0x07, - 0x4f, 0x3b, 0x56, 0xd7, 0xfe, 0x47, 0xd5, 0x10, - 0xfc, 0xe1, 0xe8, 0x6f, 0xc1, 0xb8, 0xdd, 0xbc, - 0xf4, 0xfd, 0x87, 0x87, 0xdf, 0x5b, 0xe1, 0x1e, - 0xb4, 0xa0, 0x1f, 0x64, 0x00, 0xab, 0x9b, 0xb7, - 0x9e, 0xa2, 0x4b, 0x7d, 0x2b, 0xec, 0xed, 0xfa, - 0x7d, 0xac, 0xa1, 0x70, 0x5a, 0x26, 0x67, 0x0e, - 0x7f, 0x28, 0xfa, 0x07, 0x00, 0x57, 0x00, 0x20, - 0x06, 0x36, 0x18, 0x3a, 0xdd, 0x90, 0x6d, 0xb3, - 0x25, 0x99, 0x40, 0x22, 0x38, 0xe8, 0x0b, 0xc2, - 0x3a, 0x06, 0x3a, 0x89, 0xb1, 0x10, 0x80, 0x66, - 0x43, 0xee, 0x4c, 0x7c, 0xc6, 0x44, 0xbf, 0xe5, - 0xb8, 0x63, 0x89, 0x70, 0x1a, 0x33, 0x01, 0x7e, - 0x03, 0xcc, 0xaa, 0xbf, 0xca, 0x1e, 0x21, 0xe8, - 0x1c, 0x83, 0xa5, 0x83, 0x40, 0xcf, 0x82, 0x31, - 0x19, 0x80, 0x01, 0xe6, 0x6b, 0xbd, 0x15, 0xa5, - 0x59, 0x4f, 0x29, 0x57, 0x85, 0x3e, 0x1c, 0x63, - 0xa0, 0xa7, 0x0d, 0xf6, 0x3c, 0x8b, 0xd8, 0x21, - 0x1c, 0xa7, 0x0e, 0x4c, 0x57, 0x33, 0xe8, 0x0f, - 0x88, 0x4b, 0xfd, 0x5a, 0xd8, 0xde, 0xf2, 0xa5, - 0x7b, 0x32, 0x29, 0x3f, 0xd0, 0x14, 0x3b, 0x1d, - 0xc0, 0x55, 0xc9, 0xf1, 0x89, 0x80, 0x73, 0x1d, - 0x1a, 0xbf, 0xf9, 0x6a, 0x30, 0x76, 0x62, 0xa6, - 0x5e, 0x93, 0x99, 0x35, 0x5e, 0x1e, 0xf4, 0x05, - 0xe3, 0x7c, 0x62, 0x7c, 0x1b, 0xf9, 0x53, 0x3e, - 0x00, 0x1c, 0x4b, 0xcc, 0x3f, 0x11, 0x8e, 0xde, - 0x0f, 0x88, 0x79, 0xb5, 0x09, 0xe5, 0x83, 0x81, - 0xdb, 0x59, 0x37, 0x76, 0x0b, 0xa6, 0xba, 0xa4, - 0xf2, 0x01, 0x40, 0x03, 0xd1, 0xd2, 0x35, 0x9b, - 0x63, 0x59, 0xd7, 0x0f, 0x89, 0x7b, 0x49, 0xf7, - 0x58, 0x15, 0x3c, 0x09, 0x25, 0x75, 0x7b, 0x18, - 0x83, 0xfe, 0x88, 0x44, 0x42, 0x26, 0x5b, 0xb4, - 0xf7, 0xec, 0x72, 0x65, 0x7c, 0x27, 0x96, 0x90, - 0x83, 0x8f, 0x47, 0x09, 0x2e, 0x15, 0x23, 0x70, - 0x08, 0xc7, 0x8f, 0x00, 0xe4, 0x3c, 0x42, 0x46, - 0x1d, 0x2a, 0x61, 0x70, 0x91, 0x72, 0x6b, 0x60, - 0xe9, 0x68, 0xdd, 0xf9, 0x3c, 0x6b, 0xe2, 0x95, - 0x14, 0xc7, 0xe8, 0xa3, 0x8a, 0xbb, 0x1c, 0x4a, - 0xbb, 0xa2, 0xc9, 0x7b, 0x9a, 0xf5, 0x51, 0x99, - 0x59, 0x96, 0xc1, 0xba, 0x3d, 0xcc, 0x00, 0x1a, - 0xc2, 0xb1, 0xb3, 0xec, 0x66, 0xe3, 0x62, 0xe6, - 0x47, 0xb3, 0xf9, 0xa7, 0xf5, 0xf4, 0x38, 0x5e, - 0x02, 0x61, 0xb0, 0x37, 0xab, 0x82, 0x11, 0x48, - 0x9d, 0x0b, 0xc0, 0xbc, 0xd7, 0x8e, 0x8c, 0x43, - 0x05, 0x03, 0xeb, 0x47, 0xe9, 0x3b, 0xee, 0xda, - 0xef, 0x88, 0xff, 0x16, 0x8c, 0x99, 0x29, 0x9a, - 0x6c, 0x54, 0x5d, 0x07, 0xd4, 0xd6, 0xc2, 0x60, - 0xe6, 0x47, 0x6d, 0x4a, 0x54, 0x9a, 0xd0, 0xf1, - 0x97, 0x1c, 0x66, 0x00, 0x0c, 0xb6, 0xfb, 0xeb, - 0xff, 0x68, 0xcf, 0x88, 0xfd, 0x59, 0x77, 0xc4, - 0x12, 0xae, 0xcc, 0x74, 0x1d, 0x12, 0xa1, 0x5c, - 0x87, 0x93, 0xc1, 0x08, 0x1a, 0xc2, 0xb1, 0x9b, - 0xa4, 0x30, 0xde, 0x01, 0xd1, 0x44, 0x9b, 0x72, - 0x0e, 0x05, 0x1d, 0xbd, 0x5a, 0xfc, 0xf2, 0xfd, - 0x8e, 0x49, 0xdf, 0x65, 0x20, 0xd5, 0x3e, 0x41, - 0xa7, 0x01, 0xe3, 0x0e, 0x33, 0x1d, 0x26, 0xef, - 0xad, 0xad, 0x90, 0xf1, 0x81, 0x3a, 0x3e, 0xb4, - 0x08, 0xf4, 0xb5, 0xb6, 0x16, 0x14, 0xed, 0x75, - 0xee, 0xb2, 0xe3, 0xed, 0x43, 0x8c, 0x3b, 0x6a, - 0x2a, 0xdc, 0xff, 0x57, 0xb5, 0xbd, 0x3f, 0x1c, - 0xf3, 0x82, 0xd9, 0x87, 0x54, 0xb1, 0x76, 0x8c, - 0x98, 0x6e, 0xd0, 0x39, 0x97, 0x56, 0xb9, 0xb6, - 0xaf, 0x7c, 0x6b, 0xcb, 0x71, 0x5a, 0xaf, 0xf6, - 0x9f, 0x00, 0x2e, 0xb1, 0x2a, 0xdb, 0x10, 0x73, - 0x40, 0x13, 0x62, 0x8e, 0x84, 0x51, 0xcc, 0x92, - 0x9a, 0x00, 0x14, 0x0e, 0x6a, 0x41, 0xf8, 0xb6, - 0xb7, 0xdc, 0xfd, 0xaa, 0xd9, 0x8e, 0x1b, 0x9a, - 0xa2, 0xff, 0xc4, 0x84, 0xac, 0x7b, 0xfc, 0xe9, - 0x20, 0x60, 0x6f, 0xf7, 0xd8, 0xf8, 0x84, 0xbe, - 0x03, 0xb9, 0x43, 0x33, 0x40, 0xd1, 0x27, 0x9a, - 0xc7, 0xa6, 0xab, 0xd7, 0x01, 0x1a, 0x31, 0xf2, - 0x29, 0x33, 0x17, 0x78, 0xcb, 0x5d, 0x7e, 0x10, - 0xd5, 0x22, 0xc3, 0x4c, 0xd0, 0x10, 0xea, 0xb8, - 0x4a, 0xeb, 0xd5, 0xde, 0xc3, 0xd1, 0xa3, 0x7c, - 0x08, 0x16, 0x3f, 0xe4, 0x5e, 0x63, 0x37, 0x4b, - 0x7a, 0x05, 0xa9, 0x95, 0xbf, 0xc4, 0x8a, 0xf2, - 0x01, 0x20, 0x79, 0x8f, 0x95, 0x0f, 0xd4, 0x06, - 0xc2, 0xc0, 0xd8, 0xa2, 0x4f, 0xb4, 0x43, 0x0e, - 0x23, 0x5f, 0x3e, 0x02, 0x84, 0x98, 0x6b, 0xb5, - 0xd3, 0xa4, 0x68, 0xaf, 0x5a, 0x09, 0xd7, 0xca, - 0x66, 0x04, 0xcc, 0xc6, 0x1f, 0x00, 0xe4, 0x72, - 0xca, 0x3f, 0x08, 0xe0, 0x7f, 0x40, 0x58, 0x05, - 0xa2, 0x0d, 0x00, 0xb6, 0x62, 0xf0, 0x59, 0x83, - 0x2d, 0x24, 0xf1, 0x2f, 0xa4, 0x53, 0xac, 0x41, - 0x8a, 0x10, 0x31, 0x02, 0x82, 0x3d, 0x3b, 0xdd, - 0xf7, 0x5a, 0xed, 0x3b, 0x71, 0x8f, 0xc9, 0x92, - 0xf1, 0x1c, 0xa2, 0x9f, 0xae, 0x0f, 0x79, 0x8d, - 0x24, 0x13, 0x2f, 0x5b, 0x87, 0x78, 0x85, 0xd5, - 0x4b, 0xbd, 0xe5, 0x2e, 0xbf, 0x3f, 0x1c, 0xab, - 0x4d, 0xf9, 0x38, 0xb0, 0xfe, 0x42, 0x1a, 0x07, - 0x63, 0x0d, 0x81, 0x37, 0x83, 0x68, 0xab, 0x04, - 0x3a, 0xa4, 0x10, 0x5b, 0x53, 0xf9, 0xf7, 0xfb, - 0x7c, 0xd0, 0x9c, 0xc7, 0x6f, 0x39, 0x49, 0x38, - 0x9d, 0xa7, 0x82, 0xf9, 0x54, 0x02, 0x4f, 0x61, - 0xc6, 0x7c, 0x10, 0x06, 0x9d, 0x19, 0xa8, 0xc1, - 0xc7, 0x82, 0x91, 0xea, 0xb4, 0x72, 0xa7, 0x2e, - 0xc4, 0x15, 0xb6, 0xa3, 0x9c, 0x88, 0x57, 0x80, - 0x61, 0x79, 0xbd, 0x96, 0xd4, 0xf5, 0xa2, 0x44, - 0x57, 0xcc, 0x58, 0xb3, 0x39, 0x56, 0x12, 0x8f, - 0xf3, 0xa7, 0xb0, 0x9e, 0x75, 0x7b, 0x57, 0xcf, - 0x2e, 0xf7, 0x49, 0x99, 0xfe, 0xb0, 0x60, 0x30, - 0xe8, 0xc8, 0x76, 0xaa, 0x96, 0x71, 0x4d, 0xa0, - 0xce, 0xbb, 0x44, 0xb4, 0xdc, 0x21, 0xf1, 0x9c, - 0x9d, 0xfc, 0xfe, 0xfe, 0x50, 0xf4, 0x57, 0x00, - 0xfe, 0xd9, 0x86, 0x1c, 0x03, 0x89, 0xb3, 0x14, - 0x55, 0x0b, 0x2a, 0xa7, 0xa6, 0x3c, 0x5a, 0x5e, - 0x0c, 0x88, 0x07, 0x06, 0x1f, 0x5c, 0xa5, 0x24, - 0xb9, 0x2b, 0xfa, 0x11, 0xac, 0x87, 0xa6, 0xeb, - 0x4e, 0x27, 0x1d, 0x37, 0x7f, 0xb6, 0xab, 0xd3, - 0x01, 0x00, 0x7a, 0x9c, 0x2b, 0x61, 0x2f, 0xe5, - 0xfa, 0x4b, 0x19, 0x94, 0x4f, 0x0d, 0xe1, 0xe8, - 0x5d, 0xec, 0x98, 0xf4, 0x43, 0x7f, 0x28, 0xba, - 0x17, 0x84, 0xdf, 0x78, 0xcb, 0xdd, 0xbf, 0x4b, - 0xd5, 0xb0, 0x67, 0x4c, 0xef, 0xda, 0xc2, 0xbd, - 0x8e, 0xb7, 0x4d, 0x7b, 0x1e, 0x33, 0x3e, 0x05, - 0xf0, 0x7b, 0x41, 0xfc, 0x8c, 0x99, 0xe0, 0x8f, - 0x74, 0x24, 0x83, 0x42, 0x72, 0xa9, 0x7c, 0x10, - 0xe3, 0x2e, 0x6f, 0x0a, 0xe5, 0xaf, 0x0a, 0x7d, - 0x38, 0x46, 0x47, 0xf7, 0x83, 0x33, 0x41, 0xd7, - 0xf9, 0x09, 0x7f, 0x26, 0xf0, 0xa3, 0x35, 0xe5, - 0xa5, 0x19, 0xfd, 0x0f, 0x6b, 0x6b, 0x61, 0xf8, - 0x43, 0x78, 0x09, 0xd6, 0x65, 0x74, 0x24, 0x75, - 0x1e, 0x10, 0x00, 0xc0, 0x6c, 0x73, 0xfa, 0x87, - 0x58, 0x9b, 0xee, 0x1b, 0x7f, 0x53, 0x5b, 0x19, - 0x33, 0x96, 0x20, 0x61, 0xad, 0x7f, 0x07, 0xc6, - 0xe3, 0xfe, 0xa6, 0xe8, 0x2f, 0x07, 0xb6, 0x7b, - 0xfd, 0xf5, 0xf7, 0x8e, 0x29, 0xdc, 0xeb, 0x0c, - 0x98, 0x54, 0x3e, 0x83, 0xf1, 0x3b, 0x69, 0x38, - 0x5d, 0xde, 0x0a, 0xf7, 0x9d, 0xb9, 0x50, 0x7e, - 0x43, 0x38, 0x76, 0x16, 0x21, 0xe5, 0xa1, 0x93, - 0x2d, 0xa4, 0xa0, 0x41, 0x5e, 0x55, 0xc9, 0x2d, - 0xde, 0x37, 0x08, 0xf4, 0x7d, 0x00, 0x23, 0xc1, - 0xa8, 0x64, 0xa6, 0x65, 0xc9, 0xb8, 0x86, 0x2c, - 0xa4, 0xbf, 0xe7, 0x2a, 0xf4, 0xe9, 0x3c, 0xf1, - 0xab, 0x4f, 0x54, 0xda, 0xb0, 0x4a, 0xaf, 0x28, - 0x1e, 0xd1, 0x98, 0xfe, 0x6b, 0xed, 0xe2, 0x41, - 0x5e, 0x5d, 0x84, 0x7f, 0xf1, 0x37, 0x45, 0xe1, - 0xad, 0x70, 0xdf, 0x09, 0x24, 0x6f, 0xc4, 0x88, - 0xe2, 0xd5, 0x80, 0x29, 0x39, 0xde, 0x23, 0xa2, - 0x5b, 0x6b, 0x3c, 0xe6, 0xf3, 0xf2, 0xfb, 0xc3, - 0x6d, 0xa3, 0x0c, 0xe6, 0x09, 0x85, 0xa2, 0xb0, - 0xe7, 0x8b, 0x63, 0xbb, 0x76, 0xf5, 0xbd, 0x12, - 0x05, 0x36, 0x45, 0x26, 0x31, 0x63, 0x25, 0x40, - 0x83, 0x57, 0xee, 0x36, 0x21, 0xe6, 0x47, 0xfc, - 0xa1, 0xe8, 0x18, 0xaf, 0xc7, 0xfd, 0xaf, 0x40, - 0xe2, 0x88, 0x5b, 0x73, 0xc4, 0xd7, 0x01, 0x83, - 0xd6, 0x19, 0x27, 0x16, 0x7e, 0xaa, 0x7d, 0x0b, - 0x29, 0xdc, 0xda, 0xfb, 0x23, 0x8a, 0x47, 0x34, - 0xca, 0xae, 0x03, 0xbd, 0xb0, 0xfa, 0xb8, 0x4c, - 0xea, 0x9c, 0x98, 0x19, 0xfe, 0x50, 0x74, 0x2f, - 0xac, 0x97, 0x59, 0xd9, 0xe8, 0xf5, 0xb8, 0xab, - 0xd2, 0x7d, 0x19, 0x68, 0x8a, 0x9c, 0x2b, 0x89, - 0xde, 0x48, 0xf9, 0x25, 0xe3, 0x57, 0x25, 0x86, - 0xf3, 0xde, 0xce, 0xc4, 0x8d, 0x50, 0xf2, 0x65, - 0x67, 0xa2, 0x5e, 0x92, 0xbc, 0xc8, 0x4c, 0x6a, - 0xd5, 0x40, 0x53, 0xec, 0x74, 0x99, 0x48, 0x3d, - 0x5f, 0x0d, 0xf0, 0x74, 0x1c, 0x9e, 0xc9, 0x83, - 0x01, 0x7c, 0x0a, 0x50, 0x0b, 0x43, 0x4e, 0x27, - 0xd0, 0x29, 0x2a, 0x7d, 0x02, 0x00, 0x88, 0x9e, - 0x4b, 0x9e, 0x09, 0x5c, 0xa5, 0x7c, 0x0d, 0x70, - 0xbf, 0xd4, 0x9d, 0xbf, 0x11, 0x0e, 0x7d, 0x1d, - 0xc0, 0xa9, 0x16, 0x8a, 0x3b, 0x7a, 0x76, 0xb9, - 0x4f, 0x51, 0x59, 0x28, 0xfa, 0x43, 0xd1, 0x20, - 0xac, 0x87, 0xe6, 0xef, 0xf3, 0x7a, 0xdc, 0x63, - 0x69, 0x75, 0x63, 0xf4, 0xf8, 0x38, 0xb1, 0x9d, - 0xc8, 0xd7, 0xfb, 0xbd, 0x1e, 0xf7, 0x83, 0x99, - 0x1a, 0xf8, 0x43, 0xd1, 0x97, 0x00, 0xd4, 0xa6, - 0xf9, 0x3a, 0x0a, 0xc0, 0xad, 0x32, 0x10, 0x81, - 0xf7, 0xc6, 0x59, 0x9c, 0x7f, 0x69, 0x85, 0xeb, - 0xcf, 0x2a, 0xed, 0xfd, 0xe1, 0xf6, 0x73, 0xc0, - 0xf2, 0x31, 0x0c, 0xfe, 0x95, 0xe5, 0x00, 0x0a, - 0xf7, 0x8c, 0xed, 0x9d, 0x5b, 0x3b, 0x63, 0x46, - 0x6f, 0x7d, 0x53, 0xec, 0x32, 0x22, 0x7e, 0x16, - 0xaa, 0x19, 0xc5, 0x18, 0x5b, 0x41, 0x38, 0x35, - 0xe5, 0x37, 0x4c, 0xd7, 0x79, 0x2b, 0x5c, 0x4a, - 0x6f, 0x54, 0xfe, 0x50, 0x74, 0x11, 0x80, 0x9f, - 0xab, 0xcb, 0x7c, 0x38, 0x4e, 0xa6, 0xaf, 0x89, - 0x38, 0x0c, 0x5b, 0x7b, 0xff, 0x82, 0x79, 0x53, - 0xb6, 0x36, 0x25, 0xfa, 0x8e, 0xab, 0x91, 0xea, - 0x14, 0x2f, 0x81, 0x92, 0xf2, 0x01, 0x6c, 0x14, - 0x28, 0x72, 0xa9, 0x28, 0x7f, 0xe5, 0x5b, 0x5b, - 0x8e, 0xf3, 0x37, 0x45, 0xeb, 0xc1, 0x72, 0x03, - 0xf2, 0xa2, 0x7c, 0x6c, 0x87, 0x53, 0xfb, 0x76, - 0xdf, 0xa3, 0x63, 0x41, 0x85, 0xeb, 0x65, 0x06, - 0xce, 0x01, 0xa0, 0xf6, 0xd6, 0x91, 0x46, 0xf9, - 0x44, 0x74, 0x8b, 0xaa, 0xf2, 0x01, 0xb5, 0x7b, - 0x9f, 0x89, 0x38, 0x8c, 0x52, 0x91, 0x28, 0xad, - 0x66, 0x1d, 0x83, 0xb5, 0x48, 0xb6, 0x36, 0x55, - 0x55, 0x55, 0x7a, 0x89, 0xbe, 0xe3, 0x2a, 0xa4, - 0x37, 0x82, 0xcc, 0x10, 0xaf, 0xe8, 0x19, 0x1b, - 0x9f, 0xa7, 0x92, 0x2c, 0x62, 0x55, 0x73, 0xfb, - 0xd7, 0xb5, 0x5e, 0xed, 0x4f, 0xb6, 0x1d, 0x5a, - 0xd2, 0xd3, 0x25, 0x21, 0x16, 0x7a, 0x67, 0x9f, - 0xba, 0xa7, 0xff, 0x87, 0x0b, 0x3c, 0xee, 0xcd, - 0x24, 0xe5, 0x6c, 0x00, 0x5b, 0x2c, 0xf4, 0xc9, - 0xcc, 0xfc, 0xbd, 0x9a, 0x72, 0x97, 0xa9, 0x9d, - 0x54, 0x95, 0x7b, 0x9f, 0x11, 0xd2, 0xa6, 0x89, - 0x64, 0x5d, 0x3d, 0xab, 0x74, 0x25, 0xf3, 0xf0, - 0x65, 0xc5, 0xaa, 0x11, 0x10, 0xf1, 0xcf, 0xbc, - 0xe5, 0xa5, 0xdf, 0x51, 0x09, 0x26, 0xa9, 0x0f, - 0x45, 0x67, 0x1b, 0x52, 0x6e, 0x02, 0x52, 0xfc, - 0xc2, 0x88, 0x57, 0x48, 0x88, 0x33, 0x0c, 0x21, - 0xc6, 0x13, 0x50, 0x03, 0x90, 0xa5, 0x9b, 0xc7, - 0x84, 0x9b, 0xd3, 0xb9, 0xb9, 0xd5, 0x54, 0x4e, - 0xdb, 0xaa, 0xa1, 0xb0, 0x0c, 0x80, 0x99, 0x8a, - 0x20, 0x4c, 0xc0, 0x6d, 0x0b, 0x2a, 0x4a, 0x4d, - 0x3b, 0x80, 0x26, 0xef, 0xbd, 0x0d, 0x7f, 0x4b, - 0x9e, 0x26, 0x00, 0x4c, 0xb1, 0x7c, 0x79, 0xe2, - 0x7c, 0x5a, 0x39, 0xc3, 0x44, 0x55, 0x55, 0x95, - 0xce, 0x06, 0x2f, 0x05, 0xa9, 0x6d, 0x78, 0x00, - 0xb8, 0xbf, 0xa6, 0xbc, 0x54, 0x29, 0x2a, 0x29, - 0xb0, 0x29, 0x32, 0x89, 0x80, 0x95, 0x48, 0x95, - 0xaa, 0x8d, 0xe9, 0x37, 0xde, 0xf2, 0xd2, 0xef, - 0x2c, 0xf4, 0x4c, 0x6d, 0xb9, 0xa4, 0x6c, 0xea, - 0x5f, 0x6b, 0x3c, 0xee, 0x80, 0xae, 0xe3, 0x5c, - 0x00, 0xa6, 0x12, 0x4e, 0x31, 0x61, 0x49, 0x36, - 0x0f, 0xe7, 0x8b, 0x3d, 0x27, 0xef, 0xeb, 0xd1, - 0x8a, 0xe7, 0x03, 0x68, 0x52, 0xec, 0xf3, 0x63, - 0x43, 0x77, 0xbe, 0x64, 0x46, 0x8e, 0xfe, 0x97, - 0xb3, 0x3d, 0x1f, 0x81, 0x29, 0x22, 0x59, 0x51, - 0xd3, 0x12, 0x94, 0x58, 0xc0, 0x29, 0xe3, 0xdf, - 0xbc, 0x75, 0x3c, 0x69, 0xf4, 0x02, 0x38, 0xbb, - 0x83, 0x23, 0x01, 0x4b, 0xb3, 0x2d, 0x2e, 0xfb, - 0xf0, 0xf9, 0xa0, 0x49, 0x9d, 0x56, 0x22, 0xf5, - 0xce, 0x98, 0x74, 0x16, 0xe0, 0xbe, 0xfe, 0x1f, - 0x2c, 0x06, 0x84, 0xc3, 0xc1, 0x8f, 0x03, 0x48, - 0x19, 0x1f, 0x90, 0x16, 0x26, 0xa5, 0x2d, 0xdc, - 0xda, 0x39, 0x27, 0x76, 0x49, 0xdd, 0xe9, 0x05, - 0xf0, 0x5e, 0xb6, 0xb6, 0xc4, 0xf8, 0x9a, 0xe6, - 0x88, 0x3f, 0x0b, 0x8b, 0x9b, 0xde, 0x66, 0x75, - 0xd0, 0x1f, 0x66, 0x94, 0x08, 0x0c, 0x48, 0x84, - 0x60, 0xae, 0x07, 0xec, 0xc9, 0xde, 0x28, 0x81, - 0xcf, 0x07, 0x0d, 0x71, 0xfd, 0x45, 0xa8, 0x1c, - 0xec, 0x30, 0x9e, 0xab, 0xf1, 0xb8, 0xff, 0x45, - 0xb5, 0xef, 0x82, 0x89, 0xd1, 0x9b, 0x41, 0xf8, - 0x56, 0x9a, 0xaf, 0xb7, 0x0d, 0x8c, 0xbe, 0x99, - 0xd9, 0x14, 0x7b, 0x10, 0x80, 0xe9, 0x4c, 0xdc, - 0x04, 0xbe, 0x6b, 0x55, 0x28, 0xaa, 0x34, 0x63, - 0x2e, 0xac, 0x9a, 0xfc, 0x99, 0x43, 0x77, 0x5e, - 0x00, 0xa0, 0x23, 0x5b, 0x5b, 0x06, 0x6a, 0xea, - 0xc3, 0xb1, 0x7f, 0x35, 0x2b, 0x4f, 0xf2, 0x62, - 0x65, 0x1d, 0xa4, 0x60, 0x94, 0x48, 0xd6, 0xd2, - 0xb5, 0x46, 0xa2, 0xbe, 0xae, 0x12, 0x05, 0x27, - 0x44, 0x1f, 0x85, 0xda, 0x3b, 0xeb, 0x6b, 0xbb, - 0x47, 0x74, 0xde, 0x08, 0xc5, 0x47, 0xcb, 0xeb, - 0xaf, 0xbf, 0x77, 0x0c, 0x31, 0xff, 0x5b, 0x86, - 0x26, 0x13, 0xfb, 0x87, 0x4a, 0xd7, 0x87, 0x23, - 0x57, 0x80, 0xd8, 0xea, 0x69, 0x9c, 0x53, 0x9a, - 0x78, 0xed, 0xba, 0xa8, 0x6a, 0xf2, 0x6e, 0x29, - 0x68, 0x1e, 0x14, 0xde, 0x0e, 0x88, 0xf9, 0x41, - 0x7f, 0xb8, 0xfd, 0x1c, 0xd3, 0x12, 0x99, 0xd0, - 0xc1, 0xa0, 0x4b, 0x29, 0x31, 0x03, 0x58, 0x36, - 0x00, 0x86, 0xda, 0xe0, 0xfe, 0x70, 0xf4, 0x52, - 0xa2, 0xec, 0xc9, 0x25, 0x18, 0xfc, 0x41, 0x8f, - 0x16, 0xbf, 0xda, 0x4c, 0x32, 0xc8, 0x9e, 0xe2, - 0xe2, 0xef, 0x02, 0x74, 0x42, 0x86, 0x26, 0x45, - 0x9d, 0xda, 0xc4, 0x1b, 0x01, 0xc0, 0xdf, 0x18, - 0x9b, 0x49, 0x4c, 0x4f, 0x67, 0x68, 0x9b, 0x15, - 0x06, 0xae, 0x5a, 0xdd, 0xbc, 0x55, 0x79, 0xb3, - 0x68, 0x61, 0x99, 0xab, 0x1d, 0x84, 0x6b, 0x90, - 0xfd, 0xa0, 0x47, 0x03, 0xcb, 0xe7, 0xfd, 0xe1, - 0x36, 0x53, 0x47, 0xdf, 0xaa, 0x3a, 0x48, 0x43, - 0x89, 0x80, 0x8d, 0x19, 0x40, 0x70, 0xf6, 0xc1, - 0x1b, 0x1a, 0xdb, 0x4e, 0x05, 0xe3, 0x19, 0x85, - 0xee, 0xe2, 0x00, 0x5d, 0x51, 0x3b, 0x67, 0x86, - 0x39, 0x7f, 0x3f, 0xc2, 0xa5, 0xd9, 0xdb, 0xd0, - 0xff, 0xf1, 0x37, 0xb5, 0xdf, 0x02, 0xc1, 0x75, - 0x00, 0x46, 0x98, 0xea, 0x3f, 0x45, 0x6f, 0xba, - 0xd4, 0x4d, 0xe5, 0x46, 0xf4, 0x96, 0xbb, 0xd7, - 0x11, 0xb1, 0xca, 0x7a, 0x66, 0x3c, 0x20, 0x9e, - 0x5f, 0x6c, 0x22, 0x08, 0x44, 0x45, 0x07, 0x69, - 0x21, 0x94, 0x88, 0x43, 0x25, 0xd4, 0x2d, 0xd0, - 0x97, 0x6f, 0x3f, 0xe3, 0x10, 0x42, 0x3c, 0x0d, - 0x85, 0x75, 0x06, 0x11, 0xdd, 0xbd, 0xc0, 0xe3, - 0x36, 0x15, 0x8d, 0xb4, 0xf2, 0xad, 0x2d, 0xc7, - 0x31, 0x50, 0xa1, 0xd0, 0x74, 0x24, 0x48, 0x2e, - 0x03, 0xac, 0x25, 0x7a, 0x4a, 0x81, 0x69, 0xef, - 0xa4, 0x3f, 0x97, 0x97, 0x2e, 0x4e, 0x3a, 0xa0, - 0x64, 0x86, 0x51, 0x79, 0x7a, 0x38, 0xa6, 0xec, - 0x2b, 0xa8, 0xa0, 0x83, 0x4c, 0x63, 0x8d, 0xca, - 0x6b, 0xc9, 0x98, 0xfa, 0x50, 0xe4, 0xfb, 0x0c, - 0x54, 0x29, 0x48, 0xf2, 0x66, 0x4d, 0xb9, 0xeb, - 0x57, 0x66, 0xfb, 0x17, 0x71, 0x31, 0x1b, 0xf9, - 0x8d, 0x05, 0x48, 0xc7, 0x1c, 0x98, 0x5c, 0xb5, - 0x3f, 0x00, 0x48, 0x3d, 0x8e, 0xeb, 0xa1, 0x10, - 0xf6, 0xcd, 0xcc, 0x0f, 0x07, 0x1a, 0x3b, 0x54, - 0x77, 0x48, 0x6d, 0x21, 0x40, 0xd6, 0xe3, 0xd0, - 0x49, 0x52, 0xda, 0xc7, 0xc7, 0xaa, 0x50, 0x74, - 0x0a, 0x81, 0x54, 0x42, 0xa7, 0x7a, 0x0c, 0x48, - 0x6b, 0xa1, 0xd0, 0x32, 0xa7, 0xae, 0x62, 0x66, - 0x28, 0x08, 0x04, 0x23, 0xc7, 0x99, 0xbd, 0xe8, - 0xd2, 0x2a, 0xd7, 0x76, 0x86, 0xd2, 0x02, 0xb4, - 0x58, 0x0a, 0xf9, 0xff, 0x54, 0x1e, 0x05, 0x99, - 0x74, 0x90, 0x15, 0xc2, 0x7e, 0x01, 0x1b, 0xcf, - 0x10, 0x99, 0x7e, 0xfd, 0x40, 0x46, 0x22, 0xcb, - 0x66, 0xd6, 0xcc, 0x22, 0xcc, 0xf4, 0xf0, 0x25, - 0x9e, 0xe9, 0x16, 0xb7, 0x34, 0xc5, 0xb0, 0xb9, - 0x87, 0x4b, 0x8d, 0x2d, 0x8d, 0xfd, 0xae, 0xa7, - 0xf4, 0x71, 0x66, 0x28, 0xec, 0xe1, 0x73, 0xf9, - 0xcc, 0x50, 0x24, 0xeb, 0xab, 0x70, 0x06, 0x1d, - 0x28, 0x0c, 0x81, 0x4e, 0x01, 0x1b, 0xab, 0x48, - 0x4a, 0xf3, 0x06, 0x51, 0x17, 0xdc, 0x36, 0x1a, - 0x40, 0xda, 0xa8, 0xda, 0x01, 0x58, 0x8e, 0x42, - 0x16, 0x24, 0x87, 0xad, 0x9e, 0x0f, 0x93, 0xb0, - 0x34, 0xf6, 0x03, 0x80, 0x24, 0x82, 0x52, 0x15, - 0xf1, 0x4c, 0xd9, 0x4c, 0xfa, 0x48, 0xa7, 0x03, - 0x45, 0x3a, 0x05, 0xdb, 0x59, 0x45, 0xa6, 0xd9, - 0x45, 0x5c, 0x58, 0x35, 0xf9, 0x33, 0x26, 0xfe, - 0x41, 0xaa, 0xef, 0x06, 0x42, 0x84, 0xa5, 0x6b, - 0xd6, 0xc4, 0x2c, 0x39, 0x60, 0x48, 0x90, 0xe9, - 0x04, 0xd0, 0xb9, 0x42, 0x23, 0xcd, 0xd2, 0xd8, - 0x75, 0xcd, 0xd1, 0x6f, 0x02, 0xf8, 0x47, 0x85, - 0xa6, 0xfb, 0x0c, 0xa9, 0xff, 0x53, 0xd6, 0x56, - 0x36, 0x76, 0x72, 0x39, 0x39, 0x03, 0x58, 0xcf, - 0x45, 0x43, 0xe9, 0xf3, 0xdf, 0x2e, 0x28, 0x2f, - 0x7d, 0x91, 0x09, 0xaf, 0x28, 0x88, 0x51, 0x1a, - 0x1f, 0x05, 0x6b, 0x81, 0x8f, 0x4c, 0x3b, 0x2d, - 0x5d, 0x67, 0x1f, 0xee, 0x1a, 0xd3, 0x6d, 0xba, - 0x5a, 0xc7, 0x62, 0x40, 0x08, 0x03, 0xcb, 0xa0, - 0xe2, 0x7f, 0xc9, 0x74, 0x87, 0x52, 0x86, 0xf3, - 0x0c, 0x3a, 0x50, 0x60, 0xbf, 0x20, 0x1b, 0x3b, - 0x49, 0x9c, 0xe5, 0x2c, 0xbf, 0x40, 0xd2, 0xed, - 0x00, 0x14, 0x12, 0x43, 0xf1, 0xbd, 0xab, 0x9a, - 0xdb, 0x4d, 0x67, 0xc1, 0x20, 0x18, 0xf6, 0x8e, - 0x43, 0xad, 0xb3, 0x4d, 0x35, 0xd5, 0x5d, 0x7f, - 0x66, 0x36, 0x45, 0xef, 0xca, 0xb0, 0x65, 0xfd, - 0x25, 0xc4, 0xf5, 0xaa, 0x7e, 0x01, 0xd9, 0x74, - 0x90, 0x71, 0x18, 0x4a, 0xcc, 0x00, 0x59, 0xf7, - 0xaa, 0xd3, 0x76, 0x90, 0x48, 0xc2, 0x90, 0xf6, - 0x75, 0x28, 0xe1, 0x96, 0x4d, 0x19, 0x93, 0x44, - 0x24, 0x29, 0x34, 0xa4, 0x7c, 0xd9, 0x17, 0x6c, - 0x35, 0x55, 0x74, 0xc9, 0x5b, 0x31, 0xed, 0x3d, - 0x10, 0xb6, 0x99, 0xb9, 0x26, 0x47, 0xf8, 0xcd, - 0x5e, 0x50, 0xdf, 0xd8, 0x5e, 0x06, 0xc2, 0x43, - 0xd9, 0xda, 0x11, 0xb0, 0xd7, 0x11, 0x2f, 0x50, - 0x7d, 0x2b, 0x22, 0xb2, 0x97, 0x08, 0xa3, 0x43, - 0x00, 0x64, 0x27, 0x27, 0x5d, 0x71, 0x7d, 0x63, - 0x7b, 0xc6, 0x70, 0x6e, 0xaf, 0xc7, 0xe5, 0xc3, - 0x97, 0x79, 0xf7, 0x33, 0x31, 0xad, 0x48, 0x2b, - 0x30, 0x9f, 0x14, 0x49, 0xa2, 0xce, 0xf4, 0x35, - 0x36, 0x21, 0xa6, 0x95, 0x66, 0xda, 0x07, 0x82, - 0x91, 0x71, 0x24, 0xe4, 0x8b, 0xc8, 0x7e, 0xfa, - 0xc8, 0x4c, 0x74, 0xa3, 0x6a, 0x31, 0xa8, 0xe4, - 0xbd, 0xb7, 0xb1, 0x10, 0xa6, 0x36, 0x01, 0x36, - 0x6c, 0x25, 0x25, 0xd4, 0x28, 0xbb, 0x4b, 0x59, - 0x89, 0xee, 0xfc, 0x47, 0x10, 0xde, 0xc9, 0xd6, - 0x8e, 0x89, 0xaf, 0x68, 0x68, 0x8a, 0x66, 0x5f, - 0xf8, 0xf4, 0xbf, 0x86, 0x8d, 0xa7, 0x01, 0x52, - 0xf5, 0x2f, 0xc8, 0x05, 0x6d, 0xdd, 0xbb, 0x5d, - 0xca, 0x25, 0xde, 0x7d, 0x3e, 0x68, 0x86, 0x46, - 0xcf, 0x01, 0xc8, 0xf8, 0x43, 0x49, 0xb2, 0xc4, - 0x5b, 0xee, 0x52, 0x9e, 0x5d, 0x54, 0xee, 0x7d, - 0x46, 0xd8, 0x68, 0x13, 0x4e, 0xd8, 0x73, 0x2b, - 0x4a, 0x56, 0xd4, 0xcc, 0x48, 0x55, 0xd5, 0xe4, - 0x6e, 0x8d, 0x71, 0x19, 0x80, 0xcf, 0xb2, 0xca, - 0x44, 0xf8, 0x65, 0xa0, 0x29, 0xa2, 0xbc, 0xd7, - 0xde, 0xbb, 0x67, 0x7a, 0x2b, 0xc0, 0x39, 0x2b, - 0xa4, 0x98, 0x0d, 0x62, 0xdc, 0x67, 0x26, 0xb4, - 0xab, 0x70, 0x42, 0xe4, 0x09, 0x22, 0x64, 0x4c, - 0xd6, 0x98, 0xe8, 0x18, 0x8d, 0x25, 0xfa, 0x8e, - 0xfb, 0xb2, 0xb6, 0xeb, 0x87, 0xca, 0xbd, 0xcf, - 0x84, 0x13, 0x5a, 0x44, 0x24, 0xc3, 0xa7, 0xec, - 0x14, 0x66, 0x3a, 0x4f, 0xa5, 0xd1, 0xc5, 0x1e, - 0x77, 0x07, 0x27, 0x72, 0x02, 0x64, 0x3b, 0xe6, - 0xd5, 0x24, 0xd1, 0xf3, 0xfe, 0xc6, 0xa8, 0x52, - 0xf6, 0xad, 0xa2, 0x89, 0x91, 0x25, 0xc8, 0x6d, - 0xf0, 0x68, 0x26, 0x36, 0xd7, 0x54, 0xb8, 0x15, - 0xde, 0x6c, 0x12, 0xd4, 0x87, 0x63, 0x0f, 0x01, - 0x74, 0x93, 0x42, 0xd3, 0x3d, 0xba, 0xd4, 0xaf, - 0x54, 0x75, 0x73, 0xef, 0x87, 0xd2, 0xbd, 0x4f, - 0xc3, 0xbe, 0xf9, 0x15, 0xae, 0x8f, 0xfb, 0xb6, - 0x1a, 0xed, 0x3c, 0x06, 0xe6, 0x04, 0x5a, 0x76, - 0x29, 0x9d, 0xb0, 0x2d, 0xf0, 0xb8, 0x1a, 0xc0, - 0xa4, 0x92, 0xe5, 0xa2, 0x08, 0x1a, 0xfc, 0xd9, - 0xd2, 0xc3, 0xd7, 0x87, 0x22, 0xd7, 0x31, 0x93, - 0x52, 0x56, 0x6c, 0xdb, 0x30, 0x3e, 0xd5, 0x4c, - 0x14, 0x7f, 0xa8, 0x0f, 0x45, 0xef, 0x20, 0xe6, - 0x9f, 0x28, 0x34, 0x35, 0x40, 0xe2, 0x2a, 0xb3, - 0x45, 0xad, 0x92, 0xf7, 0xdc, 0xce, 0x0c, 0xd0, - 0x06, 0xf4, 0xed, 0x35, 0x33, 0x4c, 0x47, 0xd7, - 0xf4, 0xa3, 0x20, 0x51, 0x4b, 0x57, 0x8d, 0x77, - 0x2a, 0x5c, 0x8b, 0x90, 0xf0, 0xdd, 0xcb, 0x0c, - 0x63, 0x34, 0x48, 0xac, 0x5d, 0xd9, 0x18, 0x3d, - 0x2d, 0xd5, 0xd7, 0xf5, 0xa1, 0xe8, 0x6c, 0x02, - 0x2d, 0x53, 0x17, 0xd3, 0x16, 0x3a, 0x84, 0xa8, - 0xbd, 0xd8, 0xe3, 0x56, 0x7a, 0x63, 0xf2, 0x87, - 0x62, 0xdf, 0x25, 0x40, 0xed, 0x70, 0x8b, 0xf0, - 0x03, 0x6f, 0xf9, 0xd4, 0x37, 0xcd, 0x0a, 0x94, - 0xbc, 0xe7, 0xd6, 0x83, 0x68, 0x93, 0x3a, 0x17, - 0x00, 0x40, 0x64, 0x37, 0x4f, 0xbd, 0x1c, 0x54, - 0x61, 0x23, 0x1d, 0x0f, 0x00, 0xb2, 0x44, 0x77, - 0x5e, 0x0d, 0x70, 0xc6, 0x04, 0xcc, 0x49, 0x26, - 0x68, 0x02, 0xcd, 0x03, 0x3d, 0x65, 0x5e, 0x6d, - 0xfa, 0xcb, 0x04, 0x02, 0x5e, 0x45, 0xaa, 0xe4, - 0x0b, 0xb9, 0x67, 0x3f, 0x88, 0xbe, 0xad, 0xaa, - 0xa4, 0x86, 0x70, 0x64, 0x31, 0xc0, 0x4a, 0xe5, - 0xe1, 0x08, 0x78, 0x28, 0x5d, 0xa0, 0x6c, 0x76, - 0xd4, 0xef, 0x79, 0xca, 0xb1, 0x93, 0x3a, 0x17, - 0x00, 0xe0, 0x70, 0x52, 0x23, 0xec, 0x25, 0x49, - 0xb8, 0xdc, 0xe7, 0x53, 0x3f, 0x96, 0xad, 0xaa, - 0x9a, 0xdc, 0x6d, 0x14, 0x48, 0x2f, 0xd4, 0x1e, - 0x3d, 0xc7, 0x82, 0xe5, 0x6b, 0xfe, 0x70, 0xe4, - 0x7a, 0x00, 0x58, 0xb3, 0x26, 0x56, 0xe8, 0x20, - 0xc7, 0x4a, 0x0c, 0xcd, 0x73, 0xbf, 0x43, 0x13, - 0xa2, 0x4c, 0x65, 0x65, 0xee, 0x6b, 0x6d, 0x2d, - 0xf0, 0x87, 0x23, 0xbf, 0x67, 0x26, 0xa5, 0x04, - 0xdb, 0x4c, 0x78, 0xa6, 0xc6, 0xe3, 0x5e, 0x64, - 0x45, 0xa8, 0xe4, 0xbd, 0xbe, 0xdc, 0xca, 0xb5, - 0x49, 0xf4, 0xa4, 0xce, 0x13, 0x06, 0x90, 0x74, - 0x9a, 0xb4, 0x53, 0xa8, 0x60, 0x42, 0xe1, 0xc4, - 0xa8, 0xa9, 0x0c, 0x23, 0x97, 0x9c, 0x39, 0xfd, - 0x53, 0x92, 0x72, 0x3e, 0xa0, 0xe4, 0xd4, 0xe8, - 0x04, 0xd3, 0x33, 0x0d, 0xe1, 0xc8, 0xe2, 0xf8, - 0x48, 0x7e, 0x02, 0xc0, 0x6c, 0xd5, 0x71, 0x2c, - 0xd6, 0xc5, 0xec, 0x04, 0x70, 0x7f, 0xd1, 0xc1, - 0xae, 0x6f, 0x5c, 0x5c, 0x36, 0xf5, 0xfd, 0x6c, - 0x8d, 0x57, 0x85, 0x3e, 0x1c, 0x53, 0xb8, 0xd7, - 0xf9, 0x7a, 0xa2, 0x8a, 0xb8, 0x92, 0x54, 0x6b, - 0x47, 0xc7, 0x77, 0xdc, 0x62, 0x49, 0x32, 0x00, - 0xc9, 0x7b, 0x6d, 0xa7, 0x6c, 0xfd, 0xdb, 0x7d, - 0x8e, 0xb2, 0x87, 0xce, 0x9b, 0xc9, 0x6e, 0xb9, - 0x12, 0xe5, 0x3f, 0xfe, 0x4b, 0x6a, 0x2a, 0xa7, - 0x6d, 0x95, 0x10, 0x17, 0x03, 0x48, 0x9b, 0xec, - 0xf9, 0xb0, 0x21, 0x98, 0x7e, 0x0a, 0xc2, 0xf5, - 0x26, 0x86, 0xd8, 0xe1, 0x20, 0xed, 0x7c, 0x80, - 0xfe, 0x03, 0x40, 0xd6, 0x00, 0x16, 0x02, 0x5a, - 0x18, 0x58, 0x24, 0x74, 0x9e, 0xea, 0xf5, 0xb8, - 0x1f, 0xcc, 0x94, 0x84, 0xba, 0x8f, 0x86, 0xa6, - 0xd8, 0xd9, 0x06, 0x7a, 0x36, 0x43, 0x31, 0x48, - 0x93, 0x80, 0x96, 0x1e, 0x5d, 0xaf, 0xb5, 0xb0, - 0xe2, 0xff, 0x12, 0x0b, 0xf7, 0x7a, 0x80, 0x0c, - 0x87, 0x74, 0x7d, 0x28, 0x4b, 0x58, 0x43, 0x63, - 0xdb, 0x5c, 0x16, 0xc2, 0x8e, 0x11, 0x1c, 0x10, - 0xc5, 0x23, 0xc7, 0x5b, 0xc9, 0x13, 0xe4, 0x0f, - 0xb5, 0x5f, 0x08, 0xc8, 0x3a, 0xe4, 0xf6, 0x99, - 0xde, 0x4d, 0x82, 0x2b, 0x6b, 0xca, 0x4a, 0x0f, - 0x15, 0x63, 0x0a, 0x34, 0xc5, 0x4e, 0x97, 0x02, - 0xa7, 0x41, 0xf2, 0x44, 0x12, 0x3c, 0x01, 0x8c, - 0x9e, 0xe4, 0x81, 0xd2, 0x4e, 0xc9, 0xe2, 0xad, - 0x05, 0x95, 0x53, 0x95, 0x53, 0xb0, 0x05, 0x82, - 0x91, 0x71, 0x86, 0x93, 0x96, 0x10, 0xe3, 0x06, - 0x13, 0x32, 0x45, 0xe1, 0x74, 0x54, 0x0c, 0x0c, - 0x2b, 0x33, 0x43, 0xa0, 0x65, 0xd7, 0x08, 0xd9, - 0x75, 0x60, 0x0f, 0x52, 0x05, 0xc0, 0x28, 0x42, - 0x52, 0x9e, 0xdb, 0x57, 0x05, 0xf5, 0xd0, 0xa9, - 0x54, 0xf7, 0x38, 0x23, 0x54, 0xb4, 0x57, 0xec, - 0xb5, 0x91, 0x29, 0x6c, 0x24, 0x1f, 0x3c, 0x70, - 0x13, 0x00, 0xe5, 0x34, 0x71, 0x7d, 0x78, 0x3d, - 0x53, 0xd7, 0x36, 0x34, 0xb6, 0x5d, 0xc4, 0x42, - 0xd4, 0xc3, 0xc6, 0x1f, 0x76, 0x18, 0x4c, 0xb7, - 0xd4, 0x94, 0xb9, 0x0f, 0xab, 0xc4, 0x55, 0x9d, - 0x08, 0x2c, 0x55, 0x8a, 0x2c, 0xce, 0x00, 0xd5, - 0x87, 0xa2, 0x37, 0x90, 0x46, 0x4b, 0x88, 0x61, - 0xc6, 0x2b, 0xe8, 0xbf, 0xe0, 0x74, 0x5c, 0x60, - 0x47, 0xf9, 0x00, 0xc0, 0x07, 0x0f, 0xdc, 0x04, - 0xb2, 0xa1, 0x7c, 0x60, 0x6f, 0xf7, 0x38, 0xe3, - 0xd0, 0x4e, 0xe6, 0xa1, 0x47, 0x40, 0xed, 0x8c, - 0x19, 0xbd, 0x4c, 0x78, 0xd1, 0x96, 0x70, 0x84, - 0x1f, 0xa7, 0xab, 0xc6, 0x91, 0x8d, 0x9a, 0xca, - 0x69, 0x1b, 0x48, 0xf0, 0xdc, 0x64, 0xba, 0x17, - 0x5b, 0x30, 0xe3, 0x31, 0x33, 0x51, 0xb6, 0x2a, - 0x2c, 0x06, 0x44, 0x7d, 0x28, 0x7a, 0x9e, 0x3f, - 0x1c, 0x0d, 0x12, 0xf0, 0x34, 0xc8, 0x8c, 0xf2, - 0x29, 0x2c, 0x75, 0x67, 0x95, 0x5d, 0xe5, 0x2f, - 0x6b, 0x69, 0x71, 0x32, 0xd9, 0x2b, 0xd8, 0xcd, - 0x84, 0x17, 0xfb, 0x9f, 0x64, 0x1e, 0xe6, 0x73, - 0x46, 0xa0, 0x67, 0xed, 0x74, 0x0e, 0xe0, 0xa4, - 0xf1, 0x07, 0x47, 0x99, 0x79, 0x46, 0x1f, 0x46, - 0x4d, 0x59, 0xe9, 0x9f, 0x18, 0x54, 0x09, 0x60, - 0x87, 0x0d, 0x19, 0x5a, 0x65, 0xef, 0x08, 0x9b, - 0x29, 0x55, 0xbf, 0x24, 0xd0, 0xd8, 0xe1, 0x6e, - 0x08, 0x45, 0x1f, 0x9c, 0x19, 0x8a, 0x6e, 0x23, - 0x60, 0x9d, 0xa9, 0xfa, 0x00, 0x09, 0x5e, 0x13, - 0xc5, 0xc7, 0xcc, 0x5b, 0x58, 0x35, 0x39, 0xeb, - 0x36, 0x78, 0x36, 0x92, 0xf7, 0xd6, 0x74, 0x7d, - 0xe0, 0xfe, 0x0c, 0xd4, 0xf1, 0xa0, 0x74, 0xf1, - 0xfe, 0x50, 0xac, 0xcd, 0x66, 0xbe, 0xe0, 0xf6, - 0x9e, 0x5d, 0xee, 0x69, 0x76, 0x52, 0xa1, 0x25, - 0x53, 0xd6, 0xaf, 0x83, 0xf5, 0xb3, 0xee, 0x6e, - 0x62, 0xaa, 0x87, 0x90, 0xcb, 0x75, 0xa7, 0x7c, - 0xeb, 0x92, 0x33, 0xa7, 0x2b, 0xcf, 0x2a, 0x8b, - 0x01, 0xf1, 0xf7, 0xc1, 0xd8, 0x44, 0x4d, 0x93, - 0x17, 0x12, 0x89, 0x1b, 0x6c, 0x96, 0xcd, 0xf1, - 0xed, 0x2e, 0xee, 0xbc, 0xc6, 0x4c, 0xa0, 0x4b, - 0xda, 0x8e, 0x12, 0x99, 0xc1, 0xda, 0x60, 0xeb, - 0xf8, 0x97, 0x22, 0x5e, 0x8f, 0xeb, 0xb0, 0x68, - 0xf0, 0x41, 0x9e, 0x29, 0x0c, 0x7e, 0x96, 0x00, - 0xa5, 0xa0, 0xcc, 0x34, 0x4c, 0x2d, 0x9c, 0x10, - 0xbb, 0x1e, 0x70, 0x59, 0x8e, 0xc0, 0xb9, 0xa8, - 0xec, 0xd4, 0x0f, 0x02, 0xe1, 0xd8, 0x2f, 0x24, - 0xf3, 0x7f, 0x5a, 0xec, 0xa2, 0x88, 0x89, 0xaf, - 0x00, 0xd3, 0x15, 0x5a, 0xaf, 0x06, 0x7f, 0x28, - 0xba, 0x9f, 0x81, 0x0f, 0x08, 0xd8, 0x06, 0xa6, - 0x6d, 0x20, 0xb9, 0x8d, 0x98, 0xb6, 0x31, 0xa8, - 0x18, 0xc4, 0x93, 0x01, 0x9e, 0xcc, 0xa0, 0xc9, - 0x04, 0x4c, 0x9e, 0x09, 0x9c, 0x04, 0x07, 0x0a, - 0x12, 0xfb, 0x38, 0xd6, 0xde, 0x21, 0x81, 0x44, - 0xad, 0xa4, 0x3f, 0x97, 0xbb, 0x6e, 0x55, 0x4d, - 0xfd, 0x96, 0x8d, 0xc4, 0x3d, 0xb5, 0x57, 0x04, - 0x83, 0xc1, 0x83, 0x66, 0xf8, 0x61, 0x2b, 0x18, - 0x91, 0x89, 0x40, 0x28, 0xf2, 0x0f, 0x12, 0xd4, - 0x0c, 0xfb, 0x51, 0x3c, 0xc3, 0x41, 0x9c, 0x40, - 0xf7, 0xd7, 0x78, 0x5c, 0x26, 0xaa, 0x89, 0x64, - 0x66, 0x48, 0x0b, 0x46, 0x5c, 0x54, 0x76, 0xea, - 0x07, 0x60, 0x34, 0xd8, 0x18, 0x08, 0x00, 0x8e, - 0x37, 0xa8, 0x27, 0xab, 0xf7, 0x4b, 0x2a, 0x02, - 0xc1, 0xc8, 0x38, 0x03, 0xa8, 0xc7, 0xd1, 0xa9, - 0xfc, 0x36, 0x09, 0x31, 0x27, 0x97, 0xca, 0x07, - 0x80, 0xe4, 0xbd, 0xb4, 0xa3, 0x7c, 0x80, 0xd1, - 0x30, 0x50, 0xf9, 0x40, 0x9a, 0xc0, 0x03, 0x09, - 0xb6, 0xa4, 0xbc, 0x01, 0x03, 0xde, 0x5a, 0x17, - 0x6a, 0x1f, 0x5c, 0x18, 0x22, 0x03, 0xcb, 0x5a, - 0x5a, 0x9c, 0xd2, 0x41, 0x2f, 0x9b, 0xca, 0xd4, - 0x75, 0x84, 0x40, 0xc0, 0x13, 0xa2, 0x78, 0xe4, - 0xe9, 0xb9, 0x2a, 0x92, 0xd5, 0x47, 0x5d, 0xa8, - 0x7d, 0x16, 0x18, 0xb7, 0xda, 0xed, 0x27, 0x9d, - 0x4e, 0x53, 0x1a, 0x40, 0xb2, 0xba, 0xd4, 0x3a, - 0x9b, 0x63, 0x0a, 0x82, 0x7c, 0x26, 0x51, 0x55, - 0x53, 0x8d, 0x13, 0xba, 0x4b, 0x7e, 0x0d, 0xeb, - 0x69, 0xcf, 0x86, 0x8b, 0x4f, 0x40, 0xb4, 0xa0, - 0xc6, 0xe3, 0xbe, 0xcd, 0xca, 0x26, 0x58, 0x26, - 0x7c, 0x9b, 0xb6, 0x17, 0x13, 0xe4, 0x33, 0xb0, - 0x59, 0x31, 0x0c, 0xc0, 0xba, 0x54, 0x15, 0xc3, - 0x90, 0xa9, 0x63, 0x62, 0xb2, 0x3d, 0x0b, 0x10, - 0xf0, 0xf5, 0x22, 0xd9, 0xad, 0x94, 0xdb, 0xbe, - 0x21, 0x14, 0xfd, 0x9e, 0xc9, 0xca, 0x58, 0xf6, - 0x12, 0x2e, 0xe7, 0x04, 0x5e, 0xeb, 0xd0, 0x9d, - 0x7f, 0x6f, 0xc6, 0x8d, 0xcb, 0x0c, 0x45, 0xb2, - 0x7b, 0x69, 0x2e, 0xaa, 0xb6, 0x67, 0xd2, 0x65, - 0xda, 0xc2, 0x91, 0x00, 0xe0, 0x0f, 0xc5, 0x42, - 0xb9, 0xa8, 0x1e, 0xca, 0x84, 0x6b, 0x32, 0xe5, - 0xd6, 0x09, 0x84, 0x23, 0x1e, 0xc9, 0xb4, 0x01, - 0xea, 0x29, 0x5b, 0xe2, 0xac, 0x19, 0x35, 0xc2, - 0xd0, 0x2a, 0x38, 0x91, 0x2f, 0x37, 0x37, 0xbb, - 0x87, 0xea, 0x74, 0x10, 0xe8, 0xdf, 0x6a, 0x3c, - 0xae, 0x15, 0xb0, 0xf3, 0xaa, 0x90, 0x81, 0xfa, - 0x70, 0xf4, 0x6a, 0x62, 0x3c, 0x67, 0xbf, 0x27, - 0x0a, 0x7b, 0x3d, 0xae, 0xb4, 0x49, 0x38, 0x33, - 0x4e, 0x2d, 0x42, 0xe0, 0x67, 0xf6, 0x05, 0x00, - 0x88, 0xf1, 0xbb, 0x74, 0xd1, 0xae, 0xf5, 0x8d, - 0xed, 0x27, 0x49, 0xa6, 0x57, 0x60, 0x22, 0x5f, - 0x0f, 0x01, 0x3f, 0x58, 0x30, 0x67, 0xfa, 0x6b, - 0x35, 0x1e, 0xf7, 0x22, 0x43, 0x88, 0xa9, 0x00, - 0x7e, 0x0d, 0xa0, 0x27, 0x17, 0xb2, 0x66, 0x61, - 0x07, 0x08, 0xb7, 0xef, 0x2e, 0xee, 0x9c, 0x5e, - 0xe3, 0x71, 0xfd, 0x1e, 0x79, 0x52, 0x7e, 0xa0, - 0xb1, 0xc3, 0x4d, 0x0c, 0x8b, 0x7e, 0x02, 0x87, - 0x93, 0x4d, 0x87, 0x19, 0x67, 0x00, 0x00, 0xf0, - 0x87, 0x23, 0x75, 0x39, 0xaa, 0x20, 0xde, 0x26, - 0x74, 0xf6, 0xf4, 0xaf, 0x20, 0xee, 0xdb, 0xb4, - 0xbd, 0xb8, 0x50, 0x76, 0x85, 0xd3, 0x14, 0x54, - 0x4a, 0x4d, 0x9a, 0x82, 0x94, 0x81, 0x4d, 0x91, - 0x49, 0xd2, 0x10, 0x37, 0x33, 0xe4, 0x8d, 0x79, - 0x58, 0x44, 0x86, 0x88, 0xf1, 0xd4, 0x28, 0xc3, - 0xf9, 0x82, 0x99, 0xaa, 0x9f, 0x56, 0x08, 0x04, - 0x23, 0xe3, 0xa4, 0x83, 0x42, 0x00, 0x6c, 0xe5, - 0x6f, 0x04, 0x90, 0x08, 0x30, 0x29, 0x2f, 0xcd, - 0xe8, 0x60, 0x9b, 0xd5, 0x00, 0x02, 0xe1, 0x8e, - 0x93, 0x25, 0x1b, 0xad, 0x50, 0x88, 0xf4, 0x55, - 0x90, 0xe8, 0xed, 0x1e, 0xbd, 0xf7, 0x9c, 0xda, - 0xaa, 0x19, 0x07, 0x00, 0xc0, 0x1f, 0x8a, 0x3e, - 0x0f, 0xe0, 0x4a, 0x13, 0x1d, 0x6c, 0xdc, 0x5d, - 0xdc, 0x79, 0x7e, 0xa6, 0x9d, 0xb5, 0xc5, 0x80, - 0x98, 0xd5, 0x1c, 0x3b, 0x4f, 0x4a, 0xbe, 0x01, - 0xc0, 0x5c, 0xc0, 0x52, 0xe8, 0x14, 0x13, 0xb0, - 0x85, 0x09, 0x01, 0x40, 0x3e, 0xe5, 0x2d, 0x9f, - 0x66, 0xcb, 0x75, 0x5e, 0x15, 0x5f, 0xb0, 0x75, - 0x64, 0xa1, 0xa3, 0xe0, 0xcd, 0x34, 0x39, 0x84, - 0xcd, 0xf2, 0x85, 0x20, 0x6d, 0x46, 0x75, 0xf9, - 0x94, 0x0f, 0x33, 0x35, 0xca, 0x6a, 0x00, 0x00, - 0xe0, 0x6f, 0x8a, 0xfe, 0x18, 0x84, 0x5f, 0xe4, - 0x40, 0x28, 0x30, 0xb0, 0xbe, 0x77, 0x6c, 0xfc, - 0xa2, 0xc2, 0x7d, 0x8e, 0xbb, 0xc0, 0xf4, 0xb0, - 0xfa, 0x75, 0xfc, 0x41, 0x01, 0x8b, 0x6f, 0x99, - 0x2d, 0x02, 0x11, 0x68, 0xec, 0x70, 0x1b, 0xc2, - 0xf0, 0x10, 0xb8, 0x9c, 0x99, 0x4e, 0x22, 0x81, - 0xe3, 0xc1, 0x38, 0x1e, 0x89, 0xf7, 0xea, 0x5e, - 0x24, 0x12, 0x38, 0x25, 0xff, 0xa3, 0x88, 0x60, - 0xd9, 0x04, 0x03, 0xa1, 0xfe, 0x33, 0xd5, 0x50, - 0xe0, 0x6b, 0x6d, 0x2d, 0x28, 0xd8, 0xeb, 0x5c, - 0x4d, 0x76, 0x2b, 0xb7, 0xf4, 0xc1, 0xb8, 0xdb, - 0x5b, 0xe1, 0x5e, 0x92, 0xad, 0x99, 0x92, 0x01, - 0x04, 0x83, 0x41, 0xc7, 0xe7, 0x8e, 0x49, 0xef, - 0xe4, 0x62, 0x45, 0x0a, 0x00, 0xcc, 0xd8, 0x44, - 0x84, 0xd9, 0x50, 0x7f, 0xbd, 0x39, 0x28, 0xc0, - 0x65, 0xb9, 0xa8, 0x07, 0x70, 0x24, 0x92, 0xac, - 0x42, 0xfe, 0x02, 0x72, 0x54, 0x18, 0x8b, 0x81, - 0xf7, 0x47, 0xeb, 0x3b, 0x66, 0xaa, 0x38, 0x9d, - 0x28, 0x19, 0x00, 0x70, 0x68, 0xa5, 0xde, 0x08, - 0x7b, 0x5b, 0xc4, 0x16, 0xa1, 0xcb, 0x93, 0x21, - 0x66, 0x5f, 0x39, 0x7c, 0xc1, 0xd6, 0x91, 0x05, - 0x0e, 0x67, 0x5d, 0xce, 0x7e, 0xf9, 0x00, 0x0b, - 0xe2, 0xca, 0xea, 0xf2, 0x52, 0xa5, 0xe8, 0x25, - 0xe5, 0x0d, 0x86, 0xea, 0xf2, 0xd2, 0x10, 0x08, - 0x8f, 0x59, 0x97, 0xcb, 0x32, 0x0f, 0x7e, 0x55, - 0x95, 0x1f, 0x08, 0x46, 0xc6, 0x15, 0x3a, 0x0a, - 0xde, 0xcc, 0xa1, 0xf2, 0x01, 0xc2, 0x63, 0xaa, - 0xca, 0x07, 0x4c, 0xee, 0x30, 0x95, 0xc4, 0x77, - 0xfc, 0x44, 0xd1, 0x9d, 0x3b, 0x37, 0x30, 0xfc, - 0x5e, 0x8f, 0x5b, 0xc9, 0xcb, 0xf6, 0x68, 0x23, - 0xd0, 0xd8, 0xe1, 0x4e, 0xac, 0xf6, 0x73, 0xb2, - 0xe0, 0x4b, 0xc2, 0xcd, 0x09, 0x1d, 0xa9, 0x63, - 0xca, 0x00, 0xaa, 0xaa, 0xaa, 0x74, 0x96, 0xda, - 0x95, 0x04, 0x0c, 0x45, 0xed, 0xde, 0x56, 0x08, - 0x79, 0x2d, 0xf2, 0xf4, 0xae, 0x3d, 0x9c, 0xd4, - 0x87, 0xa3, 0x57, 0x4b, 0x61, 0xb4, 0x20, 0x17, - 0xaf, 0x7a, 0x49, 0x08, 0xd8, 0xcb, 0x52, 0x33, - 0x1d, 0x5e, 0xa6, 0xbc, 0x06, 0xe8, 0x4f, 0x43, - 0x28, 0x5a, 0xcd, 0x89, 0x18, 0xf9, 0x7c, 0xad, - 0x07, 0xf6, 0x41, 0x13, 0x67, 0x7a, 0xe7, 0x4c, - 0x8d, 0xe5, 0xa9, 0xff, 0x61, 0xc1, 0xb7, 0x69, - 0x7b, 0x71, 0x91, 0xec, 0x5e, 0xca, 0xcc, 0x37, - 0xe7, 0xb8, 0x6b, 0x26, 0xc0, 0x5b, 0xe3, 0x71, - 0x07, 0xcc, 0x5e, 0x68, 0xe9, 0x90, 0xa1, 0xc6, - 0xe3, 0x0e, 0xe4, 0x6b, 0x3d, 0x40, 0x04, 0x26, - 0xd0, 0xa2, 0xaf, 0x9a, 0xf2, 0xeb, 0x42, 0xed, - 0xb3, 0x0a, 0x8c, 0xae, 0xb7, 0xf2, 0xa0, 0x7c, - 0x80, 0xf0, 0x98, 0x15, 0xe5, 0x03, 0x16, 0x67, - 0x00, 0x20, 0xe1, 0xa2, 0x54, 0x30, 0x21, 0xf6, - 0x32, 0x81, 0x4d, 0xa5, 0x4d, 0x55, 0x44, 0x82, - 0xf0, 0x84, 0xc6, 0x85, 0xf7, 0x59, 0x75, 0x2a, - 0x39, 0x52, 0x58, 0x15, 0xfa, 0x70, 0x8c, 0x41, - 0x3d, 0x0f, 0x25, 0x8f, 0x74, 0x73, 0x9e, 0x98, - 0x93, 0x41, 0x75, 0xbd, 0xbb, 0x5c, 0x97, 0x59, - 0x75, 0xc1, 0xb3, 0x6c, 0x00, 0x00, 0x10, 0x0c, - 0x6e, 0x2b, 0xea, 0x74, 0xc4, 0xd7, 0x22, 0x7f, - 0x47, 0xb8, 0x1f, 0x03, 0x74, 0x4f, 0xcf, 0x2e, - 0xd7, 0x72, 0xdb, 0xe5, 0x56, 0x87, 0x98, 0x84, - 0x0f, 0x5f, 0xec, 0x7a, 0x80, 0x1f, 0x85, 0x5d, - 0x67, 0x8e, 0xf4, 0x6c, 0x2c, 0xd1, 0x9d, 0x17, - 0xda, 0xd9, 0x9e, 0xb6, 0x65, 0x00, 0x00, 0xe0, - 0x7b, 0xa3, 0x63, 0x74, 0x61, 0x91, 0x11, 0x04, - 0xf0, 0x4d, 0x5b, 0x1d, 0x65, 0xa6, 0x9d, 0x99, - 0x1f, 0xdd, 0x33, 0x62, 0xff, 0xf2, 0x5c, 0x38, - 0x58, 0xe6, 0x93, 0x65, 0x2d, 0x2d, 0xce, 0xf1, - 0x07, 0x47, 0x5d, 0x4f, 0x44, 0xf7, 0xc0, 0xa6, - 0x0f, 0x5f, 0x16, 0xde, 0xed, 0xe9, 0xd6, 0xaa, - 0x6a, 0xcf, 0x9b, 0xf2, 0xb9, 0x9d, 0x4e, 0x6c, - 0x1b, 0x00, 0x00, 0xac, 0x0e, 0x6e, 0x3b, 0x41, - 0x77, 0xc4, 0x43, 0xc8, 0xef, 0x1f, 0x0c, 0x00, - 0x1f, 0x11, 0x63, 0x09, 0x8d, 0x18, 0xf9, 0x54, - 0xae, 0x9d, 0x2f, 0xec, 0x12, 0x68, 0xd9, 0x35, - 0x82, 0x0f, 0x1e, 0xb8, 0x29, 0xe9, 0xb7, 0x6f, - 0xcb, 0x75, 0x5b, 0x81, 0x76, 0x87, 0xee, 0xf4, - 0xa8, 0xe6, 0x12, 0xca, 0x44, 0x4e, 0x0c, 0x00, - 0x00, 0xea, 0x82, 0x5b, 0x26, 0x0b, 0x87, 0xf6, - 0x06, 0xf2, 0x6f, 0x04, 0x00, 0x70, 0x00, 0xa0, - 0x57, 0x41, 0xbc, 0xa2, 0x67, 0xa7, 0x7b, 0xc3, - 0x70, 0x3d, 0x1e, 0x7c, 0x3e, 0x68, 0x85, 0x13, - 0xa3, 0x73, 0x13, 0xb1, 0x7a, 0x7c, 0x29, 0x86, - 0xc6, 0x2f, 0xa1, 0x5d, 0xea, 0xc6, 0x79, 0x0b, - 0xab, 0xa6, 0x6f, 0xcb, 0x45, 0x67, 0x39, 0x33, - 0x00, 0xe0, 0xd0, 0x4c, 0xb0, 0x06, 0xf9, 0x7d, - 0x1c, 0x0c, 0x64, 0x17, 0x80, 0x97, 0x00, 0xb1, - 0x56, 0x14, 0x8f, 0x68, 0xcc, 0xf7, 0xcc, 0x90, - 0x88, 0xcd, 0x3b, 0x58, 0x99, 0x8c, 0xcf, 0xbf, - 0x1c, 0xf6, 0xa2, 0x74, 0xcd, 0xf2, 0xae, 0x43, - 0x77, 0xce, 0xcf, 0xc5, 0x2f, 0xbf, 0x8f, 0x9c, - 0x1a, 0x00, 0x70, 0x68, 0x4d, 0x50, 0x8f, 0xe1, - 0xf1, 0xed, 0xeb, 0x05, 0xb0, 0x09, 0xc0, 0x1b, - 0x82, 0x79, 0x93, 0xc1, 0x5a, 0x24, 0x59, 0x5a, - 0xcd, 0xea, 0x1f, 0x49, 0xf5, 0x8d, 0xed, 0x27, - 0x6a, 0x64, 0x94, 0x26, 0x13, 0x32, 0x9d, 0x87, - 0x44, 0x5a, 0x16, 0x3b, 0xe5, 0xed, 0xad, 0xb2, - 0xb1, 0xa7, 0x5b, 0x5b, 0x60, 0xf7, 0x99, 0x3f, - 0x90, 0x9c, 0x1b, 0x00, 0x90, 0x78, 0x3b, 0xf8, - 0xdc, 0xa1, 0x3f, 0x9f, 0xa7, 0x57, 0x44, 0xb3, - 0x74, 0x31, 0xd0, 0x4e, 0x40, 0x14, 0x8c, 0x3d, - 0x20, 0x74, 0x32, 0xd0, 0x29, 0x18, 0x9d, 0x7d, - 0xc5, 0x16, 0x48, 0x52, 0x89, 0x24, 0x94, 0x10, - 0x50, 0x02, 0x46, 0x09, 0x08, 0xe3, 0x19, 0x70, - 0x27, 0x93, 0x30, 0x0e, 0x5b, 0x42, 0xea, 0x3e, - 0x18, 0x54, 0x37, 0x5a, 0x77, 0x5c, 0x95, 0x0f, - 0x67, 0x94, 0xbc, 0x18, 0x00, 0x70, 0xe8, 0xf9, - 0xf8, 0x08, 0x18, 0x3f, 0xc2, 0xb0, 0x9c, 0x20, - 0x7e, 0x25, 0x60, 0x10, 0x1e, 0xeb, 0xd9, 0xe9, - 0xbe, 0x37, 0x5f, 0xeb, 0x9c, 0xbc, 0x19, 0x40, - 0x1f, 0x0d, 0xa1, 0x68, 0x35, 0x80, 0xe5, 0x36, - 0xc2, 0xce, 0xff, 0xbf, 0x24, 0x79, 0xde, 0x72, - 0xbd, 0xd5, 0x1d, 0x3e, 0xe5, 0x71, 0xf2, 0x6d, - 0x00, 0x40, 0xc2, 0xf1, 0x93, 0x84, 0xf1, 0x02, - 0x90, 0x3d, 0xff, 0xfd, 0xdf, 0x00, 0x00, 0x6e, - 0x66, 0xa9, 0x5d, 0x69, 0x26, 0x61, 0x85, 0x55, - 0xf2, 0x5a, 0x33, 0xa8, 0x8f, 0x05, 0x95, 0x53, - 0x3f, 0x2a, 0xd1, 0x77, 0x9e, 0x0d, 0xc2, 0x12, - 0x7c, 0x05, 0x4f, 0xf7, 0x72, 0x08, 0x83, 0xb0, - 0xa4, 0x44, 0xdf, 0x79, 0xf6, 0x50, 0x28, 0x1f, - 0x18, 0xa2, 0x19, 0xa0, 0x3f, 0x81, 0x70, 0xc4, - 0x63, 0x30, 0x3d, 0x9e, 0x2b, 0xf7, 0xb2, 0xaf, - 0x0a, 0x0c, 0xbc, 0xaf, 0x11, 0xdf, 0x6e, 0xc6, - 0x99, 0x23, 0x17, 0x0c, 0xc9, 0x0c, 0xd0, 0x9f, - 0xea, 0xf2, 0xd2, 0xd0, 0x68, 0x7d, 0xc7, 0x4c, - 0x30, 0xee, 0x86, 0x62, 0x72, 0xa8, 0xaf, 0x38, - 0x5f, 0x80, 0x71, 0xf7, 0x68, 0x7d, 0xc7, 0xcc, - 0xa1, 0x56, 0x3e, 0x30, 0x0c, 0x33, 0x40, 0x7f, - 0x02, 0xe1, 0x8e, 0x93, 0x25, 0xf4, 0xa5, 0x39, - 0x8a, 0x3b, 0x38, 0xfa, 0x20, 0xae, 0x17, 0x70, - 0xdc, 0x91, 0xcd, 0x75, 0x3b, 0xbf, 0x22, 0x0c, - 0xa3, 0x01, 0xf4, 0x11, 0x68, 0x8e, 0xcd, 0x93, - 0x12, 0x3f, 0xcd, 0x45, 0x18, 0xda, 0xd1, 0x01, - 0x85, 0x85, 0xc0, 0xcf, 0xaa, 0xcb, 0x5c, 0xaf, - 0x0f, 0xbb, 0x24, 0x47, 0x82, 0x01, 0xf4, 0xd1, - 0xd0, 0x14, 0x3b, 0x9b, 0x89, 0xef, 0x03, 0x70, - 0xfe, 0x70, 0xcb, 0x92, 0x27, 0xd6, 0x11, 0xd3, - 0x43, 0x35, 0x15, 0xae, 0x8d, 0xc3, 0x2d, 0x48, - 0x1f, 0x47, 0x94, 0x01, 0xf4, 0x51, 0xd7, 0x14, - 0x39, 0x53, 0x80, 0xee, 0x03, 0xa1, 0x06, 0x47, - 0xff, 0x26, 0x12, 0x83, 0xd1, 0x20, 0xc1, 0x0f, - 0xa5, 0x0b, 0xd1, 0x1e, 0x4e, 0x8e, 0x48, 0x03, - 0xe8, 0x63, 0x75, 0xf3, 0xd6, 0x53, 0xe2, 0x52, - 0xbf, 0x96, 0x40, 0xd7, 0xd9, 0x4c, 0x5c, 0x35, - 0x0c, 0x50, 0x84, 0xc1, 0xcf, 0x3a, 0x85, 0x63, - 0x45, 0xaa, 0xcc, 0x1c, 0x47, 0x0a, 0x47, 0xb4, - 0x01, 0xf4, 0xa7, 0x21, 0x1c, 0x3b, 0x8b, 0xc1, - 0xd7, 0x11, 0xe3, 0x8a, 0x23, 0x75, 0x57, 0x91, - 0x80, 0xbd, 0x4c, 0x29, 0x55, 0xfd, 0x5d, 0x00, - 0x00, 0x00, 0xa2, 0x49, 0x44, 0x41, 0x54, 0x78, - 0x91, 0x40, 0xcf, 0xd6, 0x94, 0xbb, 0xec, 0xa4, - 0xe0, 0x1f, 0x32, 0x8e, 0x1a, 0x03, 0xe8, 0xc3, - 0xd7, 0xda, 0x5a, 0x50, 0xf4, 0x89, 0xe6, 0x81, - 0x10, 0x73, 0x39, 0x11, 0x50, 0x71, 0x06, 0x54, - 0xea, 0xf0, 0xe5, 0x07, 0x1d, 0xc0, 0xdb, 0x04, - 0xac, 0x87, 0x94, 0x1b, 0xba, 0xc7, 0x19, 0x21, - 0x2b, 0xe5, 0xe4, 0x86, 0x93, 0xa3, 0xce, 0x00, - 0x06, 0xb2, 0x66, 0x73, 0xac, 0x44, 0x8f, 0x73, - 0x25, 0x33, 0xce, 0x05, 0xe1, 0x2c, 0x24, 0x7c, - 0xed, 0xc7, 0xe4, 0x69, 0xb8, 0x7d, 0x00, 0xda, - 0xc0, 0xf8, 0x23, 0x11, 0xd6, 0x3b, 0x9c, 0xd4, - 0xd8, 0x97, 0x75, 0xfb, 0x68, 0xe5, 0xa8, 0x37, - 0x80, 0x54, 0xac, 0x69, 0x8a, 0x1d, 0x1f, 0x87, - 0x51, 0x0a, 0xd2, 0xa6, 0x01, 0x3c, 0x0d, 0xc0, - 0x14, 0x4e, 0x94, 0x58, 0x1d, 0x45, 0x89, 0x62, - 0xcb, 0x25, 0x20, 0x94, 0x80, 0x31, 0x0a, 0x00, - 0x40, 0xd8, 0x9f, 0x2c, 0xa2, 0xdd, 0x99, 0x2c, - 0xa5, 0xbb, 0x3f, 0x59, 0x50, 0xb3, 0x03, 0xa0, - 0x36, 0xb0, 0xd1, 0xe6, 0x84, 0x16, 0x31, 0x1b, - 0x99, 0x7c, 0x34, 0xf0, 0xbf, 0xa1, 0x9a, 0x51, - 0xbb, 0xb4, 0x00, 0x98, 0x4f, 0x00, 0x00, 0x00, - 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, - 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, - 0x29, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x2d, 0x64, - 0x61, 0x74, 0x61, 0x2d, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x61, + 0x62, 0x6f, 0x75, 0x74, 0x2e, 0x63, 0x73, 0x73, + 0xdc, 0x17, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xb5, 0x58, 0xcd, 0x92, 0xda, 0x38, + 0x10, 0x3e, 0x2f, 0x4f, 0xa1, 0x0a, 0x35, 0x55, + 0x43, 0x0a, 0x1b, 0x1b, 0x30, 0x61, 0xa0, 0x76, + 0x2f, 0x39, 0xec, 0x03, 0xe4, 0xb0, 0x87, 0xad, + 0x3d, 0xc8, 0xb6, 0x00, 0x55, 0x64, 0xcb, 0x25, + 0x8b, 0xf9, 0xc9, 0x54, 0xde, 0x7d, 0x5b, 0x96, + 0x64, 0xcb, 0xb6, 0xf0, 0xcc, 0x6c, 0x6a, 0x21, + 0x4c, 0x40, 0x6e, 0xb5, 0xbe, 0xee, 0xfe, 0xba, + 0xa5, 0xd6, 0xea, 0x33, 0xfa, 0x93, 0xf1, 0x14, + 0x33, 0xf4, 0xf5, 0xdb, 0x37, 0x74, 0xe2, 0x02, + 0x55, 0xf8, 0x4c, 0x6a, 0xf4, 0x79, 0x35, 0x9b, + 0x5d, 0x62, 0xf4, 0x3a, 0x43, 0xe6, 0x95, 0x71, + 0xc6, 0xc5, 0x01, 0xcd, 0x53, 0x9c, 0xe6, 0xe9, + 0xee, 0xd8, 0x8e, 0x4b, 0xf2, 0x2c, 0x83, 0xfa, + 0x82, 0x73, 0xfe, 0x74, 0x40, 0x11, 0x8a, 0xab, + 0x67, 0xf8, 0xfb, 0x74, 0xa1, 0x92, 0x74, 0x32, + 0x05, 0x16, 0x67, 0x5a, 0x06, 0x29, 0x97, 0x92, + 0x17, 0x20, 0x75, 0x9c, 0xfd, 0x04, 0xed, 0xb2, + 0x60, 0x8e, 0xfe, 0x13, 0x2f, 0x65, 0x70, 0xc2, + 0x05, 0x65, 0x2f, 0x07, 0xf4, 0x15, 0x97, 0x12, + 0x0b, 0xc2, 0xd8, 0x12, 0xd5, 0xb8, 0xac, 0x83, + 0x9a, 0x08, 0x7a, 0x3a, 0xf6, 0x64, 0x0f, 0x28, + 0x8e, 0x2b, 0x89, 0x32, 0x2b, 0x79, 0x1c, 0x21, + 0x5d, 0x93, 0xcd, 0x76, 0xe3, 0x20, 0xad, 0x70, + 0x9e, 0xd3, 0xf2, 0x7c, 0x40, 0xeb, 0x08, 0x40, + 0x36, 0x7f, 0xa2, 0xe6, 0xbf, 0x4e, 0x24, 0xc5, + 0xd9, 0xf7, 0xb3, 0xe0, 0xd7, 0x32, 0x0f, 0xac, + 0x96, 0xd3, 0x0e, 0xde, 0x5b, 0xaf, 0x08, 0x2d, + 0xc0, 0x55, 0x07, 0x14, 0x3c, 0x91, 0xf4, 0x3b, + 0x95, 0xc1, 0x59, 0xe0, 0x9c, 0x92, 0x52, 0xde, + 0xb7, 0xb2, 0xf6, 0xc5, 0x68, 0x49, 0xb0, 0x58, + 0x8e, 0xc7, 0xc9, 0x49, 0x22, 0xc9, 0xab, 0x1b, + 0x4f, 0xb4, 0xbf, 0xc6, 0x0f, 0x1b, 0x68, 0x41, + 0x0d, 0x13, 0xef, 0xa3, 0x25, 0x9a, 0x13, 0xf5, + 0xca, 0x16, 0x93, 0x72, 0xf1, 0xd2, 0x5a, 0xb2, + 0x68, 0xc5, 0x16, 0x5e, 0xa3, 0x6a, 0xfa, 0x03, + 0x6c, 0x8a, 0xa3, 0xe8, 0x0e, 0x25, 0xa4, 0xf0, + 0x8a, 0x08, 0x52, 0x11, 0x0c, 0x01, 0x28, 0xb9, + 0xf9, 0xda, 0xc4, 0x73, 0xf5, 0x19, 0xe1, 0x94, + 0x5f, 0x61, 0x5c, 0x71, 0x27, 0xcc, 0x29, 0x66, + 0xfc, 0x6c, 0x02, 0xdc, 0xb9, 0xde, 0xaa, 0xd4, + 0x94, 0x68, 0x06, 0x10, 0xbe, 0x4a, 0xae, 0x47, + 0x1b, 0x32, 0x61, 0x46, 0xcf, 0xf0, 0x24, 0x03, + 0x57, 0x12, 0xa1, 0xc7, 0x7d, 0x71, 0x39, 0x19, + 0x42, 0xa4, 0x5c, 0xe4, 0x44, 0x04, 0xca, 0xf9, + 0xd7, 0x1a, 0x90, 0xdb, 0x15, 0xf4, 0x38, 0xac, + 0x00, 0x71, 0xae, 0x39, 0xa3, 0x39, 0x9a, 0xe7, + 0x9b, 0xfc, 0x4b, 0x66, 0xa6, 0x3d, 0xd1, 0x5c, + 0x5e, 0x0e, 0x68, 0x1b, 0x29, 0x79, 0x80, 0x1f, + 0x56, 0x82, 0x57, 0x44, 0x48, 0x0a, 0xe4, 0x7f, + 0xed, 0x41, 0xd4, 0xf0, 0xac, 0x48, 0xc0, 0x70, + 0x4a, 0x2c, 0x71, 0x2d, 0x98, 0x87, 0x87, 0x87, + 0x46, 0x62, 0xde, 0x78, 0x20, 0x90, 0x54, 0x32, + 0xd2, 0x17, 0x49, 0x19, 0x98, 0xe0, 0xca, 0xd4, + 0xd7, 0xd4, 0x23, 0xd6, 0x4b, 0xaf, 0xa9, 0xd4, + 0x72, 0x1d, 0x5e, 0xb1, 0x2b, 0x00, 0xd5, 0x39, + 0x3b, 0xd7, 0x3f, 0x02, 0x89, 0x53, 0x46, 0x66, + 0xae, 0x21, 0x01, 0xf0, 0x40, 0x05, 0xd6, 0xf2, + 0xdd, 0x38, 0xe0, 0x61, 0x77, 0x37, 0xf6, 0xbd, + 0xa2, 0x5f, 0xcf, 0xbb, 0x00, 0x8f, 0xe1, 0xaa, + 0x06, 0x66, 0xd8, 0x6f, 0xda, 0x16, 0x77, 0x35, + 0x24, 0x2f, 0xb3, 0x41, 0xb8, 0x77, 0x76, 0xb1, + 0x2e, 0x80, 0x60, 0x63, 0xb2, 0x4b, 0xa2, 0x24, + 0xbe, 0x19, 0x25, 0xf7, 0xb1, 0x2f, 0x0b, 0x0d, + 0xf0, 0xcd, 0xe6, 0xce, 0x87, 0x21, 0x1f, 0x62, + 0xd8, 0x7a, 0x31, 0xb8, 0x0a, 0x8d, 0x8d, 0xb6, + 0x3c, 0xc5, 0x7e, 0xc2, 0xf8, 0xca, 0x8a, 0x99, + 0xa9, 0x3d, 0x6b, 0xa7, 0x49, 0x01, 0x25, 0xab, + 0x82, 0xa2, 0x54, 0x4a, 0x1f, 0x40, 0x71, 0xb8, + 0xf0, 0x47, 0x22, 0x3a, 0xa4, 0x3d, 0x5c, 0x53, + 0x2b, 0xba, 0x31, 0x27, 0x15, 0xad, 0x2e, 0xb8, + 0x7c, 0xd1, 0x85, 0x1a, 0x4a, 0x69, 0x68, 0x47, + 0x02, 0xa7, 0xb0, 0x7a, 0xf2, 0x66, 0xb3, 0xdd, + 0x25, 0x78, 0x3b, 0x4a, 0x2b, 0x53, 0xcb, 0x4a, + 0x5e, 0xea, 0xc8, 0x76, 0xea, 0x52, 0x9e, 0xbf, + 0x0c, 0x48, 0xaa, 0x2b, 0x8e, 0x4d, 0xe4, 0xe7, + 0xa0, 0x97, 0x4b, 0xfe, 0xec, 0x56, 0x7e, 0x20, + 0xd5, 0xe5, 0x45, 0xb1, 0x0c, 0x79, 0x68, 0x99, + 0x18, 0x16, 0x36, 0xdb, 0x80, 0xa9, 0x41, 0x61, + 0x5b, 0x80, 0x7c, 0x75, 0x41, 0x69, 0x3c, 0x09, + 0x5e, 0xf8, 0xb4, 0xd9, 0x79, 0x6f, 0x6b, 0x13, + 0xf4, 0x7c, 0x91, 0x8e, 0xf0, 0x13, 0x51, 0x03, + 0x90, 0xaf, 0x9c, 0xe5, 0x7d, 0x8f, 0x17, 0xa4, + 0xe0, 0x42, 0xfb, 0x3b, 0xd4, 0xdf, 0x4d, 0x44, + 0x33, 0x5c, 0x49, 0xca, 0x4b, 0x83, 0xc3, 0x5d, + 0x72, 0x57, 0xdd, 0x56, 0xed, 0xdb, 0x17, 0xc3, + 0x07, 0x0b, 0xd1, 0x47, 0xb6, 0x37, 0xca, 0x41, + 0x1f, 0x54, 0xbf, 0x84, 0x81, 0xf4, 0x3a, 0x4c, + 0xee, 0xf4, 0x0a, 0xfa, 0x7b, 0x2f, 0x97, 0xf6, + 0xd1, 0x2f, 0x14, 0x81, 0xfe, 0xc2, 0xf2, 0x82, + 0xde, 0x95, 0x80, 0xbf, 0x50, 0x04, 0xc6, 0x6b, + 0xe6, 0xa3, 0x7d, 0xe6, 0x76, 0xd2, 0xef, 0xff, + 0x97, 0xa4, 0x47, 0xbd, 0xac, 0x77, 0x5c, 0x1b, + 0xef, 0xee, 0x7c, 0x88, 0xbb, 0x2a, 0x80, 0x3e, + 0x5e, 0x05, 0x3a, 0x52, 0xe2, 0xaa, 0x62, 0x34, + 0xc3, 0x8a, 0x7f, 0xba, 0xfe, 0x87, 0xee, 0x88, + 0xce, 0x5d, 0x43, 0x88, 0x16, 0x10, 0x6c, 0xed, + 0xc7, 0x89, 0x90, 0xa2, 0x9f, 0xb7, 0xb5, 0x2c, + 0x1b, 0xbc, 0x68, 0xf6, 0x9b, 0x8d, 0x98, 0xc7, + 0x6d, 0xe6, 0x59, 0xa0, 0xe8, 0x63, 0x0a, 0x4a, + 0xbb, 0x47, 0xeb, 0x04, 0xe8, 0x8a, 0xcc, 0x78, + 0x99, 0x0a, 0xd4, 0x0f, 0xd2, 0x62, 0xa3, 0xb6, + 0x2c, 0x40, 0xe5, 0x03, 0xa5, 0xd0, 0xb4, 0x41, + 0x8f, 0x13, 0x10, 0xbc, 0x21, 0x17, 0xd2, 0x4c, + 0xa5, 0xa8, 0x75, 0xc2, 0x6e, 0x3b, 0xa1, 0x33, + 0xcc, 0xb1, 0xc4, 0x75, 0x27, 0xbc, 0x8e, 0xa6, + 0x10, 0x84, 0xb4, 0xac, 0xae, 0xf2, 0x03, 0xaa, + 0x9d, 0x58, 0x34, 0xb5, 0xd1, 0x53, 0x8f, 0xdc, + 0x2a, 0x52, 0x17, 0x18, 0x4e, 0xb7, 0x7e, 0x85, + 0x6a, 0xa8, 0xc4, 0x85, 0xd2, 0x38, 0x2e, 0x31, + 0xb7, 0xa7, 0x5c, 0x05, 0x5b, 0x3a, 0x60, 0x06, + 0x67, 0x0f, 0xff, 0xbc, 0x81, 0x95, 0x9a, 0x45, + 0xad, 0xeb, 0xf7, 0xda, 0xe6, 0x8e, 0x98, 0xb4, + 0xcc, 0xf8, 0xb9, 0xa4, 0x92, 0x6b, 0x56, 0xb6, + 0x3f, 0xdd, 0xed, 0xa4, 0xad, 0x4e, 0xc7, 0x7e, + 0xf2, 0xea, 0xfe, 0x60, 0x38, 0x27, 0xa7, 0x8f, + 0xf3, 0x02, 0xd3, 0x32, 0x65, 0x3c, 0xfb, 0x6e, + 0x34, 0xe4, 0xb4, 0xae, 0x18, 0x86, 0x86, 0xa1, + 0x61, 0xe7, 0x9b, 0x1b, 0x92, 0xe1, 0x64, 0x77, + 0xde, 0x34, 0xc3, 0x86, 0x97, 0xdd, 0xf8, 0xc5, + 0xf8, 0xf1, 0x4b, 0x72, 0xf7, 0x36, 0x96, 0x3f, + 0xe0, 0xd7, 0xb8, 0xde, 0xb6, 0xe7, 0xac, 0x3e, + 0xc6, 0x20, 0x6b, 0x7b, 0x95, 0x47, 0x75, 0xda, + 0xcc, 0x30, 0xb3, 0xa1, 0x2f, 0x68, 0x9e, 0x5b, + 0x23, 0x3a, 0x5f, 0xd8, 0x46, 0x25, 0xde, 0x35, + 0x1a, 0x3d, 0x60, 0xda, 0x36, 0xcd, 0xc6, 0x71, + 0xbf, 0xdf, 0xe3, 0x7d, 0xd2, 0xdf, 0xbd, 0x54, + 0xb1, 0x79, 0xa4, 0xe4, 0x49, 0x85, 0x63, 0xde, + 0xfe, 0x78, 0x1d, 0x2e, 0x96, 0x58, 0xd4, 0x8e, + 0x17, 0x63, 0xcd, 0xff, 0xff, 0xe2, 0x47, 0xa7, + 0xe3, 0xb3, 0x4a, 0xad, 0x6b, 0x93, 0xed, 0x40, + 0xa9, 0x3b, 0xaf, 0xe2, 0x35, 0x55, 0xdc, 0x83, + 0xb1, 0x14, 0xca, 0xcb, 0xd5, 0x36, 0x93, 0x4d, + 0xcd, 0x35, 0xca, 0xcc, 0x62, 0xe6, 0x97, 0x46, + 0xa4, 0x99, 0xd3, 0xda, 0x07, 0x2d, 0x19, 0xb5, + 0xf5, 0x15, 0x3c, 0xf1, 0x97, 0xb2, 0xa7, 0xe9, + 0x71, 0x13, 0xd8, 0xa6, 0xae, 0x45, 0x5a, 0x62, + 0xca, 0x6a, 0x84, 0x4b, 0xa8, 0xde, 0x00, 0x4b, + 0x58, 0x47, 0x34, 0x95, 0x74, 0xe8, 0x84, 0x68, + 0xf7, 0x21, 0x27, 0x38, 0xb6, 0xf4, 0x69, 0xdd, + 0x81, 0x83, 0x8d, 0xbb, 0x08, 0x18, 0xad, 0xe5, + 0x28, 0x0c, 0x3e, 0x2b, 0x18, 0x35, 0x62, 0x6a, + 0x06, 0x34, 0x75, 0x2f, 0xc0, 0x25, 0xf9, 0x52, + 0xb5, 0x67, 0xb6, 0x1e, 0xd5, 0x68, 0xa9, 0x5a, + 0xce, 0xa0, 0xa1, 0xa7, 0x97, 0x6c, 0xe0, 0x48, + 0xcd, 0xa5, 0x1e, 0x1a, 0xb3, 0x82, 0x35, 0x79, + 0xdf, 0x5a, 0x6c, 0x83, 0xb6, 0x5e, 0x7f, 0x9c, + 0xd6, 0xcd, 0x52, 0xea, 0x81, 0x5a, 0xea, 0xc4, + 0xd4, 0xe1, 0xe5, 0x02, 0x4c, 0x27, 0xe5, 0xc0, + 0x3d, 0x71, 0xcb, 0x3d, 0xe0, 0xab, 0x82, 0xdf, + 0x15, 0x86, 0x96, 0x0d, 0xd0, 0xe8, 0x43, 0x4d, + 0x7a, 0xb4, 0x6c, 0x50, 0x5b, 0xae, 0x79, 0x12, + 0x8d, 0x09, 0x02, 0x6b, 0xa9, 0x2e, 0x55, 0x1f, + 0x63, 0x7a, 0xb6, 0xba, 0x8d, 0xd7, 0x6d, 0x63, + 0x93, 0xb1, 0xad, 0x63, 0xbf, 0xb6, 0xf0, 0x13, + 0x95, 0xa5, 0x53, 0x86, 0xbe, 0xf7, 0x82, 0xc3, + 0x3d, 0x40, 0xc6, 0xf6, 0x00, 0x79, 0xf3, 0x3c, + 0xd8, 0xad, 0x05, 0xca, 0x68, 0x55, 0xd3, 0x7a, + 0xf2, 0xc4, 0xec, 0xf8, 0xc0, 0x26, 0xc0, 0x9b, + 0x7e, 0x88, 0x37, 0xc9, 0xc8, 0x11, 0x8e, 0x07, + 0x3c, 0x47, 0x81, 0x2c, 0xcb, 0xc6, 0xa7, 0x2f, + 0xd8, 0x74, 0xee, 0x55, 0x07, 0x10, 0x08, 0x52, + 0xf3, 0xab, 0xc8, 0xc8, 0x61, 0xb5, 0x5a, 0x71, + 0x71, 0x5e, 0x9d, 0x4b, 0x5e, 0x90, 0x95, 0xed, + 0x37, 0x56, 0x05, 0xad, 0x6b, 0xf0, 0x68, 0x07, + 0x30, 0xac, 0xca, 0xf3, 0xc2, 0x18, 0xd1, 0xdd, + 0x39, 0x2c, 0xcd, 0xad, 0x4a, 0x77, 0xed, 0x02, + 0x7b, 0x8d, 0xb9, 0x31, 0x81, 0x0e, 0x65, 0xaf, + 0xde, 0xcb, 0xe6, 0x9a, 0x60, 0x31, 0x6a, 0x76, + 0x3c, 0x17, 0x18, 0xb7, 0x78, 0xe6, 0xf7, 0x99, + 0x3e, 0xbc, 0x2d, 0x67, 0x87, 0x13, 0xcf, 0xae, + 0x35, 0xba, 0xed, 0x55, 0x8f, 0x73, 0x9a, 0xbb, + 0x02, 0xfd, 0xec, 0x79, 0x70, 0x9c, 0x57, 0x1f, + 0x71, 0x4e, 0xf1, 0x7d, 0xb4, 0x6c, 0xde, 0xe1, + 0x66, 0x71, 0x13, 0x01, 0xce, 0x14, 0xc0, 0x0f, + 0x2e, 0x43, 0xcb, 0x9a, 0xc8, 0x77, 0x2f, 0x96, + 0x31, 0x5e, 0x03, 0xd9, 0xaf, 0xe0, 0x53, 0xdb, + 0xdd, 0xd8, 0xbb, 0x2e, 0x37, 0xf5, 0xe0, 0x78, + 0x82, 0xd6, 0x49, 0x54, 0xd4, 0xef, 0xa8, 0xdd, + 0x5d, 0xfd, 0x30, 0xe5, 0xbb, 0x1b, 0xe0, 0x15, + 0xce, 0xa8, 0x7c, 0x69, 0xd3, 0xf7, 0x47, 0x40, + 0xcb, 0x9c, 0x3c, 0x43, 0x66, 0x1d, 0x87, 0xbb, + 0x9b, 0x27, 0xa1, 0xa6, 0xb2, 0x68, 0x3b, 0xb8, + 0xf2, 0x88, 0x37, 0x23, 0x8a, 0xb7, 0x22, 0xa3, + 0xeb, 0xa5, 0x36, 0xc1, 0x61, 0x52, 0xf3, 0xd9, + 0xea, 0xcf, 0x44, 0x4f, 0xe6, 0x78, 0xb5, 0x71, + 0xaa, 0xbf, 0x13, 0x6f, 0xa4, 0xf6, 0xd1, 0x52, + 0xff, 0x0b, 0xd7, 0x0b, 0xef, 0x75, 0x56, 0x12, + 0xdd, 0x4d, 0x44, 0xc5, 0x34, 0x11, 0xaf, 0x53, + 0x4b, 0x18, 0x20, 0xfb, 0xa9, 0xe8, 0xf6, 0xd9, + 0xd4, 0x33, 0xaa, 0xdb, 0x5d, 0x3c, 0x97, 0x09, + 0x51, 0x14, 0x79, 0xb6, 0x11, 0x83, 0x6a, 0x92, + 0x48, 0x6d, 0xb4, 0xe3, 0x81, 0x02, 0x01, 0x6d, + 0xd2, 0x23, 0xc9, 0x91, 0x77, 0x67, 0x1a, 0xd2, + 0x2e, 0x0a, 0xbf, 0x24, 0x35, 0x22, 0x18, 0xb4, + 0xc3, 0xce, 0x0b, 0xfb, 0x46, 0x2f, 0xce, 0x51, + 0xff, 0x78, 0x11, 0xbb, 0x25, 0x7a, 0x40, 0xb6, + 0xe1, 0xd9, 0x73, 0x02, 0x8e, 0xc7, 0x98, 0xb6, + 0x2c, 0xb6, 0x9d, 0x8d, 0xba, 0x83, 0xf9, 0x3b, + 0xa7, 0xe2, 0xf7, 0x4f, 0x42, 0xb2, 0x4f, 0xff, + 0x4c, 0x4f, 0xd7, 0x07, 0x89, 0x51, 0x6a, 0xd0, + 0xf2, 0x02, 0x7c, 0x96, 0x6f, 0xe8, 0x73, 0xbc, + 0x63, 0x36, 0x3c, 0x73, 0xa5, 0xf1, 0x73, 0xf6, + 0x2f, 0x4e, 0xa7, 0x41, 0xf1, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x63, + 0x6c, 0x65, 0x61, 0x72, 0x2d, 0x64, 0x61, 0x74, + 0x61, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x63, 0x1e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x78, 0xda, 0xed, 0x59, 0x4b, 0x8f, 0xdb, 0x36, 0x10, 0xbe, 0xe7, 0x57, 0xb0, 0xba, 0x16, 0xf2, @@ -5382,112 +3364,641 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x2e, 0x68, 0x74, 0x6d, - 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xd1, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0x85, 0x53, 0xdb, 0x6e, 0xdb, 0x38, - 0x10, 0x7d, 0xf7, 0x57, 0x4c, 0x05, 0x04, 0x48, - 0x01, 0xcb, 0xb2, 0x12, 0x14, 0xd8, 0xc4, 0x17, - 0x40, 0x71, 0xec, 0xc6, 0x80, 0xe3, 0x04, 0xb6, - 0xdc, 0xd4, 0x4f, 0x0b, 0x5a, 0xa2, 0x2c, 0x36, - 0x34, 0xa9, 0x92, 0x94, 0x6d, 0x75, 0xd1, 0x0f, - 0xea, 0x6f, 0xf4, 0xcb, 0x3a, 0xa4, 0x84, 0x3a, - 0x4d, 0xbb, 0xbb, 0x2f, 0xd2, 0x90, 0x73, 0xe6, - 0xcc, 0xcc, 0x99, 0x61, 0xff, 0xcd, 0xed, 0xc3, - 0x28, 0x5e, 0x3f, 0x8e, 0x21, 0x37, 0x3b, 0x0e, - 0x8f, 0xab, 0x9b, 0xd9, 0x74, 0x04, 0x9e, 0x1f, - 0x04, 0x4f, 0x97, 0xa3, 0x20, 0xb8, 0x8d, 0x6f, - 0xe1, 0xe3, 0x5d, 0x7c, 0x3f, 0x83, 0xb0, 0xd3, - 0x85, 0xa5, 0x51, 0x2c, 0x31, 0x41, 0x30, 0x9e, - 0x7b, 0xe0, 0xe5, 0xc6, 0x14, 0xd7, 0x41, 0x70, - 0x38, 0x1c, 0x3a, 0x87, 0xcb, 0x8e, 0x54, 0xdb, - 0x20, 0x5e, 0x04, 0x47, 0xcb, 0x12, 0xda, 0xb0, - 0xc6, 0xf4, 0xb5, 0x8b, 0xe9, 0xa4, 0x26, 0xf5, - 0x86, 0xad, 0xfe, 0x1b, 0xdf, 0x6f, 0x01, 0x8c, - 0x64, 0x51, 0x29, 0xb6, 0xcd, 0x0d, 0x7c, 0xff, - 0x06, 0x17, 0xdd, 0xb0, 0xdb, 0xb6, 0xdf, 0x10, - 0x3e, 0x30, 0xc1, 0x12, 0x56, 0x6a, 0xb8, 0xa5, - 0x05, 0xfb, 0xf2, 0x45, 0xf2, 0x16, 0x82, 0xe3, - 0x9c, 0x69, 0x28, 0x94, 0xdc, 0x2a, 0xb2, 0x03, - 0x34, 0x33, 0x45, 0x29, 0x68, 0x99, 0x99, 0x03, - 0x51, 0xb4, 0x07, 0x95, 0x2c, 0x21, 0x21, 0x02, - 0x14, 0x4d, 0x99, 0xcd, 0xb5, 0x29, 0x0d, 0x05, - 0x66, 0x80, 0x88, 0x34, 0x90, 0x0a, 0x76, 0x32, - 0x65, 0x59, 0x85, 0x34, 0x78, 0x55, 0x8a, 0x94, - 0x2a, 0x30, 0x39, 0x05, 0x43, 0xd5, 0x4e, 0x83, - 0xcc, 0xdc, 0xe1, 0xfd, 0x7c, 0x05, 0xef, 0xa9, - 0xa0, 0x8a, 0x60, 0xff, 0xe5, 0x86, 0xb3, 0x04, - 0x66, 0x2c, 0xa1, 0x42, 0x53, 0x20, 0x98, 0xd9, - 0xde, 0xe8, 0x9c, 0xa6, 0xb0, 0xb1, 0x34, 0x36, - 0x60, 0x62, 0x2b, 0x58, 0x36, 0x15, 0xc0, 0x44, - 0x22, 0x2f, 0x31, 0x4c, 0x8a, 0x1e, 0x50, 0x86, - 0x7e, 0x05, 0x7b, 0xaa, 0x34, 0x9e, 0xe1, 0xa2, - 0x0d, 0x58, 0xc2, 0x39, 0x31, 0xb6, 0x4a, 0x05, - 0xb2, 0xb0, 0xa8, 0xb7, 0xc8, 0x42, 0x44, 0x05, - 0x9c, 0x98, 0x13, 0xb4, 0xf3, 0xa7, 0x4e, 0x4f, - 0x0d, 0xa5, 0xc0, 0x84, 0x4b, 0x9d, 0xcb, 0x02, - 0xab, 0xcf, 0x91, 0x11, 0xfb, 0x39, 0x30, 0xce, - 0x61, 0x43, 0xa1, 0xd4, 0x34, 0x2b, 0x79, 0x1b, - 0x19, 0x10, 0x0b, 0x4f, 0xd3, 0xf8, 0xee, 0x61, - 0x15, 0x43, 0x34, 0x5f, 0xc3, 0x53, 0xb4, 0x58, - 0x44, 0xf3, 0x78, 0xdd, 0x43, 0xac, 0xc9, 0x25, - 0x7a, 0xe9, 0x9e, 0xd6, 0x4c, 0x6c, 0x57, 0x70, - 0x86, 0xc4, 0xd8, 0x83, 0x22, 0xc2, 0x54, 0xa8, - 0x06, 0x12, 0xdc, 0x8f, 0x17, 0xa3, 0x3b, 0x8c, - 0x88, 0x6e, 0xa6, 0xb3, 0x69, 0xbc, 0xb6, 0xe5, - 0x4f, 0xa6, 0xf1, 0x7c, 0xbc, 0x5c, 0xc2, 0xe4, - 0x61, 0x01, 0x11, 0x3c, 0x46, 0x8b, 0x78, 0x3a, - 0x5a, 0xcd, 0xa2, 0x05, 0xee, 0xca, 0xe2, 0xf1, - 0x61, 0x39, 0xee, 0xc0, 0x92, 0xda, 0x9a, 0x28, - 0x86, 0xff, 0x87, 0x94, 0x99, 0x1b, 0x06, 0xea, - 0x95, 0x52, 0x43, 0x18, 0xd7, 0xae, 0xe3, 0x35, - 0x0e, 0x4f, 0x63, 0x5d, 0x3c, 0x85, 0x9c, 0xec, - 0x29, 0x0e, 0x31, 0xa1, 0x6c, 0x8f, 0x55, 0x11, - 0x48, 0x70, 0x47, 0xfe, 0x7f, 0x42, 0x56, 0x4b, - 0x2e, 0xc5, 0xd6, 0xf5, 0x87, 0xd8, 0x93, 0x80, - 0x3d, 0x60, 0x19, 0x08, 0x69, 0xda, 0x70, 0x50, - 0x0c, 0x57, 0xc2, 0xc8, 0xdf, 0x67, 0x87, 0xd1, - 0xa7, 0xe9, 0xb5, 0x61, 0x2a, 0x92, 0x4e, 0x1b, - 0xde, 0x85, 0x08, 0x22, 0xe2, 0x99, 0xa3, 0xe4, - 0xb8, 0xf0, 0x94, 0x22, 0xc5, 0x84, 0x65, 0x48, - 0x3f, 0xe1, 0x52, 0xaa, 0x36, 0xdc, 0x48, 0x6d, - 0x2c, 0xfc, 0x3e, 0x82, 0xee, 0x45, 0x18, 0x76, - 0xfd, 0xf0, 0xb2, 0x1b, 0xb6, 0x61, 0xb5, 0x8c, - 0x3a, 0x2d, 0xdf, 0xc7, 0x25, 0x77, 0x2f, 0xe9, - 0xb8, 0xe3, 0x42, 0x0f, 0xfe, 0xf0, 0x4a, 0xc2, - 0xab, 0xab, 0xab, 0xfa, 0x71, 0x78, 0x16, 0x74, - 0xcd, 0x89, 0xd8, 0x0e, 0xbc, 0x33, 0xed, 0xc1, - 0xc9, 0x4a, 0x99, 0x72, 0x86, 0x25, 0xa3, 0x24, - 0x1d, 0x62, 0xa1, 0xfd, 0x1d, 0xea, 0x06, 0x96, - 0xce, 0xa7, 0x9f, 0x4b, 0xb6, 0x1f, 0x78, 0x89, - 0x14, 0x86, 0x0a, 0xe3, 0x9b, 0xaa, 0xa0, 0x1e, - 0x34, 0xa7, 0x81, 0x67, 0xe8, 0xd1, 0x04, 0x96, - 0xbe, 0x07, 0x49, 0x4e, 0x94, 0xa6, 0x66, 0x50, - 0x9a, 0xcc, 0xff, 0xcb, 0x83, 0xc0, 0xf1, 0x18, - 0x66, 0x38, 0x1d, 0x9e, 0xe9, 0x7e, 0x50, 0x5b, - 0xf6, 0x4e, 0x9b, 0x8a, 0xa3, 0x44, 0x48, 0xd4, - 0xc4, 0x27, 0x1a, 0x93, 0x5b, 0x8c, 0xf3, 0x38, - 0xcc, 0x0b, 0x53, 0x27, 0x8a, 0x15, 0xe6, 0x25, - 0xfe, 0x13, 0xd9, 0x93, 0xfa, 0xd6, 0xb3, 0x08, - 0x80, 0xac, 0x14, 0x89, 0x55, 0x15, 0xb8, 0x24, - 0xe9, 0xdf, 0xb8, 0xef, 0x07, 0x52, 0x9d, 0xbf, - 0x75, 0xae, 0x7f, 0xdc, 0x17, 0xe0, 0x4c, 0x3b, - 0xe3, 0x6b, 0x4d, 0xee, 0x82, 0xb1, 0xdf, 0xa0, - 0x6e, 0xb8, 0xbf, 0x91, 0x69, 0x05, 0x09, 0x27, - 0x5a, 0x37, 0x4a, 0x20, 0x2a, 0x65, 0x7b, 0x60, - 0x69, 0xdd, 0x39, 0x61, 0xb8, 0x0f, 0x4d, 0xb2, - 0x57, 0x2e, 0x94, 0xe1, 0xa7, 0xc3, 0x39, 0xf3, - 0xd0, 0xf5, 0x82, 0xbf, 0x97, 0xb7, 0x36, 0xa4, - 0x49, 0x40, 0x8f, 0x05, 0x8a, 0xef, 0xd6, 0xe0, - 0x97, 0xc8, 0x9f, 0x45, 0x36, 0x21, 0x01, 0xc6, - 0x0c, 0x5b, 0xff, 0x42, 0x82, 0x8f, 0x0f, 0xf7, - 0x62, 0x23, 0x8f, 0xaf, 0x28, 0xfa, 0xb5, 0x03, - 0xa4, 0x48, 0x70, 0x73, 0x9f, 0x07, 0xde, 0x49, - 0xac, 0xeb, 0x5f, 0xd4, 0xa9, 0x15, 0xaf, 0xd1, - 0xc3, 0xdf, 0xd3, 0xbe, 0x3a, 0x34, 0x06, 0x06, - 0xa0, 0x52, 0x4e, 0x38, 0x9c, 0xf9, 0xb0, 0xf5, - 0x03, 0x5a, 0x51, 0xcf, 0xda, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x65, + 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, 0x2d, + 0x62, 0x6f, 0x6f, 0x6b, 0x6d, 0x61, 0x72, 0x6b, + 0x2d, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x2d, + 0x75, 0x69, 0x2e, 0x78, 0x6d, 0x6c, 0x00, 0x00, + 0x9c, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x75, + 0x69, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x62, + 0x61, 0x72, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x46, + 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x22, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x46, 0x69, 0x6c, 0x65, 0x22, 0x3e, 0x3c, + 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x4e, 0x65, 0x77, 0x54, 0x6f, 0x70, 0x69, + 0x63, 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, + 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, + 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, + 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x4f, 0x70, 0x65, 0x6e, 0x49, 0x6e, + 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x2f, + 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, + 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x3d, 0x22, 0x4f, 0x70, 0x65, 0x6e, 0x49, + 0x6e, 0x54, 0x61, 0x62, 0x22, 0x2f, 0x3e, 0x3c, + 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x52, 0x65, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x73, + 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, + 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, + 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x3d, 0x22, 0x50, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, + 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x49, + 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x2f, 0x3e, + 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, + 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, + 0x22, 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, + 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, + 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, + 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x45, 0x64, 0x69, 0x74, + 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x20, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x45, 0x64, + 0x69, 0x74, 0x22, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, + 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x43, 0x75, + 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, + 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x43, 0x6f, + 0x70, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, + 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x50, + 0x61, 0x73, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, + 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x22, + 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, + 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, + 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x41, 0x6c, + 0x6c, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, + 0x6e, 0x75, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x56, + 0x69, 0x65, 0x77, 0x4d, 0x65, 0x6e, 0x75, 0x22, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x56, 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, + 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, + 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x56, 0x69, 0x65, 0x77, 0x54, 0x69, 0x74, + 0x6c, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, + 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x56, + 0x69, 0x65, 0x77, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x6d, + 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, + 0x75, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x48, 0x65, 0x6c, 0x70, 0x4d, 0x65, 0x6e, 0x75, + 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x22, 0x3e, + 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, + 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x2f, + 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, + 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x3d, 0x22, 0x48, 0x65, 0x6c, 0x70, 0x41, + 0x62, 0x6f, 0x75, 0x74, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x2f, + 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x61, 0x72, 0x3e, + 0x3c, 0x70, 0x6f, 0x70, 0x75, 0x70, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x45, 0x70, 0x68, + 0x79, 0x42, 0x6f, 0x6f, 0x6b, 0x6d, 0x61, 0x72, + 0x6b, 0x45, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x50, + 0x6f, 0x70, 0x75, 0x70, 0x22, 0x20, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x50, 0x6f, + 0x70, 0x75, 0x70, 0x41, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x4f, 0x70, 0x65, + 0x6e, 0x49, 0x6e, 0x57, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, + 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x4f, 0x70, + 0x65, 0x6e, 0x49, 0x6e, 0x54, 0x61, 0x62, 0x22, + 0x2f, 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, + 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, + 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x43, 0x6f, 0x70, 0x79, 0x22, 0x2f, 0x3e, 0x3c, + 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x52, 0x65, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x6d, + 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x2f, + 0x3e, 0x3c, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, + 0x6e, 0x75, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x50, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, + 0x73, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x70, 0x6f, + 0x70, 0x75, 0x70, 0x3e, 0x3c, 0x70, 0x6f, 0x70, + 0x75, 0x70, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x45, 0x70, 0x68, 0x79, 0x42, 0x6f, 0x6f, + 0x6b, 0x6d, 0x61, 0x72, 0x6b, 0x4b, 0x65, 0x79, + 0x77, 0x6f, 0x72, 0x64, 0x50, 0x6f, 0x70, 0x75, + 0x70, 0x22, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x3d, 0x22, 0x50, 0x6f, 0x70, 0x75, 0x70, + 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x69, 0x74, 0x65, + 0x6d, 0x20, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x3d, 0x22, 0x52, 0x65, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x2f, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x69, 0x74, 0x65, 0x6d, 0x20, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x70, 0x6f, 0x70, 0x75, 0x70, 0x3e, 0x3c, 0x2f, + 0x75, 0x69, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x70, 0x72, 0x65, 0x66, + 0x73, 0x2d, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x91, 0x99, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x78, 0xda, 0xed, 0x5d, 0x41, 0x77, 0xdb, 0x36, + 0x12, 0xbe, 0xe7, 0x57, 0x60, 0x79, 0xc8, 0x65, + 0x57, 0xb6, 0x25, 0x3b, 0xb6, 0x93, 0xd8, 0xea, + 0x4b, 0xd3, 0x24, 0xed, 0x5b, 0xb7, 0x9b, 0x17, + 0x3b, 0xcd, 0xdb, 0x13, 0x1e, 0x44, 0x8e, 0x24, + 0xd4, 0x20, 0xc1, 0x02, 0x90, 0x64, 0xf5, 0xb4, + 0xbf, 0x66, 0x7f, 0xd8, 0xfe, 0x92, 0x05, 0x40, + 0x4a, 0xb6, 0x28, 0x89, 0x22, 0x19, 0x89, 0x26, + 0x25, 0xfa, 0x64, 0x49, 0x00, 0x88, 0x99, 0xf9, + 0x66, 0x30, 0x18, 0x0e, 0x30, 0x57, 0x3f, 0x3c, + 0xf8, 0x0c, 0x8d, 0x41, 0x48, 0xca, 0x83, 0x6b, + 0xa7, 0x7d, 0x74, 0xe2, 0x20, 0x08, 0x5c, 0xee, + 0xd1, 0x60, 0x70, 0xed, 0x7c, 0xbd, 0xfb, 0xd8, + 0xba, 0x74, 0x7e, 0xe8, 0xbe, 0xb8, 0xfa, 0x5b, + 0xab, 0x85, 0x3e, 0x41, 0x00, 0x82, 0x28, 0xf0, + 0xd0, 0x84, 0xaa, 0x21, 0x1a, 0x30, 0xe2, 0x01, + 0x3a, 0x3d, 0x6a, 0x9f, 0x1f, 0x9d, 0xa0, 0x56, + 0x4b, 0x37, 0xa2, 0x81, 0x02, 0xd1, 0x27, 0x2e, + 0x74, 0xaf, 0x04, 0xfc, 0x39, 0xa2, 0x02, 0x24, + 0x62, 0xb4, 0x77, 0xed, 0x0c, 0xd4, 0xfd, 0xdf, + 0x9d, 0xc7, 0xa7, 0x9c, 0xea, 0xa7, 0x1c, 0x77, + 0xaf, 0x78, 0xef, 0x0f, 0x70, 0x15, 0x72, 0x19, + 0x91, 0xf2, 0xda, 0xf9, 0xa4, 0xee, 0xdf, 0x79, + 0x7f, 0x8c, 0xa4, 0xf2, 0x21, 0x50, 0x0e, 0xa2, + 0xde, 0xb5, 0x43, 0xe6, 0x9f, 0xdb, 0x4e, 0xf7, + 0x2a, 0x14, 0x3c, 0x04, 0xa1, 0xa6, 0x28, 0x20, + 0x3e, 0x5c, 0x3b, 0x8c, 0x4f, 0x40, 0x38, 0xdd, + 0xf6, 0xd5, 0xf1, 0xec, 0x87, 0xa5, 0x26, 0xa3, + 0x30, 0xb4, 0x4d, 0x4e, 0x4e, 0x52, 0x1a, 0x8d, + 0x09, 0x1b, 0x81, 0xd3, 0xbd, 0x48, 0x69, 0x22, + 0x15, 0x84, 0x98, 0x06, 0xae, 0x00, 0x3b, 0xb7, + 0xd4, 0x67, 0x86, 0x64, 0x00, 0x0b, 0x6d, 0x17, + 0x9e, 0x7d, 0x1c, 0xd1, 0x9c, 0x8b, 0xf6, 0x8e, + 0x93, 0x42, 0x98, 0xf9, 0x7b, 0xe6, 0x99, 0xdf, + 0x50, 0xa9, 0x6e, 0x15, 0x17, 0x10, 0x4d, 0x9c, + 0xe9, 0x8f, 0xd2, 0x7c, 0x34, 0x32, 0x73, 0x39, + 0x1b, 0xf9, 0x81, 0xec, 0x5a, 0xfc, 0x44, 0x1f, + 0x5a, 0xe6, 0x69, 0xf6, 0x91, 0x06, 0x34, 0x71, + 0x0b, 0xa4, 0xa6, 0xa1, 0x9e, 0xc2, 0xc0, 0x1d, + 0x12, 0x41, 0x84, 0x20, 0x53, 0x83, 0x8f, 0x64, + 0x1f, 0x3d, 0xaa, 0x7b, 0x8f, 0x46, 0x82, 0xe5, + 0xed, 0x98, 0xa1, 0xcb, 0xf1, 0x7c, 0xa6, 0x73, + 0x42, 0x15, 0xf8, 0x21, 0xd3, 0x70, 0x9f, 0x91, + 0xfa, 0x59, 0x40, 0x5f, 0xfe, 0x44, 0x09, 0xe3, + 0x03, 0x07, 0x85, 0x44, 0x68, 0x26, 0x59, 0xfa, + 0xe3, 0xaf, 0x96, 0xf8, 0xe9, 0x92, 0x00, 0xf7, + 0xb9, 0x3b, 0x92, 0x4e, 0xf7, 0x23, 0x61, 0x12, + 0x52, 0x58, 0xdf, 0xe3, 0xc2, 0x03, 0x81, 0x27, + 0xd4, 0x53, 0x43, 0xa7, 0x9b, 0x26, 0x50, 0xc1, + 0x99, 0x06, 0x2b, 0x84, 0x34, 0x1c, 0x92, 0x60, + 0xda, 0x0a, 0xf5, 0x9c, 0x40, 0xcf, 0xc4, 0x05, + 0x99, 0xd2, 0xc9, 0xe7, 0x1e, 0x61, 0x4e, 0xf7, + 0x4e, 0x8c, 0xd2, 0x26, 0x31, 0xa1, 0x81, 0xc7, + 0x27, 0x38, 0xe4, 0x92, 0x2a, 0xad, 0xa6, 0x4e, + 0xd7, 0x05, 0xa3, 0xcf, 0x29, 0x3d, 0x3c, 0x90, + 0x4a, 0xf0, 0x29, 0x36, 0xe6, 0x00, 0x47, 0x1c, + 0xd9, 0xf8, 0x14, 0xea, 0xf2, 0x00, 0x9b, 0x7f, + 0x9d, 0xae, 0xb6, 0x0a, 0x19, 0x09, 0x30, 0x12, + 0xc3, 0x43, 0x6a, 0x86, 0xf7, 0x2c, 0xb7, 0x9f, + 0xb6, 0x75, 0x87, 0x94, 0x79, 0xc8, 0xda, 0x9e, + 0x80, 0xb0, 0x96, 0xfd, 0x78, 0xed, 0x0c, 0x41, + 0x5b, 0x27, 0xd1, 0x23, 0x5a, 0x4d, 0x96, 0x21, + 0xfb, 0xb3, 0xfd, 0xf1, 0x47, 0xfd, 0xa3, 0x85, + 0xec, 0xbc, 0xed, 0x0a, 0x33, 0xa3, 0xa8, 0xd2, + 0x1c, 0x47, 0x4a, 0x90, 0x40, 0x6a, 0x34, 0x90, + 0x1e, 0xd3, 0x5f, 0x4e, 0x41, 0x0b, 0xf5, 0x73, + 0xa6, 0xa9, 0x8f, 0xa9, 0xa4, 0x3d, 0x23, 0xb3, + 0x0d, 0x7c, 0xc9, 0x81, 0x16, 0x39, 0xe4, 0x93, + 0x96, 0xcb, 0xb8, 0x84, 0x56, 0x6f, 0xa4, 0x94, + 0x11, 0x55, 0x72, 0xf0, 0x39, 0x88, 0x8f, 0x2d, + 0x3b, 0xd6, 0x31, 0x69, 0xdc, 0xe3, 0x0f, 0xab, + 0xf8, 0xf3, 0xa3, 0xfe, 0xda, 0x72, 0x26, 0xe2, + 0x76, 0xcb, 0xb4, 0x5b, 0x61, 0x86, 0x76, 0x40, + 0x5b, 0x76, 0x4d, 0xe0, 0x82, 0x6a, 0xbc, 0x91, + 0x08, 0xaa, 0x7a, 0x69, 0x51, 0xd4, 0x25, 0x2c, + 0x8d, 0x6b, 0x21, 0x71, 0xf5, 0xa2, 0xe6, 0x74, + 0x3b, 0x9b, 0xc1, 0x43, 0x5c, 0x33, 0x2c, 0xd6, + 0x88, 0x26, 0x2b, 0xd9, 0x63, 0xb9, 0x9e, 0x64, + 0xd2, 0x93, 0x4e, 0x69, 0xbc, 0xda, 0xc4, 0x81, + 0x1c, 0xcc, 0x62, 0x64, 0xca, 0x47, 0x0a, 0x4b, + 0x35, 0xb5, 0x46, 0x21, 0xf0, 0x56, 0x42, 0x40, + 0xd3, 0x7d, 0xaf, 0x09, 0x5f, 0xea, 0x0d, 0x0f, + 0x21, 0x09, 0xbc, 0xcd, 0x4f, 0xe9, 0x53, 0xb6, + 0xd9, 0x78, 0x98, 0x87, 0x60, 0xa3, 0xa6, 0x4b, + 0xf3, 0x48, 0x36, 0x9c, 0x9b, 0x97, 0xc5, 0xe5, + 0x65, 0x3e, 0xcb, 0x05, 0xc4, 0xae, 0x60, 0xfe, + 0x6f, 0x5c, 0x41, 0x8f, 0xf3, 0xfb, 0x88, 0xf7, + 0xc6, 0x7e, 0x48, 0x1c, 0xcc, 0xbe, 0xdb, 0x06, + 0x44, 0x37, 0xb4, 0xcc, 0x8e, 0x50, 0xa3, 0xa7, + 0x38, 0x6a, 0xbe, 0x82, 0xcb, 0xeb, 0xe8, 0x9b, + 0xc3, 0x6a, 0x60, 0xdd, 0x2d, 0x86, 0xed, 0xba, + 0x1c, 0x29, 0x6a, 0xd9, 0xfa, 0xd7, 0xee, 0xec, + 0x42, 0x01, 0xdb, 0x97, 0xb9, 0xf8, 0x30, 0xa2, + 0xe5, 0xb2, 0xa0, 0x2c, 0xba, 0x8c, 0x51, 0x6d, + 0x5f, 0x9e, 0x56, 0x9b, 0xa6, 0xf3, 0x2c, 0x24, + 0xdd, 0x90, 0x1e, 0xb0, 0xd8, 0xfb, 0x33, 0xff, + 0xb6, 0x4f, 0x4f, 0x4e, 0x4a, 0x21, 0x6b, 0x48, + 0x18, 0x1d, 0x68, 0x8a, 0xa4, 0x22, 0x42, 0xa5, + 0x1a, 0x4a, 0x3b, 0xc1, 0x15, 0x8b, 0xf8, 0x4f, + 0x7c, 0x12, 0x30, 0x4e, 0xbc, 0x85, 0x25, 0x9c, + 0x28, 0x25, 0xa8, 0x5e, 0x5a, 0x41, 0x3e, 0xf9, + 0x7f, 0xe6, 0x25, 0x01, 0x1d, 0x0c, 0xb5, 0x8f, + 0x6e, 0xb7, 0x0d, 0x46, 0x5f, 0x98, 0x67, 0xfd, + 0xc7, 0xa7, 0x7d, 0x4a, 0x36, 0xbd, 0xdf, 0x6b, + 0x51, 0x17, 0x11, 0xf9, 0xfa, 0xa2, 0x46, 0x88, + 0x4c, 0x3a, 0xba, 0x44, 0x0c, 0x68, 0x80, 0x2d, + 0x1c, 0x92, 0xd6, 0x6b, 0x23, 0xf5, 0x5e, 0x0c, + 0x05, 0x1c, 0x39, 0x55, 0x78, 0xf8, 0x2c, 0x06, + 0x67, 0xa8, 0x3f, 0xfd, 0xc5, 0xf5, 0xc7, 0x6c, + 0x26, 0xa7, 0x93, 0x53, 0x3f, 0x93, 0x44, 0x46, + 0x9a, 0x51, 0x06, 0x95, 0xeb, 0x75, 0x10, 0xcf, + 0x94, 0x10, 0xf5, 0xb5, 0x36, 0x81, 0x78, 0x93, + 0xb6, 0xa5, 0x97, 0x80, 0x47, 0x81, 0x6e, 0xc4, + 0x68, 0x00, 0x29, 0x7e, 0xef, 0x76, 0x34, 0x6f, + 0x53, 0xab, 0xbc, 0xaa, 0xa7, 0xf7, 0x93, 0x2e, + 0x0c, 0x2d, 0x91, 0xc7, 0x8f, 0x3f, 0xd6, 0xcc, + 0x5c, 0xbc, 0x1f, 0x82, 0x1b, 0xbb, 0xc0, 0x71, + 0xa8, 0x62, 0xa4, 0xb8, 0xaf, 0xe1, 0xeb, 0xe2, + 0x19, 0xba, 0x24, 0x76, 0x4d, 0xa3, 0xd9, 0xee, + 0x24, 0x3b, 0x14, 0xde, 0xe1, 0xd9, 0x58, 0x84, + 0xb1, 0x29, 0xd2, 0xbd, 0x02, 0x34, 0x1b, 0x14, + 0x34, 0x3e, 0x28, 0xdb, 0xf6, 0x66, 0x6b, 0x43, + 0x4b, 0x01, 0x2e, 0xd0, 0x31, 0x48, 0xec, 0x41, + 0x9f, 0x8c, 0x98, 0xda, 0x2c, 0x84, 0x0d, 0x08, + 0x4d, 0x6e, 0xa1, 0x05, 0x99, 0x60, 0xbd, 0xf1, + 0xd6, 0x04, 0x2b, 0x2e, 0x2a, 0x04, 0xe8, 0x76, + 0x3a, 0x38, 0x9e, 0x0b, 0xb3, 0x15, 0x9d, 0xd6, + 0x49, 0x2d, 0xa7, 0x95, 0xc9, 0x21, 0x38, 0xdf, + 0x43, 0x07, 0xf5, 0xb2, 0x26, 0xde, 0xe9, 0x2d, + 0x10, 0xe1, 0x0e, 0x1b, 0xd7, 0x34, 0x42, 0xe2, + 0xa1, 0x3a, 0xa6, 0xd2, 0xa2, 0x00, 0x43, 0xa0, + 0x87, 0x00, 0xeb, 0x96, 0xb6, 0x4b, 0xe1, 0x44, + 0x71, 0x2f, 0x73, 0x71, 0xc6, 0x95, 0xf0, 0x31, + 0x3f, 0xd8, 0xb9, 0xbc, 0xd9, 0xda, 0xc2, 0xed, + 0x07, 0xe0, 0xf3, 0x40, 0xfb, 0x3c, 0x13, 0xea, + 0x0d, 0x40, 0x0b, 0x75, 0x91, 0x66, 0x97, 0xfb, + 0x3d, 0x5e, 0x23, 0xcf, 0x74, 0xd9, 0xcb, 0x33, + 0x04, 0xac, 0x81, 0xa0, 0x25, 0xae, 0x14, 0x81, + 0xfa, 0xdc, 0x33, 0xd0, 0x79, 0x7c, 0xa7, 0x54, + 0x88, 0xa5, 0x1b, 0xe6, 0xd3, 0xb8, 0x20, 0x87, + 0xe7, 0xb0, 0xb5, 0xb7, 0x11, 0x2a, 0xb9, 0x7c, + 0xb5, 0x8f, 0xc1, 0xbb, 0xce, 0xeb, 0x4e, 0x4d, + 0xdc, 0xa3, 0x6f, 0xd0, 0x43, 0xef, 0x79, 0xa0, + 0x34, 0x77, 0x2a, 0xec, 0x23, 0xed, 0xdc, 0x54, + 0x27, 0x40, 0x79, 0x7e, 0x58, 0x6e, 0xd2, 0x52, + 0x38, 0x22, 0xe4, 0xe1, 0x28, 0x94, 0x98, 0x30, + 0xc6, 0x27, 0x85, 0xe3, 0x10, 0xa6, 0x33, 0xb2, + 0x23, 0x21, 0x1c, 0xbd, 0x18, 0xdf, 0xaf, 0xb8, + 0x43, 0x56, 0xe5, 0xab, 0x6c, 0x7c, 0x62, 0x6b, + 0xc1, 0x2b, 0xaf, 0xc7, 0xb8, 0x7b, 0xbf, 0x0d, + 0xb8, 0x60, 0xe2, 0x59, 0x45, 0x90, 0x36, 0x81, + 0xa6, 0xc1, 0x4b, 0x9d, 0xe2, 0x59, 0x99, 0xf1, + 0x02, 0x81, 0x91, 0x3b, 0x0e, 0xd9, 0x48, 0x5b, + 0xaa, 0xc2, 0x71, 0xce, 0x0f, 0x76, 0x14, 0x34, + 0x1b, 0xa6, 0x81, 0x4a, 0x95, 0xa0, 0xd2, 0x69, + 0x3c, 0xe9, 0x1c, 0xd3, 0xca, 0xca, 0xad, 0xc5, + 0x4c, 0xa4, 0x28, 0x07, 0x4f, 0xab, 0x84, 0x93, + 0xc9, 0x25, 0x2d, 0xe9, 0x35, 0xf9, 0x7a, 0x85, + 0x8d, 0x72, 0x5f, 0x59, 0x2e, 0x7c, 0xea, 0xfe, + 0x78, 0x0d, 0xf6, 0x0a, 0x38, 0x77, 0x7d, 0xed, + 0xe8, 0x6a, 0xaf, 0x26, 0xf0, 0xf4, 0xf6, 0x9b, + 0x71, 0x21, 0x0f, 0x3e, 0x2f, 0x64, 0xfc, 0x7d, + 0x81, 0xb0, 0xbc, 0xd3, 0x4c, 0x63, 0x56, 0xe6, + 0xbd, 0x55, 0x4d, 0x36, 0x56, 0x1f, 0x79, 0xc2, + 0x7f, 0x39, 0xe8, 0x2d, 0x55, 0xe7, 0xc0, 0x37, + 0x54, 0x66, 0xf9, 0x1f, 0x04, 0xdc, 0x07, 0x1c, + 0xd9, 0xa0, 0x82, 0x3e, 0x0f, 0xfe, 0x2a, 0x01, + 0xc9, 0xa9, 0x54, 0xe0, 0xa3, 0x3e, 0xdf, 0x37, + 0x07, 0xb9, 0x64, 0x6f, 0x66, 0xd7, 0x81, 0xae, + 0x3b, 0x23, 0xb8, 0x48, 0xfc, 0x9a, 0xbb, 0x8a, + 0xfb, 0xb1, 0xec, 0xad, 0x40, 0x4b, 0xd1, 0x87, + 0x00, 0x0b, 0xbd, 0xe9, 0x76, 0xba, 0xa7, 0xa9, + 0x6d, 0xe2, 0xb4, 0xfd, 0x84, 0x1b, 0x92, 0x7c, + 0xaa, 0x6d, 0x84, 0xd7, 0xbc, 0xcf, 0x58, 0xca, + 0xb0, 0x9f, 0xe0, 0x9d, 0xe9, 0x96, 0x31, 0xac, + 0x4f, 0x55, 0x4b, 0x6a, 0x2d, 0xb1, 0x9c, 0x5d, + 0xa7, 0x4e, 0x65, 0x28, 0xc2, 0xa6, 0xf0, 0x38, + 0x37, 0x79, 0xf7, 0xb7, 0x7a, 0xa6, 0x28, 0x95, + 0x71, 0x46, 0x5f, 0xa2, 0xb6, 0xb9, 0xb1, 0xcf, + 0xa0, 0xaf, 0xb0, 0x5e, 0x2f, 0x88, 0x3b, 0x4c, + 0x3f, 0xa3, 0x22, 0xcc, 0x52, 0x33, 0x6f, 0x99, + 0x36, 0x9b, 0x29, 0xe6, 0xa1, 0xd1, 0x00, 0xe3, + 0xbb, 0xdd, 0xfd, 0x13, 0x7f, 0xfc, 0xe5, 0xe6, + 0xa6, 0x98, 0x26, 0x2c, 0x89, 0x0c, 0x04, 0xed, + 0x37, 0x32, 0xdb, 0x85, 0xcc, 0x14, 0x0f, 0x33, + 0x8d, 0xd8, 0xe3, 0xca, 0x58, 0xa4, 0x67, 0x85, + 0x81, 0xcf, 0x03, 0xde, 0xa0, 0x60, 0xd7, 0x28, + 0xe8, 0x64, 0x47, 0xc1, 0x69, 0x19, 0x28, 0x48, + 0x3a, 0xf4, 0xa7, 0x75, 0x49, 0x24, 0x31, 0x18, + 0xb0, 0x96, 0xcb, 0xba, 0x5e, 0x6f, 0x72, 0xc9, + 0xf8, 0x21, 0x9d, 0x7b, 0x65, 0xf1, 0xfa, 0xac, + 0x36, 0x49, 0x3b, 0xc5, 0xd8, 0xbc, 0x03, 0xeb, + 0x57, 0x11, 0xc9, 0xbd, 0xaa, 0x89, 0xe4, 0x7e, + 0xd5, 0x36, 0xdd, 0xb8, 0x7e, 0xf0, 0x9d, 0xd2, + 0xdb, 0x92, 0xd5, 0xda, 0xb1, 0xf4, 0xaa, 0x1e, + 0x30, 0x6c, 0xc2, 0xab, 0xdb, 0x0a, 0x60, 0x54, + 0xe4, 0x8c, 0x51, 0x56, 0x73, 0x51, 0x97, 0xf4, + 0x83, 0x5b, 0x73, 0xee, 0xb2, 0x89, 0x92, 0x99, + 0x10, 0x81, 0x94, 0x7a, 0x27, 0xae, 0x85, 0x4f, + 0x03, 0x73, 0xd6, 0xb1, 0xda, 0x67, 0x66, 0x3a, + 0x67, 0xbb, 0x0e, 0x98, 0x59, 0x76, 0xd8, 0x20, + 0xd9, 0xaa, 0xe8, 0xfc, 0x7a, 0x40, 0x99, 0x00, + 0x59, 0x14, 0x6d, 0x41, 0xd1, 0xa1, 0x5e, 0x39, + 0x04, 0x50, 0x4d, 0x98, 0xac, 0xc2, 0x2a, 0xf0, + 0x73, 0xe2, 0x2c, 0xb8, 0x11, 0x3d, 0x78, 0x54, + 0x95, 0xf6, 0x62, 0x26, 0xf5, 0x0c, 0xf8, 0x5a, + 0xc5, 0x4d, 0x80, 0x35, 0x9a, 0x71, 0xfe, 0x88, + 0xee, 0x07, 0xdd, 0x0f, 0xdd, 0xce, 0x91, 0xfa, + 0xbf, 0xff, 0xfc, 0xb7, 0x54, 0xb0, 0x9a, 0x96, + 0x59, 0xf7, 0xc2, 0xb9, 0x37, 0xcf, 0x35, 0x3d, + 0x69, 0xd6, 0x24, 0xc5, 0x1e, 0xc0, 0xb4, 0xf2, + 0x85, 0xf7, 0x73, 0xbf, 0x6c, 0x3f, 0x7b, 0xe6, + 0x97, 0xed, 0xf6, 0xf5, 0x23, 0x7a, 0x49, 0xfc, + 0xf0, 0x2d, 0x5a, 0x72, 0xb2, 0x8a, 0x32, 0x67, + 0xa7, 0x2f, 0xe7, 0x43, 0x41, 0xc7, 0xc4, 0x9d, + 0x36, 0xef, 0xe4, 0x6d, 0x06, 0xea, 0xc5, 0x1e, + 0xa4, 0x45, 0xcf, 0x49, 0xda, 0xdd, 0x71, 0x9b, + 0x1c, 0x19, 0xd9, 0x75, 0x89, 0x7d, 0xbd, 0xe7, + 0xfc, 0x9e, 0xc2, 0x61, 0xa7, 0x0e, 0x3c, 0x7d, + 0x49, 0x40, 0x02, 0x63, 0x10, 0xdc, 0x88, 0x2b, + 0x05, 0x3c, 0xac, 0x5f, 0xed, 0x00, 0x08, 0xc7, + 0x7c, 0x2d, 0xdb, 0xc1, 0xda, 0xfa, 0x6e, 0x40, + 0x6a, 0x7c, 0x11, 0x36, 0x9b, 0x07, 0xa3, 0xee, + 0x3d, 0x78, 0x0e, 0x1a, 0x6a, 0xf9, 0x31, 0x10, + 0x5a, 0xa5, 0x03, 0xbc, 0x92, 0x65, 0x78, 0xde, + 0x34, 0x62, 0x77, 0xe2, 0x32, 0x36, 0x39, 0x21, + 0x61, 0x08, 0x9a, 0xdf, 0x01, 0xb7, 0xf0, 0x29, + 0x19, 0x31, 0xf9, 0xaf, 0x3e, 0x6a, 0x57, 0xd2, + 0x87, 0xdb, 0xce, 0xf1, 0x83, 0xcb, 0xc3, 0xca, + 0x96, 0xf9, 0x42, 0x3c, 0xca, 0x17, 0x12, 0xca, + 0xd9, 0x84, 0x4c, 0x65, 0xae, 0x6d, 0xd4, 0x3b, + 0xdb, 0x05, 0x11, 0xd7, 0x85, 0xb0, 0xd9, 0xee, + 0x57, 0xd9, 0xb8, 0x2f, 0x49, 0x3b, 0xe0, 0x58, + 0x0d, 0xa9, 0xf0, 0xcc, 0xf5, 0x87, 0x6a, 0x9a, + 0x47, 0xea, 0xff, 0x0a, 0xd8, 0x14, 0xe1, 0xbe, + 0xe0, 0x3e, 0xd2, 0x93, 0x02, 0x89, 0xf4, 0x3e, + 0x1e, 0x19, 0x09, 0x1f, 0x16, 0x02, 0x12, 0xcd, + 0x07, 0x82, 0x8f, 0x42, 0xa7, 0x1b, 0x29, 0x51, + 0x9d, 0x0f, 0x0e, 0x2c, 0xdf, 0x89, 0xd5, 0xae, + 0x89, 0x13, 0x87, 0x5c, 0xee, 0xdb, 0x03, 0x2c, + 0xd7, 0xce, 0x17, 0x73, 0xc3, 0xa5, 0x44, 0x8a, + 0xa3, 0x97, 0x7f, 0x8e, 0xb8, 0x7a, 0x6b, 0x31, + 0xbb, 0x0a, 0xb2, 0xd1, 0xcf, 0x28, 0x7a, 0x03, + 0x85, 0x2c, 0x3a, 0x50, 0xec, 0xb3, 0x1c, 0x39, + 0xdd, 0x97, 0x4c, 0xbd, 0x95, 0x3e, 0x61, 0xec, + 0xe5, 0x40, 0xbd, 0xfd, 0xc8, 0x05, 0x82, 0x07, + 0xbd, 0xb7, 0x63, 0xf0, 0x0f, 0x14, 0x70, 0x15, + 0x8d, 0x37, 0x3f, 0x3a, 0xa3, 0x1f, 0xa7, 0x47, + 0x50, 0x43, 0x30, 0xc9, 0x82, 0xe6, 0x21, 0xa6, + 0xf3, 0xf1, 0xbc, 0xf7, 0x06, 0x5c, 0x6a, 0x0b, + 0x7e, 0x6f, 0xf0, 0xb3, 0xe9, 0xf0, 0xf6, 0x82, + 0xa1, 0xef, 0x74, 0xea, 0x70, 0xec, 0x20, 0xbb, + 0x49, 0x82, 0xf1, 0xaa, 0x20, 0x7c, 0xca, 0xfa, + 0xf3, 0x9b, 0xe9, 0x71, 0x88, 0xcb, 0x4f, 0xe5, + 0x8d, 0xcf, 0x69, 0x13, 0x56, 0x2b, 0xf9, 0x50, + 0xf7, 0xd9, 0x1e, 0x1e, 0xe9, 0xbe, 0xa8, 0x49, + 0xf4, 0xe0, 0x4e, 0x44, 0x22, 0x3b, 0xe4, 0xf0, + 0xc1, 0xd2, 0xcb, 0x44, 0x8f, 0x9b, 0xeb, 0x6d, + 0xb1, 0x32, 0xbc, 0x29, 0x9c, 0x7a, 0x7f, 0x07, + 0x8c, 0xa1, 0x09, 0xf4, 0xa2, 0x65, 0xfb, 0x17, + 0xe4, 0x71, 0xbb, 0xf4, 0x4e, 0x48, 0xa0, 0xcc, + 0xea, 0xde, 0x03, 0x64, 0xc7, 0x07, 0xaf, 0x39, + 0x89, 0x28, 0x72, 0x7a, 0x0f, 0xed, 0x4e, 0x0d, + 0xd2, 0xfc, 0x2b, 0x9a, 0xeb, 0x93, 0xf1, 0x46, + 0xd2, 0xd7, 0x7b, 0x16, 0x4f, 0xee, 0x3c, 0x73, + 0x3c, 0xf9, 0xb4, 0x5d, 0x97, 0xbc, 0xd5, 0xcf, + 0x9a, 0x86, 0x09, 0x17, 0x5e, 0x13, 0x51, 0x5e, + 0x8c, 0x28, 0x87, 0x33, 0xbe, 0x7c, 0x47, 0x4c, + 0x79, 0xce, 0xdb, 0xc3, 0x89, 0x2a, 0x27, 0xd9, + 0xd6, 0xc4, 0x95, 0x2b, 0x1c, 0x57, 0x5e, 0xf2, + 0x84, 0x4c, 0x61, 0x1a, 0xbf, 0x07, 0xe2, 0x89, + 0x18, 0x8b, 0xfa, 0x43, 0x5f, 0xe2, 0xa1, 0x50, + 0xb8, 0xca, 0xc0, 0x1c, 0xda, 0xbe, 0xb7, 0x71, + 0x68, 0x32, 0x4f, 0xeb, 0x74, 0x1b, 0x0e, 0xcd, + 0x79, 0x67, 0x2f, 0xef, 0x0d, 0x7b, 0x75, 0x5e, + 0x9b, 0xc4, 0x5d, 0x2e, 0xc0, 0x43, 0x3f, 0xe9, + 0x2f, 0x9b, 0xf4, 0x5d, 0x53, 0xff, 0xc8, 0x80, + 0xf2, 0xe2, 0xac, 0x5e, 0x97, 0xdd, 0x6f, 0xe1, + 0xdd, 0xdd, 0xcd, 0xee, 0x2e, 0x26, 0x35, 0x25, + 0xc8, 0xbe, 0x01, 0xf2, 0x47, 0x52, 0x21, 0x6d, + 0xbb, 0xd1, 0x83, 0x05, 0x2d, 0xa2, 0x81, 0x54, + 0x40, 0x3c, 0xc4, 0xfb, 0x28, 0x82, 0xb1, 0xde, + 0x7a, 0xbb, 0xc4, 0x34, 0x88, 0x3e, 0xbe, 0x40, + 0x9b, 0xfe, 0x3c, 0xae, 0x37, 0xf0, 0x76, 0xef, + 0xce, 0xc5, 0x3d, 0xea, 0x73, 0x81, 0x2c, 0xce, + 0x65, 0x54, 0x93, 0xcf, 0xac, 0x0e, 0x68, 0x22, + 0x48, 0x78, 0x84, 0xde, 0x05, 0x9e, 0xde, 0xf1, + 0xdb, 0x19, 0x6c, 0x1e, 0xd5, 0xde, 0x7e, 0xf5, + 0xd8, 0xdb, 0xc4, 0x04, 0x88, 0xeb, 0x72, 0x53, + 0x38, 0x4c, 0xc1, 0x5c, 0x85, 0xcc, 0xe9, 0x92, + 0x23, 0x5b, 0x49, 0x2d, 0x79, 0x52, 0x25, 0x56, + 0xc9, 0xb4, 0x6a, 0x38, 0x66, 0xdc, 0x0c, 0x2b, + 0xd1, 0x43, 0xcb, 0xe6, 0x33, 0xb5, 0x4c, 0x75, + 0x36, 0x73, 0xfa, 0xfb, 0xa4, 0x90, 0x86, 0xff, + 0x9b, 0x8f, 0x90, 0x16, 0x8f, 0x96, 0x35, 0x10, + 0x81, 0x64, 0xa4, 0xef, 0xba, 0xab, 0xe4, 0xc6, + 0x51, 0xd4, 0x44, 0x91, 0xa3, 0x0a, 0xdc, 0x24, + 0xba, 0x85, 0xfd, 0x80, 0x25, 0x10, 0xcf, 0x28, + 0xc3, 0x86, 0xb2, 0x02, 0x5b, 0x82, 0xf7, 0x0c, + 0x1b, 0x3e, 0x7d, 0x9e, 0x31, 0xc8, 0x58, 0xc6, + 0xda, 0xef, 0x0a, 0xaa, 0xf1, 0xc6, 0x30, 0xb3, + 0x53, 0xbf, 0x73, 0x1f, 0xa7, 0xf6, 0x77, 0xff, + 0x9f, 0x6d, 0x2d, 0x6b, 0xb6, 0xb3, 0x8b, 0xac, + 0xd9, 0x57, 0xcf, 0x9c, 0x35, 0xfb, 0x39, 0xca, + 0x41, 0x2d, 0x98, 0x2b, 0xdb, 0x29, 0x2d, 0x57, + 0x96, 0x91, 0x60, 0x30, 0x8a, 0x76, 0xe3, 0x4d, + 0xb2, 0x6c, 0xfb, 0xd5, 0xf9, 0x5e, 0xee, 0x05, + 0xce, 0xea, 0x72, 0x88, 0xef, 0x43, 0x5c, 0xec, + 0xf8, 0xa0, 0x23, 0x8c, 0x4f, 0x6e, 0xfb, 0xb1, + 0xbc, 0xb9, 0xe8, 0x94, 0x74, 0xc5, 0x4f, 0xcd, + 0xae, 0xef, 0x79, 0x5a, 0x48, 0x2b, 0xf2, 0x52, + 0xf0, 0xac, 0x58, 0x76, 0x89, 0x55, 0x0e, 0xb6, + 0x50, 0xf5, 0x0e, 0xb0, 0x9d, 0xfd, 0xf6, 0xca, + 0x21, 0x98, 0x62, 0xd5, 0xb4, 0x3f, 0xcd, 0x50, + 0x34, 0x78, 0xa9, 0x70, 0xc2, 0x12, 0x27, 0xf3, + 0xd7, 0x4e, 0x28, 0x7a, 0x52, 0xfe, 0xb8, 0x78, + 0x45, 0x84, 0xd5, 0xb3, 0xde, 0x8d, 0xfc, 0x6b, + 0x71, 0x7f, 0x52, 0x13, 0x28, 0xdc, 0x41, 0x2d, + 0xc6, 0xf6, 0x7e, 0x16, 0x18, 0xa8, 0x4b, 0xfd, + 0xa5, 0x9b, 0xd8, 0x55, 0x3d, 0x68, 0xe7, 0xe0, + 0x93, 0xa0, 0x5e, 0x5c, 0x91, 0x58, 0xff, 0x57, + 0x0e, 0x22, 0xc7, 0x19, 0x03, 0x2e, 0x99, 0x57, + 0xfb, 0xa4, 0x0f, 0xb1, 0x6d, 0xcf, 0xe0, 0xd6, + 0x15, 0x9c, 0x31, 0xf0, 0xbe, 0xd9, 0x5a, 0x01, + 0xf1, 0x4d, 0x71, 0xf1, 0x77, 0x51, 0xfd, 0x80, + 0x4e, 0x19, 0x57, 0x84, 0x0d, 0x33, 0xf2, 0x2d, + 0x2b, 0x7f, 0x87, 0x11, 0x0d, 0x3d, 0x13, 0x63, + 0xe2, 0x8c, 0xba, 0x7a, 0x81, 0xb7, 0xe9, 0xa5, + 0xa9, 0x55, 0xaf, 0x89, 0xa6, 0x36, 0x8e, 0x71, + 0xd0, 0x20, 0x0b, 0xf3, 0xee, 0x04, 0xc0, 0xef, + 0x14, 0x26, 0x8f, 0xfb, 0x43, 0xac, 0xf4, 0x57, + 0x63, 0xf3, 0x55, 0x29, 0x4c, 0x23, 0xda, 0xcd, + 0x91, 0x78, 0x7d, 0x89, 0xf6, 0xd5, 0x55, 0xe2, + 0x25, 0x30, 0x70, 0x23, 0xd5, 0x5a, 0x4d, 0xd3, + 0xed, 0xbc, 0x41, 0xe4, 0x5a, 0xc7, 0x34, 0xb5, + 0x1e, 0x3b, 0x1e, 0xa7, 0x5c, 0x94, 0x9d, 0x6f, + 0xd5, 0x3f, 0xc9, 0x78, 0xa3, 0x5a, 0x6a, 0x88, + 0x36, 0xde, 0x1c, 0xa7, 0xf2, 0xca, 0x1a, 0xb8, + 0xa2, 0xa9, 0x96, 0xbf, 0x27, 0xae, 0x4b, 0x18, + 0x47, 0xb1, 0xca, 0xd2, 0x2e, 0xd9, 0xcd, 0xa4, + 0xff, 0x8b, 0x57, 0x2a, 0x2c, 0xad, 0x1e, 0x59, + 0xc2, 0xb2, 0x16, 0xc3, 0xc4, 0xf3, 0x8a, 0x5c, + 0xaa, 0xf0, 0xce, 0xf3, 0x9a, 0x5b, 0x14, 0x6a, + 0x90, 0x8a, 0x63, 0x65, 0x2c, 0xf4, 0x66, 0x66, + 0x0c, 0xb8, 0x58, 0x0a, 0x82, 0xee, 0xd9, 0x48, + 0xba, 0xa2, 0xe7, 0x77, 0x96, 0x24, 0x3d, 0x0a, + 0x8b, 0x48, 0xf9, 0x6b, 0xd8, 0x48, 0xb8, 0xa2, + 0x07, 0x67, 0x96, 0x24, 0x6c, 0x0a, 0x4d, 0x17, + 0x91, 0xb1, 0x29, 0x5f, 0xde, 0x48, 0xb9, 0xea, + 0x47, 0x61, 0x32, 0xc7, 0x48, 0xca, 0xf7, 0x96, + 0x9a, 0x3b, 0x7b, 0xb6, 0x7d, 0x8a, 0x67, 0x1f, + 0x0b, 0x33, 0xd6, 0x26, 0xbb, 0x2a, 0x34, 0x87, + 0x4d, 0x6c, 0x66, 0x66, 0xe2, 0x2c, 0x4f, 0x3e, + 0x4b, 0x73, 0xf0, 0x27, 0x7f, 0xe2, 0x52, 0x63, + 0xd2, 0xf0, 0x13, 0xcf, 0xf8, 0x59, 0x38, 0xe5, + 0x35, 0x2e, 0x39, 0x26, 0xb3, 0x4a, 0xa7, 0x39, + 0xee, 0xd3, 0x64, 0xc7, 0x96, 0x5e, 0x3a, 0x2d, + 0x5f, 0xa2, 0x6d, 0xee, 0x14, 0x8d, 0xf3, 0x67, + 0x4e, 0xd1, 0x98, 0xc5, 0x93, 0x0b, 0xe6, 0x68, + 0x9c, 0x6e, 0x2b, 0x47, 0xa3, 0xe2, 0x0e, 0xc7, + 0xfc, 0x0b, 0x05, 0x7e, 0xa8, 0x39, 0x08, 0xab, + 0x02, 0xae, 0xf4, 0x2f, 0xf8, 0x14, 0x9d, 0xd7, + 0x5e, 0x55, 0x34, 0x7c, 0x5d, 0x6e, 0x69, 0xf4, + 0xd2, 0x51, 0xce, 0xfe, 0x99, 0xab, 0xf8, 0xaa, + 0x7b, 0x9a, 0x8e, 0x57, 0xb7, 0x5a, 0x3a, 0x7b, + 0x93, 0x6c, 0x97, 0x92, 0x93, 0x67, 0xd6, 0xa8, + 0xf9, 0x14, 0x1e, 0xe9, 0xb5, 0x91, 0xc5, 0x3e, + 0x71, 0xa1, 0xfb, 0xe2, 0xff, 0x44, 0x74, 0x6d, + 0x4b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -5514,138 +4025,1000 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x61, - 0x62, 0x6f, 0x75, 0x74, 0x2e, 0x63, 0x73, 0x73, - 0x18, 0x0e, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, - 0x78, 0xda, 0xb5, 0x57, 0xdb, 0x8e, 0xdb, 0x20, - 0x10, 0x7d, 0x6e, 0xbe, 0x02, 0x29, 0x8a, 0xd4, - 0x5d, 0xc5, 0x5e, 0x3b, 0x89, 0xdd, 0x5c, 0xa4, - 0xbe, 0xf4, 0xa1, 0x1f, 0xd0, 0x2f, 0xc0, 0x86, - 0xc4, 0x68, 0x31, 0x20, 0x4c, 0x36, 0xbb, 0x5d, - 0xf5, 0xdf, 0x0b, 0x06, 0x7c, 0x89, 0x49, 0x56, - 0x55, 0x5b, 0xaf, 0x94, 0xb5, 0xc7, 0xc3, 0x70, - 0x98, 0x39, 0x73, 0xc0, 0x4f, 0x8f, 0xe0, 0x3b, - 0xe5, 0x05, 0xa4, 0xe0, 0xdb, 0x8f, 0x1f, 0xe0, - 0xc8, 0x25, 0x10, 0xf0, 0x84, 0x1b, 0xf0, 0xf8, - 0x34, 0x9b, 0x55, 0x29, 0x78, 0x9f, 0x01, 0x77, - 0x95, 0x9c, 0x72, 0xb9, 0x07, 0xf3, 0x02, 0x16, - 0xa8, 0xc8, 0x0f, 0x9d, 0x5d, 0xe1, 0x57, 0x15, - 0x35, 0x15, 0x44, 0xfc, 0xb2, 0x07, 0x09, 0x48, - 0xc5, 0xab, 0xfe, 0xbd, 0x54, 0x44, 0xe1, 0xde, - 0xa7, 0x86, 0xf2, 0x44, 0x58, 0x54, 0x70, 0xa5, - 0x78, 0xad, 0xbd, 0x0e, 0xb3, 0x5f, 0x3a, 0xba, - 0xaa, 0xe9, 0x20, 0xfe, 0x91, 0x33, 0x15, 0x1d, - 0x61, 0x4d, 0xe8, 0xdb, 0x1e, 0x7c, 0x83, 0x4c, - 0x41, 0x89, 0x29, 0x5d, 0x82, 0x06, 0xb2, 0x26, - 0x6a, 0xb0, 0x24, 0xc7, 0xc3, 0xc8, 0x77, 0x0f, - 0xd2, 0x54, 0x28, 0x50, 0x7a, 0xcf, 0xc3, 0x04, - 0xe9, 0x0a, 0xaf, 0x37, 0xeb, 0x01, 0x52, 0x01, - 0x11, 0x22, 0xec, 0xb4, 0x07, 0xab, 0x44, 0x83, - 0x6c, 0x7f, 0x92, 0xf6, 0x5f, 0xef, 0x52, 0xc0, - 0xf2, 0xf9, 0x24, 0xf9, 0x99, 0xa1, 0xc8, 0x47, - 0x39, 0xe6, 0xfa, 0x6f, 0x13, 0x74, 0x21, 0xb5, - 0x4e, 0xd5, 0x1e, 0x44, 0x17, 0x5c, 0x3c, 0x13, - 0x15, 0x9d, 0x24, 0x44, 0x04, 0x33, 0xf5, 0xb9, - 0xf3, 0xf5, 0x17, 0x25, 0x0c, 0x43, 0xb9, 0x9c, - 0xda, 0xf1, 0x51, 0x01, 0xc5, 0xc5, 0x8d, 0x37, - 0x36, 0x5f, 0xd3, 0x97, 0x2d, 0xb4, 0xa8, 0xd1, - 0x03, 0x3f, 0x27, 0x4b, 0x30, 0xc7, 0xe6, 0x2a, - 0x1f, 0xee, 0xfa, 0xa5, 0x4b, 0xbf, 0x92, 0x87, - 0xce, 0xed, 0x21, 0xb8, 0xa8, 0x86, 0xfc, 0xd4, - 0x6b, 0x4a, 0x93, 0x64, 0x01, 0x32, 0x5c, 0x07, - 0x5d, 0x24, 0x16, 0x18, 0xea, 0x02, 0x30, 0xee, - 0x6e, 0xdb, 0x7a, 0x3e, 0x3d, 0x02, 0x58, 0xf0, - 0xb3, 0xb6, 0x1b, 0xee, 0xc4, 0x88, 0x40, 0xca, - 0x4f, 0xae, 0xc0, 0x7d, 0xea, 0x7d, 0x48, 0x4b, - 0x89, 0xd6, 0x00, 0xe0, 0x59, 0x71, 0x6b, 0x6d, - 0xc9, 0x04, 0x29, 0x39, 0xe9, 0x37, 0xa5, 0x4e, - 0x25, 0x96, 0xd6, 0x1e, 0xaa, 0xcb, 0xd1, 0x11, - 0xa2, 0xe0, 0x12, 0x61, 0x19, 0x99, 0xe4, 0x9f, - 0x1b, 0x8d, 0xdc, 0xcf, 0x60, 0xed, 0x7a, 0x06, - 0x5d, 0xe7, 0x86, 0x53, 0x82, 0xc0, 0x1c, 0xad, - 0xd1, 0x97, 0xd2, 0x0d, 0xbb, 0x10, 0xa4, 0xaa, - 0x3d, 0xd8, 0x24, 0xc6, 0x5f, 0xc3, 0x8f, 0x85, - 0xe4, 0x02, 0x4b, 0x45, 0x34, 0xf9, 0xdf, 0x47, - 0x10, 0x2d, 0x3c, 0xef, 0x12, 0x51, 0x58, 0x60, - 0x4f, 0x5c, 0x0f, 0x66, 0xb7, 0xdb, 0xb5, 0x1e, - 0xf3, 0x36, 0x03, 0x91, 0x22, 0x8a, 0xe2, 0xb1, - 0x4b, 0x41, 0xf5, 0x12, 0x86, 0x3e, 0xcd, 0xb9, - 0x08, 0xb8, 0x8d, 0xda, 0xeb, 0xa3, 0xd6, 0x72, - 0x6d, 0xa5, 0xeb, 0xeb, 0x7b, 0xea, 0xdf, 0xc4, - 0x1e, 0x16, 0x53, 0xd0, 0xb3, 0x9e, 0xc3, 0xea, - 0xc1, 0xdc, 0x3e, 0x44, 0x0a, 0x16, 0x14, 0xcf, - 0xde, 0x27, 0x18, 0xd2, 0xae, 0x97, 0x5c, 0x72, - 0x77, 0xf9, 0x62, 0x5a, 0x57, 0x43, 0xed, 0x51, - 0xe5, 0x34, 0x3c, 0x0a, 0x45, 0xa3, 0x59, 0xe7, - 0xef, 0xec, 0x5a, 0x86, 0xb3, 0x01, 0x55, 0xcd, - 0xae, 0xa8, 0x94, 0xfb, 0xc9, 0x7a, 0x72, 0xe8, - 0x35, 0x66, 0x79, 0x96, 0x64, 0xe9, 0x4d, 0x06, - 0x0c, 0x5f, 0x87, 0x3a, 0xdc, 0x01, 0x5f, 0xaf, - 0x17, 0x21, 0x0c, 0xe8, 0x1a, 0xc3, 0x26, 0x88, - 0x61, 0x18, 0xd0, 0xad, 0xd1, 0x4b, 0x5f, 0x1a, - 0x26, 0x63, 0x48, 0xb2, 0xdc, 0x48, 0x9b, 0x59, - 0x3f, 0x4c, 0x49, 0x2d, 0x87, 0x42, 0x0b, 0x1e, - 0x53, 0x21, 0x80, 0x72, 0x5f, 0xf1, 0x17, 0x2c, - 0x7b, 0xa4, 0x23, 0x5c, 0xf7, 0x66, 0x1c, 0xd6, - 0x1c, 0x0b, 0x22, 0x2a, 0xc8, 0xde, 0xec, 0x26, - 0xa0, 0x65, 0x3a, 0xf6, 0x96, 0x68, 0x20, 0xda, - 0x81, 0x9e, 0x5c, 0x6f, 0xf2, 0x0c, 0x6e, 0x26, - 0x2d, 0xeb, 0x74, 0x92, 0x71, 0x66, 0x2b, 0xdb, - 0x87, 0x2b, 0x38, 0x7a, 0xbb, 0x22, 0xa9, 0x55, - 0x33, 0x4f, 0xf0, 0xd7, 0x68, 0xd4, 0xa7, 0x61, - 0xe5, 0x30, 0x79, 0xc0, 0xa2, 0x7a, 0x33, 0x2c, - 0x6b, 0xa3, 0x8d, 0x48, 0x99, 0xb5, 0x1c, 0x6c, - 0xb7, 0x17, 0xa7, 0x6d, 0xb1, 0x13, 0xb6, 0x90, - 0xda, 0x98, 0x58, 0x47, 0xc9, 0xeb, 0x69, 0x1c, - 0x3b, 0xe6, 0xa3, 0x38, 0x92, 0x9c, 0x2a, 0xd5, - 0x39, 0x5e, 0xb0, 0x79, 0xd4, 0xdd, 0xcf, 0x29, - 0x1a, 0xe7, 0xb8, 0xc6, 0x35, 0x97, 0x36, 0xc3, - 0xb1, 0xbd, 0x77, 0x35, 0x2c, 0xa1, 0x50, 0x84, - 0x33, 0x57, 0xbf, 0xe1, 0x74, 0xb9, 0x70, 0x7d, - 0x13, 0x08, 0x1d, 0xda, 0x65, 0xe3, 0x9d, 0x4f, - 0x59, 0x88, 0x5e, 0x1f, 0x08, 0xc0, 0x08, 0xd4, - 0x6c, 0x2c, 0x88, 0xda, 0x7b, 0x15, 0x67, 0x0b, - 0x3b, 0x83, 0xbd, 0x1f, 0x75, 0xcf, 0x36, 0xf9, - 0x8b, 0xb6, 0x1f, 0x67, 0x63, 0xda, 0xf6, 0x9b, - 0x7f, 0xdd, 0xf6, 0xd3, 0x39, 0x27, 0x6d, 0xbe, - 0xba, 0xdd, 0xe6, 0xdb, 0xff, 0xdf, 0xe6, 0x83, - 0xcc, 0xa6, 0xf9, 0x22, 0x04, 0xf8, 0xaf, 0xda, - 0xbe, 0xe7, 0x24, 0x14, 0x82, 0x92, 0x12, 0x1a, - 0xfa, 0x59, 0xc1, 0x8f, 0x87, 0x16, 0xdb, 0xac, - 0x76, 0xc6, 0xf7, 0x0e, 0x90, 0x3e, 0x27, 0x1c, - 0xee, 0x54, 0x14, 0xfc, 0xba, 0x1d, 0x65, 0xa9, - 0xf1, 0xea, 0x48, 0xb3, 0x4f, 0xbe, 0x60, 0x81, - 0xac, 0xb9, 0x77, 0x91, 0x61, 0x8f, 0x53, 0x90, - 0x6e, 0xc3, 0xb7, 0xfc, 0xef, 0x55, 0x65, 0x3a, - 0x8d, 0xd0, 0xe1, 0xaf, 0xba, 0x62, 0x6d, 0xf6, - 0x28, 0x8d, 0x2a, 0x04, 0xca, 0xa0, 0xe9, 0x6a, - 0x9e, 0x66, 0x1a, 0x8d, 0xf9, 0x39, 0xdc, 0x70, - 0x8e, 0x49, 0xc9, 0x59, 0x9f, 0x89, 0x7c, 0x73, - 0x27, 0x70, 0x8c, 0xa0, 0x82, 0x4d, 0xef, 0xbc, - 0x4a, 0xee, 0xc1, 0x88, 0x09, 0x13, 0x67, 0xf5, - 0x07, 0xa1, 0x07, 0x05, 0x69, 0x15, 0x31, 0xa0, - 0x48, 0x43, 0x25, 0x69, 0x6a, 0xa8, 0xcf, 0xcb, - 0xe1, 0x80, 0xc6, 0xc4, 0x60, 0x6d, 0x22, 0x4e, - 0x65, 0xe6, 0xf6, 0x90, 0xb3, 0xa4, 0xcb, 0x01, - 0x98, 0xab, 0x13, 0x47, 0x78, 0xdc, 0xd5, 0x2a, - 0x2d, 0x95, 0xba, 0xfc, 0x6f, 0xed, 0x9a, 0x7b, - 0x76, 0x12, 0x56, 0xf2, 0x13, 0x23, 0x8a, 0x5b, - 0x6a, 0x76, 0x8f, 0xfd, 0x26, 0xd2, 0xe9, 0x93, - 0xe1, 0x7a, 0x17, 0xc8, 0x9e, 0x8c, 0xae, 0xfd, - 0x11, 0x79, 0x99, 0xd7, 0x90, 0xb0, 0x82, 0xf2, - 0xf2, 0xb9, 0x1d, 0x8d, 0x48, 0x23, 0x28, 0xd4, - 0x1f, 0x1f, 0x2d, 0x39, 0x0f, 0xb3, 0xe0, 0xf6, - 0xe3, 0xd8, 0x64, 0xe9, 0xe8, 0xcf, 0xad, 0xce, - 0xe8, 0x08, 0xe9, 0xad, 0x95, 0xcb, 0xdc, 0x97, - 0x6c, 0xf1, 0x31, 0x82, 0xaf, 0xfa, 0x69, 0xbc, - 0x86, 0xee, 0x34, 0x35, 0xc6, 0x15, 0x95, 0xee, - 0x5b, 0xe7, 0xc5, 0x9c, 0x55, 0x4b, 0x48, 0x7d, - 0x99, 0x6b, 0x82, 0x90, 0x85, 0xdd, 0xaf, 0xdc, - 0x7f, 0xe4, 0xa4, 0x79, 0x1b, 0x2b, 0x00, 0xc2, - 0x7d, 0xe2, 0xf9, 0x7a, 0x6d, 0xb7, 0x5b, 0xb8, - 0xcd, 0x8c, 0xe7, 0x6f, 0xa7, 0x07, 0x43, 0x5a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29 + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x6f, + 0x72, 0x67, 0x2f, 0x00, 0x06, 0x00, 0x00, 0x00, + 0x70, 0x61, 0x67, 0x65, 0x2d, 0x74, 0x65, 0x6d, + 0x70, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x2f, 0x00, + 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x65, 0x70, 0x69, 0x70, 0x68, 0x61, 0x6e, 0x79, + 0x2e, 0x63, 0x73, 0x73, 0x00, 0x00, 0x00, 0x00, + 0x88, 0x19, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, + 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x2d, 0x6d, + 0x65, 0x6e, 0x75, 0x20, 0x7b, 0x0a, 0x20, 0x20, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, + 0x32, 0x65, 0x33, 0x34, 0x33, 0x36, 0x3b, 0x0a, + 0x20, 0x20, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e, + 0x65, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x34, 0x36, + 0x2c, 0x20, 0x35, 0x32, 0x2c, 0x20, 0x35, 0x34, + 0x2c, 0x20, 0x30, 0x2e, 0x33, 0x29, 0x3b, 0x0a, + 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, + 0x23, 0x61, 0x31, 0x61, 0x31, 0x61, 0x31, 0x3b, + 0x0a, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, + 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x3a, 0x20, 0x6c, 0x69, 0x6e, + 0x65, 0x61, 0x72, 0x2d, 0x67, 0x72, 0x61, 0x64, + 0x69, 0x65, 0x6e, 0x74, 0x28, 0x74, 0x6f, 0x20, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x2c, 0x20, + 0x23, 0x64, 0x36, 0x64, 0x36, 0x64, 0x36, 0x2c, + 0x20, 0x67, 0x61, 0x69, 0x6e, 0x73, 0x62, 0x6f, + 0x72, 0x6f, 0x20, 0x34, 0x30, 0x25, 0x2c, 0x20, + 0x23, 0x65, 0x30, 0x65, 0x30, 0x65, 0x30, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, + 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x30, 0x2e, 0x37, 0x36, 0x39, + 0x32, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x69, + 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x3a, 0x20, 0x30, 0x20, 0x31, 0x70, + 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, + 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x2e, + 0x37, 0x36, 0x39, 0x32, 0x33, 0x29, 0x3b, 0x0a, + 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, 0x6e, + 0x73, 0x65, 0x74, 0x20, 0x30, 0x20, 0x31, 0x70, + 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x30, + 0x2c, 0x20, 0x30, 0x2c, 0x20, 0x30, 0x2c, 0x20, + 0x30, 0x2e, 0x30, 0x37, 0x29, 0x2c, 0x20, 0x69, + 0x6e, 0x73, 0x65, 0x74, 0x20, 0x30, 0x20, 0x32, + 0x70, 0x78, 0x20, 0x31, 0x70, 0x78, 0x20, 0x2d, + 0x32, 0x70, 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, + 0x28, 0x30, 0x2c, 0x20, 0x30, 0x2c, 0x20, 0x30, + 0x2c, 0x20, 0x30, 0x2e, 0x36, 0x29, 0x2c, 0x20, + 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x77, 0x68, + 0x69, 0x74, 0x65, 0x3b, 0x20, 0x7d, 0x0a, 0x0a, + 0x2e, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x69, 0x6e, + 0x67, 0x2d, 0x62, 0x61, 0x72, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, 0x65, + 0x6d, 0x65, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x5f, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, 0x0a, 0x20, + 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, + 0x70, 0x78, 0x3b, 0x0a, 0x20, 0x20, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x2d, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3a, 0x20, 0x73, 0x6f, 0x6c, 0x69, + 0x64, 0x20, 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x20, + 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x20, 0x20, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x3b, 0x0a, + 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x2d, 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x3a, + 0x20, 0x33, 0x70, 0x78, 0x20, 0x33, 0x70, 0x78, + 0x20, 0x30, 0x20, 0x30, 0x3b, 0x20, 0x7d, 0x0a, + 0x20, 0x20, 0x2e, 0x66, 0x6c, 0x6f, 0x61, 0x74, + 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x61, 0x72, 0x2e, + 0x6c, 0x65, 0x66, 0x74, 0x20, 0x7b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3a, 0x20, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x74, + 0x6f, 0x70, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x2d, + 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x3a, 0x20, + 0x30, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x2e, + 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x69, 0x6e, 0x67, + 0x2d, 0x62, 0x61, 0x72, 0x2e, 0x72, 0x69, 0x67, + 0x68, 0x74, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x74, 0x6f, + 0x70, 0x2d, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, + 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x3a, 0x20, + 0x30, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x2e, + 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x69, 0x6e, 0x67, + 0x2d, 0x62, 0x61, 0x72, 0x3a, 0x62, 0x61, 0x63, + 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, + 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x74, + 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x75, 0x6e, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, + 0x61, 0x73, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x40, 0x75, 0x6e, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x65, 0x64, 0x5f, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x73, 0x3b, + 0x20, 0x7d, 0x0a, 0x0a, 0x2e, 0x64, 0x6f, 0x77, + 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2d, 0x62, 0x6f, + 0x78, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x2d, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3a, 0x20, 0x73, 0x6f, 0x6c, 0x69, + 0x64, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x20, 0x6e, + 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x77, 0x69, + 0x64, 0x74, 0x68, 0x3a, 0x20, 0x31, 0x70, 0x78, + 0x3b, 0x0a, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3a, 0x20, 0x40, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x73, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, + 0x2e, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, + 0x64, 0x2d, 0x62, 0x6f, 0x78, 0x3a, 0x62, 0x61, + 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x20, 0x7b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x3a, 0x20, 0x40, 0x75, 0x6e, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x73, 0x3b, 0x20, 0x7d, + 0x0a, 0x0a, 0x2e, 0x64, 0x6f, 0x77, 0x6e, 0x6c, + 0x6f, 0x61, 0x64, 0x2d, 0x62, 0x6f, 0x78, 0x20, + 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, + 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, + 0x65, 0x3a, 0x64, 0x69, 0x72, 0x28, 0x6c, 0x74, + 0x72, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x70, + 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x3a, 0x20, 0x36, 0x70, + 0x78, 0x3b, 0x20, 0x7d, 0x0a, 0x2e, 0x64, 0x6f, + 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x2d, 0x62, + 0x6f, 0x78, 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x20, 0x2e, 0x66, 0x69, 0x6c, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x64, 0x69, 0x72, + 0x28, 0x72, 0x74, 0x6c, 0x29, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, + 0x67, 0x2d, 0x6c, 0x65, 0x66, 0x74, 0x3a, 0x20, + 0x36, 0x70, 0x78, 0x3b, 0x20, 0x7d, 0x0a, 0x0a, + 0x2e, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, + 0x64, 0x2d, 0x62, 0x6f, 0x78, 0x20, 0x2e, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, + 0x65, 0x64, 0x73, 0x2d, 0x61, 0x74, 0x74, 0x65, + 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x2e, 0x66, + 0x69, 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x61, 0x6e, 0x69, 0x6d, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6e, + 0x65, 0x65, 0x64, 0x73, 0x5f, 0x61, 0x74, 0x74, + 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x31, + 0x35, 0x30, 0x6d, 0x73, 0x20, 0x65, 0x61, 0x73, + 0x65, 0x2d, 0x69, 0x6e, 0x3b, 0x0a, 0x20, 0x20, + 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, + 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x3a, 0x20, 0x2d, 0x67, 0x74, 0x6b, 0x2d, 0x67, + 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x28, + 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x2c, 0x20, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x30, + 0x2c, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2c, + 0x20, 0x30, 0x2e, 0x35, 0x2c, 0x20, 0x74, 0x6f, + 0x28, 0x23, 0x34, 0x61, 0x39, 0x30, 0x64, 0x39, + 0x29, 0x2c, 0x20, 0x74, 0x6f, 0x28, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x29, 0x29, 0x2c, 0x20, 0x2d, 0x67, 0x74, + 0x6b, 0x2d, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, + 0x6e, 0x74, 0x28, 0x72, 0x61, 0x64, 0x69, 0x61, + 0x6c, 0x2c, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, + 0x72, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, + 0x2c, 0x20, 0x30, 0x2c, 0x20, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x20, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x2c, 0x20, 0x30, 0x2e, 0x35, 0x2c, + 0x20, 0x74, 0x6f, 0x28, 0x72, 0x67, 0x62, 0x61, + 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x30, 0x2e, 0x37, 0x36, 0x39, 0x32, 0x33, 0x29, + 0x29, 0x2c, 0x20, 0x74, 0x6f, 0x28, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x62, + 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, + 0x64, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x20, + 0x36, 0x70, 0x78, 0x20, 0x36, 0x70, 0x78, 0x2c, + 0x20, 0x36, 0x70, 0x78, 0x20, 0x36, 0x70, 0x78, + 0x3b, 0x0a, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, + 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x72, + 0x65, 0x70, 0x65, 0x61, 0x74, 0x3a, 0x20, 0x6e, + 0x6f, 0x2d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, + 0x3b, 0x0a, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, + 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x3a, + 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x33, + 0x70, 0x78, 0x2c, 0x20, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x20, 0x34, 0x70, 0x78, 0x3b, 0x20, 0x7d, + 0x0a, 0x20, 0x20, 0x2e, 0x64, 0x6f, 0x77, 0x6e, + 0x6c, 0x6f, 0x61, 0x64, 0x2d, 0x62, 0x6f, 0x78, + 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2e, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x2d, 0x61, + 0x74, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, + 0x20, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x6e, 0x61, + 0x6d, 0x65, 0x3a, 0x64, 0x69, 0x72, 0x28, 0x72, + 0x74, 0x6c, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x6c, + 0x65, 0x66, 0x74, 0x20, 0x33, 0x70, 0x78, 0x2c, + 0x20, 0x6c, 0x65, 0x66, 0x74, 0x20, 0x34, 0x70, + 0x78, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x2e, + 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, + 0x2d, 0x62, 0x6f, 0x78, 0x20, 0x2e, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x6e, 0x65, 0x65, + 0x64, 0x73, 0x2d, 0x61, 0x74, 0x74, 0x65, 0x6e, + 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x2e, 0x66, 0x69, + 0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x62, + 0x61, 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, + 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, + 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x20, 0x36, + 0x70, 0x78, 0x20, 0x36, 0x70, 0x78, 0x2c, 0x20, + 0x30, 0x20, 0x30, 0x3b, 0x20, 0x7d, 0x0a, 0x0a, + 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, + 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, + 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x20, 0x6c, + 0x69, 0x6e, 0x65, 0x61, 0x72, 0x2d, 0x67, 0x72, + 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x28, 0x74, + 0x6f, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x2c, 0x20, 0x23, 0x64, 0x37, 0x64, 0x63, 0x65, + 0x32, 0x2c, 0x20, 0x23, 0x63, 0x62, 0x64, 0x32, + 0x64, 0x39, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x62, + 0x6f, 0x78, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, + 0x77, 0x3a, 0x20, 0x69, 0x6e, 0x73, 0x65, 0x74, + 0x20, 0x30, 0x20, 0x2d, 0x31, 0x70, 0x78, 0x20, + 0x23, 0x62, 0x34, 0x62, 0x65, 0x63, 0x38, 0x2c, + 0x20, 0x69, 0x6e, 0x73, 0x65, 0x74, 0x20, 0x30, + 0x20, 0x31, 0x70, 0x78, 0x20, 0x23, 0x66, 0x31, + 0x66, 0x33, 0x66, 0x35, 0x3b, 0x0a, 0x20, 0x20, + 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, + 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x3a, 0x20, 0x2d, 0x67, 0x74, 0x6b, 0x2d, 0x69, + 0x63, 0x6f, 0x6e, 0x74, 0x68, 0x65, 0x6d, 0x65, + 0x28, 0x22, 0x75, 0x73, 0x65, 0x72, 0x2d, 0x6e, + 0x6f, 0x74, 0x2d, 0x74, 0x72, 0x61, 0x63, 0x6b, + 0x65, 0x64, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, + 0x6c, 0x69, 0x63, 0x22, 0x29, 0x2c, 0x20, 0x6c, + 0x69, 0x6e, 0x65, 0x61, 0x72, 0x2d, 0x67, 0x72, + 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x28, 0x74, + 0x6f, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x2c, 0x20, 0x23, 0x64, 0x37, 0x64, 0x63, 0x65, + 0x32, 0x2c, 0x20, 0x23, 0x63, 0x62, 0x64, 0x32, + 0x64, 0x39, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x62, + 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, + 0x64, 0x2d, 0x73, 0x69, 0x7a, 0x65, 0x3a, 0x20, + 0x36, 0x34, 0x70, 0x78, 0x20, 0x36, 0x34, 0x70, + 0x78, 0x2c, 0x20, 0x31, 0x30, 0x30, 0x25, 0x20, + 0x31, 0x30, 0x30, 0x25, 0x3b, 0x0a, 0x20, 0x20, + 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, + 0x6e, 0x64, 0x2d, 0x70, 0x6f, 0x73, 0x69, 0x74, + 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x31, 0x36, 0x30, + 0x70, 0x78, 0x20, 0x30, 0x2c, 0x20, 0x30, 0x20, + 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, + 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x3a, 0x20, + 0x6e, 0x6f, 0x2d, 0x72, 0x65, 0x70, 0x65, 0x61, + 0x74, 0x2c, 0x20, 0x6e, 0x6f, 0x2d, 0x72, 0x65, + 0x70, 0x65, 0x61, 0x74, 0x3b, 0x0a, 0x20, 0x20, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x38, + 0x31, 0x39, 0x32, 0x61, 0x33, 0x3b, 0x0a, 0x20, + 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, + 0x72, 0x67, 0x62, 0x61, 0x28, 0x34, 0x36, 0x2c, + 0x20, 0x35, 0x32, 0x2c, 0x20, 0x35, 0x34, 0x2c, + 0x20, 0x30, 0x2e, 0x32, 0x29, 0x3b, 0x20, 0x7d, + 0x0a, 0x20, 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, + 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, + 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x62, 0x61, 0x72, 0x20, 0x3e, 0x20, 0x2a, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x32, 0x65, + 0x33, 0x34, 0x33, 0x36, 0x3b, 0x20, 0x7d, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x2e, 0x69, 0x6e, 0x63, + 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, + 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x62, 0x61, 0x72, 0x20, 0x3e, 0x20, 0x2a, + 0x3a, 0x62, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x6f, + 0x70, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x20, 0x23, 0x38, 0x64, 0x39, 0x30, 0x39, 0x31, + 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x2e, 0x69, + 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, + 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x3a, 0x62, + 0x61, 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, + 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, + 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x20, + 0x2d, 0x67, 0x74, 0x6b, 0x2d, 0x69, 0x63, 0x6f, + 0x6e, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x28, 0x22, + 0x75, 0x73, 0x65, 0x72, 0x2d, 0x6e, 0x6f, 0x74, + 0x2d, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x65, 0x64, + 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, + 0x63, 0x22, 0x29, 0x2c, 0x20, 0x6c, 0x69, 0x6e, + 0x65, 0x61, 0x72, 0x2d, 0x67, 0x72, 0x61, 0x64, + 0x69, 0x65, 0x6e, 0x74, 0x28, 0x74, 0x6f, 0x20, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x2c, 0x20, + 0x23, 0x63, 0x62, 0x64, 0x32, 0x64, 0x39, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, + 0x78, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x3a, 0x20, 0x69, 0x6e, 0x73, 0x65, 0x74, 0x20, + 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x23, 0x66, + 0x31, 0x66, 0x33, 0x66, 0x35, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3a, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x31, + 0x34, 0x31, 0x2c, 0x20, 0x31, 0x34, 0x34, 0x2c, + 0x20, 0x31, 0x34, 0x35, 0x2c, 0x20, 0x30, 0x2e, + 0x31, 0x29, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, + 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, + 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, + 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x32, + 0x65, 0x33, 0x34, 0x33, 0x36, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74, 0x6c, 0x69, + 0x6e, 0x65, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3a, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x34, + 0x36, 0x2c, 0x20, 0x35, 0x32, 0x2c, 0x20, 0x35, + 0x34, 0x2c, 0x20, 0x30, 0x2e, 0x33, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x3a, 0x20, 0x23, 0x38, 0x31, 0x39, 0x32, + 0x61, 0x33, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, + 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x3a, 0x20, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, + 0x2d, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, + 0x74, 0x28, 0x74, 0x6f, 0x20, 0x62, 0x6f, 0x74, + 0x74, 0x6f, 0x6d, 0x2c, 0x20, 0x23, 0x64, 0x61, + 0x64, 0x66, 0x65, 0x34, 0x2c, 0x20, 0x23, 0x63, + 0x62, 0x64, 0x32, 0x64, 0x39, 0x20, 0x34, 0x30, + 0x25, 0x2c, 0x20, 0x23, 0x62, 0x63, 0x63, 0x35, + 0x63, 0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x30, 0x20, + 0x31, 0x70, 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, + 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x30, 0x2e, 0x37, 0x36, 0x39, 0x32, 0x33, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x63, + 0x6f, 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, + 0x77, 0x3a, 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, + 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x2e, 0x37, + 0x36, 0x39, 0x32, 0x33, 0x29, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, + 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, + 0x6e, 0x73, 0x65, 0x74, 0x20, 0x30, 0x20, 0x31, + 0x70, 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, + 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, + 0x2e, 0x37, 0x29, 0x2c, 0x20, 0x30, 0x20, 0x31, + 0x70, 0x78, 0x20, 0x23, 0x66, 0x31, 0x66, 0x33, + 0x66, 0x35, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, + 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, + 0x61, 0x72, 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x2e, 0x66, 0x6c, 0x61, 0x74, 0x2c, + 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, + 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, + 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, + 0x72, 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x3a, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, + 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, + 0x72, 0x65, 0x6e, 0x74, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, + 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x20, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, 0x6e, + 0x73, 0x65, 0x74, 0x20, 0x30, 0x20, 0x31, 0x70, + 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, + 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x29, + 0x2c, 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, + 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, + 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, + 0x35, 0x35, 0x2c, 0x20, 0x30, 0x29, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x65, + 0x78, 0x74, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, + 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, + 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, + 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, + 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x20, 0x7b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x65, 0x78, + 0x74, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x3a, 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, + 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, + 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, + 0x35, 0x35, 0x2c, 0x20, 0x30, 0x2e, 0x37, 0x36, + 0x39, 0x32, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x63, 0x6f, 0x6e, + 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x30, 0x2e, 0x37, 0x36, 0x39, + 0x32, 0x33, 0x29, 0x3b, 0x20, 0x7d, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, + 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, + 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x62, 0x61, 0x72, 0x20, 0x2e, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x3a, 0x68, 0x6f, 0x76, 0x65, + 0x72, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x20, 0x23, 0x32, 0x65, 0x33, 0x34, 0x33, 0x36, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x2d, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x34, 0x36, 0x2c, 0x20, + 0x35, 0x32, 0x2c, 0x20, 0x35, 0x34, 0x2c, 0x20, + 0x30, 0x2e, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3a, 0x20, 0x23, 0x38, 0x31, 0x39, 0x32, 0x61, + 0x33, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, + 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, + 0x65, 0x3a, 0x20, 0x6c, 0x69, 0x6e, 0x65, 0x61, + 0x72, 0x2d, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, + 0x6e, 0x74, 0x28, 0x74, 0x6f, 0x20, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x2c, 0x20, 0x23, 0x66, + 0x34, 0x66, 0x36, 0x66, 0x37, 0x2c, 0x20, 0x23, + 0x64, 0x37, 0x64, 0x63, 0x65, 0x32, 0x20, 0x34, + 0x30, 0x25, 0x2c, 0x20, 0x23, 0x63, 0x62, 0x64, + 0x32, 0x64, 0x39, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, + 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x30, 0x2e, 0x37, 0x36, 0x39, + 0x32, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x69, 0x63, 0x6f, 0x6e, 0x2d, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, + 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, 0x67, + 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, + 0x2c, 0x20, 0x30, 0x2e, 0x37, 0x36, 0x39, 0x32, + 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, 0x6e, + 0x73, 0x65, 0x74, 0x20, 0x30, 0x20, 0x31, 0x70, + 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, + 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x2e, + 0x37, 0x29, 0x2c, 0x20, 0x30, 0x20, 0x31, 0x70, + 0x78, 0x20, 0x23, 0x66, 0x31, 0x66, 0x33, 0x66, + 0x35, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, + 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, + 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, + 0x72, 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x3a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x2c, 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, + 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, + 0x61, 0x72, 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x3a, 0x63, 0x68, 0x65, 0x63, 0x6b, + 0x65, 0x64, 0x2c, 0x20, 0x2e, 0x69, 0x6e, 0x63, + 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, + 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x62, 0x61, 0x72, 0x20, 0x2e, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x23, 0x65, 0x70, 0x68, + 0x79, 0x2d, 0x70, 0x61, 0x67, 0x65, 0x2d, 0x6d, + 0x65, 0x6e, 0x75, 0x2d, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, + 0x65, 0x2d, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x7b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x32, + 0x65, 0x33, 0x34, 0x33, 0x36, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74, + 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x3a, 0x20, 0x72, 0x67, 0x62, 0x61, + 0x28, 0x34, 0x36, 0x2c, 0x20, 0x35, 0x32, 0x2c, + 0x20, 0x35, 0x34, 0x2c, 0x20, 0x30, 0x2e, 0x33, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, + 0x38, 0x31, 0x39, 0x32, 0x61, 0x33, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, + 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, + 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x20, + 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x2d, 0x67, + 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x28, + 0x74, 0x6f, 0x20, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x2c, 0x20, 0x23, 0x62, 0x30, 0x62, 0x62, + 0x63, 0x36, 0x2c, 0x20, 0x23, 0x62, 0x38, 0x63, + 0x31, 0x63, 0x62, 0x20, 0x34, 0x30, 0x25, 0x2c, + 0x20, 0x23, 0x62, 0x63, 0x63, 0x35, 0x63, 0x65, + 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x30, 0x20, + 0x31, 0x70, 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, + 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x30, 0x2e, 0x37, 0x36, 0x39, 0x32, 0x33, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x30, 0x20, 0x31, + 0x70, 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, + 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, + 0x2e, 0x37, 0x36, 0x39, 0x32, 0x33, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x6f, 0x78, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, + 0x77, 0x3a, 0x20, 0x69, 0x6e, 0x73, 0x65, 0x74, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x30, 0x2c, 0x20, 0x30, + 0x2c, 0x20, 0x30, 0x2c, 0x20, 0x30, 0x2e, 0x30, + 0x37, 0x29, 0x2c, 0x20, 0x69, 0x6e, 0x73, 0x65, + 0x74, 0x20, 0x30, 0x20, 0x32, 0x70, 0x78, 0x20, + 0x31, 0x70, 0x78, 0x20, 0x2d, 0x32, 0x70, 0x78, + 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x30, 0x2c, + 0x20, 0x30, 0x2c, 0x20, 0x30, 0x2c, 0x20, 0x30, + 0x2e, 0x36, 0x29, 0x2c, 0x20, 0x30, 0x20, 0x31, + 0x70, 0x78, 0x20, 0x23, 0x66, 0x31, 0x66, 0x33, + 0x66, 0x35, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, + 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, + 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, + 0x61, 0x72, 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x3a, 0x69, 0x6e, 0x73, 0x65, 0x6e, + 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x20, 0x7b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x38, + 0x64, 0x39, 0x30, 0x39, 0x31, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x3a, 0x20, 0x23, 0x38, 0x31, 0x39, 0x32, + 0x61, 0x33, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x3a, 0x20, 0x6c, 0x69, 0x6e, 0x65, + 0x61, 0x72, 0x2d, 0x67, 0x72, 0x61, 0x64, 0x69, + 0x65, 0x6e, 0x74, 0x28, 0x74, 0x6f, 0x20, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x2c, 0x20, 0x23, + 0x64, 0x32, 0x64, 0x38, 0x64, 0x65, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, + 0x65, 0x78, 0x74, 0x2d, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, 0x6e, 0x73, + 0x65, 0x74, 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, + 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x29, 0x2c, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x23, + 0x66, 0x31, 0x66, 0x33, 0x66, 0x35, 0x3b, 0x20, + 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x2e, 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, + 0x74, 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, + 0x20, 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x3a, 0x69, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x69, + 0x74, 0x69, 0x76, 0x65, 0x20, 0x3e, 0x20, 0x2e, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x69, + 0x6e, 0x68, 0x65, 0x72, 0x69, 0x74, 0x3b, 0x20, + 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2e, 0x69, + 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, + 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x20, 0x2e, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3a, 0x62, + 0x61, 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, + 0x38, 0x64, 0x39, 0x30, 0x39, 0x31, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x63, 0x62, 0x64, + 0x32, 0x64, 0x39, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, + 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x3a, 0x20, 0x6c, 0x69, 0x6e, + 0x65, 0x61, 0x72, 0x2d, 0x67, 0x72, 0x61, 0x64, + 0x69, 0x65, 0x6e, 0x74, 0x28, 0x74, 0x6f, 0x20, + 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x2c, 0x20, + 0x23, 0x63, 0x62, 0x64, 0x32, 0x64, 0x39, 0x29, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x74, 0x65, 0x78, 0x74, 0x2d, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x69, 0x63, 0x6f, 0x6e, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, 0x6e, + 0x73, 0x65, 0x74, 0x20, 0x30, 0x20, 0x31, 0x70, + 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, + 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x29, + 0x2c, 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, + 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, 0x34, 0x31, + 0x2c, 0x20, 0x32, 0x34, 0x33, 0x2c, 0x20, 0x32, + 0x34, 0x35, 0x2c, 0x20, 0x30, 0x29, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, + 0x72, 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x38, 0x31, 0x39, + 0x32, 0x61, 0x33, 0x3b, 0x20, 0x7d, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x2e, 0x69, 0x6e, + 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, + 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x62, 0x61, 0x72, 0x20, 0x2e, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3a, 0x62, 0x61, + 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x3a, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x65, 0x20, 0x7b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, + 0x38, 0x64, 0x39, 0x30, 0x39, 0x31, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x63, + 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, 0x61, + 0x65, 0x62, 0x38, 0x63, 0x33, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, + 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, + 0x20, 0x6c, 0x69, 0x6e, 0x65, 0x61, 0x72, 0x2d, + 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, + 0x28, 0x74, 0x6f, 0x20, 0x62, 0x6f, 0x74, 0x74, + 0x6f, 0x6d, 0x2c, 0x20, 0x23, 0x61, 0x65, 0x62, + 0x38, 0x63, 0x33, 0x29, 0x3b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, + 0x78, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x3a, 0x20, 0x69, 0x6e, 0x73, 0x65, 0x74, 0x20, + 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, 0x67, + 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, + 0x2c, 0x20, 0x30, 0x29, 0x2c, 0x20, 0x30, 0x20, + 0x31, 0x70, 0x78, 0x20, 0x72, 0x67, 0x62, 0x61, + 0x28, 0x32, 0x34, 0x31, 0x2c, 0x20, 0x32, 0x34, + 0x33, 0x2c, 0x20, 0x32, 0x34, 0x35, 0x2c, 0x20, + 0x30, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3a, 0x20, 0x23, 0x38, 0x31, 0x39, 0x32, 0x61, + 0x33, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, + 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, + 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x62, 0x61, 0x72, 0x20, 0x2e, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x3a, 0x62, 0x61, 0x63, 0x6b, + 0x64, 0x72, 0x6f, 0x70, 0x3a, 0x69, 0x6e, 0x73, + 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, + 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3a, 0x20, 0x23, 0x39, 0x38, 0x39, 0x65, 0x61, + 0x33, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, + 0x20, 0x23, 0x64, 0x32, 0x64, 0x38, 0x64, 0x65, + 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x3a, 0x20, 0x6c, 0x69, 0x6e, 0x65, + 0x61, 0x72, 0x2d, 0x67, 0x72, 0x61, 0x64, 0x69, + 0x65, 0x6e, 0x74, 0x28, 0x74, 0x6f, 0x20, 0x62, + 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x2c, 0x20, 0x23, + 0x64, 0x32, 0x64, 0x38, 0x64, 0x65, 0x29, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x74, 0x65, 0x78, 0x74, 0x2d, 0x73, 0x68, + 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x6e, 0x6f, + 0x6e, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x69, 0x63, 0x6f, 0x6e, + 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, + 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x6f, 0x78, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, + 0x77, 0x3a, 0x20, 0x69, 0x6e, 0x73, 0x65, 0x74, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x30, 0x29, 0x2c, 0x20, 0x30, + 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, 0x67, 0x62, + 0x61, 0x28, 0x32, 0x34, 0x31, 0x2c, 0x20, 0x32, + 0x34, 0x33, 0x2c, 0x20, 0x32, 0x34, 0x35, 0x2c, + 0x20, 0x30, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x3a, 0x20, 0x23, 0x38, 0x31, 0x39, 0x32, + 0x61, 0x33, 0x3b, 0x20, 0x7d, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2e, 0x69, + 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, + 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x20, 0x2e, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3a, 0x62, + 0x61, 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x3a, + 0x69, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, + 0x69, 0x76, 0x65, 0x20, 0x3e, 0x20, 0x2e, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x20, 0x7b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, + 0x69, 0x6e, 0x68, 0x65, 0x72, 0x69, 0x74, 0x3b, + 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2e, + 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, + 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x20, + 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, + 0x66, 0x6c, 0x61, 0x74, 0x3a, 0x62, 0x61, 0x63, + 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x2c, 0x20, 0x2e, + 0x69, 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, + 0x6f, 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x20, + 0x2e, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, + 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x3a, 0x62, 0x61, 0x63, 0x6b, + 0x64, 0x72, 0x6f, 0x70, 0x20, 0x7b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, + 0x64, 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, + 0x72, 0x3a, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, + 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, + 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, + 0x65, 0x6e, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, + 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, + 0x61, 0x67, 0x65, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, + 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, 0x6e, 0x73, + 0x65, 0x74, 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, + 0x20, 0x72, 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x29, 0x2c, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x30, 0x29, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x65, 0x78, + 0x74, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, + 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x0a, + 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x63, + 0x6f, 0x6e, 0x2d, 0x73, 0x68, 0x61, 0x64, 0x6f, + 0x77, 0x3a, 0x20, 0x6e, 0x6f, 0x6e, 0x65, 0x3b, + 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x2e, 0x69, 0x6e, + 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, + 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x62, 0x61, 0x72, 0x20, 0x2e, 0x65, + 0x6e, 0x74, 0x72, 0x79, 0x20, 0x7b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, + 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, + 0x6e, 0x73, 0x65, 0x74, 0x20, 0x30, 0x20, 0x30, + 0x20, 0x30, 0x20, 0x31, 0x70, 0x78, 0x20, 0x72, + 0x67, 0x62, 0x61, 0x28, 0x37, 0x34, 0x2c, 0x20, + 0x31, 0x34, 0x34, 0x2c, 0x20, 0x32, 0x31, 0x37, + 0x2c, 0x20, 0x30, 0x29, 0x2c, 0x20, 0x30, 0x20, + 0x31, 0x70, 0x78, 0x20, 0x23, 0x66, 0x31, 0x66, + 0x33, 0x66, 0x35, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x23, + 0x38, 0x31, 0x39, 0x32, 0x61, 0x33, 0x3b, 0x20, + 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2e, 0x69, + 0x6e, 0x63, 0x6f, 0x67, 0x6e, 0x69, 0x74, 0x6f, + 0x2d, 0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x62, 0x61, 0x72, 0x20, 0x2e, + 0x65, 0x6e, 0x74, 0x72, 0x79, 0x3a, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x20, 0x7b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x72, 0x64, + 0x65, 0x72, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, + 0x3a, 0x20, 0x23, 0x34, 0x61, 0x39, 0x30, 0x64, + 0x39, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x6f, 0x78, 0x2d, 0x73, 0x68, 0x61, + 0x64, 0x6f, 0x77, 0x3a, 0x20, 0x69, 0x6e, 0x73, + 0x65, 0x74, 0x20, 0x30, 0x20, 0x30, 0x20, 0x30, + 0x20, 0x31, 0x70, 0x78, 0x20, 0x23, 0x34, 0x61, + 0x39, 0x30, 0x64, 0x39, 0x2c, 0x20, 0x30, 0x20, + 0x31, 0x70, 0x78, 0x20, 0x23, 0x66, 0x31, 0x66, + 0x33, 0x66, 0x35, 0x3b, 0x20, 0x7d, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x2e, 0x69, 0x6e, 0x63, 0x6f, + 0x67, 0x6e, 0x69, 0x74, 0x6f, 0x2d, 0x6d, 0x6f, + 0x64, 0x65, 0x2e, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x62, 0x61, 0x72, 0x20, 0x2e, 0x65, 0x6e, 0x74, + 0x72, 0x79, 0x3a, 0x62, 0x61, 0x63, 0x6b, 0x64, + 0x72, 0x6f, 0x70, 0x20, 0x7b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x20, 0x20, 0x62, 0x6f, 0x78, 0x2d, + 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x3a, 0x20, + 0x6e, 0x6f, 0x6e, 0x65, 0x3b, 0x20, 0x7d, 0x0a, + 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, + 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x2d, + 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, + 0x6c, 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, + 0xca, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, + 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, + 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, + 0x08, 0x06, 0x00, 0x00, 0x00, 0x73, 0x7a, 0x7a, + 0xf4, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, + 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64, + 0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, + 0x73, 0x00, 0x00, 0x0d, 0xd7, 0x00, 0x00, 0x0d, + 0xd7, 0x01, 0x42, 0x28, 0x9b, 0x78, 0x00, 0x00, + 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, + 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, + 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63, + 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, + 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x04, 0x47, 0x49, + 0x44, 0x41, 0x54, 0x58, 0x85, 0xcd, 0x57, 0xcf, + 0x6f, 0x5b, 0x45, 0x10, 0xfe, 0x66, 0xf6, 0xc5, + 0x8e, 0x93, 0xd8, 0x29, 0x49, 0x4c, 0xe4, 0x50, + 0x54, 0x4a, 0x4a, 0x50, 0xa9, 0xaa, 0xaa, 0x48, + 0x88, 0x03, 0x4d, 0x78, 0x60, 0x2b, 0x51, 0x8e, + 0x55, 0x95, 0x9e, 0xe0, 0x06, 0xfc, 0x51, 0xed, + 0x05, 0x4e, 0x48, 0x44, 0x80, 0x38, 0x54, 0x91, + 0xa5, 0xc4, 0x7a, 0x72, 0x2e, 0x1c, 0x90, 0xe8, + 0xa1, 0x04, 0x82, 0x00, 0x35, 0x05, 0x9a, 0x84, + 0x34, 0x3f, 0xea, 0xc4, 0xd8, 0x8e, 0x77, 0x77, + 0x38, 0xf4, 0xf9, 0xb1, 0x7e, 0x71, 0x9a, 0x14, + 0x84, 0xcc, 0x5c, 0xde, 0xdb, 0x37, 0x3b, 0xf3, + 0x7d, 0x33, 0x3b, 0x3b, 0xbb, 0x8f, 0x44, 0x04, + 0xdd, 0x14, 0xee, 0x2a, 0x3a, 0x00, 0xef, 0x59, + 0x26, 0x17, 0x8b, 0xc5, 0x5c, 0x32, 0x99, 0x7c, + 0x15, 0xc0, 0x39, 0x00, 0x69, 0x11, 0x49, 0x03, + 0x00, 0x11, 0xed, 0x03, 0xd8, 0x07, 0xb0, 0xd6, + 0x68, 0x34, 0x56, 0x67, 0x66, 0x66, 0xd6, 0x4f, + 0xeb, 0x93, 0x4e, 0xb3, 0x04, 0xe5, 0x72, 0xf9, + 0xa2, 0xd6, 0x3a, 0xcf, 0xcc, 0xc3, 0xa7, 0x71, + 0x6a, 0xad, 0xdd, 0x66, 0xe6, 0x45, 0xdf, 0xf7, + 0x7f, 0xf8, 0x57, 0x04, 0x82, 0x20, 0x38, 0x03, + 0xe0, 0x06, 0x80, 0xb3, 0xa7, 0x01, 0xee, 0x40, + 0xe4, 0x81, 0xb5, 0xf6, 0x8b, 0x42, 0xa1, 0xf0, + 0xf8, 0x99, 0x09, 0x04, 0x41, 0xf0, 0x92, 0x88, + 0xdc, 0x24, 0xa2, 0xd4, 0x3f, 0x01, 0x77, 0xa4, + 0xaa, 0xb5, 0xfe, 0xac, 0x50, 0x28, 0x3c, 0x38, + 0x35, 0x81, 0x10, 0xfc, 0x7d, 0x22, 0x6a, 0x2b, + 0x52, 0x11, 0xb1, 0x22, 0xf2, 0x93, 0xb5, 0x76, + 0x9d, 0x88, 0x1e, 0x2a, 0xa5, 0x1e, 0x02, 0x80, + 0x31, 0x66, 0x8c, 0x99, 0x73, 0x22, 0x32, 0x46, + 0x44, 0x17, 0xe2, 0x76, 0x00, 0x0c, 0x33, 0x7f, + 0x32, 0x35, 0x35, 0xf5, 0xeb, 0x89, 0x04, 0xee, + 0xdc, 0xb9, 0xf3, 0x5c, 0x5f, 0x5f, 0xdf, 0x87, + 0x1d, 0x22, 0xdf, 0x6c, 0x34, 0x1a, 0x5f, 0x9d, + 0x54, 0x60, 0xa5, 0x52, 0xe9, 0x75, 0x22, 0xca, + 0x13, 0x51, 0x5f, 0x4c, 0x55, 0xd5, 0x5a, 0xdf, + 0x8e, 0x2f, 0xc7, 0x91, 0x6d, 0x98, 0x4a, 0xa5, + 0x6e, 0xb8, 0xe0, 0x22, 0x22, 0xc6, 0x98, 0xf2, + 0xd6, 0xd6, 0xd6, 0xed, 0x93, 0xc0, 0x17, 0x16, + 0x16, 0x32, 0x22, 0x32, 0x68, 0xad, 0xfd, 0xd6, + 0x18, 0xf3, 0x5b, 0x4c, 0xdd, 0xef, 0x79, 0xde, + 0xf5, 0xb8, 0x4d, 0x5b, 0x06, 0x96, 0x96, 0x96, + 0x5e, 0x53, 0x4a, 0xcd, 0xb9, 0x13, 0xb4, 0xd6, + 0x5f, 0x17, 0x0a, 0x85, 0xe2, 0xd3, 0x80, 0x01, + 0x20, 0x08, 0x82, 0x01, 0x63, 0xcc, 0x65, 0x97, + 0x3c, 0x33, 0x9f, 0xb7, 0xd6, 0x9e, 0x65, 0xfe, + 0x3b, 0x4e, 0x63, 0xcc, 0xa7, 0xf9, 0x7c, 0xfe, + 0xc7, 0xd6, 0xb8, 0xad, 0x0f, 0x28, 0xa5, 0xde, + 0x75, 0xc7, 0xd6, 0xda, 0xaa, 0x52, 0x4a, 0x2f, + 0x2e, 0x2e, 0x5e, 0xdc, 0xdd, 0xdd, 0xfd, 0x79, + 0x6e, 0x6e, 0xee, 0xd0, 0xd5, 0xdf, 0xba, 0x75, + 0xab, 0x67, 0x62, 0x62, 0x62, 0x94, 0x88, 0x72, + 0xd6, 0xda, 0x34, 0x11, 0xb5, 0x91, 0x32, 0xc6, + 0xac, 0x31, 0xf3, 0x10, 0x80, 0x68, 0x39, 0x42, + 0x8c, 0x88, 0x40, 0x44, 0xad, 0x58, 0x2c, 0xe6, + 0x00, 0x44, 0xfb, 0x5c, 0x9e, 0xa4, 0x66, 0x55, + 0x44, 0x84, 0x99, 0x73, 0x43, 0x43, 0x43, 0x57, + 0x5c, 0xe7, 0xa5, 0x52, 0xe9, 0xdc, 0xf8, 0xf8, + 0xf8, 0x35, 0x6b, 0xed, 0x84, 0x31, 0x26, 0xdd, + 0x29, 0x2b, 0x44, 0x64, 0x5b, 0x3e, 0x9c, 0xcf, + 0xa3, 0x0b, 0x0b, 0x0b, 0xd9, 0x23, 0x04, 0xc2, + 0x0e, 0xe7, 0x1a, 0x6f, 0x03, 0xa8, 0x3a, 0x9f, + 0xda, 0xb6, 0x91, 0xe7, 0x79, 0x7d, 0xd4, 0x1e, + 0xf2, 0x9e, 0x52, 0xaa, 0x46, 0x44, 0x0d, 0x77, + 0x9e, 0x88, 0x1c, 0x88, 0xc8, 0xae, 0xb5, 0x36, + 0xfa, 0x96, 0x4a, 0xa5, 0x22, 0x2c, 0xb7, 0x08, + 0xcf, 0xb5, 0x5e, 0xc2, 0xc9, 0x07, 0x8e, 0xee, + 0x20, 0x9f, 0xcf, 0x6f, 0xba, 0x8e, 0xad, 0xb5, + 0xa2, 0x94, 0x6a, 0x8a, 0x48, 0x8d, 0x99, 0x2b, + 0xcc, 0xbc, 0xa2, 0xb5, 0xae, 0x1a, 0x63, 0xee, + 0x01, 0xd0, 0x68, 0x97, 0x7d, 0xb7, 0x0e, 0x5c, + 0x2c, 0xb7, 0x06, 0xda, 0xd2, 0xa8, 0xb5, 0x3e, + 0x60, 0x66, 0x84, 0x4b, 0xe0, 0x66, 0x02, 0x00, + 0x10, 0xb6, 0xd9, 0xb6, 0x56, 0x1b, 0x04, 0xc1, + 0x4a, 0xa5, 0x52, 0x49, 0xf5, 0xf4, 0xf4, 0xdc, + 0xed, 0xed, 0xed, 0xbd, 0x2a, 0x22, 0x0a, 0x00, + 0x98, 0x79, 0xc3, 0x05, 0x15, 0x91, 0xc1, 0x23, + 0x04, 0x44, 0x24, 0x2a, 0xa2, 0x10, 0xf8, 0xb1, + 0x88, 0x7c, 0xb7, 0xb3, 0xb3, 0xf3, 0x28, 0x9b, + 0xcd, 0x9e, 0x8f, 0x13, 0x68, 0x49, 0xb9, 0x5c, + 0x7e, 0xd1, 0x5a, 0x2b, 0x61, 0xd4, 0x3a, 0x93, + 0xc9, 0x68, 0x00, 0x5a, 0x29, 0xb5, 0x62, 0x8c, + 0xb9, 0x64, 0xad, 0xe5, 0xc3, 0xc3, 0xc3, 0xfb, + 0x89, 0x44, 0xe2, 0xcd, 0x96, 0x0d, 0x11, 0x65, + 0x3a, 0x65, 0x00, 0xc0, 0x93, 0xf4, 0x87, 0x04, + 0x54, 0x32, 0x99, 0x1c, 0x05, 0xf0, 0x08, 0xc0, + 0xfd, 0x4e, 0xe0, 0x41, 0x10, 0x78, 0xd6, 0xda, + 0x57, 0x8e, 0xe1, 0xf6, 0x0b, 0x80, 0xbb, 0x44, + 0x74, 0x05, 0xc0, 0xce, 0x71, 0x01, 0x44, 0x0b, + 0x13, 0x1e, 0xa9, 0xae, 0x0c, 0x34, 0x9b, 0xcd, + 0x91, 0x6c, 0x36, 0x7b, 0x35, 0x9d, 0x4e, 0x13, + 0x3a, 0x88, 0xe7, 0x79, 0x1d, 0xab, 0x3f, 0x0c, + 0x44, 0x7c, 0xdf, 0xdf, 0x6b, 0x36, 0x9b, 0xdf, + 0x28, 0xa5, 0xce, 0xb8, 0x3a, 0x11, 0xa9, 0x1c, + 0x21, 0x80, 0x27, 0xe7, 0x39, 0x5a, 0xc5, 0xe2, + 0x79, 0xde, 0x40, 0xe8, 0x28, 0xb3, 0xbf, 0xbf, + 0x7f, 0xa9, 0x13, 0x48, 0xbd, 0x5e, 0x3f, 0x96, + 0x80, 0xd6, 0xda, 0x02, 0xc0, 0xf4, 0xf4, 0x74, + 0x55, 0x44, 0xc6, 0x5c, 0x1d, 0x11, 0x45, 0xed, + 0xd8, 0x25, 0xb0, 0x16, 0xf3, 0x31, 0xe0, 0xbc, + 0xef, 0x75, 0x02, 0x49, 0x24, 0x12, 0xfd, 0x00, + 0xea, 0xcc, 0x5c, 0xf1, 0x3c, 0x6f, 0x8b, 0x88, + 0x8c, 0xa3, 0xdb, 0x8d, 0x40, 0x98, 0x73, 0x31, + 0xd3, 0x08, 0x2b, 0xaa, 0x81, 0x46, 0xa3, 0xb1, + 0x9a, 0x4c, 0x26, 0xdf, 0x6e, 0x8d, 0x45, 0x64, + 0x18, 0x40, 0x3f, 0x80, 0x6a, 0x32, 0x99, 0xdc, + 0x44, 0x07, 0x99, 0x9a, 0x9a, 0xfa, 0xde, 0x1d, + 0x2f, 0x2d, 0x2d, 0xbd, 0x41, 0x44, 0x69, 0x66, + 0xfe, 0xd3, 0xf7, 0xfd, 0x03, 0x00, 0x58, 0x5e, + 0x5e, 0xce, 0x11, 0xd1, 0x05, 0x77, 0x5e, 0xad, + 0x56, 0x5b, 0x8d, 0xc8, 0xb5, 0x5e, 0xc2, 0x83, + 0x66, 0xbb, 0x35, 0x0e, 0x9b, 0xcc, 0xb8, 0x52, + 0x4a, 0x12, 0x89, 0x44, 0x7c, 0x5f, 0x77, 0x14, + 0x66, 0x3e, 0x0c, 0x9f, 0xbf, 0x03, 0xc0, 0xfc, + 0xfc, 0xbc, 0xd2, 0x5a, 0x5f, 0x8f, 0x1d, 0xcf, + 0x9b, 0xb3, 0xb3, 0xb3, 0x5b, 0x47, 0x08, 0x00, + 0x80, 0x31, 0xa6, 0x14, 0x73, 0x38, 0x68, 0x8c, + 0x19, 0xa9, 0x54, 0x2a, 0x2f, 0x9f, 0x86, 0x80, + 0x52, 0xea, 0x50, 0x44, 0x1e, 0xb5, 0xce, 0xfd, + 0x6c, 0x36, 0xfb, 0x0e, 0x11, 0x65, 0xdd, 0x39, + 0x71, 0x8c, 0x23, 0xf7, 0x81, 0x52, 0xa9, 0xf4, + 0x01, 0x33, 0xbf, 0xe0, 0x18, 0x08, 0x33, 0xdf, + 0xab, 0xd7, 0xeb, 0x8b, 0xb3, 0xb3, 0xb3, 0x15, + 0x3c, 0x45, 0x96, 0x97, 0x97, 0x73, 0x1b, 0x1b, + 0x1b, 0x7f, 0x00, 0xc0, 0xc8, 0xc8, 0x88, 0x0f, + 0xe0, 0xad, 0x58, 0xbb, 0x5e, 0xf3, 0x7d, 0xff, + 0xe3, 0xb6, 0x20, 0xe3, 0x4e, 0x6a, 0xb5, 0xda, + 0xe7, 0x22, 0x52, 0x73, 0xa2, 0x22, 0x22, 0xba, + 0xdc, 0xdb, 0xdb, 0xfb, 0x5e, 0x78, 0x60, 0x1d, + 0x2b, 0x93, 0x93, 0x93, 0xeb, 0x99, 0x4c, 0xe6, + 0xf9, 0xe1, 0xe1, 0xe1, 0x8f, 0x88, 0xe8, 0x5a, + 0x0c, 0xbc, 0xaa, 0xb5, 0xfe, 0x32, 0x6e, 0xf3, + 0xff, 0xbb, 0x92, 0xc5, 0x48, 0x74, 0xe7, 0x52, + 0xea, 0x90, 0xe8, 0xde, 0xb5, 0xdc, 0x95, 0xae, + 0xfd, 0x98, 0xc4, 0xa5, 0x6b, 0xbf, 0x66, 0xff, + 0xa5, 0x74, 0xfd, 0xef, 0xf8, 0x2f, 0x86, 0x0b, + 0x49, 0x8a, 0xdb, 0x71, 0xb2, 0x1b, 0x00, 0x00, + 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, + 0x79, 0x29 } }; static GStaticResource static_resource = { epiphany_resource_data.data, sizeof (epiphany_resource_data.data), NULL, NULL, NULL }; diff -Nru epiphany-browser-3.16.3/src/Makefile.am epiphany-browser-3.18.0/src/Makefile.am --- epiphany-browser-3.16.3/src/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/Makefile.am 2015-08-07 08:41:17.000000000 +0000 @@ -3,6 +3,7 @@ NULL = AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephymain.la @@ -92,7 +93,7 @@ -I$(top_srcdir)/src/bookmarks \ -DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\" \ -DDATADIR=\""$(pkgdatadir)"\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) libephymain_la_CFLAGS = \ @@ -112,10 +113,8 @@ resources/epiphany.css \ resources/error.html \ resources/history-dialog.ui \ - resources/incognito-tinted.png \ resources/incognito.png \ resources/missing-thumbnail.png \ - resources/overview.html \ resources/passwords-dialog.ui \ resources/prefs-dialog.ui \ resources/prefs-lang-dialog.ui \ @@ -152,15 +151,17 @@ -I$(top_builddir)/lib/widgets \ -I$(top_srcdir)/src/bookmarks \ -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - $(INCINTL) \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) epiphany_CFLAGS = \ $(DEPENDENCIES_CFLAGS) \ $(AM_CFLAGS) -epiphany_LDFLAGS = -dlopen self +epiphany_LDFLAGS = \ + -dlopen self \ + $(AM_LDFLAGS) epiphany_LDADD = \ libephymain.la \ @@ -171,8 +172,7 @@ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(LIBINTL) + $(CODE_COVERAGE_LDFLAGS) libexec_PROGRAMS = epiphany-search-provider @@ -188,8 +188,8 @@ -I$(top_srcdir)/lib/history \ -I$(top_srcdir)/src/bookmarks \ -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - $(INCINTL) \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) epiphany_search_provider_CFLAGS = $(epiphany_CFLAGS) @@ -203,8 +203,7 @@ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(LIBINTL) + $(CODE_COVERAGE_LDFLAGS) TYPES_SOURCE = \ ephy-type-builtins.c \ @@ -271,7 +270,5 @@ $(NULL) CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/src/Makefile.in epiphany-browser-3.18.0/src/Makefile.in --- epiphany-browser-3.16.3/src/Makefile.in 2015-07-09 13:29:06.000000000 +0000 +++ epiphany-browser-3.18.0/src/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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 \ ?) ;; \ @@ -82,11 +92,19 @@ bin_PROGRAMS = epiphany$(EXEEXT) libexec_PROGRAMS = epiphany-search-provider$(EXEEXT) 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/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -95,6 +113,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 = @@ -186,7 +205,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -252,6 +271,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -282,13 +303,12 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -303,7 +323,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -312,17 +331,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -332,8 +348,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -357,9 +371,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -380,11 +392,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -393,6 +401,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -411,6 +421,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -446,6 +457,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -457,6 +469,7 @@ SUBDIRS = bookmarks NULL = AM_CFLAGS = $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) noinst_LTLIBRARIES = libephymain.la EXTRA_DIST = \ org.gnome.ShellSearchProvider2.xml \ @@ -542,7 +555,7 @@ -I$(top_srcdir)/src/bookmarks \ -DLOADER_DIR=\""$(pkglibdir)/$(EPIPHANY_MAJOR)/loaders"\" \ -DDATADIR=\""$(pkgdatadir)"\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) libephymain_la_CFLAGS = \ @@ -562,10 +575,8 @@ resources/epiphany.css \ resources/error.html \ resources/history-dialog.ui \ - resources/incognito-tinted.png \ resources/incognito.png \ resources/missing-thumbnail.png \ - resources/overview.html \ resources/passwords-dialog.ui \ resources/prefs-dialog.ui \ resources/prefs-lang-dialog.ui \ @@ -596,15 +607,18 @@ -I$(top_builddir)/lib/widgets \ -I$(top_srcdir)/src/bookmarks \ -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - $(INCINTL) \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) epiphany_CFLAGS = \ $(DEPENDENCIES_CFLAGS) \ $(AM_CFLAGS) -epiphany_LDFLAGS = -dlopen self +epiphany_LDFLAGS = \ + -dlopen self \ + $(AM_LDFLAGS) + epiphany_LDADD = \ libephymain.la \ $(top_builddir)/src/bookmarks/libephybookmarks.la \ @@ -614,8 +628,7 @@ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(LIBINTL) + $(CODE_COVERAGE_LDFLAGS) epiphany_search_provider_SOURCES = \ $(dbus_shell_search_provider_built_sources) \ @@ -629,8 +642,8 @@ -I$(top_srcdir)/lib/history \ -I$(top_srcdir)/src/bookmarks \ -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - $(INCINTL) \ + -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ + -DLOCALEDIR=\"$(localedir)\" \ $(AM_CPPFLAGS) epiphany_search_provider_CFLAGS = $(epiphany_CFLAGS) @@ -643,8 +656,7 @@ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) \ - $(LIBINTL) + $(CODE_COVERAGE_LDFLAGS) TYPES_SOURCE = \ ephy-type-builtins.c \ @@ -659,8 +671,6 @@ ephy-shell-search-provider-generated.h CLEANFILES = $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES) -MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -678,7 +688,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*) \ @@ -1325,13 +1334,11 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \ @@ -1423,6 +1430,8 @@ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-libexecPROGRAMS +.PRECIOUS: Makefile + epiphany-resources.c: epiphany.gresource.xml $(RESOURCE_FILES) $(AM_V_GEN)glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-source --c-name epiphany $(srcdir)/epiphany.gresource.xml diff -Nru epiphany-browser-3.16.3/src/popup-commands.c epiphany-browser-3.18.0/src/popup-commands.c --- epiphany-browser-3.16.3/src/popup-commands.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/popup-commands.c 2015-08-07 08:41:06.000000000 +0000 @@ -367,3 +367,38 @@ { popup_cmd_view_in_new_tab (window, "media-uri"); } + +void +popup_cmd_link_in_incognito_window (GtkAction *action, + EphyWindow *window) +{ + EphyEmbedEvent *event; + GValue value = { 0, }; + + event = ephy_window_get_context_event (window); + g_assert (event != NULL); + + ephy_embed_event_get_property (event, "link-uri", &value); + ephy_open_incognito_window (g_value_get_string (&value)); + g_value_unset (&value); +} + +void +popup_cmd_search_selection (GtkAction *action, + EphyWindow *window) +{ + EphyEmbed *embed, *new_embed; + const char *text; + char *search_url; + + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_assert (EPHY_IS_EMBED (embed)); + + text = g_object_get_data (G_OBJECT (action), "selection"); + search_url = ephy_embed_utils_autosearch_address (text); + new_embed = ephy_shell_new_tab (ephy_shell_get_default (), + window, embed, EPHY_NEW_TAB_APPEND_AFTER); + ephy_web_view_load_url (ephy_embed_get_web_view (new_embed), search_url); + g_free (search_url); +} diff -Nru epiphany-browser-3.16.3/src/popup-commands.h epiphany-browser-3.18.0/src/popup-commands.h --- epiphany-browser-3.16.3/src/popup-commands.h 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/popup-commands.h 2015-08-07 08:41:06.000000000 +0000 @@ -32,6 +32,9 @@ void popup_cmd_link_in_new_tab (GtkAction *action, EphyWindow *window); +void popup_cmd_link_in_incognito_window (GtkAction *action, + EphyWindow *window); + void popup_cmd_bookmark_link (GtkAction *action, EphyWindow *window); @@ -74,6 +77,9 @@ void popup_cmd_save_media_as (GtkAction *action, EphyWindow *window); +void popup_cmd_search_selection (GtkAction *action, + EphyWindow *window); + G_END_DECLS #endif diff -Nru epiphany-browser-3.16.3/src/resources/about.css epiphany-browser-3.18.0/src/resources/about.css --- epiphany-browser-3.16.3/src/resources/about.css 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/resources/about.css 2015-08-07 08:41:17.000000000 +0000 @@ -50,12 +50,6 @@ #about-subtitle { color: #babdb6; text-shadow: 0 1px 0 white; - margin-top: 0; -} - -#about-subtitle { - color: #babdb6; - text-shadow: 0 1px 0 white; } /* about:plugins */ @@ -106,22 +100,21 @@ } #ephytext { - margin-top: 15%; - font-size: 1.5em; - text-align: center; + margin-top: 15%; + font-size: 1.5em; + text-align: center; } #from { - margin-top: 1em; - font-size: 1.5em; - text-align: right; - font-weight: bold; + margin-top: 1em; + font-size: 1.5em; + text-align: right; + font-weight: bold; } /* about:memory */ -.memory-table caption -{ +.memory-table caption { font-size: 16pt; font-weight: bold; margin-bottom: 0.9em; @@ -129,34 +122,30 @@ text-shadow: 0 1px 0 white; } -.memory-table -{ +.memory-table { margin: 0 12.5% 0.9em 12.5%; width: 80%; text-align: left; border-collapse: collapse; } -.memory-table th -{ +.memory-table th { padding: 4px; background: #565051; border: 2px solid #565051; color: #f6f6f4; } -.memory-table td -{ +.memory-table td { padding: 2px; background: #f6f6f8; border-bottom: 1px solid #d3d7cf; color: #2e3436; - border-top: 1px solidtransparent; + border-top: 1px solid transparent; width: 16%; } -.memory-table tr:hover td -{ +.memory-table tr:hover td { background: #d3d7cf; color: #2e3436; } @@ -172,7 +161,7 @@ } .applications-body p { margin-bottom: 30px; } -.applications-body td { padding: 15px 15px;} +.applications-body td { padding: 15px;} .applications-body td.icon { width: 64px; } .applications-body td.datas { width: 200px; } .applications-body td.input { width: 64px; } @@ -184,25 +173,159 @@ /* about:incognito */ .incognito-body { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } .incognito-body div#mainblock { - display: table; - max-width: 40em; - margin-left: auto; - margin-right: auto; - height: 75%; + display: table; + max-width: 40em; + margin-left: auto; + margin-right: auto; + height: 75%; } .incognito-body div#mainblock>div { - margin: 0 10px; - display: table-cell; - vertical-align: middle; - padding: 0 20px 0 160px; + margin: 0 10px; + display: table-cell; + vertical-align: middle; + padding: 0 20px 0 160px; } .incognito-body h1 { - color: #888a85; + color: #888a85; +} + +/* about:overview */ +#overview { + padding: 0 5px; + max-width: 1200px; + margin-left: auto; + margin-right: auto; + bottom: 0; + max-height: 540px; + margin: auto; + position: absolute; + top: 0; + right: 0; + left: 0; +} + +#overview-grid { + /* Width for 5 thumbnails and their paddings */ + max-width: 1060px; + margin-left: auto; + margin-right:auto; + padding: 0; +} + +#overview-item-list { + padding: 0; +} + +#overview-grid li { + list-style-type: none; + display: inline-block; + vertical-align:top; +} + +.overview-item { + width: 180px; + height: 220px; + display: table-cell; + vertical-align: top; + overflow: hidden; + padding: 15px; + outline: 0; + position: relative; + transition: 0; + top: 0; + float: left; +} + +.overview-title { + width: 180px; + height: 50px; + display: inline-block; + padding: 5px 0; + overflow: hidden; + font-family: Cantarell, sans-serif; + font-size: 11pt; + color: #2e3436; + text-overflow: ellipsis; + text-align: center; +} + +.overview-thumbnail { + width: 180px; + height: 135px; + display: block; + border: 1px solid #ccc; + background: url(ephy-resource:///org/gnome/epiphany/missing-thumbnail.png) center no-repeat, linear-gradient(to bottom, #e8e8e8, #fff); + background-repeat: no-repeat; + position: relative; +} + +.overview-thumbnail:hover, +:focus .overview-thumbnail { + border: 1px solid #999; + box-shadow: 0 1px 1px rgba(0,0,0,0.3); +} + +.overview-thumbnail:active { + border: 1px solid #999; + box-shadow: inset 0 1px 1px rgba(0,0,0,0.3); +} + +.overview-close-button { + -webkit-transition: all 250ms; + position: absolute; + top: 20px; + right: 20px; + opacity: 0; + z-index: 5; + color: #888; + font-family: sans-serif; + font-size: 14px; + width: 13px; + height: 14px; + color: #fff; + padding: 3px 3px 4px 4px; + text-shadow: 0 1px 0 rgba(0,0,0,.3); + background-color: rgba(80,80,80,.2); + border-radius: 50%; +} + +.overview-close-button:hover { + background-color: rgba(0,0,0,.8); +} + +.overview-close-button:active { + text-shadow: none; + background-color: #000; +} + +.overview-item:hover .overview-close-button { + opacity: 1; +} + +.overview-removed .overview-item { + transition: all 0.75s ease-in-out; + width: 0; + margin: 15px 0; + opacity: 0; + padding: 0; +} + +.overview-removed .overview-close-button { + display: none; +} + +html[dir="rtl"] .overview-close-button { + left: 20px; + right: inherit; +} + +html[dir="rtl"] .overview-item { + float: right; } diff -Nru epiphany-browser-3.16.3/src/resources/epiphany.css epiphany-browser-3.18.0/src/resources/epiphany.css --- epiphany-browser-3.16.3/src/resources/epiphany.css 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/resources/epiphany.css 2015-08-07 08:41:06.000000000 +0000 @@ -1,78 +1,147 @@ -#ephy-status-frame { - border-style: solid; - border-width: 1px; - padding: 4px; -} - -#ephy-tab-close-button { - -GtkButton-default-border: 0; - -GtkButton-default-outside-border: 0; - -GtkButton-inner-border: 0; - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 0; - margin: 0; - padding: 0; -} - -.primary-toolbar.toolbar { - padding-left: 0; - padding-right: 0; -} - -#fullscreen-popup { - background-color: alpha (black, 0.7); - color: white; - padding: 12px; - border-radius: 10px; -} - -EphyToolbar.incognito-mode { - background-color: transparent; - background-image: url("resource://org/gnome/epiphany/incognito-tinted.png"), - linear-gradient(to bottom, - #e4ecf5, - #c5cfd8); - background-repeat: no-repeat; - background-position: 6ex center, 0 0; - background-size: auto 180%; - border-color: shade(#c5cfd8, 0.90); - box-shadow: none; -} - -EphyToolbar.incognito-mode *:insensitive { - background-color: transparent; -} - -EphyToolbar.incognito-mode EphyMiddleClickableButton, -EphyToolbar.incognito-mode > .button { - background-image: linear-gradient(to bottom, - #e4ecf5, - #c5cfd8); - border-color: shade(#c5cfd8, 0.90); -} - -EphyTitleBox { - -GtkWidget-window-dragging: true; -} +.button.active-menu { + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #a1a1a1; + background-image: linear-gradient(to bottom, #d6d6d6, gainsboro 40%, #e0e0e0); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; } .floating-bar { background-color: @theme_base_color; border-width: 1px; border-style: solid solid none; border-color: @borders; - border-radius: 3px 3px 0 0; -} + border-radius: 3px 3px 0 0; } + .floating-bar.left { + border-left-style: none; + border-top-left-radius: 0; } + .floating-bar.right { + border-right-style: none; + border-top-right-radius: 0; } + .floating-bar:backdrop { + background-color: @theme_unfocused_base_color; + border-color: @unfocused_borders; } -.floating-bar.left { /* axes left border and border radius */ - border-left-style: none; - border-top-left-radius: 0; -} -.floating-bar.right { /* axes right border and border radius */ - border-right-style: none; - border-top-right-radius: 0; -} - -.floating-bar:backdrop { - background-color: @theme_unfocused_base_color; - border-color: @unfocused_borders; -} +.download-box { + border-style: solid none none; + border-width: 1px; + border-color: @borders; } + .download-box:backdrop { + border-color: @unfocused_borders; } + +.download-box .button .filename:dir(ltr) { + padding-right: 6px; } +.download-box .button .filename:dir(rtl) { + padding-left: 6px; } + +.download-box .button.needs-attention .filename { + animation: needs_attention 150ms ease-in; + background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4a90d9), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.76923)), to(transparent)); + background-size: 6px 6px, 6px 6px; + background-repeat: no-repeat; + background-position: right 3px, right 4px; } + .download-box .button.needs-attention .filename:dir(rtl) { + background-position: left 3px, left 4px; } + .download-box .button.needs-attention .filename:backdrop { + background-size: 6px 6px, 0 0; } + +.incognito-mode.titlebar { + background-image: linear-gradient(to bottom, #d7dce2, #cbd2d9); + box-shadow: inset 0 -1px #b4bec8, inset 0 1px #f1f3f5; + background-image: -gtk-icontheme("user-not-tracked-symbolic"), linear-gradient(to bottom, #d7dce2, #cbd2d9); + background-size: 64px 64px, 100% 100%; + background-position: 160px 0, 0 0; + background-repeat: no-repeat, no-repeat; + border-color: #8192a3; + color: rgba(46, 52, 54, 0.2); } + .incognito-mode.titlebar > * { + color: #2e3436; } + .incognito-mode.titlebar > *:backdrop { + color: #8d9091; } + .incognito-mode.titlebar:backdrop { + background-image: -gtk-icontheme("user-not-tracked-symbolic"), linear-gradient(to bottom, #cbd2d9); + box-shadow: inset 0 1px #f1f3f5; + color: rgba(141, 144, 145, 0.1); } + .incognito-mode.titlebar .button { + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #8192a3; + background-image: linear-gradient(to bottom, #dadfe4, #cbd2d9 40%, #bcc5ce); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.7), 0 1px #f1f3f5; } + .incognito-mode.titlebar .button.flat, .incognito-mode.titlebar .button.titlebutton { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + icon-shadow: none; } + .incognito-mode.titlebar .button.titlebutton { + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); } + .incognito-mode.titlebar .button:hover { + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #8192a3; + background-image: linear-gradient(to bottom, #f4f6f7, #d7dce2 40%, #cbd2d9); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(255, 255, 255, 0.7), 0 1px #f1f3f5; } + .incognito-mode.titlebar .button:active, .incognito-mode.titlebar .button:checked, .incognito-mode.titlebar .button#ephy-page-menu-button.active-menu { + color: #2e3436; + outline-color: rgba(46, 52, 54, 0.3); + border-color: #8192a3; + background-image: linear-gradient(to bottom, #b0bbc6, #b8c1cb 40%, #bcc5ce); + text-shadow: 0 1px rgba(255, 255, 255, 0.76923); + icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); + box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px #f1f3f5; } + .incognito-mode.titlebar .button:insensitive { + color: #8d9091; + border-color: #8192a3; + background-image: linear-gradient(to bottom, #d2d8de); + text-shadow: none; + icon-shadow: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #f1f3f5; } + .incognito-mode.titlebar .button:insensitive > .label { + color: inherit; } + .incognito-mode.titlebar .button:backdrop { + color: #8d9091; + border-color: #cbd2d9; + background-image: linear-gradient(to bottom, #cbd2d9); + text-shadow: none; + icon-shadow: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(241, 243, 245, 0); + border-color: #8192a3; } + .incognito-mode.titlebar .button:backdrop:active { + color: #8d9091; + border-color: #aeb8c3; + background-image: linear-gradient(to bottom, #aeb8c3); + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(241, 243, 245, 0); + border-color: #8192a3; } + .incognito-mode.titlebar .button:backdrop:insensitive { + color: #989ea3; + border-color: #d2d8de; + background-image: linear-gradient(to bottom, #d2d8de); + text-shadow: none; + icon-shadow: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(241, 243, 245, 0); + border-color: #8192a3; } + .incognito-mode.titlebar .button:backdrop:insensitive > .label { + color: inherit; } + .incognito-mode.titlebar .button.flat:backdrop, .incognito-mode.titlebar .button.titlebutton:backdrop { + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + icon-shadow: none; } + .incognito-mode.titlebar .entry { + box-shadow: inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px #f1f3f5; + border-color: #8192a3; } + .incognito-mode.titlebar .entry:focus { + border-color: #4a90d9; + box-shadow: inset 0 0 0 1px #4a90d9, 0 1px #f1f3f5; } + .incognito-mode.titlebar .entry:backdrop { + box-shadow: none; } Binary files /tmp/MF5cZo2vlu/epiphany-browser-3.16.3/src/resources/incognito-tinted.png and /tmp/hWyEv5hOVi/epiphany-browser-3.18.0/src/resources/incognito-tinted.png differ diff -Nru epiphany-browser-3.16.3/src/resources/overview.html epiphany-browser-3.18.0/src/resources/overview.html --- epiphany-browser-3.16.3/src/resources/overview.html 2015-07-09 10:05:15.000000000 +0000 +++ epiphany-browser-3.18.0/src/resources/overview.html 1970-01-01 00:00:00.000000000 +0000 @@ -1,204 +0,0 @@ - - - - - - %s - - - - - - - - -
-
-
    - %s -
-
-
- - - - diff -Nru epiphany-browser-3.16.3/src/window-commands.c epiphany-browser-3.18.0/src/window-commands.c --- epiphany-browser-3.16.3/src/window-commands.c 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/src/window-commands.c 2015-08-07 08:41:17.000000000 +0000 @@ -844,7 +844,7 @@ gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); - markup = g_strdup_printf ("%s", webkit_web_view_get_uri (WEBKIT_WEB_VIEW (view))); + markup = g_strdup_printf ("%s", ephy_web_view_get_display_address (view)); label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), markup); g_free (markup); @@ -920,9 +920,7 @@ window_cmd_file_new_incognito_window (GtkAction *action, EphyWindow *window) { - char *str = g_strdup_printf ("epiphany --incognito-mode --profile %s", ephy_dot_dir ()); - g_spawn_command_line_async (str, NULL); - g_free (str); + ephy_open_incognito_window (NULL); } void diff -Nru epiphany-browser-3.16.3/tests/data/Makefile.in epiphany-browser-3.18.0/tests/data/Makefile.in --- epiphany-browser-3.16.3/tests/data/Makefile.in 2015-07-09 13:29:07.000000000 +0000 +++ epiphany-browser-3.18.0/tests/data/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,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 \ ?) ;; \ @@ -78,10 +88,19 @@ build_triplet = @build@ host_triplet = @host@ subdir = tests/data -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -90,6 +109,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 = @@ -114,18 +134,18 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -140,7 +160,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -149,17 +168,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -169,8 +185,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -194,9 +208,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -217,11 +229,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -230,6 +238,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -248,6 +258,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -283,6 +294,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -307,7 +319,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/data/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/data/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -482,6 +493,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff -Nru epiphany-browser-3.16.3/tests/ephy-completion-model-test.c epiphany-browser-3.18.0/tests/ephy-completion-model-test.c --- epiphany-browser-3.16.3/tests/ephy-completion-model-test.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/tests/ephy-completion-model-test.c 2015-09-22 07:28:20.000000000 +0000 @@ -32,7 +32,7 @@ { EphyCompletionModel *model; model = ephy_completion_model_new (EPHY_HISTORY_SERVICE (ephy_embed_shell_get_global_history_service (ephy_embed_shell_get_default ())), - ephy_shell_get_bookmarks (ephy_shell_get_default ())); + ephy_shell_get_bookmarks (ephy_shell_get_default ()), TRUE); g_assert (model); g_object_unref (model); } @@ -58,7 +58,7 @@ GMainLoop *loop = NULL; model = ephy_completion_model_new (EPHY_HISTORY_SERVICE (ephy_embed_shell_get_global_history_service (ephy_embed_shell_get_default ())), - ephy_shell_get_bookmarks (ephy_shell_get_default ())); + ephy_shell_get_bookmarks (ephy_shell_get_default ()), TRUE); g_assert (model); loop = g_main_loop_new (NULL, FALSE); diff -Nru epiphany-browser-3.16.3/tests/ephy-download-test.c epiphany-browser-3.18.0/tests/ephy-download-test.c --- epiphany-browser-3.16.3/tests/ephy-download-test.c 2015-04-08 14:28:12.000000000 +0000 +++ epiphany-browser-3.18.0/tests/ephy-download-test.c 2015-09-09 08:19:45.000000000 +0000 @@ -177,6 +177,7 @@ } _ephy_shell_create_instance (EPHY_EMBED_SHELL_MODE_TEST); + g_application_register (G_APPLICATION (ephy_shell_get_default ()), NULL, NULL); server = soup_server_new (NULL, NULL); soup_server_listen_local (server, 0, diff -Nru epiphany-browser-3.16.3/tests/Makefile.am epiphany-browser-3.18.0/tests/Makefile.am --- epiphany-browser-3.16.3/tests/Makefile.am 2015-07-09 13:27:20.000000000 +0000 +++ epiphany-browser-3.18.0/tests/Makefile.am 2015-08-07 08:41:06.000000000 +0000 @@ -14,7 +14,7 @@ test-ephy-snapshot-service \ test-ephy-sqlite \ test-ephy-string \ - ephy-uri-helpers-test \ + test-ephy-uri-helpers \ test-ephy-web-app-utils \ test-ephy-web-view \ $(NULL) @@ -102,7 +102,10 @@ AM_CFLAGS = \ -DTEST_DIR=\"$(srcdir)\"\ $(DEPENDENCIES_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(WARN_CFLAGS) + +AM_LDFLAGS = $(WARN_LDFLAGS) LDADD = \ $(top_builddir)/src/libephymain.la \ diff -Nru epiphany-browser-3.16.3/tests/Makefile.in epiphany-browser-3.18.0/tests/Makefile.in --- epiphany-browser-3.16.3/tests/Makefile.in 2015-07-09 13:29:07.000000000 +0000 +++ epiphany-browser-3.18.0/tests/Makefile.in 2015-09-22 07:50:39.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 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 \ ?) ;; \ @@ -85,14 +95,22 @@ test-ephy-file-helpers$(EXEEXT) test-ephy-history$(EXEEXT) \ test-ephy-location-entry$(EXEEXT) test-ephy-migration$(EXEEXT) \ test-ephy-snapshot-service$(EXEEXT) test-ephy-sqlite$(EXEEXT) \ - test-ephy-string$(EXEEXT) ephy-uri-helpers-test$(EXEEXT) \ + test-ephy-string$(EXEEXT) test-ephy-uri-helpers$(EXEEXT) \ test-ephy-web-app-utils$(EXEEXT) test-ephy-web-view$(EXEEXT) subdir = tests -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_enable_debug.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/ax_append_compile_flags.m4 \ + $(top_srcdir)/m4/ax_append_flag.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ + $(top_srcdir)/m4/ax_check_enable_debug.m4 \ $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/ax_compiler_flags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_cflags.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_gir.m4 \ + $(top_srcdir)/m4/ax_compiler_flags_ldflags.m4 \ + $(top_srcdir)/m4/ax_is_release.m4 \ + $(top_srcdir)/m4/ax_require_defined.m4 \ $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ @@ -101,17 +119,17 @@ $(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 = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) -ephy_uri_helpers_test_SOURCES = ephy-uri-helpers-test.c -ephy_uri_helpers_test_OBJECTS = ephy-uri-helpers-test.$(OBJEXT) -ephy_uri_helpers_test_LDADD = $(LDADD) +am_test_ephy_bookmarks_OBJECTS = ephy-bookmarks-test.$(OBJEXT) +test_ephy_bookmarks_OBJECTS = $(am_test_ephy_bookmarks_OBJECTS) +test_ephy_bookmarks_LDADD = $(LDADD) am__DEPENDENCIES_1 = -ephy_uri_helpers_test_DEPENDENCIES = \ - $(top_builddir)/src/libephymain.la \ +test_ephy_bookmarks_DEPENDENCIES = $(top_builddir)/src/libephymain.la \ $(top_builddir)/src/bookmarks/libephybookmarks.la \ $(top_builddir)/embed/libephyembed.la \ $(top_builddir)/lib/widgets/libephywidgets.la \ @@ -123,17 +141,6 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent am__v_lt_1 = -am_test_ephy_bookmarks_OBJECTS = ephy-bookmarks-test.$(OBJEXT) -test_ephy_bookmarks_OBJECTS = $(am_test_ephy_bookmarks_OBJECTS) -test_ephy_bookmarks_LDADD = $(LDADD) -test_ephy_bookmarks_DEPENDENCIES = $(top_builddir)/src/libephymain.la \ - $(top_builddir)/src/bookmarks/libephybookmarks.la \ - $(top_builddir)/embed/libephyembed.la \ - $(top_builddir)/lib/widgets/libephywidgets.la \ - $(top_builddir)/lib/history/libephyhistory.la \ - $(top_builddir)/lib/libephymisc.la \ - $(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) am_test_ephy_completion_model_OBJECTS = \ ephy-completion-model-test.$(OBJEXT) test_ephy_completion_model_OBJECTS = \ @@ -279,6 +286,18 @@ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am_test_ephy_uri_helpers_OBJECTS = ephy-uri-helpers-test.$(OBJEXT) +test_ephy_uri_helpers_OBJECTS = $(am_test_ephy_uri_helpers_OBJECTS) +test_ephy_uri_helpers_LDADD = $(LDADD) +test_ephy_uri_helpers_DEPENDENCIES = \ + $(top_builddir)/src/libephymain.la \ + $(top_builddir)/src/bookmarks/libephybookmarks.la \ + $(top_builddir)/embed/libephyembed.la \ + $(top_builddir)/lib/widgets/libephywidgets.la \ + $(top_builddir)/lib/history/libephyhistory.la \ + $(top_builddir)/lib/libephymisc.la \ + $(top_builddir)/lib/egg/libegg.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_test_ephy_web_app_utils_OBJECTS = \ ephy-web-app-utils-test.$(OBJEXT) test_ephy_web_app_utils_OBJECTS = \ @@ -318,7 +337,7 @@ am__v_at_0 = @ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp +depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ @@ -339,7 +358,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = ephy-uri-helpers-test.c $(test_ephy_bookmarks_SOURCES) \ +SOURCES = $(test_ephy_bookmarks_SOURCES) \ $(test_ephy_completion_model_SOURCES) \ $(test_ephy_download_SOURCES) $(test_ephy_embed_shell_SOURCES) \ $(test_ephy_embed_utils_SOURCES) \ @@ -349,9 +368,10 @@ $(test_ephy_migration_SOURCES) \ $(test_ephy_snapshot_service_SOURCES) \ $(test_ephy_sqlite_SOURCES) $(test_ephy_string_SOURCES) \ + $(test_ephy_uri_helpers_SOURCES) \ $(test_ephy_web_app_utils_SOURCES) \ $(test_ephy_web_view_SOURCES) -DIST_SOURCES = ephy-uri-helpers-test.c $(test_ephy_bookmarks_SOURCES) \ +DIST_SOURCES = $(test_ephy_bookmarks_SOURCES) \ $(test_ephy_completion_model_SOURCES) \ $(test_ephy_download_SOURCES) $(test_ephy_embed_shell_SOURCES) \ $(test_ephy_embed_utils_SOURCES) \ @@ -361,6 +381,7 @@ $(test_ephy_migration_SOURCES) \ $(test_ephy_snapshot_service_SOURCES) \ $(test_ephy_sqlite_SOURCES) $(test_ephy_string_SOURCES) \ + $(test_ephy_uri_helpers_SOURCES) \ $(test_ephy_web_app_utils_SOURCES) \ $(test_ephy_web_view_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -404,6 +425,8 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -434,13 +457,12 @@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APPSTREAM_UTIL = @APPSTREAM_UTIL@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ @@ -455,7 +477,6 @@ DEPDIR = @DEPDIR@ DEPENDENCIES_CFLAGS = @DEPENDENCIES_CFLAGS@ DEPENDENCIES_LIBS = @DEPENDENCIES_LIBS@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ DUMPBIN = @DUMPBIN@ @@ -464,17 +485,14 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EPIPHANY_MAJOR = @EPIPHANY_MAJOR@ -EPIPHANY_MAJOR_VERSION = @EPIPHANY_MAJOR_VERSION@ -EPIPHANY_MICRO_VERSION = @EPIPHANY_MICRO_VERSION@ -EPIPHANY_MINOR_VERSION = @EPIPHANY_MINOR_VERSION@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +GCOV = @GCOV@ GENHTML = @GENHTML@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ GLIB_MKENUMS = @GLIB_MKENUMS@ -GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ @@ -484,8 +502,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -509,9 +525,7 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -532,11 +546,7 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POFILES = @POFILES@ -POSUB = @POSUB@ POW_LIB = @POW_LIB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -545,6 +555,8 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ +WARN_LDFLAGS = @WARN_LDFLAGS@ +WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@ WEB_EXTENSION_CFLAGS = @WEB_EXTENSION_CFLAGS@ WEB_EXTENSION_LIBS = @WEB_EXTENSION_LIBS@ XGETTEXT = @XGETTEXT@ @@ -563,6 +575,7 @@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +appstreamxmldir = @appstreamxmldir@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -598,6 +611,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -626,8 +640,10 @@ AM_CFLAGS = \ -DTEST_DIR=\"$(srcdir)\"\ $(DEPENDENCIES_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(WARN_CFLAGS) +AM_LDFLAGS = $(WARN_LDFLAGS) LDADD = \ $(top_builddir)/src/libephymain.la \ $(top_builddir)/src/bookmarks/libephybookmarks.la \ @@ -728,7 +744,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -756,10 +771,6 @@ echo " rm -f" $$list; \ rm -f $$list -ephy-uri-helpers-test$(EXEEXT): $(ephy_uri_helpers_test_OBJECTS) $(ephy_uri_helpers_test_DEPENDENCIES) $(EXTRA_ephy_uri_helpers_test_DEPENDENCIES) - @rm -f ephy-uri-helpers-test$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(ephy_uri_helpers_test_OBJECTS) $(ephy_uri_helpers_test_LDADD) $(LIBS) - test-ephy-bookmarks$(EXEEXT): $(test_ephy_bookmarks_OBJECTS) $(test_ephy_bookmarks_DEPENDENCIES) $(EXTRA_test_ephy_bookmarks_DEPENDENCIES) @rm -f test-ephy-bookmarks$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_ephy_bookmarks_OBJECTS) $(test_ephy_bookmarks_LDADD) $(LIBS) @@ -812,6 +823,10 @@ @rm -f test-ephy-string$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_ephy_string_OBJECTS) $(test_ephy_string_LDADD) $(LIBS) +test-ephy-uri-helpers$(EXEEXT): $(test_ephy_uri_helpers_OBJECTS) $(test_ephy_uri_helpers_DEPENDENCIES) $(EXTRA_test_ephy_uri_helpers_DEPENDENCIES) + @rm -f test-ephy-uri-helpers$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_ephy_uri_helpers_OBJECTS) $(test_ephy_uri_helpers_LDADD) $(LIBS) + test-ephy-web-app-utils$(EXEEXT): $(test_ephy_web_app_utils_OBJECTS) $(test_ephy_web_app_utils_DEPENDENCIES) $(EXTRA_test_ephy_web_app_utils_DEPENDENCIES) @rm -f test-ephy-web-app-utils$(EXEEXT) $(AM_V_CCLD)$(LINK) $(test_ephy_web_app_utils_OBJECTS) $(test_ephy_web_app_utils_LDADD) $(LIBS) @@ -1177,6 +1192,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + ### testing rules