diff -Nru yad-0.28.1/aclocal.m4 yad-0.29.0/aclocal.m4
--- yad-0.28.1/aclocal.m4 2015-03-10 11:36:22.000000000 +0000
+++ yad-0.29.0/aclocal.m4 2015-07-15 12:59:05.000000000 +0000
@@ -1196,31 +1196,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
IT_PO_SUBDIR([po])
])
diff -Nru yad-0.28.1/ChangeLog yad-0.29.0/ChangeLog
--- yad-0.28.1/ChangeLog 2015-03-12 10:26:10.000000000 +0000
+++ yad-0.29.0/ChangeLog 2015-07-15 12:58:42.000000000 +0000
@@ -1,3 +1,47 @@
+2015-07-15 12:58 v1c0nt
+
+ * ChangeLog, NEWS, configure.ac: release 0.29.0
+
+2015-07-15 12:51 v1c0nt
+
+ * ChangeLog, po/ru.po, po/uk.po, src/html.c: set default html
+ encoding from locale
+
+2015-07-15 12:23 v1c0nt
+
+ * src/html.c, src/main.c: fix focus problems in html dialog
+
+2015-07-14 11:22 v1c0nt
+
+ * src/form.c: fix output of empty or unset fields in form dialog
+
+2015-07-14 11:05 v1c0nt
+
+ * src/html.c: set default encoding to utf-8 in html dialog
+
+2015-07-07 12:04 v1c0nt
+
+ * src/html.c: add custom file chooser handler for html dialog
+
+2015-06-02 16:58 v1c0nt
+
+ * configure.ac, data/yad.1, po/ru.po, po/uk.po, src/html.c,
+ src/main.c, src/option.c, src/yad.h: add --no-escape option
+
+2015-05-04 11:13 v1c0nt
+
+ * po/ru.po, po/uk.po, src/about.c, src/main.c: show current gtk
+ version in --version and --about dialog
+
+2015-05-04 11:02 v1c0nt
+
+ * src/file.c, src/form.c, src/html.c, src/util.c, src/yad.h: fix
+ build with gcc 5.x
+
+2015-03-31 09:00 v1c0nt
+
+ * ChangeLog, po/ru.po, po/uk.po, src/about.c: extend about info
+
2015-03-12 10:25 v1c0nt
* NEWS: release 0.28.1
diff -Nru yad-0.28.1/configure yad-0.29.0/configure
--- yad-0.28.1/configure 2015-03-10 11:36:23.000000000 +0000
+++ yad-0.29.0/configure 2015-07-15 12:59:07.000000000 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for YAD 0.28.1.
+# Generated by GNU Autoconf 2.69 for YAD 0.29.0.
#
# Report bugs to .
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='YAD'
PACKAGE_TARNAME='yad'
-PACKAGE_VERSION='0.28.1'
-PACKAGE_STRING='YAD 0.28.1'
+PACKAGE_VERSION='0.29.0'
+PACKAGE_STRING='YAD 0.29.0'
PACKAGE_BUGREPORT='https://sourceforge.net/p/yad-dialog/tickets/'
PACKAGE_URL='https://sourceforge.net/projects/yad-dialog/'
@@ -637,6 +637,7 @@
INTLLIBS
INSTOBJEXT
GMOFILES
+DATADIRNAME
CATOBJEXT
CATALOGS
MSGFMT_OPTS
@@ -656,7 +657,6 @@
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
-DATADIRNAME
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@@ -1346,7 +1346,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 YAD 0.28.1 to adapt to many kinds of systems.
+\`configure' configures YAD 0.29.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of YAD 0.28.1:";;
+ short | recursive ) echo "Configuration of YAD 0.29.0:";;
esac
cat <<\_ACEOF
@@ -1527,7 +1527,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-YAD configure 0.28.1
+YAD configure 0.29.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1579,119 +1579,6 @@
} # ac_fn_c_try_compile
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-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_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
- test "$cross_compiling" = yes ||
- test -x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-/* Define $2 to an innocuous variant, in case declares $2.
- For example, HP-UX 11i declares gettimeofday. */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $2 (); below.
- Prefer to if __STDC__ is defined, since
- exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include
-#else
-# include
-#endif
-
-#undef $2
-
-/* 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 $2 ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- eval "$3=yes"
-else
- eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
# ac_fn_c_try_cpp LINENO
# ----------------------
# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -1892,11 +1779,124 @@
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { { ac_try="$ac_link"
+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_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ test -x conftest$ac_exeext
+ }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
+fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+/* Define $2 to an innocuous variant, in case declares $2.
+ For example, HP-UX 11i declares gettimeofday. */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $2 (); below.
+ Prefer to if __STDC__ is defined, since
+ exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+
+#undef $2
+
+/* 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 $2 ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by YAD $as_me 0.28.1, which was
+It was created by YAD $as_me 0.29.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2760,7 +2760,7 @@
# Define the identity of the package.
PACKAGE='yad'
- VERSION='0.28.1'
+ VERSION='0.29.0'
cat >>confdefs.h <<_ACEOF
@@ -2937,1055 +2937,15 @@
$as_echo "$USE_NLS" >&6; }
-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
-
-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
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
- esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-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_link_default") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- then :; else
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- fi
- # We set ac_cv_exeext here because the later test for it is not
- # safe: cross compilers may not add the suffix if given an `-o'
- # argument, so we may need to know it at that point already.
- # Even if this section looks crufty: it has the advantage of
- # actually working.
- break;;
- * )
- break;;
- esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
- ac_file=''
-fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-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_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- break;;
- * ) break;;
- esac
-done
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
- { { ac_try="$ac_link"
-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_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }
- if { ac_try='./conftest$ac_cv_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-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_compile") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- for ac_file in conftest.o conftest.obj conftest.*; do
- test -f "$ac_file" || continue;
- case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-done
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $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 :
-
-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
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
-$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
-if ${am_cv_prog_cc_c_o+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
- # Make sure it works both with $CC and with simple cc.
- # Following AC_PROG_CC_C_O, we do the test twice because some
- # compilers refuse to overwrite an existing .o file with -o,
- # though they will create one.
- am_cv_prog_cc_c_o=yes
- for am_i in 1 2; do
- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } \
- && test -f conftest2.$ac_objext; then
- : OK
- else
- am_cv_prog_cc_c_o=no
- break
- fi
- done
- rm -f core conftest*
- unset am_i
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
-$as_echo "$am_cv_prog_cc_c_o" >&6; }
-if test "$am_cv_prog_cc_c_o" != yes; then
- # Losing compiler, so override with the script.
- # FIXME: It is wrong to rewrite CC.
- # But if we don't then we get into trouble of one sort or another.
- # A longer-term fix would be to have automake use am__CC in this case,
- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
- CC="$am_aux_dir/compile $CC"
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-depcc="$CC" am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$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
-
- 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
- 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
-
-
-
-
-
-case "$am__api_version" in
- 1.01234)
- as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
- ;;
- *)
- ;;
-esac
+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.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
@@ -4501,44 +3461,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
-else
- case $host in
- *-*-solaris*)
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
- DATADIRNAME=share
-else
- DATADIRNAME=lib
-fi
-
- ;;
- *)
- DATADIRNAME=lib
- ;;
- esac
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-
-
@@ -4819,58 +3741,308 @@
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-fi
+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
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+ esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+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_link_default") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ ;;
+ [ab].out )
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
+ *.* )
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ then :; else
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ fi
+ # We set ac_cv_exeext here because the later test for it is not
+ # safe: cross compilers may not add the suffix if given an `-o'
+ # argument, so we may need to know it at that point already.
+ # Even if this section looks crufty: it has the advantage of
+ # actually working.
+ break;;
+ * )
+ break;;
+ esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+ ac_file=''
+fi
+if test -z "$ac_file"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
- test -n "$ac_ct_CC" && break
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+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_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then :
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+ test -f "$ac_file" || continue
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ break;;
+ * ) break;;
+ esac
done
+else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
- 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 ;;
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
esac
- CC=$ac_ct_CC
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+ fi
fi
fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-fi
-
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
-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; }
+int
+main ()
+{
-# 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"
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
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
+ (eval "$ac_compile") 2>&5
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; }
+ test $ac_status = 0; }; then :
+ for ac_file in conftest.o conftest.obj conftest.*; do
+ test -f "$ac_file" || continue;
+ case $ac_file in
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+ break;;
+ esac
done
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
if ${ac_cv_c_compiler_gnu+:} false; then :
@@ -5140,6 +4312,69 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+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
+
+
depcc="$CC" am_compiler_list=
@@ -5670,6 +4905,7 @@
_ACEOF
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6916,18 +6152,14 @@
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
-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
-fi
ac_config_commands="$ac_config_commands po/stamp-it"
+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
+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
@@ -7337,7 +6569,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by YAD $as_me 0.28.1, which was
+This file was extended by YAD $as_me 0.29.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7404,7 +6636,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-YAD config.status 0.28.1
+YAD config.status 0.29.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru yad-0.28.1/configure.ac yad-0.29.0/configure.ac
--- yad-0.28.1/configure.ac 2015-03-10 11:35:55.000000000 +0000
+++ yad-0.29.0/configure.ac 2015-07-15 12:58:10.000000000 +0000
@@ -1,4 +1,4 @@
-AC_INIT([YAD], [0.28.1], [https://sourceforge.net/p/yad-dialog/tickets/], yad, [https://sourceforge.net/projects/yad-dialog/])
+AC_INIT([YAD], [0.29.0], [https://sourceforge.net/p/yad-dialog/tickets/], yad, [https://sourceforge.net/projects/yad-dialog/])
AC_CONFIG_AUX_DIR([build])
AM_INIT_AUTOMAKE([1.11 foreign dist-xz no-dist-gzip])
diff -Nru yad-0.28.1/data/yad.1 yad-0.29.0/data/yad.1
--- yad-0.28.1/data/yad.1 2015-03-06 10:26:30.000000000 +0000
+++ yad-0.29.0/data/yad.1 2015-07-02 11:38:37.000000000 +0000
@@ -141,6 +141,9 @@
.B \-\-no-markup
Don't use pango markup in dialog's text.
.TP
+.B \-\-no-escape
+Don't close dialog if \fIEscape\fP was pressed.
+.TP
.B \-\-always-print-result
Always print result.
.TP
diff -Nru yad-0.28.1/debian/changelog yad-0.29.0/debian/changelog
--- yad-0.28.1/debian/changelog 2015-03-12 13:35:22.000000000 +0000
+++ yad-0.29.0/debian/changelog 2015-08-11 09:01:33.000000000 +0000
@@ -1,4 +1,10 @@
-yad (0.28.1-1~webupd8~trusty0) trusty; urgency=medium
+yad (0.29.0-1~webupd8~trusty0) trusty; urgency=medium
+
+ * New upstream bugfix release
+
+ -- Alin Andrei Tue, 11 Aug 2015 12:00:29 +0300
+
+yad (0.28.1-1~webupd8~vivid0) vivid; urgency=medium
* New upstream bugfix release
diff -Nru yad-0.28.1/NEWS yad-0.29.0/NEWS
--- yad-0.28.1/NEWS 2015-03-12 10:25:36.000000000 +0000
+++ yad-0.29.0/NEWS 2015-07-15 12:57:59.000000000 +0000
@@ -1,3 +1,11 @@
+Version 0.29.0
+ - fix focus problems in html dialog
+ - set default encoding from locale for html widget
+ - fix quoted output in form dialog
+ - add --no-escape option to prevent close dialog when Esc is pressed
+ - show gtk version within --version and about dialog
+ - fix build with gcc 5.x
+
Version 0.28.1
- fix incorrect rows output order in form dialog
diff -Nru yad-0.28.1/po/ru.po yad-0.29.0/po/ru.po
--- yad-0.28.1/po/ru.po 2015-03-06 10:24:56.000000000 +0000
+++ yad-0.29.0/po/ru.po 2015-07-15 12:23:24.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 12:24+0200\n"
+"POT-Creation-Date: 2015-07-15 15:23+0300\n"
"PO-Revision-Date: 2009-04-30 16:47+0300\n"
"Last-Translator: Victor Ananjevsky \n"
"Language-Team: \n"
@@ -51,17 +51,26 @@
"Вы должны получить копию лицензии GNU c программой. Если лицензия не была "
"получена, смотрите ."
-#: ../src/about.c:50
+#: ../src/about.c:43
+#, c-format
msgid ""
"Yet Another Dialog\n"
"(show dialog boxes from shell scripts)\n"
"\n"
"Based on Zenity code\n"
+"\n"
+"Built with Webkit\n"
+"\n"
+"Using GTK+ %d.%d.%d\n"
msgstr ""
"Yet Another Dialog\n"
"(Программа для отображения диалоговых окон из скриптов оболочки)\n"
"\n"
"Основан на коде Zenity\n"
+"\n"
+"Собран с поддержкой Webkit\n"
+"\n"
+"Используется GTK+ %d.%d.%d\n"
#: ../src/calendar.c:39 ../src/text.c:389
#, c-format
@@ -83,31 +92,31 @@
msgid "Initial value greater than maximum.\n"
msgstr "Начальное значение больше маскимального.\n"
-#: ../src/form.c:403
+#: ../src/form.c:404
msgid "Select files"
msgstr "Выбор файлов"
-#: ../src/form.c:411
+#: ../src/form.c:412
msgid "Select folders"
msgstr "Выбор каталогов"
-#: ../src/form.c:475
+#: ../src/form.c:476
msgid "Select or create file"
msgstr "Выбор или создание файла"
-#: ../src/form.c:483
+#: ../src/form.c:484
msgid "Select or create folder"
msgstr "Выбор или создание каталога"
-#: ../src/form.c:520
+#: ../src/form.c:521
msgid "Select date"
msgstr "Выбор даты"
-#: ../src/form.c:741
+#: ../src/form.c:742
msgid "Select file"
msgstr "Выбор файла"
-#: ../src/form.c:756
+#: ../src/form.c:757
msgid "Select folder"
msgstr "Выбор каталога"
@@ -121,12 +130,12 @@
msgid "Unable to open directory %s: %s\n"
msgstr "Не могу открыть каталог %s: %s\n"
-#: ../src/main.c:103 ../src/main.c:234
+#: ../src/main.c:103 ../src/main.c:250
#, c-format
msgid "%d sec"
msgstr "%d сек"
-#: ../src/main.c:667
+#: ../src/main.c:683
#, c-format
msgid "Unable to parse command line: %s\n"
msgstr "Не удается разобрать командную строку: %s\n"
@@ -227,9 +236,9 @@
msgid "Set the dialog text"
msgstr "Задать текст диалога"
-#: ../src/option.c:118 ../src/option.c:148 ../src/option.c:409
-#: ../src/option.c:415 ../src/option.c:421 ../src/option.c:561
-#: ../src/option.c:1049 ../src/option.c:1088
+#: ../src/option.c:118 ../src/option.c:148 ../src/option.c:415
+#: ../src/option.c:421 ../src/option.c:427 ../src/option.c:567
+#: ../src/option.c:1055 ../src/option.c:1094
msgid "TEXT"
msgstr "ТЕКСТ"
@@ -237,9 +246,9 @@
msgid "Set the dialog text alignment (left, center, right, fill)"
msgstr "Задать выравнивание текста диалога (left, center, right, fill)"
-#: ../src/option.c:124 ../src/option.c:166 ../src/option.c:584
-#: ../src/option.c:804 ../src/option.c:892 ../src/option.c:935
-#: ../src/option.c:1015 ../src/option.c:1216
+#: ../src/option.c:124 ../src/option.c:166 ../src/option.c:590
+#: ../src/option.c:810 ../src/option.c:898 ../src/option.c:941
+#: ../src/option.c:1021 ../src/option.c:1222
msgid "TYPE"
msgstr "ТИП"
@@ -247,7 +256,7 @@
msgid "Set the dialog image"
msgstr "Задать картинку диалога"
-#: ../src/option.c:130 ../src/option.c:445 ../src/option.c:457
+#: ../src/option.c:130 ../src/option.c:451 ../src/option.c:463
msgid "IMAGE"
msgstr "КАРТИНКА"
@@ -287,322 +296,326 @@
msgid "Don't use pango markup language in dialog's text"
msgstr "Не использовать разметку pango в тексте"
-#: ../src/option.c:178
+#: ../src/option.c:177
+msgid "Don't close dialog if Escape was pressed"
+msgstr "Не закрывать диалог при нажатии Escape"
+
+#: ../src/option.c:184
msgid "Add separator between dialog and buttons"
msgstr "Добавить разделитель между диалогом и кнопками"
-#: ../src/option.c:185
+#: ../src/option.c:191
msgid "Set window borders"
msgstr "Установить границы окна"
-#: ../src/option.c:186 ../src/option.c:265 ../src/option.c:590
-#: ../src/option.c:810 ../src/option.c:816 ../src/option.c:822
-#: ../src/option.c:828 ../src/option.c:834 ../src/option.c:840
-#: ../src/option.c:941
+#: ../src/option.c:192 ../src/option.c:271 ../src/option.c:596
+#: ../src/option.c:816 ../src/option.c:822 ../src/option.c:828
+#: ../src/option.c:834 ../src/option.c:840 ../src/option.c:846
+#: ../src/option.c:947
msgid "NUMBER"
msgstr "ЧИСЛО"
-#: ../src/option.c:191
+#: ../src/option.c:197
msgid "Always print result"
msgstr "Всегда выводить результат"
-#: ../src/option.c:197
+#: ../src/option.c:203
msgid "Dialog text can be selected"
msgstr "Текст диалога может быть выделен"
-#: ../src/option.c:204
+#: ../src/option.c:210
msgid "Set window sticky"
msgstr "Окно видимо на всех рабочих столах"
-#: ../src/option.c:210
+#: ../src/option.c:216
msgid "Set window unresizable"
msgstr "Неизменяемый размер"
-#: ../src/option.c:216
+#: ../src/option.c:222
msgid "Place window on top"
msgstr "Разместить окно поверх остальных"
-#: ../src/option.c:222
+#: ../src/option.c:228
msgid "Place window on center of screen"
msgstr "Разместить окно в центре экрана"
-#: ../src/option.c:228
+#: ../src/option.c:234
msgid "Place window at the mouse position"
msgstr "Разместить окно под указателем мыши"
-#: ../src/option.c:234
+#: ../src/option.c:240
msgid "Set window undecorated"
msgstr "Убрать обрамление"
-#: ../src/option.c:240
+#: ../src/option.c:246
msgid "Don't show window in taskbar"
msgstr "Не показывать окно в панели задач"
-#: ../src/option.c:246
+#: ../src/option.c:252
msgid "Set window maximized"
msgstr "Задать окну максимальный размер"
-#: ../src/option.c:252
+#: ../src/option.c:258
msgid "Set window fulscreen"
msgstr "Развернуть окно на весь экран"
-#: ../src/option.c:258
+#: ../src/option.c:264
msgid "Special type of dialog for XEMBED"
msgstr "Специальный режим диалога для встраивания"
-#: ../src/option.c:259 ../src/option.c:923
+#: ../src/option.c:265 ../src/option.c:929
msgid "KEY"
msgstr "КЛЮЧ"
-#: ../src/option.c:264
+#: ../src/option.c:270
msgid "Tab nubmer of this dialog"
msgstr "Номер вкладки для этого диалога"
-#: ../src/option.c:271
+#: ../src/option.c:277
msgid "Send SIGNAL to parent"
msgstr "Послать СИГНАЛ родителю"
-#: ../src/option.c:272
+#: ../src/option.c:278
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: ../src/option.c:277
+#: ../src/option.c:283
msgid "Print X Window Id to the stderr"
msgstr "Вывести идентификатор окна на stderr"
-#: ../src/option.c:284
+#: ../src/option.c:290
msgid "Add path for search icons by name"
msgstr "Добавить каталог для поиска изображений по имени"
-#: ../src/option.c:285
+#: ../src/option.c:291
msgid "PATH"
msgstr "ПУТЬ"
-#: ../src/option.c:294
+#: ../src/option.c:300
msgid "Display calendar dialog"
msgstr "Отобразить диалог для выбора даты"
-#: ../src/option.c:300
+#: ../src/option.c:306
msgid "Set the calendar day"
msgstr "Задать день календаря"
-#: ../src/option.c:301
+#: ../src/option.c:307
msgid "DAY"
msgstr "ДЕНЬ"
-#: ../src/option.c:306
+#: ../src/option.c:312
msgid "Set the calendar month"
msgstr "Задать месяц календаря"
-#: ../src/option.c:307
+#: ../src/option.c:313
msgid "MONTH"
msgstr "МЕСЯЦ"
-#: ../src/option.c:312
+#: ../src/option.c:318
msgid "Set the calendar year"
msgstr "Задать год календаря"
-#: ../src/option.c:313
+#: ../src/option.c:319
msgid "YEAR"
msgstr "ГОД"
-#: ../src/option.c:318 ../src/option.c:607
+#: ../src/option.c:324 ../src/option.c:613
msgid "Set the format for the returned date"
msgstr "Задать формат возвращаемой даты"
-#: ../src/option.c:319 ../src/option.c:608 ../src/option.c:715
+#: ../src/option.c:325 ../src/option.c:614 ../src/option.c:721
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: ../src/option.c:324
+#: ../src/option.c:330
msgid "Set the filename with dates details"
msgstr "Задать имя файла с описанием дат"
-#: ../src/option.c:325 ../src/option.c:353 ../src/option.c:485
-#: ../src/option.c:1009 ../src/option.c:1234 ../src/option.c:1274
-#: ../src/option.c:1284
+#: ../src/option.c:331 ../src/option.c:359 ../src/option.c:491
+#: ../src/option.c:1015 ../src/option.c:1240 ../src/option.c:1280
+#: ../src/option.c:1290
msgid "FILENAME"
msgstr "ИМЯ_ФАЙЛА"
-#: ../src/option.c:334
+#: ../src/option.c:340
msgid "Display color selection dialog"
msgstr "Отобразить диалог для выбора цвета"
-#: ../src/option.c:340
+#: ../src/option.c:346
msgid "Alias for --color"
msgstr "Синоним для --color"
-#: ../src/option.c:346
+#: ../src/option.c:352
msgid "Set initial color value"
msgstr "Задать начальное значение цвета"
-#: ../src/option.c:347 ../src/option.c:1192 ../src/option.c:1198
+#: ../src/option.c:353 ../src/option.c:1198 ../src/option.c:1204
msgid "COLOR"
msgstr "ЦВЕТ"
-#: ../src/option.c:352
+#: ../src/option.c:358
msgid "Set path to palette file. Default - "
msgstr "Задать путь к файлу цветов. По-умолчанию - "
-#: ../src/option.c:358
+#: ../src/option.c:364
msgid "Set output mode to MODE. Values are hex (default) or rgb"
msgstr "Установить ревим вывода в РЕЖИМ. Значения - hex (по-умолчанию) или rgb"
-#: ../src/option.c:359
+#: ../src/option.c:365
msgid "MODE"
msgstr "РЕЖИМ"
-#: ../src/option.c:364
+#: ../src/option.c:370
msgid "Use #rrrrggggbbbb format instead of #rrggbb"
msgstr "Использовать формат #rrrrggggbbbb вместо #rrggbb"
-#: ../src/option.c:370
+#: ../src/option.c:376
msgid "Add opacity to output color value"
msgstr "Добавить прозрачность к значению цвета"
-#: ../src/option.c:380
+#: ../src/option.c:386
msgid "Display drag-n-drop box"
msgstr "Отобразить диалог для перехвата dnd"
-#: ../src/option.c:386
+#: ../src/option.c:392
msgid "Use dialog text as tooltip"
msgstr "Использовать текст диалога в качестве подсказки"
-#: ../src/option.c:392
+#: ../src/option.c:398
msgid "Set command for process d-n-d data"
msgstr "Команда для обработки полученных данных"
-#: ../src/option.c:393 ../src/option.c:451 ../src/option.c:463
-#: ../src/option.c:846 ../src/option.c:957
+#: ../src/option.c:399 ../src/option.c:457 ../src/option.c:469
+#: ../src/option.c:852 ../src/option.c:963
msgid "CMD"
msgstr "КОМАНДА"
-#: ../src/option.c:402
+#: ../src/option.c:408
msgid "Display text entry or combo-box dialog"
msgstr "Отобразить диалог для ввода текста или выбора варианта"
-#: ../src/option.c:408
+#: ../src/option.c:414
msgid "Set the entry label"
msgstr "Задать метку поля ввода"
-#: ../src/option.c:414
+#: ../src/option.c:420
msgid "Set the entry text"
msgstr "Задать текст по умолчанию для ввода"
-#: ../src/option.c:420
+#: ../src/option.c:426
msgid "Hide the entry text"
msgstr "Прятать введенный текст (Пароль)"
-#: ../src/option.c:426
+#: ../src/option.c:432
msgid "Use completion instead of combo-box"
msgstr "Использовать автодополнение вместо списка значений"
-#: ../src/option.c:432
+#: ../src/option.c:438
msgid "Use spin button for text entry"
msgstr "Использовать числовое поле вместо текста"
-#: ../src/option.c:438
+#: ../src/option.c:444
msgid "Allow changes to text in combo-box"
msgstr "Разрешить изменять текст в режиме выбора варианта"
-#: ../src/option.c:444
+#: ../src/option.c:450
msgid "Set the left entry icon"
msgstr "Задать левый значок"
-#: ../src/option.c:450
+#: ../src/option.c:456
msgid "Set the left entry icon action"
msgstr "Действие для левого значка"
-#: ../src/option.c:456
+#: ../src/option.c:462
msgid "Set the right entry icon"
msgstr "Задать правый значок"
-#: ../src/option.c:462
+#: ../src/option.c:468
msgid "Set the right entry icon action"
msgstr "Действие для правого значка"
-#: ../src/option.c:472
+#: ../src/option.c:478
msgid "Display file selection dialog"
msgstr "Отобразить диалог для выбора файла"
-#: ../src/option.c:478
+#: ../src/option.c:484
msgid "Alias for --file"
msgstr "Синоним для --file"
-#: ../src/option.c:484
+#: ../src/option.c:490
msgid "Set the filename"
msgstr "Задать имя файла"
-#: ../src/option.c:490
+#: ../src/option.c:496
msgid "Allow multiple files to be selected"
msgstr "Разрешить выбор нескольких файлов"
-#: ../src/option.c:496
+#: ../src/option.c:502
msgid "Activate directory-only selection"
msgstr "Активировать выделение только по каталогам"
-#: ../src/option.c:502
+#: ../src/option.c:508
msgid "Activate save mode"
msgstr "Активировать режим сохранения"
-#: ../src/option.c:508 ../src/option.c:595 ../src/option.c:779
+#: ../src/option.c:514 ../src/option.c:601 ../src/option.c:785
msgid "Set output separator character"
msgstr "Установить выходной разделяющий символ"
-#: ../src/option.c:509 ../src/option.c:596 ../src/option.c:602
-#: ../src/option.c:780 ../src/option.c:969 ../src/option.c:975
+#: ../src/option.c:515 ../src/option.c:602 ../src/option.c:608
+#: ../src/option.c:786 ../src/option.c:975 ../src/option.c:981
msgid "SEPARATOR"
msgstr "РАЗДЕЛИТЕЛЬ"
-#: ../src/option.c:514
+#: ../src/option.c:520
msgid "Confirm file selection if filename already exists"
msgstr "Подтверждать выбор файла, если файл уже существует"
-#: ../src/option.c:515
+#: ../src/option.c:521
msgid "[TEXT]"
msgstr "[ТЕКСТ]"
-#: ../src/option.c:520
+#: ../src/option.c:526
msgid "Sets a filename filter"
msgstr "Задать фильтр файлов"
-#: ../src/option.c:521
+#: ../src/option.c:527
msgid "NAME | PATTERN1 PATTERN2 ..."
msgstr "ИМЯ | ШАБЛОН1 ШАБЛОН2 ..."
-#: ../src/option.c:526
+#: ../src/option.c:532
msgid "Enable preview"
msgstr "Добавить предпросмотр"
-#: ../src/option.c:532 ../src/option.c:619 ../src/option.c:863
+#: ../src/option.c:538 ../src/option.c:625 ../src/option.c:869
msgid "Quote dialogs output"
msgstr "Вывод значений в кавычках"
-#: ../src/option.c:542
+#: ../src/option.c:548
msgid "Display font selection dialog"
msgstr "Отобразить диалог для выбора шрифта"
-#: ../src/option.c:548
+#: ../src/option.c:554
msgid "Alias for --font"
msgstr "Синоним для --font"
-#: ../src/option.c:554
+#: ../src/option.c:560
msgid "Set initial font"
msgstr "Задать начальный шрифт"
-#: ../src/option.c:555 ../src/option.c:1033 ../src/option.c:1204
+#: ../src/option.c:561 ../src/option.c:1039 ../src/option.c:1210
msgid "FONTNAME"
msgstr "ШРИФТ"
-#: ../src/option.c:560
+#: ../src/option.c:566
msgid "Set preview text"
msgstr "Задать текст образца"
-#: ../src/option.c:570
+#: ../src/option.c:576
msgid "Display form dialog"
msgstr "Отобразить диалог формы ввода"
-#: ../src/option.c:577
+#: ../src/option.c:583
msgid ""
"Add field to form (TYPE - H, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, DIR, "
"CDIR, MDIR, FN, DT, SCL, CLR, BTN, FBTN, LBL or TXT)"
@@ -610,95 +623,95 @@
"Добавить поле к форме (Тип поля: Н, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, "
"DIR, CDIR, MDIR, FN, MFL, DT, SCL, CLR, BTN, FBTN, LBL или TXT)"
-#: ../src/option.c:578 ../src/option.c:880
+#: ../src/option.c:584 ../src/option.c:886
msgid "LABEL[:TYPE]"
msgstr "МЕТКА[:ТИП]"
-#: ../src/option.c:583
+#: ../src/option.c:589
msgid "Set alignment of filed labels (left, center or right)"
msgstr "Задать выравнивание меток полей (left, center или right)"
-#: ../src/option.c:589
+#: ../src/option.c:595
msgid "Set number of columns in form"
msgstr "Задать количество колонок в форме"
-#: ../src/option.c:601
+#: ../src/option.c:607
msgid "Set separator character for combobox or scale data"
msgstr "Установить разделяющий символ для данных списка или числового поля"
-#: ../src/option.c:613
+#: ../src/option.c:619
msgid "Make form scrollable"
msgstr "Сделать форму прокручиваемой"
-#: ../src/option.c:625
+#: ../src/option.c:631
msgid "Order output fields by rows"
msgstr "Упорядочить вівод по строкам"
-#: ../src/option.c:636
+#: ../src/option.c:642
msgid "Display HTML dialog"
msgstr "Отобразить HTML диалог"
-#: ../src/option.c:642
+#: ../src/option.c:648
msgid "Open specified location"
msgstr "Открыть указанный адрес"
-#: ../src/option.c:643
+#: ../src/option.c:649
msgid "URI"
msgstr "URI"
-#: ../src/option.c:648
+#: ../src/option.c:654
msgid "Turn on browser mode"
msgstr "Включить режим браузера"
-#: ../src/option.c:654
+#: ../src/option.c:660
msgid "Print clicked uri to stdout"
msgstr "Печатать ссылки по щелчку"
-#: ../src/option.c:660
+#: ../src/option.c:666
msgid "Set mime type of input stream data"
msgstr "Задать тип mime для входных данных"
-#: ../src/option.c:661
+#: ../src/option.c:667
msgid "MIME"
msgstr "MIME"
-#: ../src/option.c:666
+#: ../src/option.c:672
msgid "Set encoding of input stream data"
msgstr "Задать кодировку для входных данных"
-#: ../src/option.c:667
+#: ../src/option.c:673
msgid "ENCODING"
msgstr "КОДИРОВКА"
-#: ../src/option.c:677
+#: ../src/option.c:683
msgid "Display icons box dialog"
msgstr "Отобразить диалог со значками быстрого доступа"
-#: ../src/option.c:683
+#: ../src/option.c:689
msgid "Read data from .desktop files in specified directory"
msgstr "Читать данные из .desktop файлов в определенном каталоге"
-#: ../src/option.c:684
+#: ../src/option.c:690
msgid "DIRECTORY"
msgstr "КАТАЛОГ"
-#: ../src/option.c:689
+#: ../src/option.c:695
msgid "Use compact (list) view"
msgstr "Использовать компактный вид (список)"
-#: ../src/option.c:695
+#: ../src/option.c:701
msgid "Use GenericName field instead of Name for icon label"
msgstr "Использовать поле GenericName вместо Name для метки"
-#: ../src/option.c:701
+#: ../src/option.c:707
msgid "Read data from stdin"
msgstr "Читать данные со стандартного ввода"
-#: ../src/option.c:707
+#: ../src/option.c:713
msgid "Set the width of dialog items"
msgstr "Задать ширину элемента диалога"
-#: ../src/option.c:714
+#: ../src/option.c:720
#, no-c-format
msgid ""
"Use specified pattern for launch command in terminal (default: xterm -e %s)"
@@ -706,66 +719,66 @@
"Использовать указанный шаблон для запуска в терминале (по умолчанию: xterm -"
"e %s)"
-#: ../src/option.c:720
+#: ../src/option.c:726
msgid "Sort items by name instead of filename"
msgstr "Сортировать по полю Имя вместо имени файла"
-#: ../src/option.c:726
+#: ../src/option.c:732
msgid "Sort items in descending order"
msgstr "Сортировать в убывающем порядке"
-#: ../src/option.c:732
+#: ../src/option.c:738
msgid "Activate items by single click"
msgstr "Активировать элемент одинарным щелчком"
-#: ../src/option.c:742
+#: ../src/option.c:748
msgid "Display list dialog"
msgstr "Отобразить диалог со списком"
-#: ../src/option.c:748
+#: ../src/option.c:754
msgid "Don't show column headers"
msgstr "Не показывать заголовки колонок"
-#: ../src/option.c:754
+#: ../src/option.c:760
msgid "Set the column header (TYPE - TEXT, NUM, FLT, CHK, RD, IMG, HD or TIP)"
msgstr ""
"Задать заголовок столбца (ТИП - TEXT, NUM, FLT, CHK, RD, IMG, HD или TIP)"
-#: ../src/option.c:755
+#: ../src/option.c:761
msgid "COLUMN[:TYPE]"
msgstr "СТОЛБЕЦ[:ТИП]"
-#: ../src/option.c:760
+#: ../src/option.c:766
msgid "Use checkboxes for first column"
msgstr "Использовать флажки для первой колонки"
-#: ../src/option.c:766
+#: ../src/option.c:772
msgid "Use radioboxes for first column"
msgstr "Использовать переключатель для первой колонки"
-#: ../src/option.c:772
+#: ../src/option.c:778
msgid "Disable clickable column headers"
msgstr "Запретить нажимаемые заголовки"
-#: ../src/option.c:785
+#: ../src/option.c:791
msgid "Allow multiple rows to be selected"
msgstr "Разрешить выбор нескольких строк"
-#: ../src/option.c:791 ../src/option.c:1239
+#: ../src/option.c:797 ../src/option.c:1245
msgid "Allow changes to text"
msgstr "Разрешить изменять текст"
-#: ../src/option.c:797
+#: ../src/option.c:803
msgid "Print all data from list"
msgstr "Печатать таблицу полностью"
-#: ../src/option.c:803
+#: ../src/option.c:809
msgid "Set ellipsize mode for text columns (TYPE - NONE, START, MIDDLE or END)"
msgstr ""
"Задать тип усечсения для текстовых столбцов (ТИП - NONE, START, MIDDLE или "
"END)"
-#: ../src/option.c:809
+#: ../src/option.c:815
msgid ""
"Print a specific column. By default or if 0 is specified will be printed all "
"columns"
@@ -773,534 +786,534 @@
"Распечатать только определённый столбец. По-умолчанию или если столбец равен "
"0, будут распечатаны все столбцы"
-#: ../src/option.c:815
+#: ../src/option.c:821
msgid "Hide a specific column"
msgstr "Скрыть указанный столбец"
-#: ../src/option.c:821
+#: ../src/option.c:827
msgid "Set the column expandable by default. 0 sets all columns expandable"
msgstr ""
"Задать колонку, расширяемую по-умолчанию. 0 устанавливает расширяемыми все "
"колонки"
-#: ../src/option.c:827
+#: ../src/option.c:833
msgid ""
"Set the quick search column. Default is first column. Set it to 0 for "
"disable searching"
msgstr "Задать колонку поиска. По-умолчанию первая. 0 запрещает поиск"
-#: ../src/option.c:833
+#: ../src/option.c:839
msgid "Set the tooltip column"
msgstr "Задать колонку всплывающих подсказок"
-#: ../src/option.c:839
+#: ../src/option.c:845
msgid "Set the limit of rows in list"
msgstr "Задать количество строк в списке"
-#: ../src/option.c:845
+#: ../src/option.c:851
msgid "Set double-click action"
msgstr "Действие по двойному щелчку мыши"
-#: ../src/option.c:851
+#: ../src/option.c:857
msgid "Use regex in search"
msgstr "Использовать регулярные выражения при поиске"
-#: ../src/option.c:857
+#: ../src/option.c:863
msgid "Listen for data on stdin in addition to command-line"
msgstr "Получать даннные из stdin в дополнение к указанным в командной строке"
-#: ../src/option.c:873
+#: ../src/option.c:879
msgid "Display multi progress bars dialog"
msgstr "Отобразить диалог c несколькими индикаторами"
-#: ../src/option.c:879
+#: ../src/option.c:885
msgid "Add the progress bar (TYPE - NORM, RTL or PULSE)"
msgstr "Добавить индикатор (ТИП - NORM, RTL или PULSE)"
-#: ../src/option.c:885
+#: ../src/option.c:891
msgid "Show vertical bars"
msgstr "Показывать вертикальные индикаторы"
-#: ../src/option.c:891
+#: ../src/option.c:897
msgid "Set alignment of bar labels (left, center or right)"
msgstr "Задать выравнивание меток индикаторов (left, center или right)"
-#: ../src/option.c:898
+#: ../src/option.c:904
#, no-c-format
msgid "Dismiss the dialog when 100% of all bars has been reached"
msgstr "Закрыть диалог по достижении 100% всеми индикаторами"
-#: ../src/option.c:905 ../src/option.c:1074
+#: ../src/option.c:911 ../src/option.c:1080
msgid "Kill parent process if cancel button is pressed"
msgstr "Завершить родительский процесс, если нажата кнопка отмены"
-#: ../src/option.c:916
+#: ../src/option.c:922
msgid "Display notebook dialog"
msgstr "Отобразить диалог с вкладками"
-#: ../src/option.c:922
+#: ../src/option.c:928
msgid "Identifier of embedded dialogs"
msgstr "Идентификатор встраиваемых диалогов"
-#: ../src/option.c:928
+#: ../src/option.c:934
msgid "Add a tab to notebook"
msgstr "Добавить вкладку"
-#: ../src/option.c:929
+#: ../src/option.c:935
msgid "LABEL"
msgstr "МЕТКА"
-#: ../src/option.c:934
+#: ../src/option.c:940
msgid "Set position of a notebook tabs (top, bottom, left or right)"
msgstr "Задать позицию метки вкладки (top, bottom, left или right)"
-#: ../src/option.c:940
+#: ../src/option.c:946
msgid "Set tab borders"
msgstr "Установить границы вкладки"
-#: ../src/option.c:950
+#: ../src/option.c:956
msgid "Display notification"
msgstr "Отобразить диалог уведомления"
-#: ../src/option.c:956
+#: ../src/option.c:962
msgid "Set left-click action"
msgstr "Действие по левому щелчку мыши"
-#: ../src/option.c:962
+#: ../src/option.c:968
msgid "Listen for commands on stdin"
msgstr "Воспринимать команды со стандартного ввода"
-#: ../src/option.c:968
+#: ../src/option.c:974
msgid "Set separator character for menu values"
msgstr "Установить разделяющий символ для значений меню"
-#: ../src/option.c:974
+#: ../src/option.c:980
msgid "Set separator character for menu items"
msgstr "Установить разделяющий символ для элементов меню"
-#: ../src/option.c:980
+#: ../src/option.c:986
msgid "Set initial popup menu"
msgstr "Задать начальное меню"
-#: ../src/option.c:981
+#: ../src/option.c:987
msgid "STRING"
msgstr "СТРОКА"
-#: ../src/option.c:986
+#: ../src/option.c:992
msgid "Disable exit on middle click"
msgstr "Запретить выход по щелчку средней кнопкой"
-#: ../src/option.c:992
+#: ../src/option.c:998
msgid "Doesn't show icon at startup"
msgstr "Не показывать иконку при запуске"
-#: ../src/option.c:1002
+#: ../src/option.c:1008
msgid "Display printing dialog"
msgstr "Отобразить диалог печати"
-#: ../src/option.c:1008
+#: ../src/option.c:1014
msgid "Source filename"
msgstr "Имя исходного файла"
-#: ../src/option.c:1014
+#: ../src/option.c:1020
msgid "Set source type (TYPE - TEXT, IMAGE or RAW)"
msgstr "Тип исходных данных (ТИП - TEXT, IMAGE или RAW)"
-#: ../src/option.c:1020
+#: ../src/option.c:1026
msgid "Add headers to page"
msgstr "Добавлять колонтитулы на страницу"
-#: ../src/option.c:1026
+#: ../src/option.c:1032
msgid "Enable preview in print dialog"
msgstr "Разрешить предпросмотр в диалоге печати"
-#: ../src/option.c:1032 ../src/option.c:1203
+#: ../src/option.c:1038 ../src/option.c:1209
msgid "Use specified font"
msgstr "Использовать указанный шрифт"
-#: ../src/option.c:1042
+#: ../src/option.c:1048
msgid "Display progress indication dialog"
msgstr "Отобразить диалог хода процесса"
-#: ../src/option.c:1048
+#: ../src/option.c:1054
msgid "Set progress text"
msgstr "Показывать текст на индикаторе"
-#: ../src/option.c:1054
+#: ../src/option.c:1060
msgid "Set initial percentage"
msgstr "Задать начальный процент"
-#: ../src/option.c:1055
+#: ../src/option.c:1061
msgid "PERCENTAGE"
msgstr "ПРОЦЕНТЫ"
-#: ../src/option.c:1060
+#: ../src/option.c:1066
msgid "Pulsate progress bar"
msgstr "Пульсирующий индикатор прогресса"
-#: ../src/option.c:1067
+#: ../src/option.c:1073
#, no-c-format
msgid "Dismiss the dialog when 100% has been reached"
msgstr "Закрыть диалог по достижении 100%"
-#: ../src/option.c:1081
+#: ../src/option.c:1087
msgid "Right-To-Left progress bar direction"
msgstr "Направление индикатора Справа-Налево"
-#: ../src/option.c:1087
+#: ../src/option.c:1093
msgid "Show log window"
msgstr "Показать окно журнала"
-#: ../src/option.c:1093
+#: ../src/option.c:1099
msgid "Expand log window"
msgstr "Развернуть окно журнала"
-#: ../src/option.c:1099
+#: ../src/option.c:1105
msgid "Place log window above progress bar"
msgstr "Разместить окно журнала над индикатором прогресса"
-#: ../src/option.c:1105
+#: ../src/option.c:1111
msgid "Height of log window"
msgstr "Высота окна журнала"
-#: ../src/option.c:1115
+#: ../src/option.c:1121
msgid "Display scale dialog"
msgstr "Отобразить диалог масштаба"
-#: ../src/option.c:1121
+#: ../src/option.c:1127
msgid "Set initial value"
msgstr "Задать начальное значение"
-#: ../src/option.c:1122 ../src/option.c:1128 ../src/option.c:1134
-#: ../src/option.c:1140 ../src/option.c:1146
+#: ../src/option.c:1128 ../src/option.c:1134 ../src/option.c:1140
+#: ../src/option.c:1146 ../src/option.c:1152
msgid "VALUE"
msgstr "ЗНАЧЕНИЕ"
-#: ../src/option.c:1127
+#: ../src/option.c:1133
msgid "Set minimum value"
msgstr "Задать минимальное значение"
-#: ../src/option.c:1133
+#: ../src/option.c:1139
msgid "Set maximum value"
msgstr "Задать максимальное значение"
-#: ../src/option.c:1139
+#: ../src/option.c:1145
msgid "Set step size"
msgstr "Задать шаг"
-#: ../src/option.c:1145
+#: ../src/option.c:1151
msgid "Set paging size"
msgstr "Задать шаг страницы"
-#: ../src/option.c:1151
+#: ../src/option.c:1157
msgid "Print partial values"
msgstr "Печатать частичные значения"
-#: ../src/option.c:1157
+#: ../src/option.c:1163
msgid "Hide value"
msgstr "Скрыть величину"
-#: ../src/option.c:1163
+#: ../src/option.c:1169
msgid "Show vertical scale"
msgstr "Показывать вертикальную шкалу"
-#: ../src/option.c:1169
+#: ../src/option.c:1175
msgid "Invert direction"
msgstr "Инвертировать направление"
-#: ../src/option.c:1175
+#: ../src/option.c:1181
msgid "Add mark to scale (may be used multiple times)"
msgstr "Добавить метку (может использоваться несколько раз)"
-#: ../src/option.c:1176
+#: ../src/option.c:1182
msgid "NAME:VALUE"
msgstr "ИМЯ:ЗНАЧЕНИЕ"
-#: ../src/option.c:1185
+#: ../src/option.c:1191
msgid "Display text information dialog"
msgstr "Отобразить диалог с текстовой информацией"
-#: ../src/option.c:1191
+#: ../src/option.c:1197
msgid "Use specified color for text"
msgstr "Использовать указанный цвет текста"
-#: ../src/option.c:1197
+#: ../src/option.c:1203
msgid "Use specified color for background"
msgstr "Использовать указанный цвет фона"
-#: ../src/option.c:1209
+#: ../src/option.c:1215
msgid "Enable text wrapping"
msgstr "Разрешить перенос текста"
-#: ../src/option.c:1215
+#: ../src/option.c:1221
msgid "Set justification (TYPE - left, right, center or fill)"
msgstr "Установить выравнивание (ТИП - left, right, center или fill)"
-#: ../src/option.c:1221
+#: ../src/option.c:1227
msgid "Set text margins"
msgstr "Установить отступы"
-#: ../src/option.c:1222
+#: ../src/option.c:1228
msgid "SIZE"
msgstr "РАЗМЕР"
-#: ../src/option.c:1227
+#: ../src/option.c:1233
msgid "Autoscroll to end of text"
msgstr "Автопрокрутка в конец текста"
-#: ../src/option.c:1233
+#: ../src/option.c:1239
msgid "Open file"
msgstr "Открыть файл"
-#: ../src/option.c:1245
+#: ../src/option.c:1251
msgid "Make URI clickable"
msgstr "Сделать ссылки активными"
-#: ../src/option.c:1251
+#: ../src/option.c:1257
msgid "Listen for data on stdin in addition to file"
msgstr "Получать данные из стандартного потока ввода в дополнение к файлу"
-#: ../src/option.c:1261
+#: ../src/option.c:1267
msgid "Show about dialog"
msgstr "Показать диалог 'О программе'"
-#: ../src/option.c:1267
+#: ../src/option.c:1273
msgid "Print version"
msgstr "Вывести версию"
-#: ../src/option.c:1273
+#: ../src/option.c:1279
msgid "Load additional GTK settings from file"
msgstr "Загрузить дополнительные настройки GTK из файла"
-#: ../src/option.c:1283
+#: ../src/option.c:1289
msgid "Load extra arguments from file"
msgstr "Загрузить дополнительные аргументы из файла"
-#: ../src/option.c:1328 ../src/option.c:1556
+#: ../src/option.c:1334 ../src/option.c:1562
#, c-format
msgid "Unknown align type: %s\n"
msgstr "Неизвестный тип выравнивания: %s\n"
-#: ../src/option.c:1485
+#: ../src/option.c:1491
#, c-format
msgid "Mark %s doesn't have a value\n"
msgstr "Метке %s не задано значение\n"
-#: ../src/option.c:1522
+#: ../src/option.c:1528
#, c-format
msgid "Unknown color mode: %s\n"
msgstr "Неизвестный режим цвета: '%s'\n"
-#: ../src/option.c:1541
+#: ../src/option.c:1547
#, c-format
msgid "Unknown buttons layout type: %s\n"
msgstr "Неизвестный тип расположения кнопок: %s\n"
-#: ../src/option.c:1573
+#: ../src/option.c:1579
#, c-format
msgid "Unknown justification type: %s\n"
msgstr "Неизвестный тип выравнивания: %s\n"
-#: ../src/option.c:1590
+#: ../src/option.c:1596
#, c-format
msgid "Unknown tab position type: %s\n"
msgstr "Неизвестный тип позиции вкладки: %s\n"
-#: ../src/option.c:1626
+#: ../src/option.c:1632
#, c-format
msgid "Unknown ellipsize type: %s\n"
msgstr "Неизвестный тип усечения: %s\n"
-#: ../src/option.c:1641
+#: ../src/option.c:1647
#, c-format
msgid "Unknown source type: %s\n"
msgstr "Неизвестный исходный тип: %s\n"
-#: ../src/option.c:1652
+#: ../src/option.c:1658
msgid "Progress log"
msgstr "Окно журнала"
-#: ../src/option.c:1762
+#: ../src/option.c:1768
#, c-format
msgid "Unknown signal: %s\n"
msgstr "Неизвестный сигнал: %s\n"
-#: ../src/option.c:1913
+#: ../src/option.c:1920
msgid "File exist. Overwrite?"
msgstr "Файл существует. Перезаписать?"
-#: ../src/option.c:2019
+#: ../src/option.c:2026
msgid "- Yet another dialoging program"
msgstr "- Программа для отображения диалогов"
#. Adds general option entries
-#: ../src/option.c:2023
+#: ../src/option.c:2030
msgid "General options"
msgstr "Основные параметры"
-#: ../src/option.c:2023
+#: ../src/option.c:2030
msgid "Show general options"
msgstr "Показывать основные параметры"
#. Adds calendar option entries
-#: ../src/option.c:2029
+#: ../src/option.c:2036
msgid "Calendar options"
msgstr "Параметры календаря"
-#: ../src/option.c:2029
+#: ../src/option.c:2036
msgid "Show calendar options"
msgstr "Показывать параметры календаря"
#. Adds color option entries
-#: ../src/option.c:2035
+#: ../src/option.c:2042
msgid "Color selection options"
msgstr "Параметры диалога выбора цвета"
-#: ../src/option.c:2035
+#: ../src/option.c:2042
msgid "Show color selection options"
msgstr "Показывать параметры диалога выбора цвета"
#. Adds dnd option entries
-#: ../src/option.c:2041
+#: ../src/option.c:2048
msgid "DND options"
msgstr "Параметры DND"
-#: ../src/option.c:2041
+#: ../src/option.c:2048
msgid "Show drag-n-drop options"
msgstr "Показывать параметры dnd"
#. Adds entry option entries
-#: ../src/option.c:2047
+#: ../src/option.c:2054
msgid "Text entry options"
msgstr "Параметры ввода текста"
-#: ../src/option.c:2047
+#: ../src/option.c:2054
msgid "Show text entry options"
msgstr "Показывать параметры ввода текста"
#. Adds file selection option entries
-#: ../src/option.c:2053
+#: ../src/option.c:2060
msgid "File selection options"
msgstr "Параметры диалога выбора файла"
-#: ../src/option.c:2053
+#: ../src/option.c:2060
msgid "Show file selection options"
msgstr "Показывать параметры диалога выбора файлов"
#. Add font selection option entries
-#: ../src/option.c:2059
+#: ../src/option.c:2066
msgid "Font selection options"
msgstr "Параметры диалога выбора шрифта"
-#: ../src/option.c:2059
+#: ../src/option.c:2066
msgid "Show font selection options"
msgstr "Показывать параметры диалога выбора шрифта"
#. Add form option entries
-#: ../src/option.c:2065
+#: ../src/option.c:2072
msgid "Form options"
msgstr "Параметры диалога формы"
-#: ../src/option.c:2065
+#: ../src/option.c:2072
msgid "Show form options"
msgstr "Показывать параметры диалога формы"
#. Add html options entries
-#: ../src/option.c:2072
+#: ../src/option.c:2079
msgid "HTML options"
msgstr "Параметры HTML диалога"
-#: ../src/option.c:2072
+#: ../src/option.c:2079
msgid "Show HTML options"
msgstr "Показывать параметры HTML диалога"
#. Add icons option entries
-#: ../src/option.c:2079
+#: ../src/option.c:2086
msgid "Icons box options"
msgstr "Параметры диалога значков"
-#: ../src/option.c:2079
+#: ../src/option.c:2086
msgid "Show icons box options"
msgstr "Показывать параметры диалога значков быстрого доступа"
#. Adds list option entries
-#: ../src/option.c:2085
+#: ../src/option.c:2092
msgid "List options"
msgstr "Параметры списка"
-#: ../src/option.c:2085
+#: ../src/option.c:2092
msgid "Show list options"
msgstr "Показывать параметры списка"
#. Adds multi progress option entries
-#: ../src/option.c:2091
+#: ../src/option.c:2098
msgid "Multi progress bars options"
msgstr "Параметры диалога с несколькими индикаторами"
-#: ../src/option.c:2092
+#: ../src/option.c:2099
msgid "Show multi progress bars options"
msgstr "Показывать параметры диалога с несколькими индикаторами"
#. Adds notebook option entries
-#: ../src/option.c:2098
+#: ../src/option.c:2105
msgid "Notebook options"
msgstr "Параметры диалога с вкладками"
-#: ../src/option.c:2098
+#: ../src/option.c:2105
msgid "Show notebook dialog options"
msgstr "Показывать параметры диалога с вкладками"
#. Adds notification option entries
-#: ../src/option.c:2104
+#: ../src/option.c:2111
msgid "Notification icon options"
msgstr "Параметры значка уведомления"
-#: ../src/option.c:2105
+#: ../src/option.c:2112
msgid "Show notification icon options"
msgstr "Показывать параметры значка уведомления"
#. Adds print option entries
-#: ../src/option.c:2111
+#: ../src/option.c:2118
msgid "Print dialog options"
msgstr "Параметры диалога печати"
-#: ../src/option.c:2111
+#: ../src/option.c:2118
msgid "Show print dialog options"
msgstr "Показывать параметры диалога печати"
#. Adds progress option entries
-#: ../src/option.c:2117
+#: ../src/option.c:2124
msgid "Progress options"
msgstr "Параметры хода процесса"
-#: ../src/option.c:2117
+#: ../src/option.c:2124
msgid "Show progress options"
msgstr "Показывать параметры хода процесса"
#. Adds scale option entries
-#: ../src/option.c:2123
+#: ../src/option.c:2130
msgid "Scale options"
msgstr "Параметры масштаба"
-#: ../src/option.c:2123
+#: ../src/option.c:2130
msgid "Show scale options"
msgstr "Показывать параметры масштаба"
#. Adds text option entries
-#: ../src/option.c:2129
+#: ../src/option.c:2136
msgid "Text information options"
msgstr "Параметры текстовой информации"
-#: ../src/option.c:2129
+#: ../src/option.c:2136
msgid "Show text information options"
msgstr "Показывать параметры текстовой информации"
#. Adds miscellaneous option entries
-#: ../src/option.c:2135
+#: ../src/option.c:2142
msgid "Miscellaneous options"
msgstr "Дополнительные параметры"
-#: ../src/option.c:2135
+#: ../src/option.c:2142
msgid "Show miscellaneous options"
msgstr "Показывать дополнительные параметры"
diff -Nru yad-0.28.1/po/uk.po yad-0.29.0/po/uk.po
--- yad-0.28.1/po/uk.po 2015-03-06 10:24:59.000000000 +0000
+++ yad-0.29.0/po/uk.po 2015-07-15 12:23:24.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 12:24+0200\n"
+"POT-Creation-Date: 2015-07-15 15:23+0300\n"
"PO-Revision-Date: 2009-04-30 16:47+0300\n"
"Last-Translator: Victor Ananjevsky \n"
"Language-Team: \n"
@@ -49,17 +49,26 @@
"Ви мали отримати копію Загальної громадської ліцензії GNU разом з цією "
"програмою; якщо це не так, дивіться ."
-#: ../src/about.c:50
+#: ../src/about.c:43
+#, c-format
msgid ""
"Yet Another Dialog\n"
"(show dialog boxes from shell scripts)\n"
"\n"
"Based on Zenity code\n"
+"\n"
+"Built with Webkit\n"
+"\n"
+"Using GTK+ %d.%d.%d\n"
msgstr ""
"Yet Another Dialog\n"
"(Програма для відображення діалогових вікон зі сценаріїв оболонки)\n"
"\n"
"Основана на коді Zenity\n"
+"\n"
+"Вбудована підтримка Webkit\n"
+"\n"
+"Використовується GTK+ %d.%d.%d\n"
#: ../src/calendar.c:39 ../src/text.c:389
#, c-format
@@ -83,31 +92,31 @@
msgid "Initial value greater than maximum.\n"
msgstr "Початкове значення - більше за максимальне.\n"
-#: ../src/form.c:403
+#: ../src/form.c:404
msgid "Select files"
msgstr "Вибір файлу"
-#: ../src/form.c:411
+#: ../src/form.c:412
msgid "Select folders"
msgstr "Вибір каталогів"
-#: ../src/form.c:475
+#: ../src/form.c:476
msgid "Select or create file"
msgstr "Вибір або створення файлу"
-#: ../src/form.c:483
+#: ../src/form.c:484
msgid "Select or create folder"
msgstr "Вибір або створення каталогу"
-#: ../src/form.c:520
+#: ../src/form.c:521
msgid "Select date"
msgstr "Вибір дати"
-#: ../src/form.c:741
+#: ../src/form.c:742
msgid "Select file"
msgstr "Вибір файлу"
-#: ../src/form.c:756
+#: ../src/form.c:757
msgid "Select folder"
msgstr "Вибір каталогу"
@@ -121,12 +130,12 @@
msgid "Unable to open directory %s: %s\n"
msgstr "Не можу відкрити каталогу %s: %s\n"
-#: ../src/main.c:103 ../src/main.c:234
+#: ../src/main.c:103 ../src/main.c:250
#, c-format
msgid "%d sec"
msgstr "%d сек"
-#: ../src/main.c:667
+#: ../src/main.c:683
#, c-format
msgid "Unable to parse command line: %s\n"
msgstr "Не вдається розібрати командний рядок: %s\n"
@@ -227,9 +236,9 @@
msgid "Set the dialog text"
msgstr "Задати текст діалогу"
-#: ../src/option.c:118 ../src/option.c:148 ../src/option.c:409
-#: ../src/option.c:415 ../src/option.c:421 ../src/option.c:561
-#: ../src/option.c:1049 ../src/option.c:1088
+#: ../src/option.c:118 ../src/option.c:148 ../src/option.c:415
+#: ../src/option.c:421 ../src/option.c:427 ../src/option.c:567
+#: ../src/option.c:1055 ../src/option.c:1094
msgid "TEXT"
msgstr "ТЕКСТ"
@@ -237,9 +246,9 @@
msgid "Set the dialog text alignment (left, center, right, fill)"
msgstr "Задати вирівнювання тексту діалогу (left, center, right, fill)"
-#: ../src/option.c:124 ../src/option.c:166 ../src/option.c:584
-#: ../src/option.c:804 ../src/option.c:892 ../src/option.c:935
-#: ../src/option.c:1015 ../src/option.c:1216
+#: ../src/option.c:124 ../src/option.c:166 ../src/option.c:590
+#: ../src/option.c:810 ../src/option.c:898 ../src/option.c:941
+#: ../src/option.c:1021 ../src/option.c:1222
msgid "TYPE"
msgstr "ТИП"
@@ -247,7 +256,7 @@
msgid "Set the dialog image"
msgstr "Задати картинку діалогу"
-#: ../src/option.c:130 ../src/option.c:445 ../src/option.c:457
+#: ../src/option.c:130 ../src/option.c:451 ../src/option.c:463
msgid "IMAGE"
msgstr "КАРТИНКА"
@@ -288,323 +297,327 @@
msgid "Don't use pango markup language in dialog's text"
msgstr "Не використовувати розмітку pango в тексті"
-#: ../src/option.c:178
+#: ../src/option.c:177
+msgid "Don't close dialog if Escape was pressed"
+msgstr "Не закривати диалог, якшо натиснуто Escape"
+
+#: ../src/option.c:184
msgid "Add separator between dialog and buttons"
msgstr "Додати розділювач між діалогом та кнопками"
-#: ../src/option.c:185
+#: ../src/option.c:191
msgid "Set window borders"
msgstr "Задати краї вікна"
-#: ../src/option.c:186 ../src/option.c:265 ../src/option.c:590
-#: ../src/option.c:810 ../src/option.c:816 ../src/option.c:822
-#: ../src/option.c:828 ../src/option.c:834 ../src/option.c:840
-#: ../src/option.c:941
+#: ../src/option.c:192 ../src/option.c:271 ../src/option.c:596
+#: ../src/option.c:816 ../src/option.c:822 ../src/option.c:828
+#: ../src/option.c:834 ../src/option.c:840 ../src/option.c:846
+#: ../src/option.c:947
msgid "NUMBER"
msgstr "ЧИСЛО"
-#: ../src/option.c:191
+#: ../src/option.c:197
msgid "Always print result"
msgstr "Завжди виводити результат"
-#: ../src/option.c:197
+#: ../src/option.c:203
msgid "Dialog text can be selected"
msgstr "Текст діалогу може буди виділеним"
-#: ../src/option.c:204
+#: ../src/option.c:210
msgid "Set window sticky"
msgstr "Вікно - на всіх стільницях"
-#: ../src/option.c:210
+#: ../src/option.c:216
msgid "Set window unresizable"
msgstr "Незмінний розмір вікна"
-#: ../src/option.c:216
+#: ../src/option.c:222
msgid "Place window on top"
msgstr "Розташувати вікно над іншими"
-#: ../src/option.c:222
+#: ../src/option.c:228
msgid "Place window on center of screen"
msgstr "Розташувати вікно по центру екрана"
-#: ../src/option.c:228
+#: ../src/option.c:234
msgid "Place window at the mouse position"
msgstr "Розташувати вікно в положенні мишки"
-#: ../src/option.c:234
+#: ../src/option.c:240
msgid "Set window undecorated"
msgstr "Прибрати декорації вікна"
-#: ../src/option.c:240
+#: ../src/option.c:246
msgid "Don't show window in taskbar"
msgstr "Не показувати вікна в панелі завдань"
-#: ../src/option.c:246
+#: ../src/option.c:252
msgid "Set window maximized"
msgstr "Задати вікну максимальний розмір вікна"
-#: ../src/option.c:252
+#: ../src/option.c:258
msgid "Set window fulscreen"
msgstr "Розгорнути вікно на весь екран"
-#: ../src/option.c:258
+#: ../src/option.c:264
msgid "Special type of dialog for XEMBED"
msgstr "Спеціальний режим діалога для вбудовування"
-#: ../src/option.c:259 ../src/option.c:923
+#: ../src/option.c:265 ../src/option.c:929
msgid "KEY"
msgstr "КЛЮЧ"
-#: ../src/option.c:264
+#: ../src/option.c:270
msgid "Tab nubmer of this dialog"
msgstr "Номер вкладки для цього діалога"
-#: ../src/option.c:271
+#: ../src/option.c:277
msgid "Send SIGNAL to parent"
msgstr "Послати СИГНАЛ батьківському процесу"
-#: ../src/option.c:272
+#: ../src/option.c:278
msgid "SIGNAL"
msgstr "СИГНАЛ"
-#: ../src/option.c:277
+#: ../src/option.c:283
msgid "Print X Window Id to the stderr"
msgstr "Вивести ідентифікатор вікна на stderr"
-#: ../src/option.c:284
+#: ../src/option.c:290
msgid "Add path for search icons by name"
msgstr "Додати каталог для пошуку зображень"
-#: ../src/option.c:285
+#: ../src/option.c:291
msgid "PATH"
msgstr "КАТАЛОГ"
-#: ../src/option.c:294
+#: ../src/option.c:300
msgid "Display calendar dialog"
msgstr "Зобразити діалог для вибору дати"
-#: ../src/option.c:300
+#: ../src/option.c:306
msgid "Set the calendar day"
msgstr "Задати календарний день"
-#: ../src/option.c:301
+#: ../src/option.c:307
msgid "DAY"
msgstr "ДЕНЬ"
-#: ../src/option.c:306
+#: ../src/option.c:312
msgid "Set the calendar month"
msgstr "Задати календарний місяць"
-#: ../src/option.c:307
+#: ../src/option.c:313
msgid "MONTH"
msgstr "МІСЯЦЬ"
-#: ../src/option.c:312
+#: ../src/option.c:318
msgid "Set the calendar year"
msgstr "Задати календарний рік"
-#: ../src/option.c:313
+#: ../src/option.c:319
msgid "YEAR"
msgstr "РІК"
-#: ../src/option.c:318 ../src/option.c:607
+#: ../src/option.c:324 ../src/option.c:613
msgid "Set the format for the returned date"
msgstr "Задати формат відображення дати"
-#: ../src/option.c:319 ../src/option.c:608 ../src/option.c:715
+#: ../src/option.c:325 ../src/option.c:614 ../src/option.c:721
msgid "PATTERN"
msgstr "ШАБЛОН"
-#: ../src/option.c:324
+#: ../src/option.c:330
msgid "Set the filename with dates details"
msgstr "Задати назву файлу з описом дат"
-#: ../src/option.c:325 ../src/option.c:353 ../src/option.c:485
-#: ../src/option.c:1009 ../src/option.c:1234 ../src/option.c:1274
-#: ../src/option.c:1284
+#: ../src/option.c:331 ../src/option.c:359 ../src/option.c:491
+#: ../src/option.c:1015 ../src/option.c:1240 ../src/option.c:1280
+#: ../src/option.c:1290
msgid "FILENAME"
msgstr "НАЗВА ФАЙЛУ"
-#: ../src/option.c:334
+#: ../src/option.c:340
msgid "Display color selection dialog"
msgstr "Відобразити діалог для вибору кольору"
-#: ../src/option.c:340
+#: ../src/option.c:346
msgid "Alias for --color"
msgstr "Синонім для --color"
-#: ../src/option.c:346
+#: ../src/option.c:352
msgid "Set initial color value"
msgstr "Задати початковий колір"
-#: ../src/option.c:347 ../src/option.c:1192 ../src/option.c:1198
+#: ../src/option.c:353 ../src/option.c:1198 ../src/option.c:1204
msgid "COLOR"
msgstr "КОЛІР"
-#: ../src/option.c:352
+#: ../src/option.c:358
msgid "Set path to palette file. Default - "
msgstr "Задати шлях до файлу кольорів. Без назви - "
-#: ../src/option.c:358
+#: ../src/option.c:364
msgid "Set output mode to MODE. Values are hex (default) or rgb"
msgstr ""
"Встановити режим вивода в РЕЖИМ. Значення - hex (за умовчанням) або rgb"
-#: ../src/option.c:359
+#: ../src/option.c:365
msgid "MODE"
msgstr "РЕЖИМ"
-#: ../src/option.c:364
+#: ../src/option.c:370
msgid "Use #rrrrggggbbbb format instead of #rrggbb"
msgstr "Використовувати формат #rrrrggggbbbb замість #rrggbb"
-#: ../src/option.c:370
+#: ../src/option.c:376
msgid "Add opacity to output color value"
msgstr "Додати прозорість до значення кольору"
-#: ../src/option.c:380
+#: ../src/option.c:386
msgid "Display drag-n-drop box"
msgstr "Відобразити діалог для перехоплення dnd"
-#: ../src/option.c:386
+#: ../src/option.c:392
msgid "Use dialog text as tooltip"
msgstr "Використовувати текст діалогу в якості підказки"
-#: ../src/option.c:392
+#: ../src/option.c:398
msgid "Set command for process d-n-d data"
msgstr "Команда для обробки отриманих даних"
-#: ../src/option.c:393 ../src/option.c:451 ../src/option.c:463
-#: ../src/option.c:846 ../src/option.c:957
+#: ../src/option.c:399 ../src/option.c:457 ../src/option.c:469
+#: ../src/option.c:852 ../src/option.c:963
msgid "CMD"
msgstr "КОМАНДА"
-#: ../src/option.c:402
+#: ../src/option.c:408
msgid "Display text entry or combo-box dialog"
msgstr "Відобразити діалог для вводу тексту або вибору варіанта"
-#: ../src/option.c:408
+#: ../src/option.c:414
msgid "Set the entry label"
msgstr "Задати мітку поля вводу"
-#: ../src/option.c:414
+#: ../src/option.c:420
msgid "Set the entry text"
msgstr "Задати текст для поля вводу"
-#: ../src/option.c:420
+#: ../src/option.c:426
msgid "Hide the entry text"
msgstr "Сховати введений текст (Пароль)"
-#: ../src/option.c:426
+#: ../src/option.c:432
msgid "Use completion instead of combo-box"
msgstr "Використовувати автозаповнення замість списку значень"
-#: ../src/option.c:432
+#: ../src/option.c:438
msgid "Use spin button for text entry"
msgstr "Використовувати числове поле замість тексту"
-#: ../src/option.c:438
+#: ../src/option.c:444
msgid "Allow changes to text in combo-box"
msgstr "Дозволити змінювати текст у режимі вибору варіанта"
-#: ../src/option.c:444
+#: ../src/option.c:450
msgid "Set the left entry icon"
msgstr "Задати ліву іконку"
-#: ../src/option.c:450
+#: ../src/option.c:456
msgid "Set the left entry icon action"
msgstr "Дія для лівої іконки"
-#: ../src/option.c:456
+#: ../src/option.c:462
msgid "Set the right entry icon"
msgstr "Задати праву іконку"
-#: ../src/option.c:462
+#: ../src/option.c:468
msgid "Set the right entry icon action"
msgstr "Дія для правої іконки"
-#: ../src/option.c:472
+#: ../src/option.c:478
msgid "Display file selection dialog"
msgstr "Відобразити діалог для вибору файлу"
-#: ../src/option.c:478
+#: ../src/option.c:484
msgid "Alias for --file"
msgstr "Синонім для --file"
-#: ../src/option.c:484
+#: ../src/option.c:490
msgid "Set the filename"
msgstr "Задати назву файлу"
-#: ../src/option.c:490
+#: ../src/option.c:496
msgid "Allow multiple files to be selected"
msgstr "Дозволити вибір декількох файлів"
-#: ../src/option.c:496
+#: ../src/option.c:502
msgid "Activate directory-only selection"
msgstr "Активувати виділення тільки по каталогам"
-#: ../src/option.c:502
+#: ../src/option.c:508
msgid "Activate save mode"
msgstr "Активувати режим зберігання"
-#: ../src/option.c:508 ../src/option.c:595 ../src/option.c:779
+#: ../src/option.c:514 ../src/option.c:601 ../src/option.c:785
msgid "Set output separator character"
msgstr "Установити вихідний розділювач"
-#: ../src/option.c:509 ../src/option.c:596 ../src/option.c:602
-#: ../src/option.c:780 ../src/option.c:969 ../src/option.c:975
+#: ../src/option.c:515 ../src/option.c:602 ../src/option.c:608
+#: ../src/option.c:786 ../src/option.c:975 ../src/option.c:981
msgid "SEPARATOR"
msgstr "РОЗДІЛЮВАЧ"
-#: ../src/option.c:514
+#: ../src/option.c:520
msgid "Confirm file selection if filename already exists"
msgstr "Підтвердити вибір файлу, якщо файл вже існує"
-#: ../src/option.c:515
+#: ../src/option.c:521
msgid "[TEXT]"
msgstr "[ТЕКСТ]"
-#: ../src/option.c:520
+#: ../src/option.c:526
msgid "Sets a filename filter"
msgstr "Задати фільтр файлів"
-#: ../src/option.c:521
+#: ../src/option.c:527
msgid "NAME | PATTERN1 PATTERN2 ..."
msgstr "НАЗВА | ШАБЛОН1 ШАБЛОН2 ..."
-#: ../src/option.c:526
+#: ../src/option.c:532
msgid "Enable preview"
msgstr "Додати попередній перегляд"
-#: ../src/option.c:532 ../src/option.c:619 ../src/option.c:863
+#: ../src/option.c:538 ../src/option.c:625 ../src/option.c:869
msgid "Quote dialogs output"
msgstr "Виводити значення у лапках"
-#: ../src/option.c:542
+#: ../src/option.c:548
msgid "Display font selection dialog"
msgstr "Відобразити діалог для вибору шрифту"
-#: ../src/option.c:548
+#: ../src/option.c:554
msgid "Alias for --font"
msgstr "Синонім для --font"
-#: ../src/option.c:554
+#: ../src/option.c:560
msgid "Set initial font"
msgstr "Задати початковий шрифт"
-#: ../src/option.c:555 ../src/option.c:1033 ../src/option.c:1204
+#: ../src/option.c:561 ../src/option.c:1039 ../src/option.c:1210
msgid "FONTNAME"
msgstr "НАЗВА_ШРИФТУ"
-#: ../src/option.c:560
+#: ../src/option.c:566
msgid "Set preview text"
msgstr "Задати текст зразка"
-#: ../src/option.c:570
+#: ../src/option.c:576
msgid "Display form dialog"
msgstr "Відобразити діалог форми вводу"
-#: ../src/option.c:577
+#: ../src/option.c:583
msgid ""
"Add field to form (TYPE - H, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, DIR, "
"CDIR, MDIR, FN, DT, SCL, CLR, BTN, FBTN, LBL or TXT)"
@@ -612,95 +625,95 @@
"Додати поле до форми (Тип поля: Н, RO, NUM, CHK, CB, CBE, CE, FL, SFL, MFL, "
"DIR, CDIR, MDIR, FN, MFL, DT, SCL, CLR, BTN, FBTN, LBL або TXT)"
-#: ../src/option.c:578 ../src/option.c:880
+#: ../src/option.c:584 ../src/option.c:886
msgid "LABEL[:TYPE]"
msgstr "МІТКА[:ТИП]"
-#: ../src/option.c:583
+#: ../src/option.c:589
msgid "Set alignment of filed labels (left, center or right)"
msgstr "Задати вирівнювання міток полів (left, center або right)"
-#: ../src/option.c:589
+#: ../src/option.c:595
msgid "Set number of columns in form"
msgstr "Задати кількість стовпчиків у формі"
-#: ../src/option.c:601
+#: ../src/option.c:607
msgid "Set separator character for combobox or scale data"
msgstr "Задати розділювач для даних списку або числового поля"
-#: ../src/option.c:613
+#: ../src/option.c:619
msgid "Make form scrollable"
msgstr "Додати прокрутку до форми"
-#: ../src/option.c:625
+#: ../src/option.c:631
msgid "Order output fields by rows"
msgstr "Упорядкувати виведення по рядках"
-#: ../src/option.c:636
+#: ../src/option.c:642
msgid "Display HTML dialog"
msgstr "Відобразити HTML діалог"
-#: ../src/option.c:642
+#: ../src/option.c:648
msgid "Open specified location"
msgstr "Відкрити вказану адресу"
-#: ../src/option.c:643
+#: ../src/option.c:649
msgid "URI"
msgstr "URI"
-#: ../src/option.c:648
+#: ../src/option.c:654
msgid "Turn on browser mode"
msgstr "Ввімкнути режим браузеру"
-#: ../src/option.c:654
+#: ../src/option.c:660
msgid "Print clicked uri to stdout"
msgstr "Друкувати натиснуті зсилки"
-#: ../src/option.c:660
+#: ../src/option.c:666
msgid "Set mime type of input stream data"
msgstr "Задати тип mime для вхідних даних"
-#: ../src/option.c:661
+#: ../src/option.c:667
msgid "MIME"
msgstr "MIME"
-#: ../src/option.c:666
+#: ../src/option.c:672
msgid "Set encoding of input stream data"
msgstr "Задати кодування для вхідних даних"
-#: ../src/option.c:667
+#: ../src/option.c:673
msgid "ENCODING"
msgstr "КОДУВАННЯ"
-#: ../src/option.c:677
+#: ../src/option.c:683
msgid "Display icons box dialog"
msgstr "Відобразити діалог з іконками швидкого доступу"
-#: ../src/option.c:683
+#: ../src/option.c:689
msgid "Read data from .desktop files in specified directory"
msgstr "Читати дані з файлів .desktop у вказаному каталозі"
-#: ../src/option.c:684
+#: ../src/option.c:690
msgid "DIRECTORY"
msgstr "КАТАЛОГ"
-#: ../src/option.c:689
+#: ../src/option.c:695
msgid "Use compact (list) view"
msgstr "Використовувати компактний вигляд (список)"
-#: ../src/option.c:695
+#: ../src/option.c:701
msgid "Use GenericName field instead of Name for icon label"
msgstr "Використовувати поле GenericName замість Name для мітки"
-#: ../src/option.c:701
+#: ../src/option.c:707
msgid "Read data from stdin"
msgstr "Читати дані зі стандартного вводу"
-#: ../src/option.c:707
+#: ../src/option.c:713
msgid "Set the width of dialog items"
msgstr "Задати ширину елемента діалогу"
-#: ../src/option.c:714
+#: ../src/option.c:720
#, no-c-format
msgid ""
"Use specified pattern for launch command in terminal (default: xterm -e %s)"
@@ -708,66 +721,66 @@
"Використовувати вказаний шаблон для запуску в терміналі (без шаблону: xterm -"
"e %s)"
-#: ../src/option.c:720
+#: ../src/option.c:726
msgid "Sort items by name instead of filename"
msgstr "Сортувати по полю Назва замість назви файлу"
-#: ../src/option.c:726
+#: ../src/option.c:732
msgid "Sort items in descending order"
msgstr "Сортувати в порядку спадання"
-#: ../src/option.c:732
+#: ../src/option.c:738
msgid "Activate items by single click"
msgstr "Активувати елемент одним натисненням"
-#: ../src/option.c:742
+#: ../src/option.c:748
msgid "Display list dialog"
msgstr "Відобразити діалог зі списком"
-#: ../src/option.c:748
+#: ../src/option.c:754
msgid "Don't show column headers"
msgstr "Не показувати заголовки стовпчиків"
-#: ../src/option.c:754
+#: ../src/option.c:760
msgid "Set the column header (TYPE - TEXT, NUM, FLT, CHK, RD, IMG, HD or TIP)"
msgstr ""
"Задати заголовок стовпчика (ТИП - TEXT, NUM, FLT, CHK, RD, IMG, HD або TIP)"
-#: ../src/option.c:755
+#: ../src/option.c:761
msgid "COLUMN[:TYPE]"
msgstr "СТОВПЧИК[:ТИП]"
-#: ../src/option.c:760
+#: ../src/option.c:766
msgid "Use checkboxes for first column"
msgstr "Використовувати відмітки для першого стовпчика"
-#: ../src/option.c:766
+#: ../src/option.c:772
msgid "Use radioboxes for first column"
msgstr "Використовувати перемикач для першого стовпчика"
-#: ../src/option.c:772
+#: ../src/option.c:778
msgid "Disable clickable column headers"
msgstr "Заборонити натискати на заголовок"
-#: ../src/option.c:785
+#: ../src/option.c:791
msgid "Allow multiple rows to be selected"
msgstr "Дозволити вибір декількох рядків"
-#: ../src/option.c:791 ../src/option.c:1239
+#: ../src/option.c:797 ../src/option.c:1245
msgid "Allow changes to text"
msgstr "Дозволити змінювати текст"
-#: ../src/option.c:797
+#: ../src/option.c:803
msgid "Print all data from list"
msgstr "Виводити таблицю повністю"
-#: ../src/option.c:803
+#: ../src/option.c:809
msgid "Set ellipsize mode for text columns (TYPE - NONE, START, MIDDLE or END)"
msgstr ""
"Задати тип урізання для текстових стовпчиків (ТИП - NONE, START, MIDDLE або "
"END)"
-#: ../src/option.c:809
+#: ../src/option.c:815
msgid ""
"Print a specific column. By default or if 0 is specified will be printed all "
"columns"
@@ -775,15 +788,15 @@
"Виводити тільки вказаний стовпчик. Без вказівки або якщо стовпчик дорівнює "
"0, будуть виведені усі стовпчики"
-#: ../src/option.c:815
+#: ../src/option.c:821
msgid "Hide a specific column"
msgstr "Сховати вказаний стовпчик"
-#: ../src/option.c:821
+#: ../src/option.c:827
msgid "Set the column expandable by default. 0 sets all columns expandable"
msgstr "Задати стовпчик, який розширюється. 0 розширює всі стовпчики"
-#: ../src/option.c:827
+#: ../src/option.c:833
msgid ""
"Set the quick search column. Default is first column. Set it to 0 for "
"disable searching"
@@ -791,518 +804,518 @@
"Задати стовпчик швидкого пошуку. Без вказівки використовується перший "
"стовпчик. 0 забороняє пошук"
-#: ../src/option.c:833
+#: ../src/option.c:839
msgid "Set the tooltip column"
msgstr "Задати стовпчик підказок"
-#: ../src/option.c:839
+#: ../src/option.c:845
msgid "Set the limit of rows in list"
msgstr "Задати кількість рядків у списку"
-#: ../src/option.c:845
+#: ../src/option.c:851
msgid "Set double-click action"
msgstr "Дія для подвійного клацання мишки"
-#: ../src/option.c:851
+#: ../src/option.c:857
msgid "Use regex in search"
msgstr "Використовувати регулярні вирази в пошуку"
-#: ../src/option.c:857
+#: ../src/option.c:863
msgid "Listen for data on stdin in addition to command-line"
msgstr "Отримувати дані з потоку вводу додатково до командного рядка"
-#: ../src/option.c:873
+#: ../src/option.c:879
msgid "Display multi progress bars dialog"
msgstr "Відобразити діалог з декількома індикаторами виконання"
-#: ../src/option.c:879
+#: ../src/option.c:885
msgid "Add the progress bar (TYPE - NORM, RTL or PULSE)"
msgstr "Додати індикатор виконання (ТИП - NORM, RTL або PULSE)"
-#: ../src/option.c:885
+#: ../src/option.c:891
msgid "Show vertical bars"
msgstr "Відобразити вертикальні індикатори"
-#: ../src/option.c:891
+#: ../src/option.c:897
msgid "Set alignment of bar labels (left, center or right)"
msgstr "Задати вирівнювання міток індикаторів (left, center або right)"
-#: ../src/option.c:898
+#: ../src/option.c:904
#, no-c-format
msgid "Dismiss the dialog when 100% of all bars has been reached"
msgstr "Закрити діалог по досягненні 100% усіма індикаторами"
-#: ../src/option.c:905 ../src/option.c:1074
+#: ../src/option.c:911 ../src/option.c:1080
msgid "Kill parent process if cancel button is pressed"
msgstr "Завершити батьківський процес, якщо натиснута кнопка відміни"
-#: ../src/option.c:916
+#: ../src/option.c:922
msgid "Display notebook dialog"
msgstr "Відобразити діалог із вкладинками"
-#: ../src/option.c:922
+#: ../src/option.c:928
msgid "Identifier of embedded dialogs"
msgstr "Ідентифікатор діалогів що вбудовуваються"
-#: ../src/option.c:928
+#: ../src/option.c:934
msgid "Add a tab to notebook"
msgstr "Додати вкладку"
-#: ../src/option.c:929
+#: ../src/option.c:935
msgid "LABEL"
msgstr "МІТКА"
-#: ../src/option.c:934
+#: ../src/option.c:940
msgid "Set position of a notebook tabs (top, bottom, left or right)"
msgstr "Задати позицію ярлика вкладки (top, bottom, left, або right)"
-#: ../src/option.c:940
+#: ../src/option.c:946
msgid "Set tab borders"
msgstr "Задати краї вкладок"
-#: ../src/option.c:950
+#: ../src/option.c:956
msgid "Display notification"
msgstr "Відобразити діалог повідомлень"
-#: ../src/option.c:956
+#: ../src/option.c:962
msgid "Set left-click action"
msgstr "Дія для лівого клацання мишки"
-#: ../src/option.c:962
+#: ../src/option.c:968
msgid "Listen for commands on stdin"
msgstr "Читати команди зі стандартного вводу"
-#: ../src/option.c:968
+#: ../src/option.c:974
msgid "Set separator character for menu values"
msgstr "Встановити розділювач для значень меню"
-#: ../src/option.c:974
+#: ../src/option.c:980
msgid "Set separator character for menu items"
msgstr "Встановити розділювач для елементів меню"
-#: ../src/option.c:980
+#: ../src/option.c:986
msgid "Set initial popup menu"
msgstr "Задати початкове меню"
-#: ../src/option.c:981
+#: ../src/option.c:987
msgid "STRING"
msgstr "РЯДОК"
-#: ../src/option.c:986
+#: ../src/option.c:992
msgid "Disable exit on middle click"
msgstr "Заборонити вихід середньою кнопкою мишки"
-#: ../src/option.c:992
+#: ../src/option.c:998
msgid "Doesn't show icon at startup"
msgstr "Не показувати іконку при старті"
-#: ../src/option.c:1002
+#: ../src/option.c:1008
msgid "Display printing dialog"
msgstr "Відобразити діалог друку"
-#: ../src/option.c:1008
+#: ../src/option.c:1014
msgid "Source filename"
msgstr "Назва файлу"
-#: ../src/option.c:1014
+#: ../src/option.c:1020
msgid "Set source type (TYPE - TEXT, IMAGE or RAW)"
msgstr "Задати тип даних (ТИП - TEXT, IMAGE або RAW)"
-#: ../src/option.c:1020
+#: ../src/option.c:1026
msgid "Add headers to page"
msgstr "Додати колонтитули до сторінки"
-#: ../src/option.c:1026
+#: ../src/option.c:1032
msgid "Enable preview in print dialog"
msgstr "Додати попередній перегляд до діалогу друку"
-#: ../src/option.c:1032 ../src/option.c:1203
+#: ../src/option.c:1038 ../src/option.c:1209
msgid "Use specified font"
msgstr "Використовувати вказаний шрифт"
-#: ../src/option.c:1042
+#: ../src/option.c:1048
msgid "Display progress indication dialog"
msgstr "Відобразити діалог прогресу"
-#: ../src/option.c:1048
+#: ../src/option.c:1054
msgid "Set progress text"
msgstr "Показувати текст на індикаторі"
-#: ../src/option.c:1054
+#: ../src/option.c:1060
msgid "Set initial percentage"
msgstr "Задати початковий процент"
-#: ../src/option.c:1055
+#: ../src/option.c:1061
msgid "PERCENTAGE"
msgstr "ВІДСОТКИ"
-#: ../src/option.c:1060
+#: ../src/option.c:1066
msgid "Pulsate progress bar"
msgstr "Пульсовий індикатор виконання"
-#: ../src/option.c:1067
+#: ../src/option.c:1073
#, no-c-format
msgid "Dismiss the dialog when 100% has been reached"
msgstr "Закрити діалог по досягненні 100%"
-#: ../src/option.c:1081
+#: ../src/option.c:1087
msgid "Right-To-Left progress bar direction"
msgstr "Напрямок індикатору Справа Наліво"
-#: ../src/option.c:1087
+#: ../src/option.c:1093
msgid "Show log window"
msgstr "Відобразити вікно журналу"
-#: ../src/option.c:1093
+#: ../src/option.c:1099
msgid "Expand log window"
msgstr "Розгорнути вікно журналу"
-#: ../src/option.c:1099
+#: ../src/option.c:1105
msgid "Place log window above progress bar"
msgstr "Розмістити вікно жуналу поверх індикатора виконання"
-#: ../src/option.c:1105
+#: ../src/option.c:1111
msgid "Height of log window"
msgstr "Висота вікна журналу"
-#: ../src/option.c:1115
+#: ../src/option.c:1121
msgid "Display scale dialog"
msgstr "Відобразити діалог масштабу"
-#: ../src/option.c:1121
+#: ../src/option.c:1127
msgid "Set initial value"
msgstr "Задати початкове значення"
-#: ../src/option.c:1122 ../src/option.c:1128 ../src/option.c:1134
-#: ../src/option.c:1140 ../src/option.c:1146
+#: ../src/option.c:1128 ../src/option.c:1134 ../src/option.c:1140
+#: ../src/option.c:1146 ../src/option.c:1152
msgid "VALUE"
msgstr "ЗНАЧЕННЯ"
-#: ../src/option.c:1127
+#: ../src/option.c:1133
msgid "Set minimum value"
msgstr "Задати мінімальне значення"
-#: ../src/option.c:1133
+#: ../src/option.c:1139
msgid "Set maximum value"
msgstr "Задати максимальне значення"
-#: ../src/option.c:1139
+#: ../src/option.c:1145
msgid "Set step size"
msgstr "Задати крок"
-#: ../src/option.c:1145
+#: ../src/option.c:1151
msgid "Set paging size"
msgstr "Задати крок сторінки"
-#: ../src/option.c:1151
+#: ../src/option.c:1157
msgid "Print partial values"
msgstr "Виводити часткові значення"
-#: ../src/option.c:1157
+#: ../src/option.c:1163
msgid "Hide value"
msgstr "Сховати значення"
-#: ../src/option.c:1163
+#: ../src/option.c:1169
msgid "Show vertical scale"
msgstr "Відобразити вертикальну шкалу"
-#: ../src/option.c:1169
+#: ../src/option.c:1175
msgid "Invert direction"
msgstr "Інвертувати напрямок"
-#: ../src/option.c:1175
+#: ../src/option.c:1181
msgid "Add mark to scale (may be used multiple times)"
msgstr "Додати мітку шкали (може використовуватись декілька разів)"
-#: ../src/option.c:1176
+#: ../src/option.c:1182
msgid "NAME:VALUE"
msgstr "НАЗВА:ЗНАЧЕННЯ"
-#: ../src/option.c:1185
+#: ../src/option.c:1191
msgid "Display text information dialog"
msgstr "Відобразити діалог з текстовою інформацією"
-#: ../src/option.c:1191
+#: ../src/option.c:1197
msgid "Use specified color for text"
msgstr "Використовувати вказаний колір тексту"
-#: ../src/option.c:1197
+#: ../src/option.c:1203
msgid "Use specified color for background"
msgstr "Використовувати вказаний колір фону"
-#: ../src/option.c:1209
+#: ../src/option.c:1215
msgid "Enable text wrapping"
msgstr "Дозволити перенос тексту"
-#: ../src/option.c:1215
+#: ../src/option.c:1221
msgid "Set justification (TYPE - left, right, center or fill)"
msgstr "Встановити вирівнювання (ТИП - left, right, center або fill)"
-#: ../src/option.c:1221
+#: ../src/option.c:1227
msgid "Set text margins"
msgstr "Встановити відступи"
-#: ../src/option.c:1222
+#: ../src/option.c:1228
msgid "SIZE"
msgstr "РОЗМІР"
-#: ../src/option.c:1227
+#: ../src/option.c:1233
msgid "Autoscroll to end of text"
msgstr "Автопрокрутка в кінець тексту"
-#: ../src/option.c:1233
+#: ../src/option.c:1239
msgid "Open file"
msgstr "Відкрити файл"
-#: ../src/option.c:1245
+#: ../src/option.c:1251
msgid "Make URI clickable"
msgstr "Зробити посилання активними"
-#: ../src/option.c:1251
+#: ../src/option.c:1257
msgid "Listen for data on stdin in addition to file"
msgstr "Отримувати дані з потоку вводу додатково до файлу"
-#: ../src/option.c:1261
+#: ../src/option.c:1267
msgid "Show about dialog"
msgstr "Показати діалог 'Про програму'"
-#: ../src/option.c:1267
+#: ../src/option.c:1273
msgid "Print version"
msgstr "Вивести версію"
-#: ../src/option.c:1273
+#: ../src/option.c:1279
msgid "Load additional GTK settings from file"
msgstr "Завантажити додаткові налаштування GTK з файлу"
-#: ../src/option.c:1283
+#: ../src/option.c:1289
msgid "Load extra arguments from file"
msgstr "Завантажити додаткові аргументи з файлу"
-#: ../src/option.c:1328 ../src/option.c:1556
+#: ../src/option.c:1334 ../src/option.c:1562
#, c-format
msgid "Unknown align type: %s\n"
msgstr "Невідомий тип вирівнювання: %s\n"
-#: ../src/option.c:1485
+#: ../src/option.c:1491
#, c-format
msgid "Mark %s doesn't have a value\n"
msgstr "Помітці %s не надано значення\n"
-#: ../src/option.c:1522
+#: ../src/option.c:1528
#, c-format
msgid "Unknown color mode: %s\n"
msgstr "Невідомий режим коліру: '%s'\n"
-#: ../src/option.c:1541
+#: ../src/option.c:1547
#, c-format
msgid "Unknown buttons layout type: %s\n"
msgstr "Невідомий тип розміщення кнопок: %s\n"
-#: ../src/option.c:1573
+#: ../src/option.c:1579
#, c-format
msgid "Unknown justification type: %s\n"
msgstr "Невідомий тип вирівнювання: %s\n"
-#: ../src/option.c:1590
+#: ../src/option.c:1596
#, c-format
msgid "Unknown tab position type: %s\n"
msgstr "Невідомий тип позиції вкладки: %s\n"
-#: ../src/option.c:1626
+#: ../src/option.c:1632
#, c-format
msgid "Unknown ellipsize type: %s\n"
msgstr "Невідомий тип урізання: %s\n"
-#: ../src/option.c:1641
+#: ../src/option.c:1647
#, c-format
msgid "Unknown source type: %s\n"
msgstr "Невідомий тип даних: %s\n"
-#: ../src/option.c:1652
+#: ../src/option.c:1658
msgid "Progress log"
msgstr "Вікно журналу"
-#: ../src/option.c:1762
+#: ../src/option.c:1768
#, c-format
msgid "Unknown signal: %s\n"
msgstr "Невідомий сигнал: %s\n"
-#: ../src/option.c:1913
+#: ../src/option.c:1920
msgid "File exist. Overwrite?"
msgstr "Файл існує. Перезаписати?"
-#: ../src/option.c:2019
+#: ../src/option.c:2026
msgid "- Yet another dialoging program"
msgstr "- Програма для відображення діалогів"
#. Adds general option entries
-#: ../src/option.c:2023
+#: ../src/option.c:2030
msgid "General options"
msgstr "Основні параметри"
-#: ../src/option.c:2023
+#: ../src/option.c:2030
msgid "Show general options"
msgstr "Показувати основні параметри"
#. Adds calendar option entries
-#: ../src/option.c:2029
+#: ../src/option.c:2036
msgid "Calendar options"
msgstr "Параметри календаря"
-#: ../src/option.c:2029
+#: ../src/option.c:2036
msgid "Show calendar options"
msgstr "Показувати параметри календаря"
#. Adds color option entries
-#: ../src/option.c:2035
+#: ../src/option.c:2042
msgid "Color selection options"
msgstr "Параметри діалогу вибору кольору"
-#: ../src/option.c:2035
+#: ../src/option.c:2042
msgid "Show color selection options"
msgstr "Показувати параметри діалогу вибору кольору"
#. Adds dnd option entries
-#: ../src/option.c:2041
+#: ../src/option.c:2048
msgid "DND options"
msgstr "Параметри DND"
-#: ../src/option.c:2041
+#: ../src/option.c:2048
msgid "Show drag-n-drop options"
msgstr "Показувати параметри dnd"
#. Adds entry option entries
-#: ../src/option.c:2047
+#: ../src/option.c:2054
msgid "Text entry options"
msgstr "Параметри вводу тексту"
-#: ../src/option.c:2047
+#: ../src/option.c:2054
msgid "Show text entry options"
msgstr "Показувати параметри вводу тексту"
#. Adds file selection option entries
-#: ../src/option.c:2053
+#: ../src/option.c:2060
msgid "File selection options"
msgstr "Параметри діалогу вибору файлів"
-#: ../src/option.c:2053
+#: ../src/option.c:2060
msgid "Show file selection options"
msgstr "Показувати параметри діалогу вибору файлів"
#. Add font selection option entries
-#: ../src/option.c:2059
+#: ../src/option.c:2066
msgid "Font selection options"
msgstr "Параметри діалогу вибору шрифту"
-#: ../src/option.c:2059
+#: ../src/option.c:2066
msgid "Show font selection options"
msgstr "Показувати параметри діалоги вибору шрифту"
#. Add form option entries
-#: ../src/option.c:2065
+#: ../src/option.c:2072
msgid "Form options"
msgstr "Параметри діалогу форми"
-#: ../src/option.c:2065
+#: ../src/option.c:2072
msgid "Show form options"
msgstr "Показувати параметри діалогу форми"
#. Add html options entries
-#: ../src/option.c:2072
+#: ../src/option.c:2079
msgid "HTML options"
msgstr "Параметри HTML діалогу"
-#: ../src/option.c:2072
+#: ../src/option.c:2079
msgid "Show HTML options"
msgstr "Показувати параметри HTML діалогу"
#. Add icons option entries
-#: ../src/option.c:2079
+#: ../src/option.c:2086
msgid "Icons box options"
msgstr "Параметри діалогу іконок"
-#: ../src/option.c:2079
+#: ../src/option.c:2086
msgid "Show icons box options"
msgstr "Показувати параметри діалогу іконок швидкого доступу"
#. Adds list option entries
-#: ../src/option.c:2085
+#: ../src/option.c:2092
msgid "List options"
msgstr "Параметри списку"
-#: ../src/option.c:2085
+#: ../src/option.c:2092
msgid "Show list options"
msgstr "Показувати параметри списку"
#. Adds multi progress option entries
-#: ../src/option.c:2091
+#: ../src/option.c:2098
msgid "Multi progress bars options"
msgstr "Параметри діалогу з декількома індикаторами"
-#: ../src/option.c:2092
+#: ../src/option.c:2099
msgid "Show multi progress bars options"
msgstr "Показувати параметри діалогу з декількома індикаторами"
#. Adds notebook option entries
-#: ../src/option.c:2098
+#: ../src/option.c:2105
msgid "Notebook options"
msgstr "Параметри діалогу з вкладками"
-#: ../src/option.c:2098
+#: ../src/option.c:2105
msgid "Show notebook dialog options"
msgstr "Показувати параметри діалогу з вкладками"
#. Adds notification option entries
-#: ../src/option.c:2104
+#: ../src/option.c:2111
msgid "Notification icon options"
msgstr "Параметри іконки повідомлень"
-#: ../src/option.c:2105
+#: ../src/option.c:2112
msgid "Show notification icon options"
msgstr "Показувати параметри іконки повідомлень"
#. Adds print option entries
-#: ../src/option.c:2111
+#: ../src/option.c:2118
msgid "Print dialog options"
msgstr "Параметри діалогу друку"
-#: ../src/option.c:2111
+#: ../src/option.c:2118
msgid "Show print dialog options"
msgstr "Показувати параметри діалогу друку"
#. Adds progress option entries
-#: ../src/option.c:2117
+#: ../src/option.c:2124
msgid "Progress options"
msgstr "Параметри прогресу"
-#: ../src/option.c:2117
+#: ../src/option.c:2124
msgid "Show progress options"
msgstr "Показувати параметри прогресу"
#. Adds scale option entries
-#: ../src/option.c:2123
+#: ../src/option.c:2130
msgid "Scale options"
msgstr "Параметри масштабу"
-#: ../src/option.c:2123
+#: ../src/option.c:2130
msgid "Show scale options"
msgstr "Показувати параметри масштабу"
#. Adds text option entries
-#: ../src/option.c:2129
+#: ../src/option.c:2136
msgid "Text information options"
msgstr "Параметри текстової інформації"
-#: ../src/option.c:2129
+#: ../src/option.c:2136
msgid "Show text information options"
msgstr "Показувати параметри текстової інформації"
#. Adds miscellaneous option entries
-#: ../src/option.c:2135
+#: ../src/option.c:2142
msgid "Miscellaneous options"
msgstr "Додаткові параметри"
-#: ../src/option.c:2135
+#: ../src/option.c:2142
msgid "Show miscellaneous options"
msgstr "Показувати додаткові параметри"
diff -Nru yad-0.28.1/src/about.c yad-0.29.0/src/about.c
--- yad-0.28.1/src/about.c 2014-02-10 09:39:12.000000000 +0000
+++ yad-0.29.0/src/about.c 2015-05-04 11:10:25.000000000 +0000
@@ -27,31 +27,43 @@
"Victor Ananjevsky ",
NULL
};
- gchar *translators = _("translator-credits");
- gchar *license =
- _("YAD 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.\n\n"
- "YAD is distributed in the hope that it will be useful, "
- "but WITHOUT ANY WARRANTY; without even the implied warranty of "
- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
- "GNU General Public License for more details.\n\n"
- "You should have received a copy of the GNU General Public License "
- "along with YAD. If not, see .");
+ const gchar *translators = N_("translator-credits");
+ const gchar *license =
+ N_("YAD 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.\n\n"
+ "YAD is distributed in the hope that it will be useful, "
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the "
+ "GNU General Public License for more details.\n\n"
+ "You should have received a copy of the GNU General Public License "
+ "along with YAD. If not, see .");
+
+ gchar *comments = g_strdup_printf (_("Yet Another Dialog\n"
+ "(show dialog boxes from shell scripts)\n"
+ "\nBased on Zenity code\n"
+#ifdef HAVE_HTML
+ "\nBuilt with Webkit\n"
+#endif
+ "\nUsing GTK+ %d.%d.%d\n"),
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
dialog = gtk_about_dialog_new ();
gtk_window_set_icon_name (GTK_WINDOW (dialog), "yad");
-
g_object_set (G_OBJECT (dialog),
"name", PACKAGE_NAME,
"version", PACKAGE_VERSION,
- "copyright", "Copyright \xc2\xa9 2008-2014 Victor Ananjevsky ",
- "comments", _("Yet Another Dialog\n(show dialog boxes from shell scripts)\n\nBased on Zenity code\n"),
+ "copyright",
+ "Copyright \xc2\xa9 2008-2014 Victor Ananjevsky ",
+ "comments", comments,
"authors", authors,
"website", PACKAGE_URL,
"translator-credits", translators,
- "wrap-license", TRUE, "license", license, "logo-icon-name", "yad", NULL);
+ "wrap-license", TRUE,
+ "license", license,
+ "logo-icon-name", "yad",
+ NULL);
return gtk_dialog_run (GTK_DIALOG (dialog));
}
diff -Nru yad-0.28.1/src/file.c yad-0.29.0/src/file.c
--- yad-0.28.1/src/file.c 2014-02-10 09:39:12.000000000 +0000
+++ yad-0.29.0/src/file.c 2015-05-04 11:02:22.000000000 +0000
@@ -17,6 +17,8 @@
* Copyright (C) 2008-2014, Victor Ananjevsky
*/
+#include
+
#include "yad.h"
static GtkWidget *filechooser;
diff -Nru yad-0.28.1/src/form.c yad-0.29.0/src/form.c
--- yad-0.28.1/src/form.c 2015-03-10 10:43:41.000000000 +0000
+++ yad-0.29.0/src/form.c 2015-07-14 11:22:03.000000000 +0000
@@ -17,6 +17,7 @@
* Copyright (C) 2008-2014, Victor Ananjevsky
*/
+#include
#include
#include "yad.h"
@@ -996,6 +997,7 @@
static void
form_print_field (guint fn)
{
+ gchar *buf;
YadField *fld = g_slist_nth_data (options.form_data.fields, fn);
switch (fld->type)
@@ -1011,7 +1013,7 @@
case YAD_FIELD_DATE:
if (options.common_data.quoted_output)
{
- gchar *buf = g_shell_quote (gtk_entry_get_text (GTK_ENTRY (g_slist_nth_data (fields, fn))));
+ buf = g_shell_quote (gtk_entry_get_text (GTK_ENTRY (g_slist_nth_data (fields, fn))));
g_printf ("%s%s", buf, options.common_data.separator);
g_free (buf);
}
@@ -1040,11 +1042,9 @@
if (options.common_data.quoted_output)
{
#if GTK_CHECK_VERSION(2,24,0)
- gchar *buf = g_shell_quote (gtk_combo_box_text_get_active_text
- (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, fn))));
+ buf = g_shell_quote (gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (g_slist_nth_data (fields, fn))));
#else
- gchar *buf = g_shell_quote (gtk_combo_box_get_active_text
- (GTK_COMBO_BOX (g_slist_nth_data (fields, fn))));
+ buf = g_shell_quote (gtk_combo_box_get_active_text (GTK_COMBO_BOX (g_slist_nth_data (fields, fn))));
#endif
g_printf ("%s%s", buf, options.common_data.separator);
g_free (buf);
@@ -1064,13 +1064,18 @@
case YAD_FIELD_DIR:
if (options.common_data.quoted_output)
{
- gchar *buf = g_shell_quote (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, fn))));
- g_printf ("%s%s", buf, options.common_data.separator);
+ gchar *fname = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, fn)));
+ buf = g_shell_quote (fname ? fname : "");
+ g_free (fname);
+ g_printf ("%s%s", buf ? buf : "", options.common_data.separator);
g_free (buf);
}
else
- g_printf ("%s%s", gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, fn))),
- options.common_data.separator);
+ {
+ buf = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (g_slist_nth_data (fields, fn)));
+ g_printf ("%s%s", buf ? buf : "", options.common_data.separator);
+ g_free (buf);
+ }
break;
case YAD_FIELD_FONT:
if (options.common_data.quoted_output)
@@ -1116,7 +1121,14 @@
tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW (g_slist_nth_data (fields, fn)));
gtk_text_buffer_get_bounds (tb, &b, &e);
txt = escape_str (gtk_text_buffer_get_text (tb, &b, &e, FALSE));
- g_printf ("%s%s", txt, options.common_data.separator);
+ if (options.common_data.quoted_output)
+ {
+ buf = g_shell_quote (txt);
+ g_printf ("%s%s", buf, options.common_data.separator);
+ g_free (buf);
+ }
+ else
+ g_printf ("%s%s", txt, options.common_data.separator);
g_free (txt);
}
}
diff -Nru yad-0.28.1/src/html.c yad-0.29.0/src/html.c
--- yad-0.28.1/src/html.c 2015-03-06 11:11:34.000000000 +0000
+++ yad-0.29.0/src/html.c 2015-07-15 12:51:03.000000000 +0000
@@ -17,10 +17,14 @@
* Copyright (C) 2008-2015, Victor Ananjevsky
*/
-#include "yad.h"
+#include
+#include
+#include
#include
+#include "yad.h"
+
static WebKitWebView *view;
static GString *inbuf;
@@ -79,20 +83,22 @@
link_cb (WebKitWebView *v, WebKitWebFrame *f, WebKitNetworkRequest *r,
WebKitWebNavigationAction *act, WebKitWebPolicyDecision *pd, gpointer d)
{
- gchar *uri;
+ gchar *uri = (gchar *) webkit_network_request_get_uri (r);
- if (!is_loaded)
- return FALSE;
-
- uri = (gchar *) webkit_network_request_get_uri (r);
- if (options.html_data.print_uri)
- g_printf ("%s\n", uri);
- else
+ if (is_loaded && !options.html_data.browser)
{
- gchar *cmd = g_strdup_printf ("xdg-open '%s'", uri);
- g_spawn_command_line_async (cmd, NULL);
- g_free (cmd);
+ if (options.html_data.print_uri)
+ g_printf ("%s\n", uri);
+ else
+ {
+ gchar *cmd = g_strdup_printf ("xdg-open '%s'", uri);
+ g_spawn_command_line_async (cmd, NULL);
+ g_free (cmd);
+ }
+ webkit_web_policy_decision_ignore (pd);
}
+ else
+ webkit_web_policy_decision_use (pd);
return TRUE;
}
@@ -130,6 +136,7 @@
gtk_entry_set_text (entry, uri);
g_free (uri);
+ /* keep current dir */
g_free (dir);
dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dlg));
}
@@ -200,13 +207,6 @@
}
static gboolean
-ready_cb (WebKitWebView *v, gpointer d)
-{
- gtk_widget_grab_focus (GTK_WIDGET (v));
- return FALSE;
-}
-
-static gboolean
handle_stdin (GIOChannel *ch, GIOCondition cond, gpointer d)
{
gchar *buf;
@@ -239,31 +239,35 @@
html_create_widget (GtkWidget *dlg)
{
GtkWidget *sw;
+ WebKitWebSettings *settings;
SoupSession *sess;
+ const gchar *enc;
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
view = WEBKIT_WEB_VIEW (webkit_web_view_new ());
gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (view));
+
+ settings = webkit_web_view_get_settings (view);
+ g_get_charset (&enc);
+ g_object_set (G_OBJECT (settings), "default-encoding", enc);
g_signal_connect (view, "hovering-over-link", G_CALLBACK (link_hover_cb), NULL);
- g_signal_connect (view, "web-view-ready", G_CALLBACK (ready_cb), NULL);
+ g_signal_connect (view, "navigation-policy-decision-requested", G_CALLBACK (link_cb), NULL);
if (options.html_data.browser)
g_signal_connect (view, "context-menu", G_CALLBACK (menu_cb), NULL);
else
- {
- g_signal_connect (view, "document-load-finished", G_CALLBACK (loaded_cb), NULL);
- g_signal_connect (view, "navigation-policy-decision-requested", G_CALLBACK (link_cb), NULL);
- }
+ g_signal_connect (view, "document-load-finished", G_CALLBACK (loaded_cb), NULL);
sess = webkit_get_default_session ();
soup_session_add_feature_by_type (sess, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
g_object_set (G_OBJECT (sess), SOUP_SESSION_ACCEPT_LANGUAGE_AUTO, TRUE, NULL);
gtk_widget_show_all (sw);
-
+ gtk_widget_grab_focus (GTK_WIDGET (view));
+
if (options.html_data.uri)
load_uri (options.html_data.uri);
else if (!options.html_data.browser)
diff -Nru yad-0.28.1/src/main.c yad-0.29.0/src/main.c
--- yad-0.28.1/src/main.c 2015-03-02 15:21:04.000000000 +0000
+++ yad-0.29.0/src/main.c 2015-07-15 12:21:53.000000000 +0000
@@ -120,6 +120,19 @@
}
#endif
+static void
+ignore_close_cb (GtkWidget *w, gpointer data)
+{
+ g_signal_stop_emission_by_name (G_OBJECT (w), "close");
+}
+
+static void
+html_response_cb (GtkDialog *dlg, gint id, gint *data)
+{
+ *data = id;
+ gtk_main_quit ();
+}
+
GtkWidget *
create_dialog (void)
{
@@ -139,6 +152,9 @@
#endif
gtk_widget_set_name (dlg, "yad-dialog-window");
+ if (options.data.no_escape)
+ g_signal_connect (G_OBJECT (dlg), "close", G_CALLBACK (ignore_close_cb) , NULL);
+
/* get buttons container */
bbox = gtk_dialog_get_action_area (GTK_DIALOG (dlg));
@@ -736,15 +752,30 @@
case YAD_MODE_ABOUT:
ret = yad_about ();
break;
+
case YAD_MODE_VERSION:
- g_print ("%s\n", VERSION);
+ g_print ("%s (GTK+ %d.%d.%d)\n", VERSION, gtk_major_version, gtk_minor_version, gtk_micro_version);
break;
+
case YAD_MODE_NOTIFICATION:
ret = yad_notification_run ();
break;
+
case YAD_MODE_PRINT:
ret = yad_print_run ();
break;
+
+ case YAD_MODE_HTML:
+ /* Webkit doesn't handle focus for child dialogs when gtk_dialog_run() is used */
+ /* FIXME: maybe this solution must be expanded to all dialogs */
+ dialog = create_dialog ();
+ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (html_response_cb), &ret);
+
+ gtk_widget_show_all (dialog);
+
+ gtk_main ();
+ break;
+
default:
dialog = create_dialog ();
diff -Nru yad-0.28.1/src/option.c yad-0.29.0/src/option.c
--- yad-0.28.1/src/option.c 2015-03-06 09:59:50.000000000 +0000
+++ yad-0.29.0/src/option.c 2015-07-02 11:38:37.000000000 +0000
@@ -170,6 +170,12 @@
&options.data.no_markup,
N_("Don't use pango markup language in dialog's text"),
NULL},
+ {"no-escape", 0,
+ 0,
+ G_OPTION_ARG_NONE,
+ &options.data.no_escape,
+ N_("Don't close dialog if Escape was pressed"),
+ NULL},
#if !GTK_CHECK_VERSION(2,22,0)
{"dialog-sep", 0,
0,
@@ -1849,6 +1855,7 @@
#endif
options.data.borders = -1;
options.data.no_markup = FALSE;
+ options.data.no_escape = FALSE;
options.data.always_print = FALSE;
options.data.selectable_labels = FALSE;
diff -Nru yad-0.28.1/src/util.c yad-0.29.0/src/util.c
--- yad-0.28.1/src/util.c 2015-03-05 14:15:09.000000000 +0000
+++ yad-0.29.0/src/util.c 2015-05-04 11:02:22.000000000 +0000
@@ -205,19 +205,6 @@
return pb;
}
-#ifdef __clang__
-extern inline void
-#else
-inline void
-#endif
-strip_new_line (gchar * str)
-{
- gint nl = strlen (str) - 1;
-
- if (str[nl] == '\n')
- str[nl] = '\0';
-}
-
gchar **
split_arg (const gchar * str)
{
diff -Nru yad-0.28.1/src/yad.h yad-0.29.0/src/yad.h
--- yad-0.28.1/src/yad.h 2015-03-06 09:58:37.000000000 +0000
+++ yad-0.29.0/src/yad.h 2015-07-02 11:38:37.000000000 +0000
@@ -176,6 +176,7 @@
GSList *buttons;
gboolean no_buttons;
gboolean no_markup;
+ gboolean no_escape;
gboolean always_print;
gboolean selectable_labels;
GtkButtonBoxStyle buttons_layout;
@@ -487,12 +488,6 @@
GdkPixbuf *get_pixbuf (gchar * name, YadIconSize size);
-#ifdef __clang__
-extern inline void strip_new_line (gchar * str);
-#else
-inline void strip_new_line (gchar * str);
-#endif
-
gchar **split_arg (const gchar * str);
YadNTabs *get_tabs (key_t key, gboolean create);
@@ -501,6 +496,14 @@
char *escape_str (char *str);
+static inline void
+strip_new_line (gchar * str) {
+ gint nl = strlen (str) - 1;
+
+ if (str[nl] == '\n')
+ str[nl] = '\0';
+}
+
G_END_DECLS
#endif /* _YAD_H_ */