diff -Nru flush-0.9.9/aclocal.m4 flush-0.9.10/aclocal.m4 --- flush-0.9.9/aclocal.m4 2010-10-21 19:05:33.000000000 +0000 +++ flush-0.9.10/aclocal.m4 2011-03-05 14:44:41.000000000 +0000 @@ -1159,10 +1159,10 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/acx_pthread.m4]) m4_include([m4/ax_boost_base.m4]) m4_include([m4/ax_boost_filesystem.m4]) m4_include([m4/ax_boost_signals.m4]) +m4_include([m4/ax_boost_system.m4]) m4_include([m4/ax_boost_thread.m4]) m4_include([m4/check_ssl.m4]) m4_include([m4/gettext.m4]) diff -Nru flush-0.9.9/ChangeLog flush-0.9.10/ChangeLog --- flush-0.9.9/ChangeLog 2010-10-21 19:05:20.000000000 +0000 +++ flush-0.9.10/ChangeLog 2011-03-05 14:39:58.000000000 +0000 @@ -1,3 +1,13 @@ +0.9.10 (2010.03.05) +----- +[+] Support of Boost 1.46. +[+] Support of gtkmm 2.24. +[+] Support of libnotify 0.7.1. +[+] Updated Spanish and added German translations. +[-] Removed bundled libconfig and libtorrent which are not needed anymore, +because every modern distributive has them. + + 0.9.9 (2010.10.21) ----- [+] Translations update. diff -Nru flush-0.9.9/config.h.in flush-0.9.10/config.h.in --- flush-0.9.9/config.h.in 2010-10-21 19:06:54.000000000 +0000 +++ flush-0.9.10/config.h.in 2011-03-05 14:46:11.000000000 +0000 @@ -42,6 +42,9 @@ /* define if the Boost::Signals library is available */ #undef HAVE_BOOST_SIGNALS +/* define if the Boost::System library is available */ +#undef HAVE_BOOST_SYSTEM + /* define if the Boost::Thread library is available */ #undef HAVE_BOOST_THREAD @@ -69,9 +72,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H -/* Define if you have POSIX threads libraries and header files. */ -#undef HAVE_PTHREAD - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -154,10 +154,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to the necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS diff -Nru flush-0.9.9/configure flush-0.9.10/configure --- flush-0.9.9/configure 2010-10-21 19:05:49.000000000 +0000 +++ flush-0.9.10/configure 2011-03-05 14:44:47.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for Flush 0.9.9. +# Generated by GNU Autoconf 2.67 for Flush 0.9.10. # # Report bugs to . # @@ -552,8 +552,8 @@ # Identity of this package. PACKAGE_NAME='Flush' PACKAGE_TARNAME='flush' -PACKAGE_VERSION='0.9.9' -PACKAGE_STRING='Flush 0.9.9' +PACKAGE_VERSION='0.9.10' +PACKAGE_STRING='Flush 0.9.10' PACKAGE_BUGREPORT='konishchev@gmail.com' PACKAGE_URL='' @@ -646,17 +646,13 @@ MLIB_DEBUG_MODE_TRUE DEVELOP_MODE_FALSE DEVELOP_MODE_TRUE -libtorrent_rasterbar_LIBS -libtorrent_rasterbar_CFLAGS -PTHREAD_CFLAGS -PTHREAD_LIBS -PTHREAD_CC -acx_pthread_config HAVE_SSL SSL_LDFLAGS SSL_LIBS SSL_CXXFLAGS SSL_CFLAGS +libtorrent_rasterbar_LIBS +libtorrent_rasterbar_CFLAGS libnotify_LIBS libnotify_CFLAGS libconfig_LIBS @@ -668,6 +664,7 @@ DBUSXX_XML2CPP dbus_LIBS dbus_CFLAGS +BOOST_SYSTEM_LIB BOOST_THREAD_LIB BOOST_FILESYSTEM_LIB BOOST_LDFLAGS @@ -796,13 +793,11 @@ with_libintl_prefix enable_debug_mode enable_develop_mode -enable_bundle_package -enable_system_libconfig -enable_system_libtorrent with_boost with_boost_libdir with_boost_filesystem with_boost_thread +with_boost_system with_ssl with_boost_signals ' @@ -839,9 +834,7 @@ glademm_LIBS sqlite3_CFLAGS sqlite3_LIBS' -ac_subdirs_all='dbus-c++ -libconfig -libtorrent' +ac_subdirs_all='dbus-c++' # Initialize some variables set by options. ac_init_help= @@ -1383,7 +1376,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 Flush 0.9.9 to adapt to many kinds of systems. +\`configure' configures Flush 0.9.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1453,7 +1446,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Flush 0.9.9:";; + short | recursive ) echo "Configuration of Flush 0.9.10:";; esac cat <<\_ACEOF @@ -1468,16 +1461,6 @@ --enable-debug-mode enable debug mode for application --enable-develop-mode enable develop mode for application (this mode is only for developer usage) - --disable-bundle-package - disable creating bundle package which includes - libconfig and libtorrent-rasterbar (only for package - creating) - --enable-system-libconfig - use system libconfig library (only for bundle - package) - --enable-system-libtorrent - use system libtorrent-rasterbar library (only for - bundle package) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1504,6 +1487,10 @@ use the Thread library from boost - it is possible to specify a certain library for the linker e.g. --with-boost-thread=boost_thread-gcc-mt + --with-boost-system[=special-lib] + use the System library from boost - it is possible + to specify a certain library for the linker e.g. + --with-boost-system=boost_system-gcc-mt --with-ssl enable ssl will check /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr @@ -1628,7 +1615,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Flush configure 0.9.9 +Flush configure 0.9.10 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1806,52 +1793,6 @@ } # ac_fn_cxx_try_run -# 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 || - $as_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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - # ac_fn_cxx_try_cpp LINENO # ------------------------ # Try to preprocess conftest.$ac_ext, and return whether this succeeded. @@ -2014,7 +1955,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Flush $as_me 0.9.9, which was +It was created by Flush $as_me 0.9.10, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2838,7 +2779,7 @@ # Define the identity of the package. PACKAGE='flush' - VERSION='0.9.9' + VERSION='0.9.10' cat >>confdefs.h <<_ACEOF @@ -6562,28 +6503,6 @@ - libconfig_dir_name="libconfig" - libconfig_package_dir="$srcdir/$libconfig_dir_name" - - if test -d "$libconfig_package_dir" - then - package_libconfig=yes - else - package_libconfig=no - fi - - libtorrent_dir_name="libtorrent" - libtorrent_package_dir="$srcdir/$libtorrent_dir_name" - - if test -d "$libtorrent_package_dir" - then - package_libtorrent=yes - else - package_libtorrent=no - fi - - - # Check whether --enable-debug_mode was given. if test "${enable_debug_mode+set}" = set; then : enableval=$enable_debug_mode; debug_mode=$enableval @@ -6602,51 +6521,6 @@ fi - # Check whether --enable-bundle_package was given. -if test "${enable_bundle_package+set}" = set; then : - enableval=$enable_bundle_package; - if test "X$enableval" = "Xyes" - then - disable_bundle_package=no - else - disable_bundle_package=yes - fi - -else - disable_bundle_package=no - -fi - - - # Check whether --enable-system_libconfig was given. -if test "${enable_system_libconfig+set}" = set; then : - enableval=$enable_system_libconfig; - if test "X$enableval" = "Xyes" - then - package_libconfig=no - else - package_libconfig=yes - fi - - -fi - - - # Check whether --enable-system_libtorrent was given. -if test "${enable_system_libtorrent+set}" = set; then : - enableval=$enable_system_libtorrent; - if test "X$enableval" = "Xyes" - then - package_libtorrent=no - else - package_libtorrent=yes - fi - - -fi - - - if test "X$develop_mode" = "Xyes" then @@ -6733,14 +6607,6 @@ fi - if test "X$disable_bundle_package" = "Xyes" - then - package_libconfig=no - package_libtorrent=no - fi - - - @@ -6808,8 +6674,6 @@ - - COMMON_CPPFLAGS='' COMMON_CFLAGS='' COMMON_CXXFLAGS='' @@ -6821,12 +6685,10 @@ APP_DEPENDENCIES='' APP_LDADD='' - COMMON_CPPFLAGS="$COMMON_CPPFLAGS -include \$(top_builddir)/config.h" APP_CPPFLAGS="$APP_CPPFLAGS -I \$(top_srcdir)/src" - if test "X$develop_mode" = "Xyes" then CXXFLAGS="$CXXFLAGS -O0 -g" @@ -6841,8 +6703,6 @@ - - # Check whether --with-boost was given. if test "${with_boost+set}" = set; then : withval=$with_boost; @@ -7630,150 +7490,283 @@ APP_LDADD="$APP_LDADD $BOOST_THREAD_LIB" -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus" >&5 -$as_echo_n "checking for dbus... " >&6; } - -if test -n "$dbus_CFLAGS"; then - pkg_cv_dbus_CFLAGS="$dbus_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_dbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$dbus_LIBS"; then - pkg_cv_dbus_LIBS="$dbus_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_dbus_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +# Check whether --with-boost-system was given. +if test "${with_boost_system+set}" = set; then : + withval=$with_boost_system; + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_system_lib="" + else + want_boost="yes" + ax_boost_user_system_lib="$withval" + fi -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes else - _pkg_short_errors_supported=no + want_boost="yes" + fi - if test $_pkg_short_errors_supported = yes; then - dbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1` - else - dbus_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$dbus_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (dbus-1) were not met: -$dbus_PKG_ERRORS + if test "x$want_boost" = "xyes"; then -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. -Alternatively, you may set the environment variables dbus_CFLAGS -and dbus_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS -Alternatively, you may set the environment variables dbus_CFLAGS -and dbus_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5 +$as_echo_n "checking whether the Boost::System library is available... " >&6; } +if test "${ax_cv_boost_system+set}" = set; then : + $as_echo_n "(cached) " >&6 else - dbus_CFLAGS=$pkg_cv_dbus_CFLAGS - dbus_LIBS=$pkg_cv_dbus_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - APP_CPPFLAGS="$APP_CPPFLAGS $dbus_CFLAGS" - APP_LDADD="$APP_LDADD $dbus_LIBS" - - DBUSXX_CPPFLAGS='-I $(top_srcdir)/dbus-c++/include' - DBUSXX_LIBRARIES='$(top_builddir)/dbus-c++/src/.libs/libdbus-c++-1.a' - DBUSXX_XML2CPP='$(top_builddir)/dbus-c++/tools/dbusxx-xml2cpp' + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + CXXFLAGS_SAVE=$CXXFLAGS - APP_CPPFLAGS="$APP_CPPFLAGS $DBUSXX_CPPFLAGS" - APP_DEPENDENCIES="$APP_DEPENDENCIES $DBUSXX_LIBRARIES" - APP_LDADD="$APP_LDADD $DBUSXX_LIBRARIES" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +boost::system::system_category + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + ax_cv_boost_system=yes +else + ax_cv_boost_system=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CXXFLAGS=$CXXFLAGS_SAVE + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "3" != "3" - then - as_fn_error $? "MLIB_SET_CUSTOM_LIBRARY usage error at line $LINENO: macros takes three arguments." "$LINENO" 5 - else - eval "mlib_dbus_cxx_is_custom=yes" - eval "mlib_dbus_cxx_CPPFLAGS='$DBUSXX_CPPFLAGS'" - eval "mlib_dbus_cxx_LDADD='$DBUSXX_LIBRARIES'" - fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5 +$as_echo "$ax_cv_boost_system" >&6; } + if test "x$ax_cv_boost_system" = "xyes"; then - APP_LDADD="$APP_LDADD $LIBINTL" +$as_echo "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread" >&5 -$as_echo_n "checking for gthread... " >&6; } + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'` -if test -n "$gthread_CFLAGS"; then - pkg_cv_gthread_CFLAGS="$gthread_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_gthread_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null` + LDFLAGS_SAVE=$LDFLAGS + if test "x$ax_boost_user_system_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break +else + link_system="no" +fi + + done + if test "x$link_system" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break +else + link_system="no" +fi + + done + fi + + else + for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do + as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5 +$as_echo_n "checking for exit in -l$ax_lib... " >&6; } +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$ax_lib $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char exit (); +int +main () +{ +return exit (); + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break +else + link_system="no" +fi + + done + + fi + if test "x$ax_lib" = "x"; then + as_fn_error $? "Could not find a version of the library!" "$LINENO" 5 + fi + if test "x$link_system" = "xno"; then + as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5 + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi + + if test -z "$BOOST_SYSTEM_LIB" + then + as_fn_error $? "Unable to find Boost.System library." "$LINENO" 5 + fi + APP_LDADD="$APP_LDADD $BOOST_SYSTEM_LIB" + + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus" >&5 +$as_echo_n "checking for dbus... " >&6; } + +if test -n "$dbus_CFLAGS"; then + pkg_cv_dbus_CFLAGS="$dbus_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_dbus_CFLAGS=`$PKG_CONFIG --cflags "dbus-1" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$gthread_LIBS"; then - pkg_cv_gthread_LIBS="$gthread_LIBS" +if test -n "$dbus_LIBS"; then + pkg_cv_dbus_LIBS="$dbus_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1\""; } >&5 + ($PKG_CONFIG --exists --print-errors "dbus-1") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_gthread_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null` + pkg_cv_dbus_LIBS=`$PKG_CONFIG --libs "dbus-1" 2>/dev/null` else pkg_failed=yes fi @@ -7793,22 +7786,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - gthread_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0" 2>&1` + dbus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1` else - gthread_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0" 2>&1` + dbus_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$gthread_PKG_ERRORS" >&5 + echo "$dbus_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gthread-2.0) were not met: + as_fn_error $? "Package requirements (dbus-1) were not met: -$gthread_PKG_ERRORS +$dbus_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables gthread_CFLAGS -and gthread_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables dbus_CFLAGS +and dbus_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -7819,53 +7812,75 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables gthread_CFLAGS -and gthread_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables dbus_CFLAGS +and dbus_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5 ; } else - gthread_CFLAGS=$pkg_cv_gthread_CFLAGS - gthread_LIBS=$pkg_cv_gthread_LIBS + dbus_CFLAGS=$pkg_cv_dbus_CFLAGS + dbus_LIBS=$pkg_cv_dbus_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - APP_CPPFLAGS="$APP_CPPFLAGS $gthread_CFLAGS" - APP_LDADD="$APP_LDADD $gthread_LIBS" + APP_CPPFLAGS="$APP_CPPFLAGS $dbus_CFLAGS" + APP_LDADD="$APP_LDADD $dbus_LIBS" + + DBUSXX_CPPFLAGS='-I $(top_srcdir)/dbus-c++/include' + DBUSXX_LIBRARIES='$(top_builddir)/dbus-c++/src/.libs/libdbus-c++-1.a' + DBUSXX_XML2CPP='$(top_builddir)/dbus-c++/tools/dbusxx-xml2cpp' + + + APP_CPPFLAGS="$APP_CPPFLAGS $DBUSXX_CPPFLAGS" + APP_DEPENDENCIES="$APP_DEPENDENCIES $DBUSXX_LIBRARIES" + APP_LDADD="$APP_LDADD $DBUSXX_LIBRARIES" + + + if test "3" != "3" + then + as_fn_error $? "MLIB_SET_CUSTOM_LIBRARY usage error at line $LINENO: macros takes three arguments." "$LINENO" 5 + else + eval "mlib_dbus_cxx_is_custom=yes" + eval "mlib_dbus_cxx_CPPFLAGS='$DBUSXX_CPPFLAGS'" + eval "mlib_dbus_cxx_LDADD='$DBUSXX_LIBRARIES'" + fi + + + APP_LDADD="$APP_LDADD $LIBINTL" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtkmm" >&5 -$as_echo_n "checking for gtkmm... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthread" >&5 +$as_echo_n "checking for gthread... " >&6; } -if test -n "$gtkmm_CFLAGS"; then - pkg_cv_gtkmm_CFLAGS="$gtkmm_CFLAGS" +if test -n "$gthread_CFLAGS"; then + pkg_cv_gthread_CFLAGS="$gthread_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtkmm-2.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_gtkmm_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4" 2>/dev/null` + pkg_cv_gthread_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$gtkmm_LIBS"; then - pkg_cv_gtkmm_LIBS="$gtkmm_LIBS" +if test -n "$gthread_LIBS"; then + pkg_cv_gthread_LIBS="$gthread_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtkmm-2.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gthread-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gthread-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_gtkmm_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4" 2>/dev/null` + pkg_cv_gthread_LIBS=`$PKG_CONFIG --libs "gthread-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -7885,22 +7900,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - gtkmm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkmm-2.4" 2>&1` + gthread_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gthread-2.0" 2>&1` else - gtkmm_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkmm-2.4" 2>&1` + gthread_PKG_ERRORS=`$PKG_CONFIG --print-errors "gthread-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$gtkmm_PKG_ERRORS" >&5 + echo "$gthread_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtkmm-2.4) were not met: + as_fn_error $? "Package requirements (gthread-2.0) were not met: -$gtkmm_PKG_ERRORS +$gthread_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables gtkmm_CFLAGS -and gtkmm_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables gthread_CFLAGS +and gthread_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -7911,684 +7926,145 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables gtkmm_CFLAGS -and gtkmm_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } -else - gtkmm_CFLAGS=$pkg_cv_gtkmm_CFLAGS - gtkmm_LIBS=$pkg_cv_gtkmm_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - APP_CPPFLAGS="$APP_CPPFLAGS $gtkmm_CFLAGS" - APP_LDADD="$APP_LDADD $gtkmm_LIBS" - - if test "X$package_libconfig" = "Xyes" - then - LIBCONFIG_CPPFLAGS="-I \$(top_srcdir)/$libconfig_dir_name" - LIBCONFIG_LIBRARIES="\$(top_builddir)/$libconfig_dir_name/.libs/libconfig++.a" - - APP_CPPFLAGS="$APP_CPPFLAGS $LIBCONFIG_CPPFLAGS" - APP_DEPENDENCIES="$APP_DEPENDENCIES $LIBCONFIG_LIBRARIES" - APP_LDADD="$APP_LDADD $LIBCONFIG_LIBRARIES" - - - if test "3" != "3" - then - as_fn_error $? "MLIB_SET_CUSTOM_LIBRARY usage error at line $LINENO: macros takes three arguments." "$LINENO" 5 - else - eval "mlib_libconfig_is_custom=yes" - eval "mlib_libconfig_CPPFLAGS='$LIBCONFIG_CPPFLAGS'" - eval "mlib_libconfig_LDADD='$LIBCONFIG_LIBRARIES'" - fi - - else - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libconfig" >&5 -$as_echo_n "checking for libconfig... " >&6; } - -if test -n "$libconfig_CFLAGS"; then - pkg_cv_libconfig_CFLAGS="$libconfig_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libconfig++ >= 1.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libconfig++ >= 1.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_libconfig_CFLAGS=`$PKG_CONFIG --cflags "libconfig++ >= 1.3" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$libconfig_LIBS"; then - pkg_cv_libconfig_LIBS="$libconfig_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libconfig++ >= 1.3\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libconfig++ >= 1.3") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_libconfig_LIBS=`$PKG_CONFIG --libs "libconfig++ >= 1.3" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - libconfig_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libconfig++ >= 1.3" 2>&1` - else - libconfig_PKG_ERRORS=`$PKG_CONFIG --print-errors "libconfig++ >= 1.3" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$libconfig_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libconfig++ >= 1.3) were not met: - -$libconfig_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables libconfig_CFLAGS -and libconfig_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables libconfig_CFLAGS -and libconfig_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables gthread_CFLAGS +and gthread_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5 ; } else - libconfig_CFLAGS=$pkg_cv_libconfig_CFLAGS - libconfig_LIBS=$pkg_cv_libconfig_LIBS + gthread_CFLAGS=$pkg_cv_gthread_CFLAGS + gthread_LIBS=$pkg_cv_gthread_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - APP_CPPFLAGS="$APP_CPPFLAGS $libconfig_CFLAGS" - APP_LDADD="$APP_LDADD $libconfig_LIBS" - fi + APP_CPPFLAGS="$APP_CPPFLAGS $gthread_CFLAGS" + APP_LDADD="$APP_LDADD $gthread_LIBS" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnotify" >&5 -$as_echo_n "checking for libnotify... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtkmm" >&5 +$as_echo_n "checking for gtkmm... " >&6; } -if test -n "$libnotify_CFLAGS"; then - pkg_cv_libnotify_CFLAGS="$libnotify_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_libnotify_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$libnotify_LIBS"; then - pkg_cv_libnotify_LIBS="$libnotify_LIBS" +if test -n "$gtkmm_CFLAGS"; then + pkg_cv_gtkmm_CFLAGS="$gtkmm_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_libnotify_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - libnotify_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1` - else - libnotify_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$libnotify_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libnotify) were not met: - -$libnotify_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables libnotify_CFLAGS -and libnotify_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables libnotify_CFLAGS -and libnotify_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5 ; } -else - libnotify_CFLAGS=$pkg_cv_libnotify_CFLAGS - libnotify_LIBS=$pkg_cv_libnotify_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - APP_CPPFLAGS="$APP_CPPFLAGS $libnotify_CFLAGS" - APP_LDADD="$APP_LDADD $libnotify_LIBS" - - if test "X$package_libtorrent" = "Xyes" - then - - -# Check whether --with-ssl was given. -if test "${with_ssl+set}" = set; then : - withval=$with_ssl; -fi - - for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do - ssldir="$dir" - if test -f "$dir/include/openssl/ssl.h"; then - found_ssl="yes"; - SSL_CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; - - SSL_CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; - - break; - fi - if test -f "$dir/include/ssl.h"; then - found_ssl="yes"; - SSL_CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL"; - - SSL_CXXFLAGS="$CXXFLAGS -I$ssldir/include/ -DHAVE_SSL"; - - break - fi - done - if test x_$found_ssl != x_yes; then - as_fn_error $? "Cannot find ssl libraries" "$LINENO" 5 - else - printf "OpenSSL found in $ssldir\n"; - SSL_LIBS="$LIBS -lssl -lcrypto"; - - SSL_LDFLAGS="$LDFLAGS -L$ssldir/lib"; - - HAVE_SSL=yes - fi - - - LIBTORRENT_CPPFLAGS="$SSL_CXXFLAGS" - LIBTORRENT_LDADD="$SSL_LDFLAGS $SSL_LIBS" - - - - - -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 - -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5 -$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_join (); -int -main () -{ -return pthread_join (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthread or - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5 -$as_echo_n "checking whether pthreads work without any flags... " >&6; } - ;; - - -*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5 -$as_echo_n "checking whether pthreads work with $flag... " >&6; } - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. -set dummy pthread-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_acx_pthread_config+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$acx_pthread_config"; then - ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_acx_pthread_config="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" -fi -fi -acx_pthread_config=$ac_cv_prog_acx_pthread_config -if test -n "$acx_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 -$as_echo "$acx_pthread_config" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 -$as_echo_n "checking for the pthreads library -l$flag... " >&6; } - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: threads are created detached by default - # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 -$as_echo_n "checking for joinable pthread attribute... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int attr=PTHREAD_CREATE_JOINABLE; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ok=PTHREAD_CREATE_JOINABLE -else - ok=unknown -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test x"$ok" = xunknown; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -int attr=PTHREAD_CREATE_UNDETACHED; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ok=PTHREAD_CREATE_UNDETACHED -else - ok=unknown -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi - if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then - -$as_echo "#define PTHREAD_CREATE_JOINABLE \$ok" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ok}" >&5 -$as_echo "${ok}" >&6; } - if test x"$ok" = xunknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: we do not know how to create joinable pthreads" >&5 -$as_echo "$as_me: WARNING: we do not know how to create joinable pthreads" >&2;} - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 -$as_echo_n "checking if more special flags are required for pthreads... " >&6; } - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 -$as_echo "${flag}" >&6; } - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with cc_r - # Extract the first word of "cc_r", so it can be a program name with args. -set dummy cc_r; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$PTHREAD_CC"; then - ac_cv_prog_PTHREAD_CC="$PTHREAD_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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PTHREAD_CC="cc_r" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_PTHREAD_CC" && ac_cv_prog_PTHREAD_CC="${CC}" + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtkmm-2.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_gtkmm_CFLAGS=`$PKG_CONFIG --cflags "gtkmm-2.4" 2>/dev/null` +else + pkg_failed=yes fi + else + pkg_failed=untried fi -PTHREAD_CC=$ac_cv_prog_PTHREAD_CC -if test -n "$PTHREAD_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5 -$as_echo "$PTHREAD_CC" >&6; } +if test -n "$gtkmm_LIBS"; then + pkg_cv_gtkmm_LIBS="$gtkmm_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtkmm-2.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtkmm-2.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_gtkmm_LIBS=`$PKG_CONFIG --libs "gtkmm-2.4" 2>/dev/null` else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + pkg_failed=yes +fi + else + pkg_failed=untried fi + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - PTHREAD_CC="$CC" + _pkg_short_errors_supported=no fi + if test $_pkg_short_errors_supported = yes; then + gtkmm_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtkmm-2.4" 2>&1` + else + gtkmm_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtkmm-2.4" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$gtkmm_PKG_ERRORS" >&5 + as_fn_error $? "Package requirements (gtkmm-2.4) were not met: +$gtkmm_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. +Alternatively, you may set the environment variables gtkmm_CFLAGS +and gtkmm_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - -$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h +Alternatively, you may set the environment variables gtkmm_CFLAGS +and gtkmm_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. - : +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5 ; } else - acx_pthread_ok=no + gtkmm_CFLAGS=$pkg_cv_gtkmm_CFLAGS + gtkmm_LIBS=$pkg_cv_gtkmm_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi -ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS $PTHREAD_CFLAGS" - LIBTORRENT_LDADD="$LIBTORRENT_LDADD $PTHREAD_LIBS" - - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS -DTORRENT_USE_OPENSSL" - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS -I \$(top_srcdir)/$libtorrent_dir_name/include" - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS -I \$(top_srcdir)/$libtorrent_dir_name/include/libtorrent" - LIBTORRENT_LIBRARIES="\$(top_builddir)/$libtorrent_dir_name/src/.libs/libtorrent-rasterbar.a" - LIBTORRENT_LDADD="$LIBTORRENT_LDADD $LIBTORRENT_LIBRARIES -lrt" - - APP_CPPFLAGS="$APP_CPPFLAGS $LIBTORRENT_CPPFLAGS" - APP_DEPENDENCIES="$APP_DEPENDENCIES $LIBTORRENT_LIBRARIES" - APP_LDADD="$APP_LDADD $LIBTORRENT_LDADD" - - - if test "3" != "3" - then - as_fn_error $? "MLIB_SET_CUSTOM_LIBRARY usage error at line $LINENO: macros takes three arguments." "$LINENO" 5 - else - eval "mlib_libtorrent_is_custom=yes" - eval "mlib_libtorrent_CPPFLAGS='$LIBTORRENT_CPPFLAGS'" - eval "mlib_libtorrent_LDADD='$LIBTORRENT_LDADD'" - fi + APP_CPPFLAGS="$APP_CPPFLAGS $gtkmm_CFLAGS" + APP_LDADD="$APP_LDADD $gtkmm_LIBS" - else pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtorrent_rasterbar" >&5 -$as_echo_n "checking for libtorrent_rasterbar... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libconfig" >&5 +$as_echo_n "checking for libconfig... " >&6; } -if test -n "$libtorrent_rasterbar_CFLAGS"; then - pkg_cv_libtorrent_rasterbar_CFLAGS="$libtorrent_rasterbar_CFLAGS" +if test -n "$libconfig_CFLAGS"; then + pkg_cv_libconfig_CFLAGS="$libconfig_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar-0.14 >= 0.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar-0.14 >= 0.14") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libconfig++ >= 1.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libconfig++ >= 1.3") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libtorrent_rasterbar_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar-0.14 >= 0.14" 2>/dev/null` + pkg_cv_libconfig_CFLAGS=`$PKG_CONFIG --cflags "libconfig++ >= 1.3" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$libtorrent_rasterbar_LIBS"; then - pkg_cv_libtorrent_rasterbar_LIBS="$libtorrent_rasterbar_LIBS" +if test -n "$libconfig_LIBS"; then + pkg_cv_libconfig_LIBS="$libconfig_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar-0.14 >= 0.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar-0.14 >= 0.14") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libconfig++ >= 1.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libconfig++ >= 1.3") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libtorrent_rasterbar_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar-0.14 >= 0.14" 2>/dev/null` + pkg_cv_libconfig_LIBS=`$PKG_CONFIG --libs "libconfig++ >= 1.3" 2>/dev/null` else pkg_failed=yes fi @@ -8608,45 +8084,79 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libtorrent_rasterbar_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libtorrent-rasterbar-0.14 >= 0.14" 2>&1` + libconfig_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libconfig++ >= 1.3" 2>&1` else - libtorrent_rasterbar_PKG_ERRORS=`$PKG_CONFIG --print-errors "libtorrent-rasterbar-0.14 >= 0.14" 2>&1` + libconfig_PKG_ERRORS=`$PKG_CONFIG --print-errors "libconfig++ >= 1.3" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$libtorrent_rasterbar_PKG_ERRORS" >&5 + echo "$libconfig_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libconfig++ >= 1.3) were not met: + +$libconfig_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables libconfig_CFLAGS +and libconfig_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables libconfig_CFLAGS +and libconfig_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5 ; } +else + libconfig_CFLAGS=$pkg_cv_libconfig_CFLAGS + libconfig_LIBS=$pkg_cv_libconfig_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +fi + APP_CPPFLAGS="$APP_CPPFLAGS $libconfig_CFLAGS" + APP_LDADD="$APP_LDADD $libconfig_LIBS" pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libtorrent_rasterbar" >&5 -$as_echo_n "checking for libtorrent_rasterbar... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnotify" >&5 +$as_echo_n "checking for libnotify... " >&6; } -if test -n "$libtorrent_rasterbar_CFLAGS"; then - pkg_cv_libtorrent_rasterbar_CFLAGS="$libtorrent_rasterbar_CFLAGS" +if test -n "$libnotify_CFLAGS"; then + pkg_cv_libnotify_CFLAGS="$libnotify_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 0.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.14") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libtorrent_rasterbar_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 0.14" 2>/dev/null` + pkg_cv_libnotify_CFLAGS=`$PKG_CONFIG --cflags "libnotify" 2>/dev/null` else pkg_failed=yes fi else pkg_failed=untried fi -if test -n "$libtorrent_rasterbar_LIBS"; then - pkg_cv_libtorrent_rasterbar_LIBS="$libtorrent_rasterbar_LIBS" +if test -n "$libnotify_LIBS"; then + pkg_cv_libnotify_LIBS="$libnotify_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 0.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 0.14") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libtorrent_rasterbar_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 0.14" 2>/dev/null` + pkg_cv_libnotify_LIBS=`$PKG_CONFIG --libs "libnotify" 2>/dev/null` else pkg_failed=yes fi @@ -8666,22 +8176,22 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libtorrent_rasterbar_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libtorrent-rasterbar >= 0.14" 2>&1` + libnotify_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify" 2>&1` else - libtorrent_rasterbar_PKG_ERRORS=`$PKG_CONFIG --print-errors "libtorrent-rasterbar >= 0.14" 2>&1` + libnotify_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$libtorrent_rasterbar_PKG_ERRORS" >&5 + echo "$libnotify_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libtorrent-rasterbar >= 0.14) were not met: + as_fn_error $? "Package requirements (libnotify) were not met: -$libtorrent_rasterbar_PKG_ERRORS +$libnotify_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables libtorrent_rasterbar_CFLAGS -and libtorrent_rasterbar_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables libnotify_CFLAGS +and libnotify_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -8692,23 +8202,21 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables libtorrent_rasterbar_CFLAGS -and libtorrent_rasterbar_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables libnotify_CFLAGS +and libnotify_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5 ; } else - libtorrent_rasterbar_CFLAGS=$pkg_cv_libtorrent_rasterbar_CFLAGS - libtorrent_rasterbar_LIBS=$pkg_cv_libtorrent_rasterbar_LIBS + libnotify_CFLAGS=$pkg_cv_libnotify_CFLAGS + libnotify_LIBS=$pkg_cv_libnotify_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } fi - -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + APP_CPPFLAGS="$APP_CPPFLAGS $libnotify_CFLAGS" + APP_LDADD="$APP_LDADD $libnotify_LIBS" pkg_failed=no @@ -8799,25 +8307,54 @@ $as_echo "yes" >&6; } fi + APP_CPPFLAGS="$APP_CPPFLAGS $libtorrent_rasterbar_CFLAGS" + APP_LDADD="$APP_LDADD $libtorrent_rasterbar_LIBS" -else - libtorrent_rasterbar_CFLAGS=$pkg_cv_libtorrent_rasterbar_CFLAGS - libtorrent_rasterbar_LIBS=$pkg_cv_libtorrent_rasterbar_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + +# Check whether --with-ssl was given. +if test "${with_ssl+set}" = set; then : + withval=$with_ssl; fi - APP_CPPFLAGS="$APP_CPPFLAGS $libtorrent_rasterbar_CFLAGS" - APP_LDADD="$APP_LDADD $libtorrent_rasterbar_LIBS" - fi + for dir in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do + ssldir="$dir" + if test -f "$dir/include/openssl/ssl.h"; then + found_ssl="yes"; + SSL_CFLAGS="$CFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; + + SSL_CXXFLAGS="$CXXFLAGS -I$ssldir/include/openssl -DHAVE_SSL"; + + break; + fi + if test -f "$dir/include/ssl.h"; then + found_ssl="yes"; + SSL_CFLAGS="$CFLAGS -I$ssldir/include/ -DHAVE_SSL"; + + SSL_CXXFLAGS="$CXXFLAGS -I$ssldir/include/ -DHAVE_SSL"; + break + fi + done + if test x_$found_ssl != x_yes; then + as_fn_error $? "Cannot find ssl libraries" "$LINENO" 5 + else + printf "OpenSSL found in $ssldir\n"; + SSL_LIBS="$LIBS -lssl -lcrypto"; + + SSL_LDFLAGS="$LDFLAGS -L$ssldir/lib"; + + HAVE_SSL=yes + fi + + + APP_CPPFLAGS="$APP_CPPFLAGS $SSL_CXXFLAGS" + APP_LDADD="$APP_LDADD $SSL_LDFLAGS $SSL_LIBS" MLIB_CPPFLAGS="$COMMON_CPPFLAGS $MLIB_CPPFLAGS" MLIB_CFLAGS="$COMMON_CPPFLAGS $MLIB_CFLAGS" MLIB_CXXFLAGS="$COMMON_CXXFLAGS $MLIB_CXXFLAGS" - if test "X$develop_mode" = "Xyes"; then DEVELOP_MODE_TRUE= DEVELOP_MODE_FALSE='#' @@ -8828,7 +8365,6 @@ - if test "1" != "1" then as_fn_error $? "MLIB_FEATURE_ENABLE usage error at line $LINENO: macros takes one argument." "$LINENO" 5 @@ -9132,7 +8668,6 @@ as_fn_error $? "MLIB_FEATURE_ENABLE usage error at line $LINENO: unknown feature name '$mlib_feature'." "$LINENO" 5 esac - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -11701,7 +11236,6 @@ $as_echo "$as_me: mlib have been successfully configured." >&6;} - APP_CPPFLAGS="$MLIB_CPPFLAGS $APP_CPPFLAGS" APP_CFLAGS="$MLIB_CFLAGS $APP_CFLAGS" APP_CXXFLAGS="$MLIB_CXXFLAGS $APP_CXXFLAGS" @@ -11714,46 +11248,21 @@ - - PACKAGE_LIBRARIES_SUBDIRS="dbus-c++" +PACKAGE_LIBRARIES_SUBDIRS="dbus-c++" subdirs="$subdirs dbus-c++" - if test "X$package_libconfig" = "Xyes" - then - PACKAGE_LIBRARIES_SUBDIRS="$PACKAGE_LIBRARIES_SUBDIRS $libconfig_dir_name" - subdirs="$subdirs libconfig" - - fi - - if test "X$package_libtorrent" = "Xyes" - then - PACKAGE_LIBRARIES_SUBDIRS="$PACKAGE_LIBRARIES_SUBDIRS $libtorrent_dir_name" - subdirs="$subdirs libtorrent" - - fi - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: debug mode: $debug_mode" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: debug mode: $debug_mode" >&5 $as_echo "$as_me: debug mode: $debug_mode" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: develop mode: $develop_mode" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: develop mode: $develop_mode" >&5 $as_echo "$as_me: develop mode: $develop_mode" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: disable bundle package: $disable_bundle_package" >&5 -$as_echo "$as_me: disable bundle package: $disable_bundle_package" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: using package libconfig: $package_libconfig" >&5 -$as_echo "$as_me: using package libconfig: $package_libconfig" >&6;} - { $as_echo "$as_me:${as_lineno-$LINENO}: using package libtorrent: $package_libtorrent" >&5 -$as_echo "$as_me: using package libtorrent: $package_libtorrent" >&6;} - ac_config_files="$ac_config_files icons/Makefile man/Makefile man/ru/Makefile po/Makefile.in src/Makefile ui/Makefile flush.desktop Makefile" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -12328,7 +11837,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Flush $as_me 0.9.9, which was +This file was extended by Flush $as_me 0.9.10, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12394,7 +11903,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Flush config.status 0.9.9 +Flush config.status 0.9.10 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -Nru flush-0.9.9/configure.ac flush-0.9.10/configure.ac --- flush-0.9.9/configure.ac 2010-10-21 19:05:27.000000000 +0000 +++ flush-0.9.10/configure.ac 2011-03-05 14:44:34.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([Flush], [0.9.9], [konishchev@gmail.com]) +AC_INIT([Flush], [0.9.10], [konishchev@gmail.com]) AC_CONFIG_SRCDIR([src/main.cpp]) @@ -28,33 +28,7 @@ MLIB_INIT -dnl libconfig --> - libconfig_dir_name="libconfig" - libconfig_package_dir="$srcdir/$libconfig_dir_name" - - if test -d "$libconfig_package_dir" - then - package_libconfig=yes - else - package_libconfig=no - fi -dnl libconfig <-- - -dnl libtorrent --> - libtorrent_dir_name="libtorrent" - libtorrent_package_dir="$srcdir/$libtorrent_dir_name" - - if test -d "$libtorrent_package_dir" - then - package_libtorrent=yes - else - package_libtorrent=no - fi -dnl libtorrent <-- - - dnl Configuring command line options --> - AC_ARG_ENABLE(debug_mode, [AS_HELP_STRING([--enable-debug-mode], [enable debug mode for application])], @@ -69,47 +43,6 @@ [develop_mode=no] ) - AC_ARG_ENABLE(bundle_package, - [AS_HELP_STRING([--disable-bundle-package], - [disable creating bundle package which includes libconfig and libtorrent-rasterbar (only for package creating)])], - [ - if test "X$enableval" = "Xyes" - then - disable_bundle_package=no - else - disable_bundle_package=yes - fi - ], - [disable_bundle_package=no] - ) - - AC_ARG_ENABLE([system_libconfig], - [AS_HELP_STRING([--enable-system-libconfig], - [use system libconfig library (only for bundle package)])], - [ - if test "X$enableval" = "Xyes" - then - package_libconfig=no - else - package_libconfig=yes - fi - ] - ) - - AC_ARG_ENABLE([system_libtorrent], - [AS_HELP_STRING([--enable-system-libtorrent], - [use system libtorrent-rasterbar library (only for bundle package)])], - [ - if test "X$enableval" = "Xyes" - then - package_libtorrent=no - else - package_libtorrent=yes - fi - ] - ) - - if test "X$develop_mode" = "Xyes" then MLIB_FEATURE_ENABLE([[develop_mode]]) @@ -122,18 +55,10 @@ then MLIB_FEATURE_ENABLE([[debug_mode]]) fi - - if test "X$disable_bundle_package" = "Xyes" - then - package_libconfig=no - package_libtorrent=no - fi - dnl Configuring command line options <-- dnl config.h --> - AH_TOP([ #ifndef HEADER_CONFIG #define HEADER_CONFIG @@ -181,12 +106,10 @@ AH_BOTTOM([ #endif ]) - dnl config.h <-- dnl Compiler flags --> - dnl Clearing all flags --> COMMON_CPPFLAGS='' COMMON_CFLAGS='' @@ -200,13 +123,11 @@ APP_LDADD='' dnl Clearing all flags <-- - dnl Including config.h anywhere COMMON_CPPFLAGS="$COMMON_CPPFLAGS -include \$(top_builddir)/config.h" APP_CPPFLAGS="$APP_CPPFLAGS -I \$(top_srcdir)/src" - dnl Develop mode flags --> if test "X$develop_mode" = "Xyes" then @@ -224,9 +145,7 @@ fi dnl Develop mode flags <-- - dnl Libraries --> - dnl boost --> AX_BOOST_BASE([1.34]) if test -z "$BOOST_LDFLAGS" @@ -249,6 +168,13 @@ AC_MSG_ERROR([Unable to find Boost.Thread library.]) fi APP_LDADD="$APP_LDADD $BOOST_THREAD_LIB" + + AX_BOOST_SYSTEM + if test -z "$BOOST_SYSTEM_LIB" + then + AC_MSG_ERROR([Unable to find Boost.System library.]) + fi + APP_LDADD="$APP_LDADD $BOOST_SYSTEM_LIB" dnl boost <-- dnl DBus --> @@ -281,21 +207,9 @@ dnl GTK <-- dnl libconfig --> - if test "X$package_libconfig" = "Xyes" - then - LIBCONFIG_CPPFLAGS="-I \$(top_srcdir)/$libconfig_dir_name" - LIBCONFIG_LIBRARIES="\$(top_builddir)/$libconfig_dir_name/.libs/libconfig++.a" - - APP_CPPFLAGS="$APP_CPPFLAGS $LIBCONFIG_CPPFLAGS" - APP_DEPENDENCIES="$APP_DEPENDENCIES $LIBCONFIG_LIBRARIES" - APP_LDADD="$APP_LDADD $LIBCONFIG_LIBRARIES" - - MLIB_SET_CUSTOM_LIBRARY([[libconfig]], [[$LIBCONFIG_CPPFLAGS]], [[$LIBCONFIG_LIBRARIES]]) - else - PKG_CHECK_MODULES([libconfig], [libconfig++ >= 1.3]) - APP_CPPFLAGS="$APP_CPPFLAGS $libconfig_CFLAGS" - APP_LDADD="$APP_LDADD $libconfig_LIBS" - fi + PKG_CHECK_MODULES([libconfig], [libconfig++ >= 1.3]) + APP_CPPFLAGS="$APP_CPPFLAGS $libconfig_CFLAGS" + APP_LDADD="$APP_LDADD $libconfig_LIBS" dnl libconfig <-- dnl libnotify --> @@ -305,39 +219,16 @@ dnl libnotify <-- dnl libtorrent --> - if test "X$package_libtorrent" = "Xyes" - then - CHECK_SSL - LIBTORRENT_CPPFLAGS="$SSL_CXXFLAGS" - LIBTORRENT_LDADD="$SSL_LDFLAGS $SSL_LIBS" - - ACX_PTHREAD - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS $PTHREAD_CFLAGS" - LIBTORRENT_LDADD="$LIBTORRENT_LDADD $PTHREAD_LIBS" - - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS -DTORRENT_USE_OPENSSL" - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS -I \$(top_srcdir)/$libtorrent_dir_name/include" - LIBTORRENT_CPPFLAGS="$LIBTORRENT_CPPFLAGS -I \$(top_srcdir)/$libtorrent_dir_name/include/libtorrent" - LIBTORRENT_LIBRARIES="\$(top_builddir)/$libtorrent_dir_name/src/.libs/libtorrent-rasterbar.a" - LIBTORRENT_LDADD="$LIBTORRENT_LDADD $LIBTORRENT_LIBRARIES -lrt" - - APP_CPPFLAGS="$APP_CPPFLAGS $LIBTORRENT_CPPFLAGS" - APP_DEPENDENCIES="$APP_DEPENDENCIES $LIBTORRENT_LIBRARIES" - APP_LDADD="$APP_LDADD $LIBTORRENT_LDADD" - - MLIB_SET_CUSTOM_LIBRARY([[libtorrent]], [[$LIBTORRENT_CPPFLAGS]], [[$LIBTORRENT_LDADD]]) - else - dnl TODO: remove bad named libtorrent-rasterbar-0.14 when it package - dnl will become obsolete - PKG_CHECK_MODULES([libtorrent_rasterbar], [libtorrent-rasterbar-0.14 >= 0.14], [], [ - PKG_CHECK_MODULES([libtorrent_rasterbar], [libtorrent-rasterbar >= 0.14]) - ]) - - APP_CPPFLAGS="$APP_CPPFLAGS $libtorrent_rasterbar_CFLAGS" - APP_LDADD="$APP_LDADD $libtorrent_rasterbar_LIBS" - fi + PKG_CHECK_MODULES([libtorrent_rasterbar], [libtorrent-rasterbar >= 0.14]) + APP_CPPFLAGS="$APP_CPPFLAGS $libtorrent_rasterbar_CFLAGS" + APP_LDADD="$APP_LDADD $libtorrent_rasterbar_LIBS" dnl libtorrent <-- + dnl openssl --> + CHECK_SSL + APP_CPPFLAGS="$APP_CPPFLAGS $SSL_CXXFLAGS" + APP_LDADD="$APP_LDADD $SSL_LDFLAGS $SSL_LIBS" + dnl openssl <-- dnl Libraries <-- MLIB_CPPFLAGS="$COMMON_CPPFLAGS $MLIB_CPPFLAGS" @@ -345,11 +236,9 @@ MLIB_CXXFLAGS="$COMMON_CXXFLAGS $MLIB_CXXFLAGS" dnl Compiler flags <-- - dnl Conditionals AM_CONDITIONAL([DEVELOP_MODE], [test "X$develop_mode" = "Xyes"]) - dnl Configuring mlib --> MLIB_FEATURE_ENABLE([[async_fs]]) MLIB_FEATURE_ENABLE([[dbus]]) @@ -359,11 +248,9 @@ MLIB_FEATURE_ENABLE([[gtk_builder_emulation]]) MLIB_FEATURE_ENABLE([[libconfig]]) MLIB_FEATURE_ENABLE([[libtorrent]]) - MLIB_CONFIGURE dnl Configuring mlib <-- - dnl Application flags --> APP_CPPFLAGS="$MLIB_CPPFLAGS $APP_CPPFLAGS" APP_CFLAGS="$MLIB_CFLAGS $APP_CFLAGS" @@ -378,35 +265,14 @@ AC_SUBST([APP_LDADD]) dnl Application flags <-- - -dnl Libraries inside of package --> - PACKAGE_LIBRARIES_SUBDIRS="dbus-c++" - AC_CONFIG_SUBDIRS([dbus-c++]) - - if test "X$package_libconfig" = "Xyes" - then - PACKAGE_LIBRARIES_SUBDIRS="$PACKAGE_LIBRARIES_SUBDIRS $libconfig_dir_name" - AC_CONFIG_SUBDIRS([libconfig]) - fi - - if test "X$package_libtorrent" = "Xyes" - then - PACKAGE_LIBRARIES_SUBDIRS="$PACKAGE_LIBRARIES_SUBDIRS $libtorrent_dir_name" - AC_CONFIG_SUBDIRS([libtorrent]) - fi - - AC_SUBST([PACKAGE_LIBRARIES_SUBDIRS]) -dnl Libraries inside of package <-- - - -dnl Summary report --> - AC_MSG_NOTICE([debug mode: $debug_mode]) - AC_MSG_NOTICE([develop mode: $develop_mode]) - AC_MSG_NOTICE([disable bundle package: $disable_bundle_package]) - AC_MSG_NOTICE([using package libconfig: $package_libconfig]) - AC_MSG_NOTICE([using package libtorrent: $package_libtorrent]) -dnl Summary report <-- - +dnl Libraries inside of the package +PACKAGE_LIBRARIES_SUBDIRS="dbus-c++" +AC_CONFIG_SUBDIRS([dbus-c++]) +AC_SUBST([PACKAGE_LIBRARIES_SUBDIRS]) + +dnl Summary report +AC_MSG_NOTICE([debug mode: $debug_mode]) +AC_MSG_NOTICE([develop mode: $develop_mode]) AC_CONFIG_FILES([ icons/Makefile @@ -419,6 +285,5 @@ Makefile ]) - AC_OUTPUT diff -Nru flush-0.9.9/debian/changelog flush-0.9.10/debian/changelog --- flush-0.9.9/debian/changelog 2010-10-21 19:15:35.000000000 +0000 +++ flush-0.9.10/debian/changelog 2011-03-05 15:25:43.000000000 +0000 @@ -1,3 +1,9 @@ +flush (0.9.10-0ubuntu1~ppa1~maverick1) maverick; urgency=low + + * New upstream release. + + -- Dmitry Konishchev Sat, 05 Mar 2011 17:57:09 +0300 + flush (0.9.9-0ubuntu1~ppa1~maverick1) maverick; urgency=low * New upstream release. diff -Nru flush-0.9.9/debian/rules flush-0.9.10/debian/rules --- flush-0.9.9/debian/rules 2010-10-21 19:15:35.000000000 +0000 +++ flush-0.9.10/debian/rules 2011-03-05 15:25:43.000000000 +0000 @@ -3,4 +3,3 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -#DEB_CONFIGURE_EXTRA_FLAGS = --disable-bundle-package diff -Nru flush-0.9.9/icons/Makefile.in flush-0.9.10/icons/Makefile.in --- flush-0.9.9/icons/Makefile.in 2010-10-21 19:05:50.000000000 +0000 +++ flush-0.9.10/icons/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -42,10 +42,10 @@ $(dist_categories_16_DATA) $(dist_status_16_DATA) \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -109,6 +109,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -171,9 +172,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -194,7 +192,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/m4/acx_pthread.m4 flush-0.9.10/m4/acx_pthread.m4 --- flush-0.9.9/m4/acx_pthread.m4 2010-07-03 08:10:22.000000000 +0000 +++ flush-0.9.10/m4/acx_pthread.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,199 +0,0 @@ -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html -dnl -AC_DEFUN([ACX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_C -acx_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case "${host_cpu}-${host_os}" in - *solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthread or - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" - ;; -esac - -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_TRY_LINK([#include ], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [acx_pthread_ok=yes]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$acx_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: threads are created detached by default - # and the JOINABLE attribute has a nonstandard name (UNDETACHED). - AC_MSG_CHECKING([for joinable pthread attribute]) - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_JOINABLE;], - ok=PTHREAD_CREATE_JOINABLE, ok=unknown) - if test x"$ok" = xunknown; then - AC_TRY_LINK([#include ], - [int attr=PTHREAD_CREATE_UNDETACHED;], - ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) - fi - if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then - AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok, - [Define to the necessary symbol if this constant - uses a non-standard name on your system.]) - fi - AC_MSG_RESULT(${ok}) - if test x"$ok" = xunknown; then - AC_MSG_WARN([we do not know how to create joinable pthreads]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; - esac - AC_MSG_RESULT(${flag}) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: must compile with cc_r - AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) -else - PTHREAD_CC="$CC" -fi - -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_CC) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then - ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) - : -else - acx_pthread_ok=no - $2 -fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD diff -Nru flush-0.9.9/m4/ax_boost_system.m4 flush-0.9.10/m4/ax_boost_system.m4 --- flush-0.9.9/m4/ax_boost_system.m4 1970-01-01 00:00:00.000000000 +0000 +++ flush-0.9.10/m4/ax_boost_system.m4 2011-02-25 15:15:36.000000000 +0000 @@ -0,0 +1,120 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_boost_system.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_SYSTEM +# +# DESCRIPTION +# +# Test for System library from the Boost C++ libraries. The macro requires +# a preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_SYSTEM_LIB) +# +# And sets: +# +# HAVE_BOOST_SYSTEM +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# Copyright (c) 2008 Daniel Casimiro +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 14 + +AC_DEFUN([AX_BOOST_SYSTEM], +[ + AC_ARG_WITH([boost-system], + AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@], + [use the System library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-system=boost_system-gcc-mt ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_system_lib="" + else + want_boost="yes" + ax_boost_user_system_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::System library is available, + ax_cv_boost_system, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[boost::system::system_category]])], + ax_cv_boost_system=yes, ax_cv_boost_system=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_system" = "xyes"; then + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + LDFLAGS_SAVE=$LDFLAGS + if test "x$ax_boost_user_system_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], + [link_system="no"]) + done + if test "x$link_system" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], + [link_system="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], + [link_system="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_system" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru flush-0.9.9/Makefile.in flush-0.9.10/Makefile.in --- flush-0.9.9/Makefile.in 2010-10-21 19:05:51.000000000 +0000 +++ flush-0.9.10/Makefile.in 2011-03-05 14:44:49.000000000 +0000 @@ -42,10 +42,10 @@ build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -152,6 +152,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -214,9 +215,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -237,7 +235,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/man/Makefile.in flush-0.9.10/man/Makefile.in --- flush-0.9.9/man/Makefile.in 2010-10-21 19:05:50.000000000 +0000 +++ flush-0.9.10/man/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -37,10 +37,10 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -137,6 +137,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -199,9 +200,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -222,7 +220,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/man/ru/Makefile.in flush-0.9.10/man/ru/Makefile.in --- flush-0.9.9/man/ru/Makefile.in 2010-10-21 19:05:50.000000000 +0000 +++ flush-0.9.10/man/ru/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -37,10 +37,10 @@ DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -97,6 +97,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -159,9 +160,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -182,7 +180,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/mlib/Makefile.in flush-0.9.10/mlib/Makefile.in --- flush-0.9.9/mlib/Makefile.in 2010-10-21 19:05:50.000000000 +0000 +++ flush-0.9.10/mlib/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -36,10 +36,10 @@ subdir = mlib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -111,6 +111,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -173,9 +174,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -196,7 +194,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/mlib/mlib/base/libs_forwards/Makefile.in flush-0.9.10/mlib/mlib/base/libs_forwards/Makefile.in --- flush-0.9.9/mlib/mlib/base/libs_forwards/Makefile.in 2010-10-21 19:05:50.000000000 +0000 +++ flush-0.9.10/mlib/mlib/base/libs_forwards/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -36,10 +36,10 @@ subdir = mlib/mlib/base/libs_forwards DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -71,6 +71,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -133,9 +134,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -156,7 +154,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/mlib/mlib/base/Makefile.in flush-0.9.10/mlib/mlib/base/Makefile.in --- flush-0.9.9/mlib/mlib/base/Makefile.in 2010-10-21 19:05:50.000000000 +0000 +++ flush-0.9.10/mlib/mlib/base/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -37,10 +37,10 @@ subdir = mlib/mlib/base DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -135,6 +135,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -197,9 +198,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -220,7 +218,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/mlib/mlib/fs.cpp flush-0.9.10/mlib/mlib/fs.cpp --- flush-0.9.9/mlib/mlib/fs.cpp 2010-07-03 08:10:22.000000000 +0000 +++ flush-0.9.10/mlib/mlib/fs.cpp 2011-02-25 15:39:50.000000000 +0000 @@ -472,7 +472,7 @@ Path::Path(const Glib::ustring& path_string) - : boost_fs::path(path_string) + : boost_fs::path(path_string.raw()) { } @@ -603,7 +603,11 @@ for(; it != this->end(); it++) if(*it != "/" && *it != "." && *it != "") + #if BOOST_FILESYSTEM_VERSION < 3 path_components.push_back(*it); + #else + path_components.push_back(it->string()); + #endif } { @@ -824,7 +828,7 @@ #if BOOST_VERSION / 100 <= 1035 cp( L2U((from_path / it->leaf()).string()), L2U((to_path / it->leaf()).string()) ); #else - cp( L2U((from_path / it->filename()).string()), L2U((to_path / it->filename()).string()) ); + cp( L2U(it->path().string()), L2U((to_path / it->path().filename()).string()) ); #endif } catch(m::Exception& e) @@ -982,7 +986,7 @@ #if BOOST_VERSION / 100 <= 1035 rm( L2U((dir_path / it->leaf()).string()) ); #else - rm( L2U((dir_path / it->filename()).string()) ); + rm( L2U(it->path().string()) ); #endif } catch(m::Exception& e) diff -Nru flush-0.9.9/mlib/mlib/fs.hpp flush-0.9.10/mlib/mlib/fs.hpp --- flush-0.9.9/mlib/mlib/fs.hpp 2010-07-03 08:10:22.000000000 +0000 +++ flush-0.9.10/mlib/mlib/fs.hpp 2011-02-25 15:34:17.000000000 +0000 @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff -Nru flush-0.9.9/mlib/mlib/gtk/Makefile.in flush-0.9.10/mlib/mlib/gtk/Makefile.in --- flush-0.9.9/mlib/mlib/gtk/Makefile.in 2010-10-21 19:05:51.000000000 +0000 +++ flush-0.9.10/mlib/mlib/gtk/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -43,10 +43,10 @@ subdir = mlib/mlib/gtk DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -128,6 +128,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -190,9 +191,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -213,7 +211,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/mlib/mlib/Makefile.in flush-0.9.10/mlib/mlib/Makefile.in --- flush-0.9.9/mlib/mlib/Makefile.in 2010-10-21 19:05:50.000000000 +0000 +++ flush-0.9.10/mlib/mlib/Makefile.in 2011-03-05 14:44:48.000000000 +0000 @@ -64,10 +64,10 @@ subdir = mlib/mlib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -180,6 +180,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -242,9 +243,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -265,7 +263,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ Binary files /tmp/ir4L0YLINr/flush-0.9.9/po/bg.gmo and /tmp/zsTJNzIHfv/flush-0.9.10/po/bg.gmo differ diff -Nru flush-0.9.9/po/bg.po flush-0.9.10/po/bg.po --- flush-0.9.9/po/bg.po 2010-10-21 19:06:58.000000000 +0000 +++ flush-0.9.10/po/bg.po 2011-03-05 14:47:29.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: flush-0.9.2-bundle\n" "Report-Msgid-Bugs-To: konishchev@gmail.com\n" -"POT-Creation-Date: 2010-10-21 23:06+0400\n" +"POT-Creation-Date: 2011-03-05 17:47+0300\n" "PO-Revision-Date: 2010-04-25 14:54+0000\n" "Last-Translator: Georgi Dobrev \n" "Language-Team: Georgi Dobrev \n" @@ -345,7 +345,7 @@ "При промяна на времето за последен достъп и времето за модификация на " "директорията '%1' се получи грешка: %2." -#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:815 src/daemon_fs.cpp:43 +#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:819 src/daemon_fs.cpp:43 #, qt-format msgid "Can't create directory '%1': %2." msgstr "Неуспех при създаване на директория '%1': %2." @@ -365,7 +365,7 @@ msgid "Invalid file path '%1' - file '%2' is already exits." msgstr "Невалиден път на файла '%1': файл '%2' вече съществува." -#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 +#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:775 mlib/mlib/fs.cpp:785 #, qt-format msgid "Can't stat '%1': %2." msgstr "Неуспех при получаване на информация (stat) за '%1': %2." @@ -389,58 +389,58 @@ msgid "parent directory is not exists" msgstr "директорията източник не съществува" -#: mlib/mlib/fs.cpp:735 +#: mlib/mlib/fs.cpp:739 msgid "file is already exists" msgstr "файла вече съществува" -#: mlib/mlib/fs.cpp:752 +#: mlib/mlib/fs.cpp:756 msgid "it is a directory" msgstr "това е директория" -#: mlib/mlib/fs.cpp:756 +#: mlib/mlib/fs.cpp:760 msgid "it is a special file" msgstr "това е специален файл" -#: mlib/mlib/fs.cpp:767 mlib/mlib/fs.cpp:777 +#: mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 #, qt-format msgid "No such file or directory ('%1')." msgstr "Няма такъв файл или директория ('%1')." -#: mlib/mlib/fs.cpp:846 +#: mlib/mlib/fs.cpp:850 #, qt-format msgid "Error while copying '%1' to '%2': %3." msgstr "Грешка при копирането на '%1' в '%2': %3." -#: mlib/mlib/fs.cpp:852 mlib/mlib/fs.cpp:1007 +#: mlib/mlib/fs.cpp:856 mlib/mlib/fs.cpp:1011 #, qt-format msgid "Error while reading '%1': %2." msgstr "Грешка при четене '%1': %2." -#: mlib/mlib/fs.cpp:888 +#: mlib/mlib/fs.cpp:892 msgid "Can't get user home path." msgstr "Неуспех при получаване на път към домашния каталог на ползвателя." -#: mlib/mlib/fs.cpp:928 +#: mlib/mlib/fs.cpp:932 #, qt-format msgid "file '%1' is already exists" msgstr "файла '%1' вече съществува" -#: mlib/mlib/fs.cpp:1000 +#: mlib/mlib/fs.cpp:1004 #, qt-format msgid "Can't delete directory '%1': %2." msgstr "Неуспех при създаване на директория '%1': %2." -#: mlib/mlib/fs.cpp:1014 +#: mlib/mlib/fs.cpp:1018 #, qt-format msgid "file or directory '%1' is not exists" msgstr "файла или директорията '%1' не существува" -#: mlib/mlib/fs.cpp:1018 +#: mlib/mlib/fs.cpp:1022 #, qt-format msgid "Can't delete file '%1': %2." msgstr "Неуспех при изтриване на файл '%1': %2." -#: mlib/mlib/fs.cpp:1064 +#: mlib/mlib/fs.cpp:1068 #, qt-format msgid "Unable to synchronize data for file '%1' with storage device: %2." msgstr "" @@ -1115,19 +1115,19 @@ msgid "Upload speed|Up: %1 (%2) / %3" msgstr "Качване: %1 (%2) / %3" -#: src/open_torrent_dialog.cpp:94 +#: src/open_torrent_dialog.cpp:95 msgid "Please choose a torrent file" msgstr "Моля, изберете *.torrent файл" -#: src/open_torrent_dialog.cpp:110 +#: src/open_torrent_dialog.cpp:111 msgid "Torrent file encoding:" msgstr "Кодировка на торент-файла:" -#: src/open_torrent_dialog.cpp:137 src/create_torrent_dialog.cpp:699 +#: src/open_torrent_dialog.cpp:138 src/create_torrent_dialog.cpp:699 msgid "Torrent files" msgstr "*.torrent файлове" -#: src/open_torrent_dialog.cpp:142 src/create_torrent_dialog.cpp:704 +#: src/open_torrent_dialog.cpp:143 src/create_torrent_dialog.cpp:704 msgid "Any files" msgstr "Всички файлове" @@ -2005,11 +2005,11 @@ msgid "application is now ending it's work" msgstr "в дадения момент приложението завършва своята работа" -#: src/application.cpp:406 +#: src/application.cpp:414 msgid "Unable to show libnotify message" msgstr "Не може да се покаже съобщение libnotify" -#: src/application.cpp:407 +#: src/application.cpp:415 #, qt-format msgid "" "Unable to show libnotify message: %1. You can disable notifications in the " @@ -2022,16 +2022,16 @@ "Текст на съобщението:\n" "%2" -#: src/application.cpp:458 +#: src/application.cpp:466 #, qt-format msgid "Running open command failed. %1." msgstr "Стартирането на програмата за преглед на файлове се провали. %1" -#: src/application.cpp:533 +#: src/application.cpp:541 msgid "Error while saving settings" msgstr "Грешка при съхраняване на настройките" -#: src/application.cpp:607 +#: src/application.cpp:615 msgid "" "Unable to initialize a libnotify instance. Notification's displaying is not " "possible." Binary files /tmp/ir4L0YLINr/flush-0.9.9/po/de.gmo and /tmp/zsTJNzIHfv/flush-0.9.10/po/de.gmo differ diff -Nru flush-0.9.9/po/de.po flush-0.9.10/po/de.po --- flush-0.9.9/po/de.po 1970-01-01 00:00:00.000000000 +0000 +++ flush-0.9.10/po/de.po 2011-03-05 14:47:29.000000000 +0000 @@ -0,0 +1,2802 @@ +# German translation for flush +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the flush package. +# Dmitry Konishchev , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: flush\n" +"Report-Msgid-Bugs-To: konishchev@gmail.com\n" +"POT-Creation-Date: 2011-03-05 17:47+0300\n" +"PO-Revision-Date: 2010-11-04 13:12+0000\n" +"Last-Translator: bpola \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-03-05 14:08+0000\n" +"X-Generator: Launchpad (build 12515)\n" + +#: mlib/mlib/misc.cpp:95 mlib/mlib/misc.cpp:157 +msgid "Buffer positioning error." +msgstr "Puffer Positionierungsfehler" + +#: mlib/mlib/misc.cpp:226 mlib/mlib/sys.cpp:283 +#, qt-format +msgid "Can't create a pipe: %1." +msgstr "Konnte Pipe %1 nicht erzeugen." + +#: mlib/mlib/misc.cpp:235 +#, qt-format +msgid "Can't set flags for a pipe: %1." +msgstr "Konnte keine Flags für Pipe %1 setzen." + +#: mlib/mlib/misc.cpp:243 mlib/mlib/misc.cpp:246 +#, qt-format +msgid "Error while closing a pipe: %1." +msgstr "Fehler beim Schließen der Pipe %1." + +#: mlib/mlib/misc.cpp:274 +#, qt-format +msgid "Can't read from a pipe: %1." +msgstr "Konnte nicht aus Pipe %1 lesen." + +#: mlib/mlib/misc.cpp:306 +#, qt-format +msgid "Can't write to a pipe: %1." +msgstr "Konnte nicht in Pipe %1 schreiben." + +#: mlib/mlib/misc.cpp:372 +#, qt-format +msgid "Can't get max opened files limit: %1." +msgstr "Konnte das maximal geöffnete Dateilimit nicht erhalten: %1." + +#: mlib/mlib/misc.cpp:390 +#, qt-format +msgid "Copyright (C) %1-%2 %3." +msgstr "Copyright (C) %1-%2 %3." + +#: mlib/mlib/misc.cpp:393 +#, qt-format +msgid "Copyright (C) %1 %2." +msgstr "Copyright (C) %1 %2." + +#: mlib/mlib/misc.cpp:403 +#, qt-format +msgid "Realloc failed: %1." +msgstr "Realloc fehlgeschlagen: %1." + +#: mlib/mlib/misc.cpp:447 +#, qt-format +msgid "Running command '%1' failed: %2." +msgstr "Laufender Befehl '%1' fehlgeschlagen: %2." + +#: mlib/mlib/misc.cpp:479 +#, qt-format +msgid "Error while creating epoll instance: %1." +msgstr "Fehler während des erstellens der epoll Instanz: %1." + +#: mlib/mlib/misc.cpp:498 +#, qt-format +msgid "Error while using epoll instance: %1." +msgstr "Fehler während des Verwenden der epoll Instanz: %1." + +#: mlib/mlib/misc.cpp:540 +#, qt-format +msgid "Can't read data from a file descriptor: %1." +msgstr "Konnte keine Daten aus der Dateibeschreibung lesen: %1." + +#: mlib/mlib/fs_watcher.cpp:163 +#, qt-format +msgid "Error while closing an inotify instance: %1." +msgstr "Fehler während des Schließens einer inotify Instanz: %1." + +#: mlib/mlib/fs_watcher.cpp:226 +#, qt-format +msgid "Can't create an inotify instance: %1." +msgstr "Konnte keine inotify Instanz erstellen: %1." + +#: mlib/mlib/fs_watcher.cpp:359 +msgid "Program has been compiled without inotify support." +msgstr "Programm wurde ohne inotify Unterstützung kompiliert." + +#: mlib/mlib/fs_watcher.cpp:378 +#, qt-format +msgid "Error while removing an inotify watch instance: %1." +msgstr "Fehler während des Entfernens einer inotify Überwachungsinstanz: %1." + +#: mlib/mlib/fs_watcher.cpp:425 +#, qt-format +msgid "Can't read data from inotify descriptor: %1." +msgstr "Konnte keine Daten aus der inotify Beschreibung lesen: %1." + +#: mlib/mlib/libconfig.cpp:41 +#, qt-format +msgid "%1 at line %2" +msgstr "%1 bei Zeile %2" + +#: mlib/mlib/sqlite.cpp:137 +msgid "unknown error" +msgstr "Unbekannter Fehler" + +#: mlib/mlib/sqlite.cpp:219 mlib/mlib/sqlite.cpp:260 +msgid "Database is not opened yet." +msgstr "Datenbank zur Zeit nicht geöffnet" + +#: mlib/mlib/sqlite.cpp:272 +msgid "Database is already opened." +msgstr "Datenbank ist bereits geöffnet" + +#: mlib/mlib/sqlite.cpp:369 +msgid "Query is already finalized." +msgstr "Anfrage ist bereits finalisiert." + +#: mlib/mlib/sqlite.cpp:450 +msgid "Operation on finalized query." +msgstr "Operation an finalisierter Anfrage" + +#: mlib/mlib/async_fs.cpp:245 +msgid "" +"Asynchronous filesystem finished it's work, but not all tasks are processed." +msgstr "" +"Asynchrones Dateisystem hat seine Arbeit vollendet, aber es wurden nicht " +"alle Prozesse ausgeführt." + +#: mlib/mlib/gtk/misc.cpp:125 src/main.cpp:432 +msgid "Information" +msgstr "Information" + +#: mlib/mlib/gtk/misc.cpp:131 src/main.cpp:426 +msgid "Warning" +msgstr "Warnung" + +#: mlib/mlib/gtk/builder.hh:42 +#, qt-format +msgid "Can't get widget '%1' from glade file '%2'." +msgstr "Konnte das Objekt '%1' nicht aus der glade Datei '%2' bekommen." + +#: mlib/mlib/gtk/toolbar.cpp:103 +#, qt-format +msgid "Invalid toolbar style name '%1'." +msgstr "Üngültiger Toolbar Style Name '%1'." + +#: mlib/mlib/gtk/tree_view.hh:188 +#, qt-format +msgid "No such column: '%1'." +msgstr "'%1' ist keine Spalte" + +#: mlib/mlib/libtorrent.cpp:94 +msgid "Invalid magnet URI." +msgstr "Ungültige Magnet URI." + +#: mlib/mlib/libtorrent.cpp:119 +msgid "there is no 'xt=urn:btih:' field in it" +msgstr "Hier ist kein 'xt=urn:bith:' Feld integriert" + +#: mlib/mlib/libtorrent.cpp:182 +#, qt-format +msgid "Invalid magnet URI: %1." +msgstr "Ungültiger Magnet URI: %1." + +#: mlib/mlib/libtorrent.cpp:220 +#, qt-format +msgid "Invalid torrent file path '%1'." +msgstr "Ungültiger Torrent Datei Pfad '%1'." + +#: mlib/mlib/libtorrent.cpp:495 +msgid "invalid torrent file" +msgstr "Ungültige Torrentdatei" + +#: mlib/mlib/libtorrent.cpp:519 src/daemon_session.cpp:517 +#: src/daemon_session.cpp:532 src/daemon_session.cpp:1609 +#: src/daemon_session.cpp:1626 +#, qt-format +msgid "Error while reading torrent file '%1': %2." +msgstr "Fehler beim Lesen der Torrentdatei '%1': %2." + +#: mlib/mlib/libtorrent.cpp:583 +msgid "bad torrent data" +msgstr "korrupte Torrentdaten" + +#: mlib/mlib/libtorrent.cpp:591 +#, qt-format +msgid "libtorrent error code [%1]" +msgstr "libtorrent Fehler Code [%1]" + +#: mlib/mlib/libtorrent.cpp:596 +msgid "torrent is already exists in this session" +msgstr "Torrent existiert bereits in dieser Sitzung" + +#: mlib/mlib/libtorrent.cpp:603 +msgid "this is not a torrent file" +msgstr "Dies ist keine Torrentdatei" + +#: mlib/mlib/base/exception.cpp:94 +#, qt-format +msgid "Exception: '%1'." +msgstr "Ausnahme: '%1'." + +#: mlib/mlib/base/messages.cpp:112 +msgid "[[gettimeofday time getting error]]" +msgstr "[[gettimeofday time getting error]]" + +#: mlib/mlib/base/messages.cpp:222 +msgid "Logical error" +msgstr "Logischer Fehler" + +#: mlib/mlib/base/format.cpp:111 mlib/mlib/base/format.cpp:125 +#: mlib/mlib/base/format.cpp:183 mlib/mlib/base/format.cpp:241 +#: mlib/mlib/base/format.cpp:269 mlib/mlib/base/format.hh:61 +#: mlib/mlib/base/format.hh:76 mlib/mlib/base/format.hh:91 +#: mlib/mlib/base/format.hh:106 mlib/mlib/base/format.hh:121 +#: mlib/mlib/base/format.hh:136 mlib/mlib/base/format.hh:151 +#: mlib/mlib/base/format.hh:166 mlib/mlib/base/format.hh:181 +#: mlib/mlib/base/format.hh:201 mlib/mlib/base/format.hh:222 +#: mlib/mlib/base/format.hh:237 mlib/mlib/base/format.hh:252 +#: mlib/mlib/base/format.hh:267 +msgid "[[Invalid encoding]]" +msgstr "[[Ungültige dekodierung]]" + +#: mlib/mlib/sys.cpp:130 mlib/mlib/sys.cpp:140 +#, qt-format +msgid "Can't duplicate a file descriptor: %1." +msgstr "" +"Es ist nicht möglich ein Duplikat einer Dateibeschreibung zu erstellen: %1." + +#: mlib/mlib/sys.cpp:211 +#, qt-format +msgid "Can't fork the process: %1." +msgstr "Konnte den Prozess '%1' nicht abzweigen (fork)." + +#: mlib/mlib/sys.cpp:298 +msgid "too big link target path" +msgstr "Zu großer Link Ziel Pfad" + +#: mlib/mlib/string.cpp:60 +msgid "0m" +msgstr "Om" + +#: mlib/mlib/string.cpp:77 mlib/mlib/string.cpp:118 +msgid "M" +msgstr "M" + +#: mlib/mlib/string.cpp:80 mlib/mlib/string.cpp:121 mlib/mlib/string.cpp:130 +msgid "d" +msgstr "d" + +#: mlib/mlib/string.cpp:83 mlib/mlib/string.cpp:133 mlib/mlib/string.cpp:141 +msgid "h" +msgstr "h" + +#: mlib/mlib/string.cpp:86 mlib/mlib/string.cpp:144 mlib/mlib/string.cpp:152 +msgid "m" +msgstr "m" + +#: mlib/mlib/string.cpp:155 mlib/mlib/string.cpp:161 +msgid "s" +msgstr "s" + +#: mlib/mlib/string.cpp:174 +msgid "minutes|m" +msgstr "m" + +#: mlib/mlib/string.cpp:175 +msgid "seconds|s" +msgstr "s" + +#: mlib/mlib/string.cpp:226 +msgid "GB" +msgstr "GB" + +#: mlib/mlib/string.cpp:233 mlib/mlib/string.cpp:243 +#: src/create_torrent_dialog.cpp:580 src/create_torrent_dialog.cpp:584 +#: src/create_torrent_dialog.cpp:588 src/create_torrent_dialog.cpp:592 +msgid "MB" +msgstr "MB" + +#: mlib/mlib/string.cpp:250 mlib/mlib/string.cpp:260 +#: src/create_torrent_dialog.cpp:560 src/create_torrent_dialog.cpp:564 +#: src/create_torrent_dialog.cpp:568 src/create_torrent_dialog.cpp:572 +#: src/create_torrent_dialog.cpp:576 +msgid "KB" +msgstr "KB" + +#: mlib/mlib/string.cpp:267 mlib/mlib/string.cpp:274 +msgid "B" +msgstr "B" + +#: mlib/mlib/string.cpp:294 +msgid "0 KB/s" +msgstr "0 KB" + +#: mlib/mlib/string.cpp:307 mlib/mlib/string.cpp:309 src/main_window.cpp:255 +msgid "KB/s" +msgstr "KB/s" + +#: mlib/mlib/string.cpp:312 +msgid "B/s" +msgstr "B/s" + +#: mlib/mlib/string.cpp:315 +msgid "/s" +msgstr "/s" + +#: mlib/mlib/fs.cpp:161 +#, qt-format +msgid "Can't copy file '%1' to '%2': %3." +msgstr "Konnte die Datei '%1' nicht nach '%2' kopieren: %3." + +#: mlib/mlib/fs.cpp:194 +#, qt-format +msgid "" +"Error while changing directory '%1' access and modification times. Can't " +"stat directory '%2': %3." +msgstr "" +"Fehler während des wechseln des Verzeichnisses '%1' Zugriff und Änderungs " +"Zeiten. Konnte Verzeichnis '%2' nicht finden: %3." + +#: mlib/mlib/fs.cpp:208 +#, qt-format +msgid "Error while changing directory '%1' access and modification times: %2." +msgstr "" +"Fehler während des wechseln des Verzeichnisses '%1' Zugriff und Änderungs " +"Zeiten: %2." + +#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:819 src/daemon_fs.cpp:43 +#, qt-format +msgid "Can't create directory '%1': %2." +msgstr "Konnte Verzeichnis '%1' nicht erzeugen: %2." + +#: mlib/mlib/fs.cpp:254 +#, qt-format +msgid "Invalid file path '%1'." +msgstr "Ungültiger Dateipfad '%1'." + +#: mlib/mlib/fs.cpp:303 +#, qt-format +msgid "Invalid file path '%1' - file with such path is already exists." +msgstr "" +"Ungültiger Dateipfad '%1' - Eine Datei mit diesem Pfad existiert bereits." + +#: mlib/mlib/fs.cpp:312 +#, qt-format +msgid "Invalid file path '%1' - file '%2' is already exits." +msgstr "Ungültiger Dateipfad '%1' - Datei '%2' existiert bereits." + +#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:775 mlib/mlib/fs.cpp:785 +#, qt-format +msgid "Can't stat '%1': %2." +msgstr "Konnte '%1' nicht finden: %2." + +#: mlib/mlib/fs.cpp:370 +#, qt-format +msgid "Can't remove file '%1': %2." +msgstr "Konnte Datei '%1' nicht entfernen: %2." + +#: mlib/mlib/fs.cpp:394 +#, qt-format +msgid "Can't read directory '%1': %2." +msgstr "Konnte Verzeichnis '%1' nicht lesen: %2." + +#: mlib/mlib/fs.cpp:398 +#, qt-format +msgid "Can't remove directory '%1': %2." +msgstr "Konnte Verzeichnis '%1' nicht entfernen: %2." + +#: mlib/mlib/fs.cpp:435 +msgid "parent directory is not exists" +msgstr "Überverzeichnis existiert nicht" + +#: mlib/mlib/fs.cpp:739 +msgid "file is already exists" +msgstr "Datei existiert bereits" + +#: mlib/mlib/fs.cpp:756 +msgid "it is a directory" +msgstr "Ist ein Verzeichnis" + +#: mlib/mlib/fs.cpp:760 +msgid "it is a special file" +msgstr "Ist eine Spezial Datei" + +#: mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 +#, qt-format +msgid "No such file or directory ('%1')." +msgstr "Keine Datei oder Verzeichnis ('%1')." + +#: mlib/mlib/fs.cpp:850 +#, qt-format +msgid "Error while copying '%1' to '%2': %3." +msgstr "Fehler während des Kopiervorgangs von '%1' nach '%2': %3." + +#: mlib/mlib/fs.cpp:856 mlib/mlib/fs.cpp:1011 +#, qt-format +msgid "Error while reading '%1': %2." +msgstr "Fehler beim Lesen von '%1': %2." + +#: mlib/mlib/fs.cpp:892 +msgid "Can't get user home path." +msgstr "Konnte Heimatverzeichnis nicht finden" + +#: mlib/mlib/fs.cpp:932 +#, qt-format +msgid "file '%1' is already exists" +msgstr "Datei '%1' existiert bereits." + +#: mlib/mlib/fs.cpp:1004 +#, qt-format +msgid "Can't delete directory '%1': %2." +msgstr "Konnte Verzeichnis '%1' nicht löschen: %2." + +#: mlib/mlib/fs.cpp:1018 +#, qt-format +msgid "file or directory '%1' is not exists" +msgstr "Datei oder Verzeichnis '%1' existiert nicht" + +#: mlib/mlib/fs.cpp:1022 +#, qt-format +msgid "Can't delete file '%1': %2." +msgstr "Konnte die Datei '%1' nicht löschen: %2." + +#: mlib/mlib/fs.cpp:1068 +#, qt-format +msgid "Unable to synchronize data for file '%1' with storage device: %2." +msgstr "" +"Unmöglich Daten für die Datei '%1' mit Speichermedium zu synchronisieren: %2" + +#: src/settings_window.cpp:236 src/settings_window.cpp:238 +#: src/torrents_view.cpp:325 src/torrents_view.cpp:358 +#: src/torrent_files_view.cpp:180 src/torrent_files_view.cpp:185 +msgid "Name" +msgstr "Name" + +#: src/settings_window.cpp:246 src/main_window.cpp:867 src/main_window.cpp:868 +msgid "Preferences" +msgstr "Einstellungen" + +#: src/settings_window.cpp:254 +msgid "Please select torrents download directory" +msgstr "Bitte wählen sie das Torrent Download Verzeichnis" + +#: src/settings_window.cpp:260 +msgid "Please select directory for finished downloads copying" +msgstr "Bitte wähle ein Verzeichnis für fertigestellte Download Kopien." + +#: src/settings_window.cpp:300 src/settings_window.cpp:396 +#: src/torrent_peers_view.cpp:88 src/torrent_peers_view.cpp:99 +msgid "Client" +msgstr "Client" + +#: src/settings_window.cpp:306 src/settings_window.cpp:405 +msgid "Main" +msgstr "Haupt" + +#: src/settings_window.cpp:316 src/settings_window.cpp:422 +msgid "GUI" +msgstr "GUI" + +#: src/settings_window.cpp:322 src/settings_window.cpp:355 +#: ui/preferences.client.gui.glade:62 ui/preferences.daemon.network.glade:62 +msgid "Misc" +msgstr "Misc" + +#: src/settings_window.cpp:328 ui/preferences.client.gui.glade:78 +msgid "Status bar" +msgstr "Satus Bar" + +#: src/settings_window.cpp:339 src/settings_window.cpp:606 +msgid "Daemon" +msgstr "Hintergrundprogramm" + +#: src/settings_window.cpp:349 src/settings_window.cpp:615 +msgid "Network" +msgstr "Netzwerk" + +#: src/settings_window.cpp:361 ui/preferences.daemon.network.glade:78 +msgid "IP filter" +msgstr "IP Filter" + +#: src/settings_window.cpp:369 src/settings_window.cpp:632 +msgid "Automation" +msgstr "Automatisierung" + +#: src/settings_window.cpp:444 +msgid "Client::Main" +msgstr "Client::Haupt" + +#: src/settings_window.cpp:447 +msgid "Show add torrent dialog when opening torrent file" +msgstr "Torrent Hinzufügen Dialog, wenn Torrentdatei geöffnet wird." + +#: src/settings_window.cpp:452 +msgid "Start torrent on adding" +msgstr "Starte Torrent wenn es hinzugefüt wird" + +#: src/settings_window.cpp:462 ui/preferences.daemon.automation.glade:119 +msgid "Download to:" +msgstr "Herunterladen nach:" + +#: src/settings_window.cpp:470 ui/preferences.daemon.automation.glade:140 +msgid "Copy finished to:" +msgstr "Kopiervorgang fertiggestellt nach:" + +#: src/settings_window.cpp:485 +msgid "Open command:" +msgstr "Öffne Befehl:" + +#: src/settings_window.cpp:974 +msgid "none" +msgstr "keine" + +#: src/statistics_window.cpp:52 src/statistics_window.cpp:138 +#: src/main_window.cpp:857 src/main_window.cpp:859 +msgid "Statistics" +msgstr "Statistik" + +#: src/statistics_window.cpp:121 +msgid "Reset statistics?" +msgstr "Statistik zurücksetzen?" + +#: src/statistics_window.cpp:121 +msgid "Are you sure want to reset statistics?" +msgstr "Sind Sie sicher das Sie die Statistik zurücksetzten wollen?" + +#: src/statistics_window.cpp:159 +msgid "Session start time" +msgstr "Sitzungs Startzeit" + +#: src/statistics_window.cpp:160 +msgid "Statistics start time" +msgstr "Statistik Startzeit" + +#: src/statistics_window.cpp:162 src/main_window.cpp:1537 +#: ui/preferences.client.gui.status_bar.glade:108 +msgid "Downloaded" +msgstr "Heruntergeladen" + +#: src/statistics_window.cpp:163 +msgid "Payload download" +msgstr "Payload Download" + +#: src/statistics_window.cpp:164 src/torrents_view.cpp:370 +msgid "Total download" +msgstr "Gesamt Download" + +#: src/statistics_window.cpp:165 +msgid "Total payload download" +msgstr "Gesamt payload Download" + +#: src/statistics_window.cpp:167 src/main_window.cpp:1543 +#: ui/preferences.client.gui.status_bar.glade:136 +msgid "Uploaded" +msgstr "Hochgeladen" + +#: src/statistics_window.cpp:168 +msgid "Payload upload" +msgstr "Payload Upload" + +#: src/statistics_window.cpp:169 src/torrents_view.cpp:372 +msgid "Total upload" +msgstr "Gesamt Upload" + +#: src/statistics_window.cpp:170 +msgid "Total payload upload" +msgstr "Gesamt payload Upload" + +#: src/statistics_window.cpp:172 src/main_window.cpp:1549 +#: src/torrents_view.cpp:382 ui/preferences.client.gui.status_bar.glade:162 +msgid "Share ratio" +msgstr "Verteilungsverhältnis" + +#: src/statistics_window.cpp:173 +msgid "Total share ratio" +msgstr "Gesamtes Verteilungsverhältnis" + +#: src/statistics_window.cpp:175 src/main_window.cpp:1552 +#: ui/preferences.client.gui.status_bar.glade:149 +msgid "Failed" +msgstr "Fehlgeschlagen" + +#: src/statistics_window.cpp:176 src/torrents_view.cpp:374 +msgid "Total failed" +msgstr "Fehlgeschlagen gesamt" + +#: src/statistics_window.cpp:177 src/main_window.cpp:1555 +#: ui/preferences.client.gui.status_bar.glade:190 +msgid "Redundant" +msgstr "Redundant" + +#: src/statistics_window.cpp:178 src/torrents_view.cpp:375 +msgid "Total redundant" +msgstr "Redundant gesamt" + +#: src/statistics_window.cpp:187 +msgid "Reset" +msgstr "Zurücksetzen" + +#: src/torrents_viewport.cpp:228 +msgid "Details" +msgstr "Details" + +#: src/torrents_viewport.cpp:245 +msgid "Files" +msgstr "Dateien" + +#: src/torrents_viewport.cpp:262 src/torrents_view.cpp:346 +#: src/torrents_view.cpp:384 +msgid "Peers" +msgstr "Peers" + +#: src/torrents_viewport.cpp:278 +msgid "Options" +msgstr "Optionen" + +#: src/torrents_viewport.cpp:295 +msgid "Log" +msgstr "Log" + +#: src/daemon_settings.cpp:45 +#, qt-format +msgid "Daemon config: Bad option '%1' type at line %2." +msgstr "Daemon config: Korrupter Options '%1' Typ bie Zeile %2." + +#: src/daemon_settings.cpp:74 +#, qt-format +msgid "Daemon config: Bad option '%1' value '%2' at line %3." +msgstr "Daemon config: Korrupte Option '%1' Wert '%2' bei Zeile %3." + +#: src/daemon_settings.cpp:104 +#, qt-format +msgid "Daemon config: Invalid option '%1' UTF-8 value at line %2." +msgstr "Daemon config: Ungültige Option '%1' UTF-8 Wert bei Zeile %2." + +#: src/daemon_settings.cpp:114 +#, qt-format +msgid "Daemon config: Unknown option '%1' at line %2." +msgstr "Daemon config: Unbekannte Option '%1' bei Zeile %2." + +#: src/daemon_settings.cpp:452 src/client_settings.cpp:1147 +#, qt-format +msgid "Reading configuration file '%1' failed. %2" +msgstr "Lesen der Konfigurationsdatei '%1' fehlgeschlagen. %2." + +#: src/daemon_settings.cpp:456 +#, qt-format +msgid "Error while reading configuration file '%1': %2." +msgstr "Fehler beim Lesen der Konfigurationsdatei '%1': %2." + +#: src/daemon_settings.cpp:460 +#, qt-format +msgid "Error while parsing configuration file '%1': %2." +msgstr "Fehler während der Syntaxanalyse der Konfigurationsdatei '%1': %2." + +#: src/daemon_settings.cpp:769 +msgid "invalid DHT state data" +msgstr "Ungültige DHT Status Daten" + +#: src/daemon_settings.cpp:775 +#, qt-format +msgid "Error while reading DHT state from file '%1': %2." +msgstr "Fehler beim Lesen des DHT Status von der Datei '%1': %2." + +#: src/daemon_settings.cpp:807 +#, qt-format +msgid "Daemon config: Invalid IP filter rule at line %1: %2." +msgstr "Daemon Konfiguration: Ungültige IP Filter Regel bei Zeile %1: %2." + +#: src/daemon_settings.cpp:813 +#, qt-format +msgid "Daemon config: Invalid IP filter rule at line %1." +msgstr "Daemon Konfiguration: Ungültige IP Filter Regel bei Zeile %1." + +#: src/daemon_settings.cpp:964 src/client_settings.cpp:1233 +#, qt-format +msgid "Writing configuration file '%1' failed. %2" +msgstr "Schreiben der Konfigurationsdatei '%1' fehlgeschlagen. %2" + +#: src/daemon_settings.cpp:968 +#, qt-format +msgid "Can't write configuration file %1: %2." +msgstr "Konnte Konfigurationsdatei '%1' nicht schreiben: %2." + +#: src/daemon_settings.cpp:1005 +#, qt-format +msgid "Can't write DHT state to file '%1': %2." +msgstr "Konnte DHT Status nicht in die Datei '%1' schreiben: %2." + +#: src/daemon_settings.cpp:1016 +#, qt-format +msgid "Writing DHT state to file '%1' failed. %2" +msgstr "Schreiben des DHT Status in die Datei '%1' fehlgeschlagen. %2" + +#: src/daemon_settings.cpp:1416 +#, qt-format +msgid "Daemon config: %1" +msgstr "Daemon Konfiguration: %1" + +#: src/daemon_settings.cpp:1524 +#, qt-format +msgid "Reading torrent configuration file '%1' failed. %2" +msgstr "Lesen der Torrent Konfigurationdatei '%1' fehlgeschlagen. %2" + +#: src/daemon_settings.cpp:1528 +#, qt-format +msgid "Error while reading torrent configuration file '%1': %2." +msgstr "Fehler während des Lesens der Torrent Konfigurationsdatei '%1': %2." + +#: src/daemon_settings.cpp:1532 +#, qt-format +msgid "Error while parsing torrent configuration file '%1': %2." +msgstr "" +"Fehler während der Syntaxanalyse der Torrent Konfigurationsdatei '%1': %2." + +#: src/daemon_settings.cpp:1549 src/daemon_settings.cpp:1560 +#, qt-format +msgid "Can't read torrent resume data from file '%1': %2." +msgstr "Konnte Torrent resume Daten nicht aus der Datei '%1' lesen: %2." + +#: src/daemon_settings.cpp:1570 src/daemon_settings.cpp:1576 +#, qt-format +msgid "Error while reading torrent resume data from file '%1': file broken." +msgstr "" +"Fehler während des Lesens der resume Daten aus der Torrentdatei '%1': Datei " +"beschädigt" + +#: src/daemon_settings.cpp:1602 +#, qt-format +msgid "Can't read torrent resume data from file '%1': bad resume data." +msgstr "" +"Konnte Torrent resume Daten nicht aus der Datei '%1' lesen: Korrupte resume " +"Daten." + +#: src/daemon_settings.cpp:1714 +#, qt-format +msgid "Writing torrent configuration file '%1' failed. %2" +msgstr "Schreiben der Torrent Konfigurationsdatei '%1' fehlgeschlagen. %2" + +#: src/daemon_settings.cpp:1718 +#, qt-format +msgid "Can't write torrent configuration file %1: %2." +msgstr "Konnte Torrent Konfigurationsdatei '%1' nicht schreiben: %2." + +#: src/daemon_settings.cpp:1736 +#, qt-format +msgid "Removing old resume data '%1' failed. %2" +msgstr "Entfernen der alten resume Daten '%1' fehlgeschlagen. %2" + +#: src/daemon_settings.cpp:1770 +#, qt-format +msgid "Can't write torrent resume data to file '%1': %2." +msgstr "Konnte Torrent resume Daten nicht in die Datei '%1' schreiben: %2." + +#: src/daemon_settings.cpp:1781 +#, qt-format +msgid "Writing torrent resume data to file '%1' failed. %2" +msgstr "" +"Schreiben der Torrent resume Daten in die Datei '%1' ist fehlgeschlagen. %2" + +#: src/torrent_peers_view.cpp:87 +msgid "IP" +msgstr "IP" + +#: src/torrent_peers_view.cpp:89 src/torrents_view.cpp:340 +msgid "Download speed|Down speed" +msgstr "Down Speed" + +#: src/torrent_peers_view.cpp:90 src/torrents_view.cpp:341 +msgid "Download speed (payload)|Down speed (data)" +msgstr "Down Speed (Daten)" + +#: src/torrent_peers_view.cpp:91 src/torrents_view.cpp:342 +msgid "Upload speed|Up speed" +msgstr "Up Speed" + +#: src/torrent_peers_view.cpp:92 src/torrents_view.cpp:343 +msgid "Upload speed (payload)|Up speed (data)" +msgstr "Up Speed (Daten)" + +#: src/torrent_peers_view.cpp:93 src/torrents_view.cpp:334 +msgid "Total download (payload)|Down data" +msgstr "Down Daten" + +#: src/torrent_peers_view.cpp:94 src/torrents_view.cpp:336 +msgid "Total upload (payload)|Up data" +msgstr "Up Daten" + +#: src/torrent_peers_view.cpp:95 src/torrent_peers_view.cpp:108 +msgid "Availability" +msgstr "Ereichbarkeit" + +#: src/torrent_peers_view.cpp:96 src/torrent_peers_view.cpp:113 +msgid "Hash fails" +msgstr "Hash fehlgeschlagen" + +#: src/torrent_peers_view.cpp:98 +msgid "IP address" +msgstr "IP-Adresse" + +#: src/torrent_peers_view.cpp:101 src/main_window.cpp:1525 +#: src/torrents_view.cpp:377 ui/preferences.client.gui.status_bar.glade:58 +msgid "Download speed" +msgstr "Download Speed" + +#: src/torrent_peers_view.cpp:102 src/main_window.cpp:1528 +#: src/torrents_view.cpp:378 ui/preferences.client.gui.status_bar.glade:95 +msgid "Download speed (payload)" +msgstr "Download Speed (Payload)" + +#: src/torrent_peers_view.cpp:103 src/main_window.cpp:1531 +#: src/torrents_view.cpp:379 ui/preferences.client.gui.status_bar.glade:82 +msgid "Upload speed" +msgstr "Upload Speed" + +#: src/torrent_peers_view.cpp:104 src/main_window.cpp:1534 +#: src/torrents_view.cpp:380 ui/preferences.client.gui.status_bar.glade:67 +msgid "Upload speed (payload)" +msgstr "Upload Speed (payload)" + +#: src/torrent_peers_view.cpp:105 src/torrents_view.cpp:371 +msgid "Total download (payload)" +msgstr "Gesamt Download (payload)" + +#: src/torrent_peers_view.cpp:106 src/torrents_view.cpp:373 +msgid "Total upload (payload)" +msgstr "Total Upload (payload)" + +#: src/main_window.cpp:226 +msgid "Set download rate limit" +msgstr "Setze Download Raten Limit" + +#: src/main_window.cpp:226 +msgid "Set upload rate limit" +msgstr "Setze Upload Raten Limit" + +#: src/main_window.cpp:277 +msgid "Getting current rate limit failed" +msgstr "Holen der aktuellen Verbindungs Raten Limits fehlgeschlagen" + +#: src/main_window.cpp:289 +msgid "Setting current rate limit failed" +msgstr "Setzen der aktuellen Verbindungs Raten Limits fehlgeschlagen" + +#: src/main_window.cpp:331 +msgid "_File" +msgstr "_Datei" + +#: src/main_window.cpp:333 +msgid "_Create" +msgstr "_Erzeugen" + +#: src/main_window.cpp:337 +msgid "_Open a torrent" +msgstr "_Torrent öffnen" + +#: src/main_window.cpp:341 +msgid "_Open a magnet link" +msgstr "_Öffne Magnet Link" + +#: src/main_window.cpp:345 +msgid "_Quit" +msgstr "_Beenden" + +#: src/main_window.cpp:350 +msgid "_Edit" +msgstr "_Bearbeiten" + +#: src/main_window.cpp:352 +msgid "_Statistics" +msgstr "_Statistiken" + +#: src/main_window.cpp:356 +msgid "_Preferences" +msgstr "_Einstellungen" + +#: src/main_window.cpp:361 +msgid "_View" +msgstr "_Ansicht" + +#: src/main_window.cpp:364 +msgid "_Toolbar" +msgstr "_Toolbar" + +#: src/main_window.cpp:367 src/main_window.cpp:444 +msgid "'Show ...' toggle|_Show" +msgstr "_Zeige" + +#: src/main_window.cpp:380 +msgid "Toolbar _style" +msgstr "Toolbar _Style" + +#: src/main_window.cpp:384 +msgid "_Desktop default" +msgstr "_Desktop Standard" + +#: src/main_window.cpp:394 +msgid "_Icons" +msgstr "_Icons" + +#: src/main_window.cpp:404 +msgid "_Text" +msgstr "_Text" + +#: src/main_window.cpp:414 +msgid "_Both" +msgstr "_Beide" + +#: src/main_window.cpp:424 +msgid "Both _horizontal" +msgstr "Beide _horizontal" + +#: src/main_window.cpp:441 +msgid "_Categories" +msgstr "_Kategorien" + +#: src/main_window.cpp:454 +msgid "Show _names" +msgstr "Zeige _Namen" + +#: src/main_window.cpp:464 +msgid "Show _counters" +msgstr "Zeige _Zähler" + +#: src/main_window.cpp:476 +msgid "_Torrents" +msgstr "_Torrents" + +#: src/main_window.cpp:479 +msgid "_Resume" +msgstr "_Zurücksetzen" + +#: src/main_window.cpp:481 src/main_window.cpp:505 src/main_window.cpp:533 +#: src/main_window.cpp:560 +msgid "_All" +msgstr "_Alle" + +#: src/main_window.cpp:488 src/main_window.cpp:512 src/main_window.cpp:540 +#: src/main_window.cpp:567 +msgid "_Downloads" +msgstr "_Downloads" + +#: src/main_window.cpp:495 src/main_window.cpp:519 src/main_window.cpp:547 +#: src/main_window.cpp:574 +msgid "_Uploads" +msgstr "_Uploads" + +#: src/main_window.cpp:503 +msgid "_Pause" +msgstr "_Pause" + +#: src/main_window.cpp:529 +msgid "R_esume temporary" +msgstr "Z_urücksetzen kurzfristig" + +#: src/main_window.cpp:556 +msgid "P_ause temporary" +msgstr "P_ausieren kurzfristig" + +#: src/main_window.cpp:582 +msgid "C_omplete pending temporary action" +msgstr "V_ervollständige ausstehende Temporäre Aktion" + +#: src/main_window.cpp:589 +msgid "_Cancel pending temporary action" +msgstr "_Abbrechen der bevorstehenden kurzfristigen Aktion" + +#: src/main_window.cpp:599 +msgid "Set _upload rate limit" +msgstr "Setze _Upload Raten Limit" + +#: src/main_window.cpp:607 +msgid "Set _download rate limit" +msgstr "Setze_Limit für Download Rate" + +#: src/main_window.cpp:615 +msgid "_Help" +msgstr "_Hilfe" + +#: src/main_window.cpp:617 +msgid "_About" +msgstr "_Über" + +#: src/main_window.cpp:781 +msgid "Create" +msgstr "Erzeugen" + +#: src/main_window.cpp:782 +msgid "Create a new torrent" +msgstr "Erzeuge ein neues Torrent" + +#: src/main_window.cpp:790 +msgid "Open" +msgstr "Öffnen" + +#: src/main_window.cpp:791 +msgid "Open a torrent" +msgstr "Torrent Öffnen" + +#: src/main_window.cpp:800 +msgid "Magnet link" +msgstr "Magnet Link" + +#: src/main_window.cpp:801 ui/dialog.open_magnet_link.glade:7 +msgid "Open a magnet link" +msgstr "Magnet Link Öffnen" + +#: src/main_window.cpp:815 src/torrents_view.cpp:455 +msgid "Resume" +msgstr "Zurücksetzen" + +#: src/main_window.cpp:816 +msgid "Resume torrent(s)" +msgstr "Torrent(s) Zurücksetzen" + +#: src/main_window.cpp:827 src/torrents_view.cpp:461 +msgid "Pause" +msgstr "Pause" + +#: src/main_window.cpp:828 +msgid "Pause torrent(s)" +msgstr "Torrent(s) Pausieren" + +#: src/main_window.cpp:839 src/torrents_view.cpp:474 src/torrents_view.cpp:766 +msgid "Remove" +msgstr "Entfernen" + +#: src/main_window.cpp:840 +msgid "Remove torrent(s)" +msgstr "Torrent(s) Entfernen" + +#: src/main_window.cpp:1023 +msgid "Interrupting the temporary action on torrents failed" +msgstr "Unterbrechen der temporären Aktion der Torrents ist fehlgeschlagen" + +#: src/main_window.cpp:1053 src/main_window.cpp:1067 +msgid "Pausing torrents failed" +msgstr "Pausieren fer Torrents fehlgeschlagen" + +#: src/main_window.cpp:1088 src/main_window.cpp:1099 +#: src/client_cmd_options.cpp:196 +msgid "Dmitry Konishchev" +msgstr "Dmitry Konishchev" + +#: src/main_window.cpp:1097 +msgid "GTK-based BitTorrent client" +msgstr "GTK-based BitTorrent client" + +#: src/main_window.cpp:1231 +msgid "Processing the temporary action on torrents failed" +msgstr "Ausführen der temporären Aktion der Torrents ist fehlgeschlagen." + +#: src/main_window.cpp:1335 src/add_torrent_dialog.cpp:281 +msgid "Opening torrent failed" +msgstr "Torrent öffnen fehlgeschlagen" + +#: src/main_window.cpp:1335 src/add_torrent_dialog.cpp:283 +#, qt-format +msgid "Opening torrent '%1' failed. %2" +msgstr "Öffnen des Torrent '%1' fehlgeschlagen. %2" + +#: src/main_window.cpp:1496 +#, qt-format +msgid "Download/Upload|D: %1, U: %2 - %3" +msgstr "D: %1, U:%2 - %3" + +#: src/main_window.cpp:1540 +msgid "Download (payload)" +msgstr "Download (Payload)" + +#: src/main_window.cpp:1546 +msgid "Upload (payload)" +msgstr "Upload (Payload)" + +#: src/main_window.cpp:1574 +#, qt-format +msgid "Download speed|Down: %1 (%2) / %3" +msgstr "Down: %1 (%2) / %3" + +#: src/main_window.cpp:1581 +#, qt-format +msgid "Upload speed|Up: %1 (%2) / %3" +msgstr "Up: %1 (%2) / %3" + +#: src/open_torrent_dialog.cpp:95 +msgid "Please choose a torrent file" +msgstr "Bitte wählen Sie eine Torrent Datei" + +#: src/open_torrent_dialog.cpp:111 +msgid "Torrent file encoding:" +msgstr "Torrent Datei Verschlüsseln" + +#: src/open_torrent_dialog.cpp:138 src/create_torrent_dialog.cpp:699 +msgid "Torrent files" +msgstr "Torrent Dateien" + +#: src/open_torrent_dialog.cpp:143 src/create_torrent_dialog.cpp:704 +msgid "Any files" +msgstr "Jede Datei" + +#: src/torrents_view.cpp:326 src/torrents_view.cpp:360 +msgid "Status" +msgstr "Status" + +#: src/torrents_view.cpp:328 src/torrents_view.cpp:365 +#: src/torrent_files_view.cpp:181 src/torrent_files_view.cpp:205 +msgid "Size" +msgstr "Größe" + +#: src/torrents_view.cpp:329 +msgid "Requested size|Requested" +msgstr "Benötigt" + +#: src/torrents_view.cpp:330 +msgid "Downloaded requested size|Downloaded" +msgstr "Downloaded" + +#: src/torrents_view.cpp:331 src/torrents_view.cpp:368 +#, c-format +msgid "%% Complete" +msgstr "%% Fertig" + +#: src/torrents_view.cpp:333 +msgid "Total download|Download" +msgstr "Download" + +#: src/torrents_view.cpp:335 +msgid "Total upload|Upload" +msgstr "Upload" + +#: src/torrents_view.cpp:337 +msgid "Total failed|Failed" +msgstr "Fehlgeschlagen" + +#: src/torrents_view.cpp:338 +msgid "Total redundant|Redundant" +msgstr "Redundant" + +#: src/torrents_view.cpp:345 +msgid "Share ratio|Ratio" +msgstr "Verhältnis" + +#: src/torrents_view.cpp:347 src/torrents_view.cpp:385 +msgid "Seeds" +msgstr "Seeds" + +#: src/torrents_view.cpp:349 +msgid "Time added|Added" +msgstr "Hinzugefügt" + +#: src/torrents_view.cpp:350 +msgid "Time left|ETA" +msgstr "ETA" + +#: src/torrents_view.cpp:351 +msgid "Time seeding|Seeding" +msgstr "Seeding" + +#: src/torrents_view.cpp:353 src/torrents_view.cpp:391 +msgid "Tracker" +msgstr "Tracker" + +#: src/torrents_view.cpp:355 +msgid "Status icon" +msgstr "Status Icon" + +#: src/torrents_view.cpp:366 +msgid "Requested size" +msgstr "Benötigte Größe" + +#: src/torrents_view.cpp:367 +msgid "Downloaded requested size" +msgstr "Benötigte Downloadgröße" + +#: src/torrents_view.cpp:387 +msgid "Time added" +msgstr "Zeit hinzugefügt" + +#: src/torrents_view.cpp:388 +msgid "Time left" +msgstr "Verbleibende Zeit" + +#: src/torrents_view.cpp:389 +msgid "Time seeding" +msgstr "Zeit Seeding" + +#: src/torrents_view.cpp:450 +msgid "Open directory" +msgstr "Verzeichnis Öffnen" + +#: src/torrents_view.cpp:467 +msgid "Recheck" +msgstr "Nachprüfung" + +#: src/torrents_view.cpp:636 +#, qt-format +msgid "Opening torrent '%1' directory failed. %2" +msgstr "Öffnen des Torrent Verzeichnises '%1' fehlgeschlagen. %2" + +#: src/torrents_view.cpp:660 +#, qt-format +msgid "Opening torrent '%1' file(s) failed. %2" +msgstr "Öffnen der Torrent '%1' Datei/Dateien fehlgeschlagen. %2" + +#: src/torrents_view.cpp:754 +msgid "Remove torrent" +msgstr "Torrent Entfernen" + +#: src/torrents_view.cpp:755 +msgid "Remove torrents" +msgstr "Torrents Entfernen" + +#: src/torrents_view.cpp:760 +#, qt-format +msgid "Are you sure want to remove torrent '%1'?" +msgstr "Sind Sie sicher, dass Sie die Torrent Datei '%1' entfernen wollen?" + +#: src/torrents_view.cpp:761 +msgid "Are you sure want to remove following torrents?" +msgstr "Sind Sie sicher, dass Sie die folgenden Torrents entfernen wollen?" + +#: src/torrents_view.cpp:767 +msgid "Remove with data" +msgstr "Entfernen mit Daten" + +#: src/torrents_view.cpp:830 +msgid "Removing torrent(s) failed." +msgstr "Torrent(s) entfernen fehlgeschlagen." + +#: src/torrents_view.cpp:830 +#, qt-format +msgid "Removing torrent(s) failed. %1" +msgstr "Torrent(s) entfernen fehlgeschlagen. %1" + +#: src/torrents_view.cpp:834 +msgid "Removing torrent(s) with data failed." +msgstr "Torrent(s) entfernen mit Daten fehlgeschlagen." + +#: src/torrents_view.cpp:834 +#, qt-format +msgid "Removing torrent(s) with data failed. %1" +msgstr "Torrent(s) entfernen mit Daten fehlgeschlagen. %1" + +#: src/torrents_view.cpp:838 +msgid "Pausing torrent(s) failed." +msgstr "Torrent(s) Pausieren fehlgeschlagen." + +#: src/torrents_view.cpp:838 +#, qt-format +msgid "Pausing torrent(s) failed. %1" +msgstr "Torrent(s) Pausieren fehlgeschlagen. %1" + +#: src/torrents_view.cpp:842 +msgid "Resuming torrent(s) failed." +msgstr "Torrent(s) zurücksetzen fehlgeschlagen." + +#: src/torrents_view.cpp:842 +#, qt-format +msgid "Resuming torrent(s) failed. %1" +msgstr "Torrent(s) zurücksetzen fehlgeschlagen. %1" + +#: src/daemon_types.cpp:218 +#, qt-format +msgid "Unable to parse torrent '%1' magnet URI. %2" +msgstr "Analysieren der Torrent '%1' Magnet URI nicht möglich. %2" + +#: src/daemon_types.cpp:232 +msgid "Libtorrent internal error." +msgstr "Libtorrent interner Fehler." + +#: src/daemon_types.cpp:256 +#, qt-format +msgid "Can't save torrent file '%1': %2." +msgstr "Konnte Torrent Datei '%1' nicht speichern: %2" + +#: src/daemon_types.cpp:266 +msgid "Unable to save torrent's metadata" +msgstr "Konnte Torrent's Metadaten nicht speichern" + +#: src/daemon_types.cpp:267 +#, qt-format +msgid "Saving torrent's '%1' downloaded metadata failed. %2" +msgstr "" +"Speichern der Heruntergeladenen Torrent(s) '%1' Metadaten fehlgeschlagen. %2" + +#: src/open_magnet_dialog.cpp:113 src/open_magnet_dialog.cpp:119 +msgid "Invalid magnet URI" +msgstr "Ungültiger Magnet URI" + +#: src/open_magnet_dialog.cpp:114 +msgid "Please enter a magnet URI." +msgstr "Bitte Magnet URI eingeben." + +#: src/open_magnet_dialog.cpp:120 +#, qt-format +msgid "'%1' is not a magnet URI." +msgstr "'%1' ist kein Magnet URI" + +#: src/client_settings.cpp:41 +#, qt-format +msgid "Client config: Bad option '%1' type at line %2." +msgstr "Client Konfiguration: Fehlerhafter Options '%1' Typ bei Zeile %2" + +#: src/client_settings.cpp:68 +#, qt-format +msgid "Client config: Bad option '%1' value '%2' at line %3." +msgstr "Client config: Böse Option '%1' Wert '%2' bei Zeile %3." + +#: src/client_settings.cpp:78 +#, qt-format +msgid "Client config: Invalid option '%1' UTF-8 value at line %2." +msgstr "Client config: Fehlerhafte Option '%1' UTF-8 Wert bei Zeile %2." + +#: src/client_settings.cpp:88 +#, qt-format +msgid "Client config: Unknown option '%1' at line %2." +msgstr "Client Konfiguration: Unbekante Option '%1' bei Zeile %2." + +#: src/client_settings.cpp:1153 +#, qt-format +msgid "Can't read configuration file '%1': %2." +msgstr "Konnte Konfigurations Datei nicht lesen '%1': %2." + +#: src/client_settings.cpp:1157 +#, qt-format +msgid "Can't parse configuration file '%1': %2." +msgstr "Konnte Konfigurations Datei '%1' nicht analysieren: %2." + +#: src/client_settings.cpp:1240 +#, qt-format +msgid "Can't write configuration file '%1': %2." +msgstr "Konnte Konfigurations Datei '%1' nicht schreiben: %2." + +#: src/daemon_session.cpp:210 +#, qt-format +msgid "%1 (%2). Errors: %3." +msgstr "%1 (%2). Fehler: %3" + +#: src/daemon_session.cpp:545 +msgid "This torrent is already exists in the current session." +msgstr "Dieses Torrent existiert bereits in dieser Sitzung" + +#: src/daemon_session.cpp:563 +#, qt-format +msgid "Can't create torrent configuration directory '%1': %2." +msgstr "Konnte Torrent Konfigurations Verzeichnis '%1' nicht erzeugen: %2." + +#: src/daemon_session.cpp:587 +#, qt-format +msgid "Torrent '%1' has been changed while it's been processed." +msgstr "Torrent '%1' wurde während eines Prozesses verändert." + +#: src/daemon_session.cpp:602 +#, qt-format +msgid "Can't copy torrent file '%1' to '%2': %3." +msgstr "Konnte Torrent Datei '%1' nicht nach '%2' kopieren: %3." + +#: src/daemon_session.cpp:802 +#, qt-format +msgid "Can't pause torrent '%1'. %2" +msgstr "Konnte Torrent '%1' nich pausieren. %2" + +#: src/daemon_session.cpp:815 +#, qt-format +msgid "Can't remove torrent '%1'. %2" +msgstr "Konnte Torrent '%1' nicht entfernen. %2" + +#: src/daemon_session.cpp:828 +#, qt-format +msgid "Can't remove with data torrent '%1'. %2" +msgstr "Konnte Torrent '%1' mit Daten nicht entfernen. %2" + +#: src/daemon_session.cpp:873 +#, qt-format +msgid "Can't stat torrent file: %1." +msgstr "Konnte Torrent Datei '%1' nicht starten." + +#: src/daemon_session.cpp:913 +msgid "Deleting automatically loaded *.torrent file failed" +msgstr "Automatisches Löschen der geladenen *.torrent Datei ist fehlgeschlagen" + +#: src/daemon_session.cpp:915 +#, qt-format +msgid "Can't delete automatically loaded *.torrent file '%1': %2." +msgstr "" +"Konnte automatisches Löschen der geladenen *.torrent Datei '%1' nicht " +"ausführen: %2" + +#: src/daemon_session.cpp:944 src/daemon_session.cpp:1705 +#, qt-format +msgid "Automatic loading the torrent '%1' failed. %2" +msgstr "Automatisches Laden des Torrents '%1' fehlgeschlagen. %2" + +#: src/daemon_session.cpp:954 src/daemon_session.cpp:959 +#: src/daemon_session.cpp:978 src/daemon_session.cpp:2507 +#: src/daemon_session.cpp:2589 +msgid "Automatic torrents loading failed" +msgstr "Automatisches Laden der Torrents fehlgeschlagen" + +#: src/daemon_session.cpp:961 +#, qt-format +msgid "Directory '%1' has been deleted or moved." +msgstr "Verzeichnis '%1' wurde verschoben oder gelöscht." + +#: src/daemon_session.cpp:1082 +msgid "Automatic torrents cleaning failed" +msgstr "Automatisches Aufräumen der Torrents ist fehlgeschlagen" + +#: src/daemon_session.cpp:1177 +msgid "All torrents downloaded." +msgstr "Alle Torrents heruntergeladen." + +#: src/daemon_session.cpp:1227 +msgid "Copying finished torrent's files failed" +msgstr "Kopieren der fertiggestellten Torrents ist fehlgeschlagen" + +#: src/daemon_session.cpp:1229 +#, qt-format +msgid "Copying finished torrent's '%1' files from '%2' to '%3' failed." +msgstr "" +"Kopieren der fertiggestellten Torrents '%1' von '%2' nach '%3' ist " +"fehlgeschlagen." + +#: src/daemon_session.cpp:1311 src/daemon_session.cpp:1323 +#: src/daemon_session.cpp:1334 src/daemon_session.cpp:1347 +#, qt-format +msgid "Bad torrent id '%1'." +msgstr "Korrupte Torrent id '%1'." + +#: src/daemon_session.cpp:1573 +#, qt-format +msgid "Restoring torrent's previous session settings failed. %1" +msgstr "" +"Wiederherstellen der vorherigen Sitzungseinstellungen ist fehlgeschlagen. %1" + +#: src/daemon_session.cpp:1656 +#, qt-format +msgid "Invalid torrent '%1' files' settings. Rejecting them..." +msgstr "Ungültige Torrentdatei '%1' Einstellungen. Sie werden zurückgewisen" + +#: src/daemon_session.cpp:1667 +msgid "Torrent added with errors" +msgstr "Torrent mit Fehlern hinzugefügt" + +#: src/daemon_session.cpp:1668 +#, qt-format +msgid "Torrent '%1' has been added with errors.%2" +msgstr "Torrent '%1' wurde mit Fehlern hinzugefügt. %2" + +#: src/daemon_session.cpp:1717 +#, qt-format +msgid "Can't read directory '%1' for automatic torrents loading: %2." +msgstr "" +"Konnte Verzeichnis '%1' für Automatisches Torrent Laden nicht lesen: %2." + +#: src/daemon_session.cpp:1752 +msgid "Loading torrent failed" +msgstr "Laden des Torrents fehlgeschlagen" + +#: src/daemon_session.cpp:1752 +#, qt-format +msgid "Loading of the torrent '%1' failed. %2" +msgstr "Laden des Torrents '%1' fehlgeschlagen. %2" + +#: src/daemon_session.cpp:1758 +#, qt-format +msgid "Can't read directory with torrents configs '%1': %2." +msgstr "Konnte Verzeichnis der Torrent Konfiguration nicht lesen '%1': %2." + +#: src/daemon_session.cpp:1764 +#, qt-format +msgid "Loading torrents from previous session failed. %1" +msgstr "Laden von Torrents aus der letzten Sitzung fehlgeschlagen. %1" + +#: src/daemon_session.cpp:1780 src/daemon_session.cpp:2662 +msgid "Saving session failed" +msgstr "Speichern der Sitzung fehlgeschlagen" + +#: src/daemon_session.cpp:1780 src/daemon_session.cpp:2662 +#, qt-format +msgid "Saving session failed. %1" +msgstr "Speichern der Sitzung fehlgeschlagen. %1" + +#: src/daemon_session.cpp:1994 +#, qt-format +msgid "Bad torrent id: '%1'." +msgstr "Korrupte Torrent id: '%1'." + +#: src/daemon_session.cpp:2042 src/daemon_session.cpp:2058 +msgid "Deleting torrent data failed" +msgstr "Löschen des Torrent Daten Feldes" + +#: src/daemon_session.cpp:2043 src/daemon_session.cpp:2059 +#, qt-format +msgid "Deleting torrent '%1' data failed." +msgstr "Löschen der Torrent '%1\" Daten Feldes." + +#: src/daemon_session.cpp:2184 +msgid "Saving torrent settings failed" +msgstr "Speichern der Torrent Einstellungen fehlgeschlagen" + +#: src/daemon_session.cpp:2186 +#, qt-format +msgid "Saving torrent '%1' settings failed. %2" +msgstr "Speichern der Torrent '%1' Einstellungen fehlgeschlagen. %2" + +#: src/daemon_session.cpp:2217 +#, qt-format +msgid "Invalid copy when finished to path '%1'." +msgstr "Ungültige Kopie wenn im Pfad angekommen '%1'." + +#: src/daemon_session.cpp:2239 src/daemon_session.cpp:2261 +#, qt-format +msgid "Bad file id: %1." +msgstr "Korrupte Datei id: %1." + +#: src/daemon_session.cpp:2484 +msgid "Setting directory for automatic torrents loading failed" +msgstr "" +"Einrichten des Verzeichnisses für automatisches Torrent laden ist " +"fehlgeschlagen" + +#: src/daemon_session.cpp:2486 +#, qt-format +msgid "Setting directory '%1' for automatic torrents loading failed. %2" +msgstr "" +"Einrichten des Verzeichnisses '%1' für automatisches Torrent laden ist " +"fehlgeschlagen. %2" + +#: src/daemon_session.cpp:2552 +msgid "Setting torrent trackers failed: libtorrent internal error." +msgstr "Setzen der Torrent Tracker fehlgeschlagen: libtorrent interner Fehler." + +#: src/daemon.cpp:195 +#, qt-format +msgid "Can't start daemon. Creating config directories failed. %1" +msgstr "" +"Konnte Daemon nicht starten. Erzeugen der config Verzeichnise " +"fehlgeschlagen. %1" + +#: src/torrent_files_view.cpp:82 src/torrent_files_view.cpp:93 +msgid "Change file or directory path" +msgstr "Datei oder Verzeichnis Pfad ändern" + +#: src/torrent_files_view.cpp:125 src/torrent_files_view.cpp:533 +#: src/torrent_files_view.cpp:550 +msgid "Changing file or directory path failed" +msgstr "Verändern des Datei oder Verzeichnis Pfades fehlgeschlagen" + +#: src/torrent_files_view.cpp:126 +msgid "" +"Changing file or directory path failed. Invalid path has been gotten. Please " +"enter a valid path." +msgstr "" +"Verändern des Datei oder Verzeichnis Pfades fehlgeschlagen. Ungültigen Pfad " +"erhalten. Bitte gültigen Pfad eingeben." + +#: src/torrent_files_view.cpp:182 src/torrent_files_view.cpp:200 +msgid "Priority" +msgstr "Priorität" + +#: src/torrent_files_view.cpp:183 src/torrent_files_view.cpp:207 +msgid "Progress" +msgstr "Fortschritt" + +#: src/torrent_files_view.cpp:241 +msgid "Download" +msgstr "Download" + +#: src/torrent_files_view.cpp:247 +msgid "Do not download" +msgstr "Nicht Downloaden" + +#: src/torrent_files_view.cpp:253 +msgid "Normal priority" +msgstr "Normale Priorität" + +#: src/torrent_files_view.cpp:259 +msgid "High priority" +msgstr "Hohe Priorität" + +#: src/torrent_files_view.cpp:265 +msgid "Change path" +msgstr "Verändere Pfad" + +#: src/torrent_files_view.cpp:395 +#, qt-format +msgid "Changing torrent files download status failed. %1" +msgstr "Verändern des Download Status der Torrent Datei fehlgeschlagen. %1" + +#: src/torrent_files_view.cpp:434 +#, qt-format +msgid "Changing torrent files priorities failed. %1" +msgstr "Verändern der Torrent Dateien Priorität fehlgeschlagen. %1" + +#: src/torrent_files_view.cpp:502 +msgid "Changing file path failed" +msgstr "Verändern des Datei Pfades fehlgeschlagen" + +#: src/torrent_files_view.cpp:503 +msgid "" +"Changing file path failed. Invalid file path has been gotten. Please enter a " +"valid path." +msgstr "" +"Verändern des Datei Pfades fehlgeschlagen. Ungültiger Datei Pfad wurde " +"erhalten. Bitte gültigen Pfad eingeben." + +#: src/torrent_files_view.cpp:534 src/torrent_files_view.cpp:551 +#, qt-format +msgid "Changing file or directory path failed. %1" +msgstr "Verändern des Datei oder Verzeichnis Pfades fehlgeschlagen. %1" + +#: src/torrent_files_view.cpp:630 +#, qt-format +msgid "Changing download status for '%1' failed. %2" +msgstr "Verändern des Downloadstatus für '%1' fehlgeschlagen. %2" + +#: src/add_torrent_dialog.cpp:248 +msgid "Invalid torrent name" +msgstr "Ungültiger Torrent Name" + +#: src/add_torrent_dialog.cpp:249 +msgid "" +"You have entered invalid torrent name. Please enter non-empty torrent name." +msgstr "" +"Sie haben eine ungültigen Torrent Namen vergeben. Bitte geben Sie einen " +"nicht leeren Torrent Namen ein." + +#: src/common.cpp:81 +#, qt-format +msgid "invalid auto clean action type '%1'" +msgstr "Ungültiger automatischer Clean Aktions Typ '%1'" + +#: src/common.cpp:270 +#, qt-format +msgid "invalid IP address '%1'" +msgstr "ungültige IP Adresse '%1'" + +#: src/common.cpp:274 +#, qt-format +msgid "invalid IP range %1-%2" +msgstr "ungültiger IP Bereich %1-%2" + +#: src/common.cpp:320 +#, qt-format +msgid "%1 - Download completed" +msgstr "%1 - Download fertiggestellt" + +#: src/common.cpp:324 +#, qt-format +msgid "%1 - All downloads completed" +msgstr "%1 - Alle Downloads fertiggestellt" + +#: src/common.cpp:409 +msgid "normal" +msgstr "Normal" + +#: src/common.cpp:413 +msgid "high" +msgstr "Hoch" + +#: src/common.cpp:449 +#, qt-format +msgid "Invalid file priority name: '%1'." +msgstr "Ungültiger Datei Prioritäts Name: '%1'." + +#: src/common.cpp:568 +msgid "[Invalid encoding]" +msgstr "[Ungültige entschlüsselung]" + +#: src/common.cpp:701 src/common.cpp:704 src/common.cpp:758 +msgid "(short)|Paused" +msgstr "Pausiert" + +#: src/common.cpp:712 +msgid "(short)|Allocating" +msgstr "Verteilend" + +#: src/common.cpp:716 +msgid "(short)|Queued for checking" +msgstr "Wartet auf überprüfung" + +#: src/common.cpp:720 +msgid "(short)|Checking files" +msgstr "Überprüfe Dateien" + +#: src/common.cpp:724 +msgid "Waiting for metadata download (short)|Metadata down wait" +msgstr "warte auf Metadaten" + +#: src/common.cpp:728 +msgid "Downloading metadata (short)|Metadata down" +msgstr "Metadata down" + +#: src/common.cpp:732 +msgid "Waiting for download (short)|Download wait" +msgstr "Download wartet" + +#: src/common.cpp:736 +msgid "(short)|Downloading" +msgstr "Downloading" + +#: src/common.cpp:740 +msgid "(short)|Seeding" +msgstr "Seeding" + +#: src/common.cpp:744 +msgid "(short)|Uploading" +msgstr "Uploading" + +#: src/common.cpp:748 +msgid "(short)|Unknown" +msgstr "Unbekannt" + +#: src/common.cpp:925 +msgid "Tracker status is not given yet|Not given yet" +msgstr "Noch nicht erhalten" + +#: src/common.cpp:928 +#, qt-format +msgid "OK (%1)" +msgstr "OK (%1)" + +#: src/common.cpp:931 +msgid "There are no trackers has been setted for this torrent" +msgstr "Für dieses Torrent sind keine Tracker gesetzt." + +#: src/client_cmd_options.cpp:67 +#, qt-format +msgid "Bad option '%1' value '%2'." +msgstr "Korrupte Option '%1' Wert '%2'." + +#: src/client_cmd_options.cpp:75 +msgid "torrent_path" +msgstr "Torrent_Pfad" + +#: src/client_cmd_options.cpp:84 +msgid "Main options" +msgstr "Haupt Optionen" + +#: src/client_cmd_options.cpp:90 +msgid "Show program version" +msgstr "Zeige Program Version" + +#: src/client_cmd_options.cpp:106 +#, qt-format +msgid "Configuration directory path (default: ~/%1)" +msgstr "Konfigurations Verzeichnis Pfad (default: ~/%1)" + +#: src/client_cmd_options.cpp:107 +msgid "DIRECTORY" +msgstr "VERZEICHNIS" + +#: src/client_cmd_options.cpp:114 +msgid "Set download rate limit (KB/s)" +msgstr "Setze Download Raten Limit (KB/s)" + +#: src/client_cmd_options.cpp:115 src/client_cmd_options.cpp:123 +msgid "SPEED" +msgstr "SPEED" + +#: src/client_cmd_options.cpp:122 +msgid "Set upload rate limit (KB/s)" +msgstr "Setze Upload Raten Limit (KB/s)" + +#: src/client_cmd_options.cpp:130 +msgid "Set maximum uploads" +msgstr "Setze maximale Uploads" + +#: src/client_cmd_options.cpp:131 src/client_cmd_options.cpp:139 +msgid "NUMBER" +msgstr "NUMMER" + +#: src/client_cmd_options.cpp:138 +msgid "Set maximum connections" +msgstr "Setze maximale Verbindungen" + +#: src/client_cmd_options.cpp:147 +msgid "Start torrents" +msgstr "Start Torrents" + +#: src/client_cmd_options.cpp:148 src/client_cmd_options.cpp:157 +msgid "{all,downloads,uploads}" +msgstr "{alle,downloads,uploads}" + +#: src/client_cmd_options.cpp:156 +msgid "Stop torrents" +msgstr "Stop Torrents" + +#: src/client_cmd_options.cpp:166 +#, qt-format +msgid "" +"Only pass commands to already running %1 instance. Does not start new " +"instance if it is not running yet" +msgstr "" +"Geben Sie nur Kommandos zu der bereits laufenden %1 Instanz ein. Straten Sie " +"eine neue Instanz nur dann, wenn sie noch nicht läuft." + +#: src/client_cmd_options.cpp:239 +#, qt-format +msgid "Error while processing torrent '%1'" +msgstr "Fehler bei der Ausführung des Torrents '%1'" + +#: src/client_cmd_options.cpp:240 +#, qt-format +msgid "Can't get '%1' absolute path: %2." +msgstr "Konnte Absoluten Pfad nicht erhalten '%1': %2" + +#: src/client_cmd_options.cpp:260 +#, qt-format +msgid "Bad option '%1' value '%2'. Allowed values: all, downloads, uploads." +msgstr "" +"Korrupte Option '%1' Wert '%2'. Erlaubte Werte: alle, downloads, uploads." + +#: src/create_torrent_dialog.cpp:161 +msgid "Hashing files..." +msgstr "Zerlege Dateien.." + +#: src/create_torrent_dialog.cpp:170 +msgid "Hashing files. Please wait..." +msgstr "Zerlege Dateien. Bitte warten.." + +#: src/create_torrent_dialog.cpp:279 src/create_torrent_dialog.cpp:326 +#, qt-format +msgid "Error while reading torrent files. File '%1': %2." +msgstr "Fehler beim Lesen der Torrent Datei. Datei '%1': %2." + +#: src/create_torrent_dialog.cpp:285 +msgid "Libtorrent internal error happened while reading torrent files." +msgstr "" +"Libtorrent ein interner Fehler ist während des lesens einer Torrent Datei " +"aufgetreten." + +#: src/create_torrent_dialog.cpp:302 +msgid "Libtorrent internal error happened while creating torrent." +msgstr "" +"Libtorrent eine interner Fehler ist während des erzeugen einer Torrent Datei " +"aufgetreten." + +#: src/create_torrent_dialog.cpp:338 +msgid "Libtorrent internal error happened while hashing torrent files." +msgstr "" +"Libtorrent eine interner Fehler ist während des zerlegen einer Torrent Datei " +"aufgetreten." + +#: src/create_torrent_dialog.cpp:387 +msgid "Libtorrent return invalid torrent file." +msgstr "Libtorrent setzt ungültige Torrentdatei zurück." + +#: src/create_torrent_dialog.cpp:416 +#, qt-format +msgid "Can't write torrent file '%1': %2." +msgstr "Konnte Torrentdatei '%1' nischt schreiben: %2." + +#: src/create_torrent_dialog.cpp:423 +#, qt-format +msgid "Libtorrent internal error happened while creating torrent file '%1'." +msgstr "" +"Libtorrent es ist ein interner Fehler während des Erzeugens der Torrentdatei " +"'%1' aufgetreten." + +#: src/create_torrent_dialog.cpp:435 +msgid "Torrent created" +msgstr "Torrent erzeugt" + +#: src/create_torrent_dialog.cpp:437 +#, qt-format +msgid "Torrent '%1' has been created successfully." +msgstr "Torrent '%1' wurde erfolgreich erzeugt." + +#: src/create_torrent_dialog.cpp:461 +msgid "Creating torrent failed" +msgstr "Torrent erzeugung fehlgeschlagen" + +#: src/create_torrent_dialog.cpp:462 +#, qt-format +msgid "Creating torrent '%1' failed. %2" +msgstr "Erzeugen des Torrents '%1' fehlgeschlagen. %2" + +#: src/create_torrent_dialog.cpp:488 +msgid "Creating torrent" +msgstr "Erzeuge Torrent" + +#: src/create_torrent_dialog.cpp:503 +msgid "Torrent:" +msgstr "Torrent:" + +#: src/create_torrent_dialog.cpp:508 +msgid "File or directory to create torrent from:" +msgstr "Datei oder Verzeichnis des zu Erzeugenden Torrents" + +#: src/create_torrent_dialog.cpp:543 +msgid "Private torrent (DHT is not allowed)" +msgstr "Privates Torrent (DHT ist verboten)" + +#: src/create_torrent_dialog.cpp:601 +msgid "Piece size:" +msgstr "Teil größe:" + +#: src/create_torrent_dialog.cpp:607 +msgid "Trackers:" +msgstr "Trackers:" + +#: src/create_torrent_dialog.cpp:670 +msgid "File or directory to create torrent from is not setted" +msgstr "Datei oder Verzeichnis um ein Torrent zu erzeugen wurde nicht gesetzt" + +#: src/create_torrent_dialog.cpp:671 +msgid "Please choose file or directory to create torrent from." +msgstr "" +"Bitte wählen Sie eine Datei oder ein Verzeichnis von dem das Torrent erzeugt " +"werden soll." + +#: src/create_torrent_dialog.cpp:680 +msgid "Please choose a file to save the torrent" +msgstr "Bitte wählen Sie eine Datei um das Torrent zu speichern." + +#: src/create_torrent_dialog.cpp:740 +msgid "Please choose a directory to create torrent from" +msgstr "" +"Bitte wählen Sie ein Verzeichnis von dem ein Torrent erzeugt werden soll" + +#: src/create_torrent_dialog.cpp:741 +msgid "Please choose a file to create torrent from" +msgstr "Bitte wählen Sie eine Datei von dem ein Torrent erzeugt werden soll" + +#: src/torrent_options_view.cpp:73 +msgid "Downloading" +msgstr "Downloading" + +#: src/torrent_options_view.cpp:76 +msgid "Sequential download" +msgstr "Sequenzieller Download" + +#: src/torrent_options_view.cpp:84 ui/dialog.add_torrent.glade:162 +msgid "Copy when finished to:" +msgstr "Nach Ferstigstellung kopiere nach:" + +#: src/torrent_options_view.cpp:118 +msgid "Trackers" +msgstr "Trackers" + +#: src/torrent_options_view.cpp:201 +#, qt-format +msgid "Error while getting torrent download settings. %1" +msgstr "Fehler während des Setzen der Torren Downloadeinstellungen. %1" + +#: src/torrent_options_view.cpp:228 src/torrent_options_view.cpp:274 +#, qt-format +msgid "Error while setting torrent download settings. %1" +msgstr "Fehler während des Setzen der Torrent Downloadeinstellungen. %1" + +#: src/torrent_options_view.cpp:241 +msgid "Please choose a directory for torrent finished files copying" +msgstr "" +"Bitte wählen Sie ein Verzeichnis für das Kopieren von fertiggestellten " +"Torrents" + +#: src/torrent_options_view.cpp:292 +#, qt-format +msgid "Can't set torrent trackers. %1" +msgstr "Konnte keine Torrent Tracker setzen. %1" + +#: src/application.cpp:78 +msgid "Silent warning" +msgstr "Leise Warnung" + +#: src/application.cpp:290 +msgid "application is now ending it's work" +msgstr "Applikation beedet nun seine Arbeit" + +#: src/application.cpp:414 +msgid "Unable to show libnotify message" +msgstr "Zeigen der libnotify message nicht möglich" + +#: src/application.cpp:415 +#, qt-format +msgid "" +"Unable to show libnotify message: %1. You can disable notifications in the " +"Preferences dialog.\n" +"Message text:\n" +"%2" +msgstr "" +"Nicht möglich libnotify Nachrichten zu zeigen: %1. Unter den Einstellungen " +"könne Sie Anzeige aktivieren.\n" +"Nachrichten Text: \n" +"%2" + +#: src/application.cpp:466 +#, qt-format +msgid "Running open command failed. %1." +msgstr "Ausführen des Öffnen Befehls fehlgeschlagen. %1." + +#: src/application.cpp:541 +msgid "Error while saving settings" +msgstr "Fehler beim speichern der Einstellungen" + +#: src/application.cpp:615 +msgid "" +"Unable to initialize a libnotify instance. Notification's displaying is not " +"possible." +msgstr "" +"Es ist nicht möglich libnotify Instanzen zu initialisieren. Eine Anzeige ist " +"nicht möglich." + +#: src/main.cpp:172 +msgid "Error" +msgstr "Fehler" + +#: src/main.cpp:174 +#, qt-format +msgid "Starting %1 failed:" +msgstr "Starten von %1 fehlgeschlagen:" + +#: src/main.cpp:214 +msgid "Error at" +msgstr "Fehler bei" + +#: src/main.cpp:215 +msgid "" +"\n" +"Locale settings:\n" +msgstr "" +"\n" +"Lokale Einstellungen:\n" + +#: src/main.cpp:228 +msgid "" +"\n" +"Compiled with native language support.\n" +msgstr "" +"\n" +"Kompiliert mit nativer Sprachunterstüzung.\n" + +#: src/main.cpp:230 +msgid "" +"\n" +"Compiled without native language support.\n" +msgstr "" +"\n" +"Kompiliert ohne nativer Sprachunterstüzung.\n" + +#: src/main.cpp:259 +msgid "Logical error." +msgstr "Logischer Fehler" + +#: src/main.cpp:265 src/main.cpp:283 +msgid "Critical error" +msgstr "Kritischer Fehler" + +#: src/main.cpp:301 src/main.cpp:355 +msgid "Debug info:" +msgstr "Debug Info:" + +#: src/main.cpp:790 +#, qt-format +msgid "Enable to set non-block mode for a pipe: %1." +msgstr "Erlaube das Setzen des non-block mode für eine Pipe: %1." + +#: src/main.cpp:845 +#, qt-format +msgid "Can't create config directory '%1': %2." +msgstr "Konnte config Verzeichnis '%1' nicht erzeugen: %2" + +#: src/main.cpp:865 +#, qt-format +msgid "Error while opening config directory '%1': %2." +msgstr "Fehler während des Öffnen des config Verzeichnises '%1': %2." + +#: src/main.cpp:877 +#, qt-format +msgid "Error! Can't stat config directory '%1': %2." +msgstr "Fehler! Konnte config Verzeichnis '%1' nicht finden: %2." + +#: src/main.cpp:883 +#, qt-format +msgid "Error! Config path '%1' is not a directory." +msgstr "Fehler! Config Pfad '%1' ist kein Verzeichnis." + +#: src/main.cpp:889 +#, qt-format +msgid "Error! Can't change current directory to config directory '%1': %2." +msgstr "" +"Fehler! Aktuelles Verzeichnis kann nicht als config Verzeichnis '%1' " +"verwendet werden: %2." + +#: src/main.cpp:914 src/main.cpp:930 +#, qt-format +msgid "" +"Can't communicate with running %1 instance. Error while reading link '%2' " +"target path: %3." +msgstr "" +"Konnten nicht mit der laufenden Instanz %1 kommunizieren. Fehler während des " +"Lesens des Link Zielpfades '%2' : %3." + +#: src/main.cpp:942 +#, qt-format +msgid "Can't set environment variable '%1'='%2': %3." +msgstr "Konnte die Umgebunsvariable '%1'='%2' nicht setzen: %3" + +#: src/main.cpp:948 src/main.cpp:1161 +#, qt-format +msgid "Can't communicate with running %1 instance. It is not running." +msgstr "" +"Konnten nicht mit der laufenden Instanz %1 kommunizieren. Sie läuft nicht." + +#: src/main.cpp:988 +msgid "Unexpected DBus behavior" +msgstr "Unerwartetes DBus Verhalten" + +#: src/main.cpp:989 +msgid "Name request has been added to queue, but queuing has been forbidden." +msgstr "" +"Namensanfrage wurde in die Warteschlange aufgenommen, aber " +"Warteschlangenbildung ist verboten." + +#: src/main.cpp:995 src/main.cpp:1002 +msgid "Unexpected DBus behavior while requesting name" +msgstr "Unerwartetes DBus Verhalten während der Namesanfrage" + +#: src/main.cpp:996 +msgid "" +"DBus saying that application is already name owner, but name request has not " +"been sent yet." +msgstr "" +"DBus meldet das die Applikation bereits einen Namen besitzt, aber die " +"Namensanfrage wurde noch nicht gesendet." + +#: src/main.cpp:1003 +msgid "Unknown reply has been gotten." +msgstr "Unbekannte Rückgabe erhalten." + +#: src/main.cpp:1014 +msgid "DBus error" +msgstr "DBus Fehler" + +#: src/main.cpp:1042 +#, qt-format +msgid "Creating %1 session failed. Can't remove DBus session link '%2'. %3" +msgstr "" +"Erzeugen %1 Sitzung fehlgeschlagen. Konnte DBus Sitzungs Link '%2' nicht " +"entfernen. %3" + +#: src/main.cpp:1051 +#, qt-format +msgid "" +"Creating %1 session failed. Error while reading link '%2' target path: %3." +msgstr "" +"Erzeugen %1 Sitzung fehlgeschlagen. Fehler während des Lesens des Links '%2' " +"Ziel Pfad: %3" + +#: src/main.cpp:1058 +#, qt-format +msgid "Creating %1 session failed. Can't get DBus session bus address." +msgstr "" +"Erzeugen %1 Sitzung fehlgeschlagen. Konnte DBus Sitzungs Bus Adresse nicht " +"erfassen." + +#: src/main.cpp:1067 +#, qt-format +msgid "Creating %1 session failed. Can't create DBus session link '%2': %3." +msgstr "" +"Erzeugen %1 Sitzung fehlgeschlagen. Konnte DBus Sitzungs Link '%2' nicht " +"erzeugen: %3." + +#: src/main.cpp:1105 src/main.cpp:1121 +#, qt-format +msgid "Closing %1 session failed. Can't remove DBus session link '%2': %3." +msgstr "" +"Erzeugen %1 Sitzung fehlgeschlagen. Konnte DBus Sitzungs Link '%2' nicht " +"entfernen: %3." + +#: src/main.cpp:1140 +msgid "Nothing to process. Exiting..." +msgstr "Nichts Auszuführen. Beenden..." + +#: src/main.cpp:1143 +msgid "Delivering command line options to working copy..." +msgstr "Ausliefernde Befehlszeilen Option um zu kopieren.." + +#: src/main.cpp:1152 src/main.cpp:1156 src/main.cpp:1161 +msgid "Transmitting command line options failed" +msgstr "Übrermittelde Befehlszeilen Option fehlgeschlagen" + +#: src/main.cpp:1152 +#, qt-format +msgid "Running %1 instance rejected command line options transfered to it: %2." +msgstr "Laufende %1 Instanz gibt Kommandozeilen transfer Optionen zurück: %2." + +#: src/main.cpp:1156 +#, qt-format +msgid "Can't communicate with running %1 instance via DBus: %2." +msgstr "Konnte nicht mit laufender %1 Instanz über DBus kommunizieren: %2." + +#: src/trackers_view.cpp:169 +#, qt-format +msgid "" +"Gotten invalid tracker URL ('%1'). Please inter a valid URL started from " +"'http://'." +msgstr "" +"Ungültige Tracker URL erhalten ('%1'). Bitte geben Sie eine gültige URL ein, " +"beginnent mit 'http://'." + +#: src/trackers_view.cpp:187 +#, qt-format +msgid "" +"Gotten invalid tracker URL ('%1'). This URL is already exists in the tracker " +"list." +msgstr "" +"Ungültige Tracker URL erhalten ('%1'). Diese URL existiert bereits in der " +"Trackerliste." + +#: src/trackers_view.cpp:234 src/trackers_view.cpp:236 +msgid "Invalid tracker URL" +msgstr "Ungültige Tracker URL" + +#: src/categories_view.cpp:294 +msgid "invalid category name" +msgstr "Ungültiger Kategorie Name" + +#: src/categories_view.cpp:341 +msgid "All torrents (as short as possible)|All" +msgstr "Alle" + +#: src/categories_view.cpp:342 +msgid "Paused torrents (as short as possible)|Paused" +msgstr "Pausiert" + +#: src/categories_view.cpp:343 +msgid "Checking torrents (as short as possible)|Checking" +msgstr "Überprüfe" + +#: src/categories_view.cpp:344 +msgid "Waiting for download torrents (as short as possible)|Down. wait" +msgstr "Warte a. Down." + +#: src/categories_view.cpp:345 +msgid "Downloading torrents (as short as possible)|Downloading" +msgstr "Downloading" + +#: src/categories_view.cpp:346 +msgid "Seeding torrents (as short as possible)|Seeding" +msgstr "Seeding" + +#: src/categories_view.cpp:347 +msgid "Uploading torrents (as short as possible)|Uploading" +msgstr "Uploading" + +#: src/categories_view.cpp:348 +msgid "Torrents with tracker error (as short as possible)|Tracker error" +msgstr "Tracker Fehler" + +#: src/categories_view.cpp:363 +#, qt-format +msgid "Can't select torrent category '%1': %2." +msgstr "Konnte Torrent Kategorie nicht wählen '%1': %2." + +#: src/categories_view.cpp:373 +msgid "All torrents" +msgstr "Alle Torrents" + +#: src/categories_view.cpp:378 +msgid "Paused torrents" +msgstr "Pausierte Torrents" + +#: src/categories_view.cpp:384 +msgid "Checking torrents" +msgstr "Überprüfe Torrents" + +#: src/categories_view.cpp:390 +msgid "Waiting for download torrents" +msgstr "Warte auf Torrent Download" + +#: src/categories_view.cpp:396 +msgid "Downloading torrents" +msgstr "Downloading Torrents" + +#: src/categories_view.cpp:402 +msgid "Finished (seeding) torrents" +msgstr "Fertiggestellte (seeding) Torrents" + +#: src/categories_view.cpp:408 +msgid "Uploading torrents" +msgstr "Uploading Torrents" + +#: src/categories_view.cpp:414 +msgid "Torrents with tracker error" +msgstr "Torrents mit Tracker Fehler" + +#: src/ip_filter.cpp:262 +msgid "Error while adding rule to IP filter" +msgstr "Fehler während Regeladaption im IP Filter" + +#: src/ip_filter.cpp:263 +#, qt-format +msgid "Error while adding rule to IP filter: %1." +msgstr "Fehler während Regeladaption im IP Filter: %1" + +#: src/temporary_action_dialog.cpp:122 +msgid "1 minute" +msgstr "1 Minute" + +#: src/temporary_action_dialog.cpp:123 +msgid "5 minutes" +msgstr "5 Minuten" + +#: src/temporary_action_dialog.cpp:124 +msgid "10 minutes" +msgstr "10 Minuten" + +#: src/temporary_action_dialog.cpp:125 +msgid "15 minutes" +msgstr "15 Minuten" + +#: src/temporary_action_dialog.cpp:126 +msgid "30 minutes" +msgstr "30 Minuten" + +#: src/temporary_action_dialog.cpp:127 +msgid "45 minutes" +msgstr "45 Minuten" + +#: src/temporary_action_dialog.cpp:128 +msgid "1 hour" +msgstr "1 Stunde" + +#: src/temporary_action_dialog.cpp:129 +msgid "2 hours" +msgstr "2 Stunden" + +#: src/temporary_action_dialog.cpp:130 +msgid "4 hours" +msgstr "4 Stunden" + +#: src/temporary_action_dialog.cpp:131 +msgid "8 hours" +msgstr "8 Stunden" + +#: src/temporary_action_dialog.cpp:132 +msgid "12 hours" +msgstr "12 Stunden" + +#: src/temporary_action_dialog.cpp:133 +msgid "1 day" +msgstr "1 Tag" + +#: src/temporary_action_dialog.cpp:208 +msgid "Temporary resume downloads|resume" +msgstr "Zurückgesetzte" + +#: src/temporary_action_dialog.cpp:212 +msgid "Temporary pause downloads|pause" +msgstr "Pausierte" + +#: src/temporary_action_dialog.cpp:223 +msgid "Temporary pause all torrents|all torrents" +msgstr "Alle Torrents" + +#: src/temporary_action_dialog.cpp:227 +msgid "Temporary pause downloads|downloads" +msgstr "Downloads" + +#: src/temporary_action_dialog.cpp:231 +msgid "Temporary pause uploads|uploads" +msgstr "Uploads" + +#: src/temporary_action_dialog.cpp:239 +#, qt-format +msgid "Temporary pause downloads|Temporary %1 %2" +msgstr "Vorübergehend %1 %2" + +#: ui/dialog.temporary_action.glade:42 +msgid "Time:" +msgstr "Zeit:" + +#: ui/dialog.temporary_action.glade:61 +msgid "Custom time (m)|Custom (m)" +msgstr "Gepflogen (m)" + +#: ui/dialog.temporary_action.glade:75 +msgid "Predefined time|Predefined" +msgstr "Vordefiniert" + +#: ui/preferences.client.gui.status_bar.glade:19 +msgid "Client::GUI::Status bar" +msgstr "Client::GUI::Status bar" + +#: ui/preferences.client.gui.status_bar.glade:121 +msgid "Downloaded (payload)" +msgstr "Heruntergeladen (payload)" + +#: ui/preferences.client.gui.status_bar.glade:175 +msgid "Uploaded (payload)" +msgstr "Uploaded (payload)" + +#: ui/dialog.add_torrent.glade:7 +msgid "Add torrent" +msgstr "Torrent Hinzufügen" + +#: ui/dialog.add_torrent.glade:28 +msgid "Torrent" +msgstr "Torrent" + +#: ui/dialog.add_torrent.glade:45 +msgid "Path:" +msgstr "Pfad:" + +#: ui/dialog.add_torrent.glade:76 +msgid "Name:" +msgstr "Name:" + +#: ui/dialog.add_torrent.glade:100 +msgid "Start torrent" +msgstr "Start Torrent" + +#: ui/dialog.add_torrent.glade:133 +msgid "Download path:" +msgstr "Download Pfad:" + +#: ui/dialog.add_torrent.glade:145 +msgid "Please select torrent's download directory" +msgstr "Bitte wählen Sie ein Torrent download Verzeichnis" + +#: ui/dialog.add_torrent.glade:179 ui/preferences.daemon.automation.glade:158 +msgid "Please select a directory for finished downloads copying" +msgstr "" +"Bitte wählen Sie ein Verzeichnis wohin fertiggestellte Downloads kopiert " +"werden" + +#: ui/dialog.add_torrent.glade:195 +msgid "Paths" +msgstr "Pfade" + +#: ui/dialog.add_torrent.glade:227 +msgid "Files" +msgstr "Dateien" + +#: ui/dialog.add_torrent.glade:250 +#: ui/preferences.daemon.network.misc.glade:510 +msgid "Trackers" +msgstr "Trackers" + +#: ui/preferences.daemon.network.misc.glade:17 +msgid "Daemon::Network::Misc" +msgstr "Daemon::Network::Misc" + +#: ui/preferences.daemon.network.misc.glade:51 +msgid "Listen port" +msgstr "Port Lauschen" + +#: ui/preferences.daemon.network.misc.glade:60 +msgid "Random port" +msgstr "Zufälliger Port" + +#: ui/preferences.daemon.network.misc.glade:76 +msgid "Custom port range:" +msgstr "Benutzerdefinierter Port Bereich:" + +#: ui/preferences.daemon.network.misc.glade:107 +msgid "From port to port|from" +msgstr "Von" + +#: ui/preferences.daemon.network.misc.glade:131 +msgid "From port to port|to" +msgstr "zu" + +#: ui/preferences.daemon.network.misc.glade:179 +msgid "Current listen port:" +msgstr "Aktueller Lausch Port:" + +#: ui/preferences.daemon.network.misc.glade:226 +msgid "Extras" +msgstr "Extras" + +#: ui/preferences.daemon.network.misc.glade:247 +msgid "DHT" +msgstr "DHT" + +#: ui/preferences.daemon.network.misc.glade:256 +msgid "UPnP" +msgstr "UPnP" + +#: ui/preferences.daemon.network.misc.glade:269 +msgid "LSD" +msgstr "LSD" + +#: ui/preferences.daemon.network.misc.glade:273 +msgid "" +"Local Service Discovery. This service will broadcast the infohashes of all " +"the non-private torrents on the local network to look for peers on the same " +"swarm within multicast reach." +msgstr "" +"Lokale Service Erforschung. Dieser Service überträgt die infohashes von " +"allen non-private Torrents im Lokalen Netzwerk um nach Peers mit den selben " +"Swarm zu suchen." + +#: ui/preferences.daemon.network.misc.glade:283 +msgid "NAT-PMP" +msgstr "NAT-PMP" + +#: ui/preferences.daemon.network.misc.glade:298 +msgid "Peer exchange" +msgstr "Peer tausch" + +#: ui/preferences.daemon.network.misc.glade:302 +msgid "Exchanges peers between clients." +msgstr "Vertauscht Peers zwischen Clients." + +#: ui/preferences.daemon.network.misc.glade:312 +msgid "Smart ban" +msgstr "Smart Bann" + +#: ui/preferences.daemon.network.misc.glade:316 +msgid "Ban peers that sends bad data with very high accuracy." +msgstr "" +"Verbanne Peers die korrupte Daten mit sehr hoher Treffsicherheit versenden" + +#: ui/preferences.daemon.network.misc.glade:358 +msgid "Bandwidth" +msgstr "Bandbreite" + +#: ui/preferences.daemon.network.misc.glade:376 +msgid "Download rate limit (KB/s):" +msgstr "Download Raten Limit (KB/s):" + +#: ui/preferences.daemon.network.misc.glade:383 +msgid "Upload rate limit (KB/s):" +msgstr "Upload Raten Limit (KB/s):" + +#: ui/preferences.daemon.network.misc.glade:394 +msgid "Max uploads:" +msgstr "Max Uploads:" + +#: ui/preferences.daemon.network.misc.glade:405 +msgid "Max connections:" +msgstr "Max Verbindungen:" + +#: ui/preferences.daemon.network.misc.glade:481 +msgid "Ignore rate limits on local network" +msgstr "Ignorieren Ratenlimit im Lokalen-Netzwerk" + +#: ui/preferences.daemon.network.misc.glade:486 +#: ui/preferences.daemon.network.misc.glade:528 +msgid "" +"This option is very usable if you have no real IP address, and trackers sets " +"too big announce interval for it's torrents, because in this case you " +"receive new peers only one time per this interval.\n" +"\n" +"Please do not set this option, if you have real IP address! In this case you " +"do not make torrent client work better, but this option increase trackers " +"overload." +msgstr "" +"Diese Option ist sehr nützlich, wenn Sie keine richtige IP-Adresse besitzen, " +"und Tracker zu große Anmeldeintervalle für Torrents festlegen, weil Sie in " +"diesem Fall neue Peers nur einmal pro Intervall erhalten.\n" +"\n" +"Bitte verwenden Sie diese Option nicht, wenn Sie über ein richtige IP-" +"Adresse verfügen! In diesem Fall würde der Torrent Client nicht besser " +"arbeiten, aber diese Option erhöht Tracker Overloads." + +#: ui/preferences.daemon.network.misc.glade:524 +msgid "Max announce interval (m):" +msgstr "Max angekündigte Intervalle (m):" + +#: ui/preferences.daemon.network.ip_filter.glade:14 +msgid "Daemon::Network::IP filter" +msgstr "Daemon::Network::IP filter" + +#: ui/preferences.daemon.network.ip_filter.glade:52 +msgid "" +"This list is fully scanned from top to bottom. In a case of overlapping " +"ranges the last one applied takes precedence. The list has one implicit rule " +"at the top, which allows all IPs." +msgstr "" +"Diese Liste wurde von Oben bis Unten durchsucht. Im Falle eins überlaufenden " +"Registers hat der Letzte Vorrang. Die Liste hat Oben eine indirekte Regel, " +"die alle IP's erlaubt." + +#: ui/preferences.daemon.network.ip_filter.glade:226 +msgid "Enable IP filter|Enable" +msgstr "Einschalten" + +#: ui/torrent_info_tabs.details.glade:39 +#: ui/torrent_info_tabs.details_compact.glade:39 +msgid "Size:" +msgstr "Größe:" + +#: ui/torrent_info_tabs.details.glade:46 +#: ui/torrent_info_tabs.details_compact.glade:46 +msgid "Requested size:" +msgstr "Benötigte Größe:" + +#: ui/torrent_info_tabs.details.glade:57 +#: ui/torrent_info_tabs.details_compact.glade:57 +msgid "Downloaded requested size:" +msgstr "Benötigte Heruntergeladene Größe:" + +#: ui/torrent_info_tabs.details.glade:68 +msgid "Total download:" +msgstr "Total Download:" + +#: ui/torrent_info_tabs.details.glade:79 +#: ui/torrent_info_tabs.details_compact.glade:68 +msgid "Total payload download:" +msgstr "Total payload Download:" + +#: ui/torrent_info_tabs.details.glade:92 +msgid "Total upload:" +msgstr "Total Upload:" + +#: ui/torrent_info_tabs.details.glade:105 +#: ui/torrent_info_tabs.details_compact.glade:195 +msgid "Total payload upload:" +msgstr "Total payload Upload:" + +#: ui/torrent_info_tabs.details.glade:118 +msgid "Total failed:" +msgstr "Fehlgeschlagen Gesamt:" + +#: ui/torrent_info_tabs.details.glade:131 +msgid "Total redundant:" +msgstr "Redundant gesamt:" + +#: ui/torrent_info_tabs.details.glade:310 +msgid "Download speed:" +msgstr "Download Speed:" + +#: ui/torrent_info_tabs.details.glade:321 +#: ui/torrent_info_tabs.details_compact.glade:171 +msgid "Download payload speed:" +msgstr "Download payload Speed:" + +#: ui/torrent_info_tabs.details.glade:334 +msgid "Upload speed:" +msgstr "Upload Speed:" + +#: ui/torrent_info_tabs.details.glade:347 +#: ui/torrent_info_tabs.details_compact.glade:182 +msgid "Upload payload speed:" +msgstr "Upload payload Speed:" + +#: ui/torrent_info_tabs.details.glade:396 +#: ui/torrent_info_tabs.details_compact.glade:220 +msgid "Share ratio:" +msgstr "Verteil Verhältnis:" + +#: ui/torrent_info_tabs.details.glade:407 +msgid "Peers:" +msgstr "Peers:" + +#: ui/torrent_info_tabs.details.glade:418 +msgid "Seeds:" +msgstr "Seeds:" + +#: ui/torrent_info_tabs.details.glade:429 +#: ui/torrent_info_tabs.details_compact.glade:257 +msgid "Time left:" +msgstr "Benötigte Zeit:" + +#: ui/torrent_info_tabs.details.glade:454 +msgid "Time seeding:" +msgstr "Seeding Zeit:" + +#: ui/torrent_info_tabs.details.glade:493 +msgid "Time added:" +msgstr "Hinzugefügte Zeit:" + +#: ui/torrent_info_tabs.details.glade:519 +msgid "Next announce:" +msgstr "Näschte Anfrage:" + +#: ui/torrent_info_tabs.details.glade:532 +msgid "Announce interval:" +msgstr "Anfrageinterval:" + +#: ui/torrent_info_tabs.details.glade:646 +#: ui/torrent_info_tabs.details_compact.glade:323 +msgid "Tracker status:" +msgstr "Tracker Status:" + +#: ui/torrent_info_tabs.details.glade:653 +#: ui/torrent_info_tabs.details_compact.glade:330 +msgid "Publisher URL:" +msgstr "Publisher URL:" + +#: ui/preferences.client.gui.glade:14 +msgid "Client::GUI" +msgstr "Client::GUI" + +#: ui/preferences.daemon.automation.glade:19 +msgid "Daemon::Automation" +msgstr "Daemon::Automation" + +#: ui/preferences.daemon.automation.glade:54 +msgid "Torrents auto load" +msgstr "Torrents auto load" + +#: ui/preferences.daemon.automation.glade:72 +msgid "Load torrents from" +msgstr "Lade Torrents von" + +#: ui/preferences.daemon.automation.glade:90 +msgid "Please select a directory for torrents auto load" +msgstr "Bitte wählen Sie ein Verzeichnis für automatisches Torrent Laden" + +#: ui/preferences.daemon.automation.glade:131 +msgid "Please select a torrents download directory" +msgstr "Bitte wählen sie ein Torrent Download Verzeichnis" + +#: ui/preferences.daemon.automation.glade:169 +msgid "Delete loaded *.torrent files" +msgstr "Lösche geladene *.torrent Dateien" + +#: ui/preferences.daemon.automation.glade:226 +msgid "Torrents auto cleaning" +msgstr "Torrents auto cleaning" + +#: ui/preferences.daemon.automation.glade:248 +msgid "Max ratio:" +msgstr "Max Verhältnis:" + +#: ui/preferences.daemon.automation.glade:261 +msgid "Max seeding torrents:" +msgstr "Max Seeding Torrents:" + +#: ui/preferences.daemon.automation.glade:358 +msgid "Max seeding time (m):" +msgstr "Max Seeding Zeit (m):" + +#: ui/preferences.daemon.network.glade:14 +msgid "Daemon::Network" +msgstr "Daemon::Netzwerk" + +#: ui/preferences.client.gui.misc.glade:19 +msgid "Client::GUI::Misc" +msgstr "Client::GUI::Misc" + +#: ui/preferences.client.gui.misc.glade:51 +msgid "Show speed in window title" +msgstr "Zeige Geschwindigkeit in Fensterleiste" + +#: ui/preferences.client.gui.misc.glade:64 +msgid "Show zero values in torrents info columns" +msgstr "Zeige Null Werte in Torrent Info Spalten" + +#: ui/preferences.client.gui.misc.glade:77 +msgid "Compact details tab" +msgstr "Kompaktdeteils Tab" + +#: ui/preferences.client.gui.misc.glade:110 +msgid "GUI update interval (ms):" +msgstr "GUI Update Interval (ms):" + +#: ui/preferences.client.gui.misc.glade:117 +msgid "Max log lines:" +msgstr "Max log Zeilen:" + +#: ui/preferences.client.gui.misc.glade:168 +msgid "Show tray icon" +msgstr "Zeige Tray Icon" + +#: ui/preferences.client.gui.misc.glade:194 +msgid "Minimize to tray" +msgstr "Minimieren to Tray" + +#: ui/preferences.client.gui.misc.glade:215 +msgid "Hide main window to tray at startup" +msgstr "Verstecke Hauptfenster to Tray in der Startleiste" + +#: ui/preferences.client.gui.misc.glade:228 +msgid "Close to tray" +msgstr "Schließe to Tray" + +#: ui/preferences.client.gui.misc.glade:266 +msgid "Download completed notification" +msgstr "Download abgeschlossen Benachrichtigung" + +#: ui/preferences.client.gui.misc.glade:279 +msgid "All downloads completed notification" +msgstr "Alle Downloads abgschlossen Benachrichtigung" + +#: ui/dialog.open_magnet_link.glade:26 +msgid "Magnet link:" +msgstr "Magnet Link:" Binary files /tmp/ir4L0YLINr/flush-0.9.9/po/es.gmo and /tmp/zsTJNzIHfv/flush-0.9.10/po/es.gmo differ diff -Nru flush-0.9.9/po/es.po flush-0.9.10/po/es.po --- flush-0.9.9/po/es.po 2010-10-21 19:06:58.000000000 +0000 +++ flush-0.9.10/po/es.po 2011-03-05 14:47:29.000000000 +0000 @@ -1,28 +1,28 @@ # Spanish translation for flush # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # This file is distributed under the same license as the flush package. -# FIRST AUTHOR , 2009. +# Dmitry Konishchev , 2009. # msgid "" msgstr "" "Project-Id-Version: flush\n" "Report-Msgid-Bugs-To: konishchev@gmail.com\n" -"POT-Creation-Date: 2010-10-21 23:06+0400\n" -"PO-Revision-Date: 2010-08-26 13:24+0000\n" -"Last-Translator: Francisco Luque Contreras \n" +"POT-Creation-Date: 2011-03-05 17:47+0300\n" +"PO-Revision-Date: 2010-12-13 01:26+0000\n" +"Last-Translator: Fitoschido \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-21 18:36+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"X-Launchpad-Export-Date: 2011-03-05 14:08+0000\n" +"X-Generator: Launchpad (build 12515)\n" "X-Language: es_ES\n" "X-Source-Language: C\n" #: mlib/mlib/misc.cpp:95 mlib/mlib/misc.cpp:157 msgid "Buffer positioning error." -msgstr "Error posicionamiento de búfer." +msgstr "Error de posicionamiento de búfer." #: mlib/mlib/misc.cpp:226 mlib/mlib/sys.cpp:283 #, qt-format @@ -67,7 +67,7 @@ #: mlib/mlib/misc.cpp:403 #, qt-format msgid "Realloc failed: %1." -msgstr "Falló en la asignación de memoría:%1." +msgstr "Error en la asignación de memoria: %1." #: mlib/mlib/misc.cpp:447 #, qt-format @@ -101,7 +101,7 @@ #: mlib/mlib/fs_watcher.cpp:359 msgid "Program has been compiled without inotify support." -msgstr "El programa fué compilado sin soporte para inotify." +msgstr "El programa fue compilado sin soporte para inotify." #: mlib/mlib/fs_watcher.cpp:378 #, qt-format @@ -111,7 +111,7 @@ #: mlib/mlib/fs_watcher.cpp:425 #, qt-format msgid "Can't read data from inotify descriptor: %1." -msgstr "No se puede leer los datos del descriptor inotify: %1." +msgstr "No se pueden leer los datos del descriptor inotify: %1." #: mlib/mlib/libconfig.cpp:41 #, qt-format @@ -124,15 +124,15 @@ #: mlib/mlib/sqlite.cpp:219 mlib/mlib/sqlite.cpp:260 msgid "Database is not opened yet." -msgstr "La base de datos aun no esta abierta" +msgstr "La base de datos aún no esta abierta." #: mlib/mlib/sqlite.cpp:272 msgid "Database is already opened." -msgstr "La base de datos ya está abierta." +msgstr "La base de datos ya estaba abierta." #: mlib/mlib/sqlite.cpp:369 msgid "Query is already finalized." -msgstr "Consulta de la Base de datos finalizada." +msgstr "La consulta ya había finalizado." #: mlib/mlib/sqlite.cpp:450 msgid "Operation on finalized query." @@ -142,8 +142,8 @@ msgid "" "Asynchronous filesystem finished it's work, but not all tasks are processed." msgstr "" -"El sistema de archivos asíncrono ha terminado su trabajo, pero no han sido " -"procesadas todas las tareas." +"El sistema de archivos asíncrono ha terminado su trabajo, pero no se han " +"procesado todas las tareas." #: mlib/mlib/gtk/misc.cpp:125 src/main.cpp:432 msgid "Information" @@ -204,7 +204,7 @@ #: mlib/mlib/libtorrent.cpp:591 #, qt-format msgid "libtorrent error code [%1]" -msgstr "" +msgstr "código de error de libtorrent [%1]" #: mlib/mlib/libtorrent.cpp:596 msgid "torrent is already exists in this session" @@ -343,7 +343,7 @@ msgstr "" "Error al cambiar el directorio '%1' tiempo de acceso y modificación: %2." -#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:815 src/daemon_fs.cpp:43 +#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:819 src/daemon_fs.cpp:43 #, qt-format msgid "Can't create directory '%1': %2." msgstr "No se puedo crear el directorio '%1': %2." @@ -363,7 +363,7 @@ msgid "Invalid file path '%1' - file '%2' is already exits." msgstr "Ruta de archivo no válida '%1' - El archivo '%2' ya existe." -#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 +#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:775 mlib/mlib/fs.cpp:785 #, qt-format msgid "Can't stat '%1': %2." msgstr "No se puede crear '%1': %2." @@ -387,58 +387,58 @@ msgid "parent directory is not exists" msgstr "no existe la carpeta contenedora" -#: mlib/mlib/fs.cpp:735 +#: mlib/mlib/fs.cpp:739 msgid "file is already exists" msgstr "el archivo ya existe" -#: mlib/mlib/fs.cpp:752 +#: mlib/mlib/fs.cpp:756 msgid "it is a directory" msgstr "es un directorio" -#: mlib/mlib/fs.cpp:756 +#: mlib/mlib/fs.cpp:760 msgid "it is a special file" msgstr "es un archivo especial" -#: mlib/mlib/fs.cpp:767 mlib/mlib/fs.cpp:777 +#: mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 #, qt-format msgid "No such file or directory ('%1')." msgstr "No existe el fichero o directorio ('%1')." -#: mlib/mlib/fs.cpp:846 +#: mlib/mlib/fs.cpp:850 #, qt-format msgid "Error while copying '%1' to '%2': %3." msgstr "Error al copiar '%1' a '%2': %3." -#: mlib/mlib/fs.cpp:852 mlib/mlib/fs.cpp:1007 +#: mlib/mlib/fs.cpp:856 mlib/mlib/fs.cpp:1011 #, qt-format msgid "Error while reading '%1': %2." msgstr "Error de lectura '%1': %2." -#: mlib/mlib/fs.cpp:888 +#: mlib/mlib/fs.cpp:892 msgid "Can't get user home path." msgstr "No se puede obtener la ruta de la carpeta de usuario." -#: mlib/mlib/fs.cpp:928 +#: mlib/mlib/fs.cpp:932 #, qt-format msgid "file '%1' is already exists" msgstr "El archivo '%1' ya existe" -#: mlib/mlib/fs.cpp:1000 +#: mlib/mlib/fs.cpp:1004 #, qt-format msgid "Can't delete directory '%1': %2." msgstr "No se puede borrar la carpeta '%1': %2." -#: mlib/mlib/fs.cpp:1014 +#: mlib/mlib/fs.cpp:1018 #, qt-format msgid "file or directory '%1' is not exists" msgstr "el archivo o carpeta '%1' no existe" -#: mlib/mlib/fs.cpp:1018 +#: mlib/mlib/fs.cpp:1022 #, qt-format msgid "Can't delete file '%1': %2." msgstr "No se puede borrar el archivo '%1': %2." -#: mlib/mlib/fs.cpp:1064 +#: mlib/mlib/fs.cpp:1068 #, qt-format msgid "Unable to synchronize data for file '%1' with storage device: %2." msgstr "" @@ -558,7 +558,7 @@ #: src/statistics_window.cpp:163 msgid "Payload download" -msgstr "Descarga real" +msgstr "Descarga (real)" #: src/statistics_window.cpp:164 src/torrents_view.cpp:370 msgid "Total download" @@ -566,7 +566,7 @@ #: src/statistics_window.cpp:165 msgid "Total payload download" -msgstr "Descarga real total" +msgstr "Descarga total (real)" #: src/statistics_window.cpp:167 src/main_window.cpp:1543 #: ui/preferences.client.gui.status_bar.glade:136 @@ -575,7 +575,7 @@ #: src/statistics_window.cpp:168 msgid "Payload upload" -msgstr "Subida real" +msgstr "Subida (real)" #: src/statistics_window.cpp:169 src/torrents_view.cpp:372 msgid "Total upload" @@ -583,7 +583,7 @@ #: src/statistics_window.cpp:170 msgid "Total payload upload" -msgstr "Subida real total" +msgstr "Subida total (real)" #: src/statistics_window.cpp:172 src/main_window.cpp:1549 #: src/torrents_view.cpp:382 ui/preferences.client.gui.status_bar.glade:162 @@ -610,7 +610,7 @@ #: src/statistics_window.cpp:178 src/torrents_view.cpp:375 msgid "Total redundant" -msgstr "Total Redundante" +msgstr "Total Redundantes" #: src/statistics_window.cpp:187 msgid "Reset" @@ -782,7 +782,7 @@ #: src/torrent_peers_view.cpp:90 src/torrents_view.cpp:341 msgid "Download speed (payload)|Down speed (data)" -msgstr "Vel Bajada (datos)" +msgstr "Vel Bajada (real)" #: src/torrent_peers_view.cpp:91 src/torrents_view.cpp:342 msgid "Upload speed|Up speed" @@ -790,15 +790,15 @@ #: src/torrent_peers_view.cpp:92 src/torrents_view.cpp:343 msgid "Upload speed (payload)|Up speed (data)" -msgstr "Vel Subida (datos)" +msgstr "Vel Subida (real)" #: src/torrent_peers_view.cpp:93 src/torrents_view.cpp:334 msgid "Total download (payload)|Down data" -msgstr "Datos Bajada" +msgstr "Total Descargado (real)" #: src/torrent_peers_view.cpp:94 src/torrents_view.cpp:336 msgid "Total upload (payload)|Up data" -msgstr "Datos Subida" +msgstr "Total Subido (real)" #: src/torrent_peers_view.cpp:95 src/torrent_peers_view.cpp:108 msgid "Availability" @@ -894,7 +894,7 @@ #: src/main_window.cpp:364 msgid "_Toolbar" -msgstr "_Barra de estado" +msgstr "Barra de _herramientas" #: src/main_window.cpp:367 src/main_window.cpp:444 msgid "'Show ...' toggle|_Show" @@ -1096,19 +1096,19 @@ msgid "Upload speed|Up: %1 (%2) / %3" msgstr "Sub: %1 (%2) / %3" -#: src/open_torrent_dialog.cpp:94 +#: src/open_torrent_dialog.cpp:95 msgid "Please choose a torrent file" msgstr "Por favor, elija un archivo torrent" -#: src/open_torrent_dialog.cpp:110 +#: src/open_torrent_dialog.cpp:111 msgid "Torrent file encoding:" msgstr "Codificación archivo Torrent:" -#: src/open_torrent_dialog.cpp:137 src/create_torrent_dialog.cpp:699 +#: src/open_torrent_dialog.cpp:138 src/create_torrent_dialog.cpp:699 msgid "Torrent files" msgstr "Archivo torrent" -#: src/open_torrent_dialog.cpp:142 src/create_torrent_dialog.cpp:704 +#: src/open_torrent_dialog.cpp:143 src/create_torrent_dialog.cpp:704 msgid "Any files" msgstr "Cualquier archivo" @@ -1123,7 +1123,7 @@ #: src/torrents_view.cpp:329 msgid "Requested size|Requested" -msgstr "Requerido" +msgstr "Solicitado" #: src/torrents_view.cpp:330 msgid "Downloaded requested size|Downloaded" @@ -1180,11 +1180,11 @@ #: src/torrents_view.cpp:366 msgid "Requested size" -msgstr "Tamaño requerido" +msgstr "Tamaño solicitado" #: src/torrents_view.cpp:367 msgid "Downloaded requested size" -msgstr "Tamaño descargado requerido" +msgstr "Bajado tamaño solicitado" #: src/torrents_view.cpp:387 msgid "Time added" @@ -1411,7 +1411,7 @@ #: src/daemon_session.cpp:961 #, qt-format msgid "Directory '%1' has been deleted or moved." -msgstr "El directorio '%1' ha sido eliminado o movido." +msgstr "El directorio '%1' a sido eliminado o movido." #: src/daemon_session.cpp:1082 msgid "Automatic torrents cleaning failed" @@ -1546,7 +1546,7 @@ msgid "Can't start daemon. Creating config directories failed. %1" msgstr "" "No se puede iniciar los ajustes. La creación del directorio de configuración " -"ha fallado.%1" +"a fallado.%1" #: src/torrent_files_view.cpp:82 src/torrent_files_view.cpp:93 msgid "Change file or directory path" @@ -1926,7 +1926,7 @@ #: src/torrent_options_view.cpp:73 msgid "Downloading" -msgstr "Descargar" +msgstr "Descargando" #: src/torrent_options_view.cpp:76 msgid "Sequential download" @@ -1934,7 +1934,7 @@ #: src/torrent_options_view.cpp:84 ui/dialog.add_torrent.glade:162 msgid "Copy when finished to:" -msgstr "Copiar al terminar para:" +msgstr "Al terminar copiar en:" #: src/torrent_options_view.cpp:118 msgid "Trackers" @@ -1968,11 +1968,11 @@ msgid "application is now ending it's work" msgstr "El programa terminará ahora su trabajo" -#: src/application.cpp:406 +#: src/application.cpp:414 msgid "Unable to show libnotify message" msgstr "Imposible mostrar mesage de notificación" -#: src/application.cpp:407 +#: src/application.cpp:415 #, qt-format msgid "" "Unable to show libnotify message: %1. You can disable notifications in the " @@ -1985,16 +1985,16 @@ "Mensaje de texto:\n" "%2" -#: src/application.cpp:458 +#: src/application.cpp:466 #, qt-format msgid "Running open command failed. %1." msgstr "Error en la ejecución de comandos. %1." -#: src/application.cpp:533 +#: src/application.cpp:541 msgid "Error while saving settings" msgstr "Error al guardar los ajustes" -#: src/application.cpp:607 +#: src/application.cpp:615 msgid "" "Unable to initialize a libnotify instance. Notification's displaying is not " "possible." @@ -2110,7 +2110,7 @@ #: src/main.cpp:989 msgid "Name request has been added to queue, but queuing has been forbidden." -msgstr "Nombre ha sido añadido a la cola, pero en la cola a sido restringido." +msgstr "Nombre añadido a la cola, pero a sido restringido." #: src/main.cpp:995 src/main.cpp:1002 msgid "Unexpected DBus behavior while requesting name" @@ -2222,31 +2222,31 @@ #: src/categories_view.cpp:342 msgid "Paused torrents (as short as possible)|Paused" -msgstr "Pausar" +msgstr "Pausados" #: src/categories_view.cpp:343 msgid "Checking torrents (as short as possible)|Checking" -msgstr "Verificar" +msgstr "Verificando" #: src/categories_view.cpp:344 msgid "Waiting for download torrents (as short as possible)|Down. wait" -msgstr "Descargar. esperar" +msgstr "Comprobando...espere" #: src/categories_view.cpp:345 msgid "Downloading torrents (as short as possible)|Downloading" -msgstr "Descargar" +msgstr "Descargandos" #: src/categories_view.cpp:346 msgid "Seeding torrents (as short as possible)|Seeding" -msgstr "Sembrar" +msgstr "Sembrando" #: src/categories_view.cpp:347 msgid "Uploading torrents (as short as possible)|Uploading" -msgstr "Subir" +msgstr "Subiendo" #: src/categories_view.cpp:348 msgid "Torrents with tracker error (as short as possible)|Tracker error" -msgstr "Error de trackers" +msgstr "Error de Trackers" #: src/categories_view.cpp:363 #, qt-format @@ -2267,7 +2267,7 @@ #: src/categories_view.cpp:390 msgid "Waiting for download torrents" -msgstr "Ruta para descargar torrents" +msgstr "Comprobando de descarga" #: src/categories_view.cpp:396 msgid "Downloading torrents" @@ -2532,7 +2532,7 @@ #: ui/preferences.daemon.network.misc.glade:481 msgid "Ignore rate limits on local network" -msgstr "" +msgstr "No hacer caso de los límites de velocidad de la red local" #: ui/preferences.daemon.network.misc.glade:486 #: ui/preferences.daemon.network.misc.glade:528 @@ -2545,11 +2545,11 @@ "do not make torrent client work better, but this option increase trackers " "overload." msgstr "" -"Esta opción es muy útil si no tiene dirección IP real, los trackers usan un " -"intervalo muy amplio para que los torrents, ya que en este caso recibe " -"nuevos pares sólo una vez por este intervalo. Por favor, no establece esta " -"opción, si ustedno tiene dirección IP real! En este caso usted no descagará " -"más rápido,y sobrecargará a los trackers." +"Esta opción es muy útil si no tiene dirección IP fija, los trackers usan un " +"intervalo muy amplio para los torrents, ya que en este caso recibe nuevos " +"pares sólo una vez por intervalo. Por favor, no establezca esta opción, si " +"usted no tiene dirección IP fija! En este caso usted no descagará más " +"rápido,y sobrecargará a los trackers." #: ui/preferences.daemon.network.misc.glade:524 msgid "Max announce interval (m):" @@ -2581,12 +2581,12 @@ #: ui/torrent_info_tabs.details.glade:46 #: ui/torrent_info_tabs.details_compact.glade:46 msgid "Requested size:" -msgstr "Tamaño requerido:" +msgstr "Tamaño solicitado:" #: ui/torrent_info_tabs.details.glade:57 #: ui/torrent_info_tabs.details_compact.glade:57 msgid "Downloaded requested size:" -msgstr "Tamaño de descarga requerido:" +msgstr "Bajado tamaño solicitado:" #: ui/torrent_info_tabs.details.glade:68 msgid "Total download:" @@ -2595,7 +2595,7 @@ #: ui/torrent_info_tabs.details.glade:79 #: ui/torrent_info_tabs.details_compact.glade:68 msgid "Total payload download:" -msgstr "Total real descargado:" +msgstr "Total (real) descargado:" #: ui/torrent_info_tabs.details.glade:92 msgid "Total upload:" @@ -2604,7 +2604,7 @@ #: ui/torrent_info_tabs.details.glade:105 #: ui/torrent_info_tabs.details_compact.glade:195 msgid "Total payload upload:" -msgstr "Total subido real:" +msgstr "Total subido (real):" #: ui/torrent_info_tabs.details.glade:118 msgid "Total failed:" @@ -2621,7 +2621,7 @@ #: ui/torrent_info_tabs.details.glade:321 #: ui/torrent_info_tabs.details_compact.glade:171 msgid "Download payload speed:" -msgstr "Velocidad de descarga real:" +msgstr "Velocidad de descarga (real):" #: ui/torrent_info_tabs.details.glade:334 msgid "Upload speed:" @@ -2630,7 +2630,7 @@ #: ui/torrent_info_tabs.details.glade:347 #: ui/torrent_info_tabs.details_compact.glade:182 msgid "Upload payload speed:" -msgstr "Velocidad de subida real:" +msgstr "Velocidad de subida (real):" #: ui/torrent_info_tabs.details.glade:396 #: ui/torrent_info_tabs.details_compact.glade:220 Binary files /tmp/ir4L0YLINr/flush-0.9.9/po/fi.gmo and /tmp/zsTJNzIHfv/flush-0.9.10/po/fi.gmo differ diff -Nru flush-0.9.9/po/fi.po flush-0.9.10/po/fi.po --- flush-0.9.9/po/fi.po 2010-10-21 19:06:58.000000000 +0000 +++ flush-0.9.10/po/fi.po 2011-03-05 14:47:29.000000000 +0000 @@ -1,13 +1,13 @@ # Finnish translation for flush # Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 # This file is distributed under the same license as the flush package. -# FIRST AUTHOR , 2010. +# Dmitry Konishchev , 2010. # msgid "" msgstr "" "Project-Id-Version: flush\n" "Report-Msgid-Bugs-To: konishchev@gmail.com\n" -"POT-Creation-Date: 2010-10-21 23:06+0400\n" +"POT-Creation-Date: 2011-03-05 17:47+0300\n" "PO-Revision-Date: 2010-05-05 22:30+0000\n" "Last-Translator: Jouni Mikkola \n" "Language-Team: Finnish \n" @@ -336,7 +336,7 @@ msgid "Error while changing directory '%1' access and modification times: %2." msgstr "" -#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:815 src/daemon_fs.cpp:43 +#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:819 src/daemon_fs.cpp:43 #, qt-format msgid "Can't create directory '%1': %2." msgstr "" @@ -356,7 +356,7 @@ msgid "Invalid file path '%1' - file '%2' is already exits." msgstr "" -#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 +#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:775 mlib/mlib/fs.cpp:785 #, qt-format msgid "Can't stat '%1': %2." msgstr "" @@ -380,58 +380,58 @@ msgid "parent directory is not exists" msgstr "" -#: mlib/mlib/fs.cpp:735 +#: mlib/mlib/fs.cpp:739 msgid "file is already exists" msgstr "" -#: mlib/mlib/fs.cpp:752 +#: mlib/mlib/fs.cpp:756 msgid "it is a directory" msgstr "" -#: mlib/mlib/fs.cpp:756 +#: mlib/mlib/fs.cpp:760 msgid "it is a special file" msgstr "" -#: mlib/mlib/fs.cpp:767 mlib/mlib/fs.cpp:777 +#: mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 #, qt-format msgid "No such file or directory ('%1')." msgstr "" -#: mlib/mlib/fs.cpp:846 +#: mlib/mlib/fs.cpp:850 #, qt-format msgid "Error while copying '%1' to '%2': %3." msgstr "" -#: mlib/mlib/fs.cpp:852 mlib/mlib/fs.cpp:1007 +#: mlib/mlib/fs.cpp:856 mlib/mlib/fs.cpp:1011 #, qt-format msgid "Error while reading '%1': %2." msgstr "" -#: mlib/mlib/fs.cpp:888 +#: mlib/mlib/fs.cpp:892 msgid "Can't get user home path." msgstr "" -#: mlib/mlib/fs.cpp:928 +#: mlib/mlib/fs.cpp:932 #, qt-format msgid "file '%1' is already exists" msgstr "" -#: mlib/mlib/fs.cpp:1000 +#: mlib/mlib/fs.cpp:1004 #, qt-format msgid "Can't delete directory '%1': %2." msgstr "" -#: mlib/mlib/fs.cpp:1014 +#: mlib/mlib/fs.cpp:1018 #, qt-format msgid "file or directory '%1' is not exists" msgstr "" -#: mlib/mlib/fs.cpp:1018 +#: mlib/mlib/fs.cpp:1022 #, qt-format msgid "Can't delete file '%1': %2." msgstr "" -#: mlib/mlib/fs.cpp:1064 +#: mlib/mlib/fs.cpp:1068 #, qt-format msgid "Unable to synchronize data for file '%1' with storage device: %2." msgstr "" @@ -1085,19 +1085,19 @@ msgid "Upload speed|Up: %1 (%2) / %3" msgstr "" -#: src/open_torrent_dialog.cpp:94 +#: src/open_torrent_dialog.cpp:95 msgid "Please choose a torrent file" msgstr "" -#: src/open_torrent_dialog.cpp:110 +#: src/open_torrent_dialog.cpp:111 msgid "Torrent file encoding:" msgstr "" -#: src/open_torrent_dialog.cpp:137 src/create_torrent_dialog.cpp:699 +#: src/open_torrent_dialog.cpp:138 src/create_torrent_dialog.cpp:699 msgid "Torrent files" msgstr "" -#: src/open_torrent_dialog.cpp:142 src/create_torrent_dialog.cpp:704 +#: src/open_torrent_dialog.cpp:143 src/create_torrent_dialog.cpp:704 msgid "Any files" msgstr "" @@ -1937,11 +1937,11 @@ msgid "application is now ending it's work" msgstr "" -#: src/application.cpp:406 +#: src/application.cpp:414 msgid "Unable to show libnotify message" msgstr "" -#: src/application.cpp:407 +#: src/application.cpp:415 #, qt-format msgid "" "Unable to show libnotify message: %1. You can disable notifications in the " @@ -1950,16 +1950,16 @@ "%2" msgstr "" -#: src/application.cpp:458 +#: src/application.cpp:466 #, qt-format msgid "Running open command failed. %1." msgstr "" -#: src/application.cpp:533 +#: src/application.cpp:541 msgid "Error while saving settings" msgstr "" -#: src/application.cpp:607 +#: src/application.cpp:615 msgid "" "Unable to initialize a libnotify instance. Notification's displaying is not " "possible." diff -Nru flush-0.9.9/po/flush.pot flush-0.9.10/po/flush.pot --- flush-0.9.9/po/flush.pot 2010-10-21 19:06:58.000000000 +0000 +++ flush-0.9.10/po/flush.pot 2011-03-05 14:47:28.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: flush 0.9.9\n" +"Project-Id-Version: flush 0.9.10\n" "Report-Msgid-Bugs-To: konishchev@gmail.com\n" -"POT-Creation-Date: 2010-10-21 23:06+0400\n" +"POT-Creation-Date: 2011-03-05 17:47+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -332,7 +332,7 @@ msgid "Error while changing directory '%1' access and modification times: %2." msgstr "" -#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:815 src/daemon_fs.cpp:43 +#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:819 src/daemon_fs.cpp:43 #, qt-format msgid "Can't create directory '%1': %2." msgstr "" @@ -352,7 +352,7 @@ msgid "Invalid file path '%1' - file '%2' is already exits." msgstr "" -#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 +#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:775 mlib/mlib/fs.cpp:785 #, qt-format msgid "Can't stat '%1': %2." msgstr "" @@ -376,58 +376,58 @@ msgid "parent directory is not exists" msgstr "" -#: mlib/mlib/fs.cpp:735 +#: mlib/mlib/fs.cpp:739 msgid "file is already exists" msgstr "" -#: mlib/mlib/fs.cpp:752 +#: mlib/mlib/fs.cpp:756 msgid "it is a directory" msgstr "" -#: mlib/mlib/fs.cpp:756 +#: mlib/mlib/fs.cpp:760 msgid "it is a special file" msgstr "" -#: mlib/mlib/fs.cpp:767 mlib/mlib/fs.cpp:777 +#: mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 #, qt-format msgid "No such file or directory ('%1')." msgstr "" -#: mlib/mlib/fs.cpp:846 +#: mlib/mlib/fs.cpp:850 #, qt-format msgid "Error while copying '%1' to '%2': %3." msgstr "" -#: mlib/mlib/fs.cpp:852 mlib/mlib/fs.cpp:1007 +#: mlib/mlib/fs.cpp:856 mlib/mlib/fs.cpp:1011 #, qt-format msgid "Error while reading '%1': %2." msgstr "" -#: mlib/mlib/fs.cpp:888 +#: mlib/mlib/fs.cpp:892 msgid "Can't get user home path." msgstr "" -#: mlib/mlib/fs.cpp:928 +#: mlib/mlib/fs.cpp:932 #, qt-format msgid "file '%1' is already exists" msgstr "" -#: mlib/mlib/fs.cpp:1000 +#: mlib/mlib/fs.cpp:1004 #, qt-format msgid "Can't delete directory '%1': %2." msgstr "" -#: mlib/mlib/fs.cpp:1014 +#: mlib/mlib/fs.cpp:1018 #, qt-format msgid "file or directory '%1' is not exists" msgstr "" -#: mlib/mlib/fs.cpp:1018 +#: mlib/mlib/fs.cpp:1022 #, qt-format msgid "Can't delete file '%1': %2." msgstr "" -#: mlib/mlib/fs.cpp:1064 +#: mlib/mlib/fs.cpp:1068 #, qt-format msgid "Unable to synchronize data for file '%1' with storage device: %2." msgstr "" @@ -1081,19 +1081,19 @@ msgid "Upload speed|Up: %1 (%2) / %3" msgstr "" -#: src/open_torrent_dialog.cpp:94 +#: src/open_torrent_dialog.cpp:95 msgid "Please choose a torrent file" msgstr "" -#: src/open_torrent_dialog.cpp:110 +#: src/open_torrent_dialog.cpp:111 msgid "Torrent file encoding:" msgstr "" -#: src/open_torrent_dialog.cpp:137 src/create_torrent_dialog.cpp:699 +#: src/open_torrent_dialog.cpp:138 src/create_torrent_dialog.cpp:699 msgid "Torrent files" msgstr "" -#: src/open_torrent_dialog.cpp:142 src/create_torrent_dialog.cpp:704 +#: src/open_torrent_dialog.cpp:143 src/create_torrent_dialog.cpp:704 msgid "Any files" msgstr "" @@ -1926,11 +1926,11 @@ msgid "application is now ending it's work" msgstr "" -#: src/application.cpp:406 +#: src/application.cpp:414 msgid "Unable to show libnotify message" msgstr "" -#: src/application.cpp:407 +#: src/application.cpp:415 #, qt-format msgid "" "Unable to show libnotify message: %1. You can disable notifications in the Preferences dialog.\n" @@ -1938,16 +1938,16 @@ "%2" msgstr "" -#: src/application.cpp:458 +#: src/application.cpp:466 #, qt-format msgid "Running open command failed. %1." msgstr "" -#: src/application.cpp:533 +#: src/application.cpp:541 msgid "Error while saving settings" msgstr "" -#: src/application.cpp:607 +#: src/application.cpp:615 msgid "Unable to initialize a libnotify instance. Notification's displaying is not possible." msgstr "" diff -Nru flush-0.9.9/po/LINGUAS flush-0.9.10/po/LINGUAS --- flush-0.9.9/po/LINGUAS 2010-10-21 18:57:25.000000000 +0000 +++ flush-0.9.10/po/LINGUAS 2011-03-05 14:41:58.000000000 +0000 @@ -1,5 +1,6 @@ # Set of available languages bg +de es fi ru Binary files /tmp/ir4L0YLINr/flush-0.9.9/po/ru.gmo and /tmp/zsTJNzIHfv/flush-0.9.10/po/ru.gmo differ diff -Nru flush-0.9.9/po/ru.po flush-0.9.10/po/ru.po --- flush-0.9.9/po/ru.po 2010-10-21 19:06:58.000000000 +0000 +++ flush-0.9.10/po/ru.po 2011-03-05 14:47:29.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: konishchev@gmail.com\n" -"POT-Creation-Date: 2010-10-21 23:06+0400\n" +"POT-Creation-Date: 2011-03-05 17:47+0300\n" "Last-Translator: Dmitry Konishchev \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -337,7 +337,7 @@ "При изменении времени последнего доступа и времени модификации для " "директории '%1' произошла ошибка: %2." -#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:815 src/daemon_fs.cpp:43 +#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:819 src/daemon_fs.cpp:43 #, qt-format msgid "Can't create directory '%1': %2." msgstr "Не удалось создать директорию '%1': %2." @@ -357,7 +357,7 @@ msgid "Invalid file path '%1' - file '%2' is already exits." msgstr "Недопустимый путь файла '%1': файл '%2' уже существует." -#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 +#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:775 mlib/mlib/fs.cpp:785 #, qt-format msgid "Can't stat '%1': %2." msgstr "Не удалось получить информацию (stat) о '%1': %2." @@ -381,58 +381,58 @@ msgid "parent directory is not exists" msgstr "родительской директории не существует" -#: mlib/mlib/fs.cpp:735 +#: mlib/mlib/fs.cpp:739 msgid "file is already exists" msgstr "файл уже существует" -#: mlib/mlib/fs.cpp:752 +#: mlib/mlib/fs.cpp:756 msgid "it is a directory" msgstr "это директория" -#: mlib/mlib/fs.cpp:756 +#: mlib/mlib/fs.cpp:760 msgid "it is a special file" msgstr "это специальный файл" -#: mlib/mlib/fs.cpp:767 mlib/mlib/fs.cpp:777 +#: mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 #, qt-format msgid "No such file or directory ('%1')." msgstr "Нет такого файла или директории ('%1')." -#: mlib/mlib/fs.cpp:846 +#: mlib/mlib/fs.cpp:850 #, qt-format msgid "Error while copying '%1' to '%2': %3." msgstr "Ошибка при копировании '%1' в '%2': %3." -#: mlib/mlib/fs.cpp:852 mlib/mlib/fs.cpp:1007 +#: mlib/mlib/fs.cpp:856 mlib/mlib/fs.cpp:1011 #, qt-format msgid "Error while reading '%1': %2." msgstr "Ошибка при чтении '%1': %2." -#: mlib/mlib/fs.cpp:888 +#: mlib/mlib/fs.cpp:892 msgid "Can't get user home path." msgstr "Не удалось получить путь к домашнему каталогу пользователя." -#: mlib/mlib/fs.cpp:928 +#: mlib/mlib/fs.cpp:932 #, qt-format msgid "file '%1' is already exists" msgstr "файл '%1' уже существует" -#: mlib/mlib/fs.cpp:1000 +#: mlib/mlib/fs.cpp:1004 #, qt-format msgid "Can't delete directory '%1': %2." msgstr "Не удалось создать директорию '%1': %2." -#: mlib/mlib/fs.cpp:1014 +#: mlib/mlib/fs.cpp:1018 #, qt-format msgid "file or directory '%1' is not exists" msgstr "файл или директория '%1' не существуют" -#: mlib/mlib/fs.cpp:1018 +#: mlib/mlib/fs.cpp:1022 #, qt-format msgid "Can't delete file '%1': %2." msgstr "Не удалось удалить файл '%1': %2." -#: mlib/mlib/fs.cpp:1064 +#: mlib/mlib/fs.cpp:1068 #, qt-format msgid "Unable to synchronize data for file '%1' with storage device: %2." msgstr "Не удалось сбросить данные файла '%1' в файловую систему: %2." @@ -1104,19 +1104,19 @@ msgid "Upload speed|Up: %1 (%2) / %3" msgstr "Отдача: %1 (%2) / %3" -#: src/open_torrent_dialog.cpp:94 +#: src/open_torrent_dialog.cpp:95 msgid "Please choose a torrent file" msgstr "Пожалуйста, выберите *.torrent файл" -#: src/open_torrent_dialog.cpp:110 +#: src/open_torrent_dialog.cpp:111 msgid "Torrent file encoding:" msgstr "Кодировка торрент-файла:" -#: src/open_torrent_dialog.cpp:137 src/create_torrent_dialog.cpp:699 +#: src/open_torrent_dialog.cpp:138 src/create_torrent_dialog.cpp:699 msgid "Torrent files" msgstr "*.torrent файлы" -#: src/open_torrent_dialog.cpp:142 src/create_torrent_dialog.cpp:704 +#: src/open_torrent_dialog.cpp:143 src/create_torrent_dialog.cpp:704 msgid "Any files" msgstr "Все файлы" @@ -1995,11 +1995,11 @@ msgid "application is now ending it's work" msgstr "в данный момент приложение завершает свою работу" -#: src/application.cpp:406 +#: src/application.cpp:414 msgid "Unable to show libnotify message" msgstr "Не удалось отобразить сообщение libnotify" -#: src/application.cpp:407 +#: src/application.cpp:415 #, qt-format msgid "" "Unable to show libnotify message: %1. You can disable notifications in the " @@ -2012,16 +2012,16 @@ "Текст сообщения:\n" "%2" -#: src/application.cpp:458 +#: src/application.cpp:466 #, qt-format msgid "Running open command failed. %1." msgstr "Запуск программы просмотра файлов завершился неудачей. %1" -#: src/application.cpp:533 +#: src/application.cpp:541 msgid "Error while saving settings" msgstr "Ошибка при сохранении настроек" -#: src/application.cpp:607 +#: src/application.cpp:615 msgid "" "Unable to initialize a libnotify instance. Notification's displaying is not " "possible." Binary files /tmp/ir4L0YLINr/flush-0.9.9/po/uk.gmo and /tmp/zsTJNzIHfv/flush-0.9.10/po/uk.gmo differ diff -Nru flush-0.9.9/po/uk.po flush-0.9.10/po/uk.po --- flush-0.9.9/po/uk.po 2010-10-21 19:06:58.000000000 +0000 +++ flush-0.9.10/po/uk.po 2011-03-05 14:47:29.000000000 +0000 @@ -1,13 +1,13 @@ # Ukrainian translation for flush # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009 # This file is distributed under the same license as the flush package. -# FIRST AUTHOR , 2009. +# Dmitry Konishchev , 2009. # msgid "" msgstr "" "Project-Id-Version: flush\n" "Report-Msgid-Bugs-To: konishchev@gmail.com\n" -"POT-Creation-Date: 2010-10-21 23:06+0400\n" +"POT-Creation-Date: 2011-03-05 17:47+0300\n" "PO-Revision-Date: 2010-08-01 21:42+0000\n" "Last-Translator: Volodymyr Fedyk \n" "Language-Team: Ukrainian \n" @@ -341,7 +341,7 @@ "Під час отримання часу модифікації та доступу каталогу '%1' виникла помилка. " "Неможливо переглянути статистику каталогу '%2'." -#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:815 src/daemon_fs.cpp:43 +#: mlib/mlib/fs.cpp:223 mlib/mlib/fs.cpp:819 src/daemon_fs.cpp:43 #, qt-format msgid "Can't create directory '%1': %2." msgstr "Неможливо створити каталог '%1': %2." @@ -361,7 +361,7 @@ msgid "Invalid file path '%1' - file '%2' is already exits." msgstr "Неправильний шлях до файлу '%1' - файл '%2' фже існує." -#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 +#: mlib/mlib/fs.cpp:356 mlib/mlib/fs.cpp:775 mlib/mlib/fs.cpp:785 #, qt-format msgid "Can't stat '%1': %2." msgstr "НЕможливо зібрати статистику '%1': %2." @@ -385,58 +385,58 @@ msgid "parent directory is not exists" msgstr "батьківський каталог не існує" -#: mlib/mlib/fs.cpp:735 +#: mlib/mlib/fs.cpp:739 msgid "file is already exists" msgstr "файл вже існує" -#: mlib/mlib/fs.cpp:752 +#: mlib/mlib/fs.cpp:756 msgid "it is a directory" msgstr "це каталог" -#: mlib/mlib/fs.cpp:756 +#: mlib/mlib/fs.cpp:760 msgid "it is a special file" msgstr "це спеціальний файл" -#: mlib/mlib/fs.cpp:767 mlib/mlib/fs.cpp:777 +#: mlib/mlib/fs.cpp:771 mlib/mlib/fs.cpp:781 #, qt-format msgid "No such file or directory ('%1')." msgstr "Немає такого файлу чи каталога ('%1')." -#: mlib/mlib/fs.cpp:846 +#: mlib/mlib/fs.cpp:850 #, qt-format msgid "Error while copying '%1' to '%2': %3." msgstr "Помилка під час копіювання '%1' до '%2': %3." -#: mlib/mlib/fs.cpp:852 mlib/mlib/fs.cpp:1007 +#: mlib/mlib/fs.cpp:856 mlib/mlib/fs.cpp:1011 #, qt-format msgid "Error while reading '%1': %2." msgstr "Помилка під час читання '%1': %2." -#: mlib/mlib/fs.cpp:888 +#: mlib/mlib/fs.cpp:892 msgid "Can't get user home path." msgstr "Неможливо дізнатись шлях до домашньої теки користувача." -#: mlib/mlib/fs.cpp:928 +#: mlib/mlib/fs.cpp:932 #, qt-format msgid "file '%1' is already exists" msgstr "файл '%1' вже існує" -#: mlib/mlib/fs.cpp:1000 +#: mlib/mlib/fs.cpp:1004 #, qt-format msgid "Can't delete directory '%1': %2." msgstr "Неможливо видалити каталог '%1': %2." -#: mlib/mlib/fs.cpp:1014 +#: mlib/mlib/fs.cpp:1018 #, qt-format msgid "file or directory '%1' is not exists" msgstr "файл чи каталог '%1' не існує" -#: mlib/mlib/fs.cpp:1018 +#: mlib/mlib/fs.cpp:1022 #, qt-format msgid "Can't delete file '%1': %2." msgstr "Неможливо видалити файл '%1': %2." -#: mlib/mlib/fs.cpp:1064 +#: mlib/mlib/fs.cpp:1068 #, qt-format msgid "Unable to synchronize data for file '%1' with storage device: %2." msgstr "Неможливо синхронізувати дані файлу '%1' із пристроєм збереження: %2." @@ -1090,19 +1090,19 @@ msgid "Upload speed|Up: %1 (%2) / %3" msgstr "Роз.: %1 (%2) / %3" -#: src/open_torrent_dialog.cpp:94 +#: src/open_torrent_dialog.cpp:95 msgid "Please choose a torrent file" msgstr "Виберіть торрент-файл" -#: src/open_torrent_dialog.cpp:110 +#: src/open_torrent_dialog.cpp:111 msgid "Torrent file encoding:" msgstr "Кодування торрент-файлу:" -#: src/open_torrent_dialog.cpp:137 src/create_torrent_dialog.cpp:699 +#: src/open_torrent_dialog.cpp:138 src/create_torrent_dialog.cpp:699 msgid "Torrent files" msgstr "Торрент-файли" -#: src/open_torrent_dialog.cpp:142 src/create_torrent_dialog.cpp:704 +#: src/open_torrent_dialog.cpp:143 src/create_torrent_dialog.cpp:704 msgid "Any files" msgstr "Будь-які файли" @@ -1945,11 +1945,11 @@ msgid "application is now ending it's work" msgstr "програма завершує роботу" -#: src/application.cpp:406 +#: src/application.cpp:414 msgid "Unable to show libnotify message" msgstr "" -#: src/application.cpp:407 +#: src/application.cpp:415 #, qt-format msgid "" "Unable to show libnotify message: %1. You can disable notifications in the " @@ -1958,16 +1958,16 @@ "%2" msgstr "" -#: src/application.cpp:458 +#: src/application.cpp:466 #, qt-format msgid "Running open command failed. %1." msgstr "Виконання команди було невдалим. %1." -#: src/application.cpp:533 +#: src/application.cpp:541 msgid "Error while saving settings" msgstr "Помилка під час збереження налаштувань" -#: src/application.cpp:607 +#: src/application.cpp:615 msgid "" "Unable to initialize a libnotify instance. Notification's displaying is not " "possible." diff -Nru flush-0.9.9/src/application.cpp flush-0.9.10/src/application.cpp --- flush-0.9.9/src/application.cpp 2010-07-03 08:10:22.000000000 +0000 +++ flush-0.9.10/src/application.cpp 2011-02-09 19:06:25.000000000 +0000 @@ -399,7 +399,15 @@ const char *icon_path = APP_ICONS_PATH "/hicolor/48x48/apps/" APP_UNIX_NAME ".png"; NotifyNotification *notify = notify_notification_new( - message.get_title().c_str(), message.get_message().c_str(), icon_path, NULL); + message.get_title().c_str(), message.get_message().c_str(), icon_path + #if defined(NOTIFY_CHECK_VERSION) + #if !NOTIFY_CHECK_VERSION(0, 7, 0) + , NULL + #endif + #else + , NULL + #endif + ); if(!notify_notification_show(notify, &gerror)) { diff -Nru flush-0.9.9/src/Makefile.in flush-0.9.10/src/Makefile.in --- flush-0.9.9/src/Makefile.in 2010-10-21 19:05:51.000000000 +0000 +++ flush-0.9.10/src/Makefile.in 2011-03-05 14:44:49.000000000 +0000 @@ -49,10 +49,10 @@ subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -129,6 +129,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -191,9 +192,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -214,7 +212,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ diff -Nru flush-0.9.9/src/open_torrent_dialog.cpp flush-0.9.10/src/open_torrent_dialog.cpp --- flush-0.9.9/src/open_torrent_dialog.cpp 2010-07-03 08:10:22.000000000 +0000 +++ flush-0.9.10/src/open_torrent_dialog.cpp 2011-02-25 15:40:52.000000000 +0000 @@ -64,8 +64,7 @@ Open_torrent_dialog::Private::Private(void) : - encoding_model( Gtk::ListStore::create(this->encoding_columns) ), - encoding_combo(encoding_model) + encoding_model( Gtk::ListStore::create(this->encoding_columns) ) { const m::Charset* charset = m::AVAILABLE_CHARSETS; @@ -76,6 +75,8 @@ row[this->encoding_columns.title] = charset->title; charset++; } + + this->encoding_combo.set_model(encoding_model); } diff -Nru flush-0.9.9/ui/Makefile.in flush-0.9.10/ui/Makefile.in --- flush-0.9.9/ui/Makefile.in 2010-10-21 19:05:51.000000000 +0000 +++ flush-0.9.10/ui/Makefile.in 2011-03-05 14:44:49.000000000 +0000 @@ -38,10 +38,10 @@ DIST_COMMON = $(dist_ui_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ - $(top_srcdir)/m4/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_boost_base.m4 \ $(top_srcdir)/m4/ax_boost_filesystem.m4 \ $(top_srcdir)/m4/ax_boost_signals.m4 \ + $(top_srcdir)/m4/ax_boost_system.m4 \ $(top_srcdir)/m4/ax_boost_thread.m4 \ $(top_srcdir)/m4/check_ssl.m4 $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -96,6 +96,7 @@ BOOST_FILESYSTEM_LIB = @BOOST_FILESYSTEM_LIB@ BOOST_LDFLAGS = @BOOST_LDFLAGS@ BOOST_SIGNALS_LIB = @BOOST_SIGNALS_LIB@ +BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@ BOOST_THREAD_LIB = @BOOST_THREAD_LIB@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -158,9 +159,6 @@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ -PTHREAD_CC = @PTHREAD_CC@ -PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ -PTHREAD_LIBS = @PTHREAD_LIBS@ RANLIB = @RANLIB@ SED = @SED@ SET_MAKE = @SET_MAKE@ @@ -181,7 +179,6 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@