diff -Nru devhelp-3.8.2/Makefile.am devhelp-3.10.2/Makefile.am --- devhelp-3.8.2/Makefile.am 2013-02-01 12:33:19.000000000 +0000 +++ devhelp-3.10.2/Makefile.am 2013-07-08 21:01:16.000000000 +0000 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = libgd po src data misc contrib +SUBDIRS = po src data misc contrib EXTRA_DIST = \ autogen.sh \ diff -Nru devhelp-3.8.2/Makefile.in devhelp-3.10.2/Makefile.in --- devhelp-3.8.2/Makefile.in 2013-05-15 11:07:36.000000000 +0000 +++ devhelp-3.10.2/Makefile.in 2013-11-11 15:03:30.000000000 +0000 @@ -59,15 +59,11 @@ build-aux/install-sh build-aux/ltmain.sh build-aux/missing \ build-aux/py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -173,12 +169,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -186,7 +180,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -195,7 +188,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -203,27 +195,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -242,7 +224,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -256,10 +237,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ @@ -323,7 +301,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = libgd po src data misc contrib +SUBDIRS = po src data misc contrib EXTRA_DIST = \ autogen.sh \ misc/devhelp.el \ diff -Nru devhelp-3.8.2/NEWS devhelp-3.10.2/NEWS --- devhelp-3.8.2/NEWS 2013-05-15 11:07:17.000000000 +0000 +++ devhelp-3.10.2/NEWS 2013-11-11 15:43:49.000000000 +0000 @@ -1,3 +1,103 @@ +============== +Version 3.10.2 +============== + +Updated translations: ca, ca@valencia, de, el + +Many thanks to all contributors: Christian Kirbach, Efstathios Iosifidis, +Gil Forcada, Carles Ferrando + + +============== +Version 3.10.0 +============== + +Fixed bugs: + + - #707490, [PATCH] Don't use AM_GNU_GETTEXT + +Updated translations: as, be, da, fi, he, id, ja, ko, lv, ru, sk, +sr@latin, sr, th + +Many thanks to all contributors: Changwoo Ryu, Ville-Pekka Vainio, Andika +Triwidada, Мирослав Николић, Ignacio Casal Quinteiro, Pavol +Klačanský, Ihar Hrachyshka, Ask H. Larsen, Theppitak Karoonboonyanan, +Nilamdyuti Goswami, Jiro Matsuzawa, Yosef Or Boczko, Rūdolfs Mazurs, +Kerrick Staley, Yuri Myasoedov + + +============== +Version 3.9.91 +============== + +Fixed bugs: + + - #700588, Error regarding gsetting schema when gsettings-data-convert + starts + - #706498, Typo in the last devhelp´s POT File + +Updated translations: cs, es, fr, gl, he, hu, it, lt, nb, pl, pt_BR, +sl, zh_HK, zh_TW + +Many thanks to all contributors: Balázs Úr, Milo Casagrande, Kjartan +Maraas, Ignacio Casal Quinteiro, Fran Diéguez, Piotr Drąg, Matej +Urbančič, Aurimas Černius, Daniel Mustieles, Enrico Nicoletto, Marek +Černocký, Chao-Hsiung Liao, Yaron Shahrabani, Alexandre Franke + + +============== +Version 3.9.90 +============== + +Ignacio Casal Quinteiro ported devhelp to GtkHeaderBar, GtkSearchBar, +and more. + +Fixed bugs: + + - #700588, Error regarding gsetting schema when gsettings-data-convert + starts + +Updated translations: it, lt, pt_BR, zh_HK, zh_TW + +Many thanks to all contributors: Milo Casagrande, Ignacio Casal Quinteiro, +Rafael Ferreira, Piotr Drąg, Baptiste Mille-Mathias, Aurimas Černius, +Chao-Hsiung Liao + + +============= +Version 3.9.5 +============= + +Fixed bugs: + + - #703609, Set button arrow icons according to locale's text direction + - #704752, Make window a template and other stuff + - #704805, The notebook in the preferences does not expand properly + +Many thanks to all contributors: Garrett Regier, Ignacio Casal Quinteiro, +Piotr Drąg + + +============= +Version 3.9.4 +============= + +Fixed bugs: + + - #665531, devhelp: change ShowSearchTab key to ctrl+K + - #695758, Ctrl+F/Ctrl+S don't focus the search entry + - #696922, Tabs should be reorderable + - #700430, .pc uses WEBKITGTK_PC_NAME which is no longer defined + +Updated translations: cs, es, eu, gl, he, hu, ml, nb, ru, sl + +Many thanks to all contributors: Balázs Úr, Kjartan Maraas, Carlos Garcia +Campos, Ignacio Casal Quinteiro, Fran Diéguez, Javier Jardón, Matej +Urbančič, Yuri Myasoedov, Daniel Mustieles, Yosef Or Boczko, Adam Dingle, +Marek Černocký, Arnel A. Borja, Yaron Shahrabani, Anish A, Aleksander +Morgado + + ============= Version 3.8.2 ============= diff -Nru devhelp-3.8.2/aclocal.m4 devhelp-3.10.2/aclocal.m4 --- devhelp-3.8.2/aclocal.m4 2013-05-15 11:07:32.000000000 +0000 +++ devhelp-3.10.2/aclocal.m4 2013-11-11 15:03:27.000000000 +0000 @@ -1693,19 +1693,10 @@ ] ) -m4_include([libgd/libgd.m4]) -m4_include([m4/gettext.m4]) -m4_include([m4/iconv.m4]) -m4_include([m4/intlmacosx.m4]) m4_include([m4/intltool.m4]) -m4_include([m4/lib-ld.m4]) -m4_include([m4/lib-link.m4]) -m4_include([m4/lib-prefix.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) m4_include([m4/ltsugar.m4]) m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) m4_include([m4/nls.m4]) -m4_include([m4/po.m4]) -m4_include([m4/progtest.m4]) diff -Nru devhelp-3.8.2/autogen.sh devhelp-3.10.2/autogen.sh --- devhelp-3.8.2/autogen.sh 2013-02-01 12:39:10.000000000 +0000 +++ devhelp-3.10.2/autogen.sh 2013-07-08 21:01:16.000000000 +0000 @@ -5,7 +5,6 @@ test -z "$srcdir" && srcdir=. PKG_NAME="Devhelp" -ACLOCAL_FLAGS="-I libgd $ACLOCAL_FLAGS" (test -f $srcdir/src/dh-main.c) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" diff -Nru devhelp-3.8.2/build-aux/ltmain.sh devhelp-3.10.2/build-aux/ltmain.sh --- devhelp-3.8.2/build-aux/ltmain.sh 2013-05-15 11:07:26.000000000 +0000 +++ devhelp-3.10.2/build-aux/ltmain.sh 2013-11-11 15:03:24.000000000 +0000 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.2" +VERSION="2.4.2 Debian-2.4.2-1.3" TIMESTAMP="" package_revision=1.3337 diff -Nru devhelp-3.8.2/config.h.in devhelp-3.10.2/config.h.in --- devhelp-3.8.2/config.h.in 2013-05-15 11:07:33.000000000 +0000 +++ devhelp-3.10.2/config.h.in 2013-11-11 15:03:28.000000000 +0000 @@ -1,33 +1,11 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Define to 1 if translation of program messages to the user's native - language is requested. */ -#undef ENABLE_NLS - /* Package name for gettext */ #undef GETTEXT_PACKAGE -/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the - CoreFoundation framework. */ -#undef HAVE_CFLOCALECOPYCURRENT - -/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in - the CoreFoundation framework. */ -#undef HAVE_CFPREFERENCESCOPYAPPVALUE - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -#undef HAVE_DCGETTEXT - /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define if you have the iconv() function and it works. */ -#undef HAVE_ICONV - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -55,18 +33,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define if building with WebKit2 */ -#undef HAVE_WEBKIT2 - /* Define to 1 if you have the header file. */ #undef HAVE_ZLIB_H -/* Description */ -#undef LIBGD_HEADER_BAR - -/* Description */ -#undef LIBGD__HEADER_BUTTON - /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #undef LT_OBJDIR diff -Nru devhelp-3.8.2/configure devhelp-3.10.2/configure --- devhelp-3.8.2/configure 2013-05-15 11:07:33.000000000 +0000 +++ devhelp-3.10.2/configure 2013-11-11 15:03:28.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Devhelp 3.8.2. +# Generated by GNU Autoconf 2.69 for Devhelp 3.10.2. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='Devhelp' PACKAGE_TARNAME='devhelp' -PACKAGE_VERSION='3.8.2' -PACKAGE_STRING='Devhelp 3.8.2' +PACKAGE_VERSION='3.10.2' +PACKAGE_STRING='Devhelp 3.10.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp' PACKAGE_URL='http://live.gnome.org/devhelp' @@ -633,48 +633,10 @@ # include #endif" -gt_needs= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -LIBGD_SOURCES -LIBGD_GIR_INCLUDES -LIBGD_LIBS -LIBGD_CFLAGS -LIBGD__VIEW_COMMON_FALSE -LIBGD__VIEW_COMMON_TRUE -LIBGD__HEADER_BUTTON_FALSE -LIBGD__HEADER_BUTTON_TRUE -LIBGD_GIR_FALSE -LIBGD_GIR_TRUE -LIBGD_VAPI_FALSE -LIBGD_VAPI_TRUE -LIBGD_TAGGED_ENTRY_FALSE -LIBGD_TAGGED_ENTRY_TRUE -LIBGD_STACK_FALSE -LIBGD_STACK_TRUE -LIBGD_REVEALER_FALSE -LIBGD_REVEALER_TRUE -LIBGD_NOTIFICATION_FALSE -LIBGD_NOTIFICATION_TRUE -LIBGD_MARGIN_CONTAINER_FALSE -LIBGD_MARGIN_CONTAINER_TRUE -LIBGD_HEADER_BAR_FALSE -LIBGD_HEADER_BAR_TRUE -LIBGD_MAIN_TOOLBAR_FALSE -LIBGD_MAIN_TOOLBAR_TRUE -LIBGD_MAIN_LIST_VIEW_FALSE -LIBGD_MAIN_LIST_VIEW_TRUE -LIBGD_MAIN_ICON_VIEW_FALSE -LIBGD_MAIN_ICON_VIEW_TRUE -LIBGD_MAIN_VIEW_FALSE -LIBGD_MAIN_VIEW_TRUE -LIBGD_GTK_HACKS_FALSE -LIBGD_GTK_HACKS_TRUE -LIBGD_STATIC_FALSE -LIBGD_STATIC_TRUE -LIBGD_MODULE_DIR pkgpyexecdir pyexecdir pkgpythondir @@ -686,18 +648,6 @@ PYTHON GLIB_MKENUMS GETTEXT_PACKAGE -POSUB -LTLIBINTL -LIBINTL -INTLLIBS -LTLIBICONV -LIBICONV -INTL_MACOSX_LIBS -XGETTEXT_EXTRA_OPTIONS -XGETTEXT_015 -GMSGFMT_015 -MSGFMT_015 -GETTEXT_MACRO_VERSION DATADIRNAME ALL_LINGUAS INTLTOOL_PERL @@ -742,9 +692,6 @@ DEVHELP_LIBS DEVHELP_CFLAGS LIBM -WEBKITGTK_PC_NAME -WITH_WEBKIT2_FALSE -WITH_WEBKIT2_TRUE WARN_CFLAGS GSETTINGS_RULES GLIB_COMPILE_SCHEMAS @@ -883,12 +830,8 @@ enable_schemas_compile enable_compile_warnings enable_iso_c -with_webkit2 with_zlib enable_nls -enable_rpath -with_libiconv_prefix -with_libintl_prefix ' ac_precious_vars='build_alias host_alias @@ -906,9 +849,7 @@ DEVHELP_LIBS LIBDEVHELP_CFLAGS LIBDEVHELP_LIBS -PYTHON -LIBGD_CFLAGS -LIBGD_LIBS' +PYTHON' # Initialize some variables set by options. @@ -1449,7 +1390,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 Devhelp 3.8.2 to adapt to many kinds of systems. +\`configure' configures Devhelp 3.10.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1519,7 +1460,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Devhelp 3.8.2:";; + short | recursive ) echo "Configuration of Devhelp 3.10.2:";; esac cat <<\_ACEOF @@ -1542,7 +1483,6 @@ Turn on compiler warnings --enable-iso-c Try to warn if code is not ISO C --disable-nls do not use Native Language Support - --disable-rpath do not hardcode runtime library paths Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1552,13 +1492,7 @@ --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --with-webkit2 build with WebKit2 [default=yes] --with-zlib=DIR use zlib in DIR - --with-gnu-ld assume the C compiler uses GNU ld default=no - --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib - --without-libiconv-prefix don't search for libiconv in includedir and libdir - --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib - --without-libintl-prefix don't search for libintl in includedir and libdir Some influential environment variables: CC C compiler command @@ -1583,9 +1517,6 @@ LIBDEVHELP_LIBS linker flags for LIBDEVHELP, overriding pkg-config PYTHON the Python interpreter - LIBGD_CFLAGS - C compiler flags for LIBGD, overriding pkg-config - LIBGD_LIBS linker flags for LIBGD, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1654,7 +1585,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Devhelp configure 3.8.2 +Devhelp configure 3.10.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2023,7 +1954,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Devhelp $as_me 3.8.2, which was +It was created by Devhelp $as_me 3.10.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2303,7 +2234,6 @@ >$cache_file fi -gt_needs="$gt_needs " # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2857,7 +2787,7 @@ # Define the identity of the package. PACKAGE='devhelp' - VERSION='3.8.2' + VERSION='3.10.2' # Some tools Automake needs. @@ -12191,35 +12121,6 @@ - -# Check whether --with-webkit2 was given. -if test "${with_webkit2+set}" = set; then : - withval=$with_webkit2; -else - with_webkit2=yes -fi - - -if test "x$with_webkit2" != xno; then - WEBKITGTK_PC_NAME=webkit2gtk-3.0 - WEBKITGTK_REQUIRED_VERSION=1.10.0 - -$as_echo "#define HAVE_WEBKIT2 1" >>confdefs.h - -else - WEBKITGTK_PC_NAME=webkitgtk-3.0 - WEBKITGTK_REQUIRED_VERSION=1.6.0 -fi - if test "x$with_webkit2" != xno; then - WITH_WEBKIT2_TRUE= - WITH_WEBKIT2_FALSE='#' -else - WITH_WEBKIT2_TRUE='#' - WITH_WEBKIT2_FALSE= -fi - - - LIBM= case $host in *-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) @@ -12365,24 +12266,24 @@ if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - \$WEBKITGTK_PC_NAME >= \$WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 \""; } >&5 ($PKG_CONFIG --exists --print-errors " gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DEVHELP_CFLAGS=`$PKG_CONFIG --cflags " gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -12397,24 +12298,24 @@ if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - \$WEBKITGTK_PC_NAME >= \$WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 \""; } >&5 ($PKG_CONFIG --exists --print-errors " gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_DEVHELP_LIBS=`$PKG_CONFIG --libs " gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -12438,16 +12339,16 @@ if test $_pkg_short_errors_supported = yes; then DEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 " 2>&1` else DEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 " 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -12455,9 +12356,9 @@ as_fn_error $? "Package requirements ( gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 ) were not met: $DEVHELP_PKG_ERRORS @@ -12501,22 +12402,22 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - \$WEBKITGTK_PC_NAME >= \$WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 \""; } >&5 ($PKG_CONFIG --exists --print-errors " - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBDEVHELP_CFLAGS=`$PKG_CONFIG --cflags " - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -12530,22 +12431,22 @@ elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - \$WEBKITGTK_PC_NAME >= \$WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 \""; } >&5 ($PKG_CONFIG --exists --print-errors " - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_LIBDEVHELP_LIBS=`$PKG_CONFIG --libs " - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -12568,24 +12469,24 @@ fi if test $_pkg_short_errors_supported = yes; then LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 " 2>&1` else LIBDEVHELP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$LIBDEVHELP_PKG_ERRORS" >&5 as_fn_error $? "Package requirements ( - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 ) were not met: $LIBDEVHELP_PKG_ERRORS @@ -13273,93 +13174,24 @@ +GETTEXT_PACKAGE=devhelp +cat >>confdefs.h <<_ACEOF +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" +_ACEOF - GETTEXT_MACRO_VERSION=0.17 - - - - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else - case "$MSGFMT" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --statistics /dev/null >&5 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 +# Extract the first word of "glib-mkenums", so it can be a program name with args. +set dummy glib-mkenums; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GMSGFMT+:} false; then : +if ${ac_cv_path_GLIB_MKENUMS+:} false; then : $as_echo_n "(cached) " >&6 else - case $GMSGFMT in + case $GLIB_MKENUMS in [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -13369,7 +13201,7 @@ test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -13377,14 +13209,13 @@ done IFS=$as_save_IFS - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } +GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS +if test -n "$GLIB_MKENUMS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 +$as_echo "$GLIB_MKENUMS" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -13392,1979 +13223,158 @@ - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; - *) MSGFMT_015=$MSGFMT ;; - esac - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; - *) GMSGFMT_015=$GMSGFMT ;; - esac -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" + + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5 +$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; } + prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +sys.exit(sys.hexversion < minverhex)" + if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 + ($PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - ac_executable_p="test -f" + as_fn_error $? "too old" "$LINENO" 5 fi -rm -f conf$$.file + am_display_PYTHON=$PYTHON + else + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5 +$as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; } +if ${am_cv_pathless_PYTHON+:} false; then : + $as_echo_n "(cached) " >&6 +else -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 + for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0] +minverhex = 0 +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] +sys.exit(sys.hexversion < minverhex)" + if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 + ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then : + break +fi + done +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 +$as_echo "$am_cv_pathless_PYTHON" >&6; } + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. +set dummy $am_cv_pathless_PYTHON; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XGETTEXT+:} false; then : +if ${ac_cv_path_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else - case "$XGETTEXT" in + case $PYTHON in [\\/]* | ?:[\\/]*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. - ;; + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" - ;; + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; esac fi -XGETTEXT="$ac_cv_path_XGETTEXT" -if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 -$as_echo "$XGETTEXT" >&6; } +PYTHON=$ac_cv_path_PYTHON +if test -n "$PYTHON"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 +$as_echo "$PYTHON" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - rm -f messages.po - - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; - *) XGETTEXT_015=$XGETTEXT ;; - esac + fi + am_display_PYTHON=$am_cv_pathless_PYTHON + fi -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' + if test "$PYTHON" = :; then + no else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file -# Extract the first word of "msgmerge", so it can be a program name with args. -set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_MSGMERGE+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 +$as_echo_n "checking for $am_display_PYTHON version... " >&6; } +if ${am_cv_python_version+:} false; then : $as_echo_n "(cached) " >&6 else - case "$MSGMERGE" in - [\\/]* | ?:[\\/]*) - ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&5 - if $ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1; then - ac_cv_path_MSGMERGE="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" - test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":" - ;; -esac -fi -MSGMERGE="$ac_cv_path_MSGMERGE" -if test "$MSGMERGE" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 -$as_echo "$MSGMERGE" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 +$as_echo "$am_cv_python_version" >&6; } + PYTHON_VERSION=$am_cv_python_version - test -n "$localedir" || localedir='${datadir}/locale' + PYTHON_PREFIX='${prefix}' - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + PYTHON_EXEC_PREFIX='${exec_prefix}' - ac_config_commands="$ac_config_commands po-directories" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 +$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } +if ${am_cv_python_platform+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 +$as_echo "$am_cv_python_platform" >&6; } + PYTHON_PLATFORM=$am_cv_python_platform - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -# Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi - -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5 -$as_echo_n "checking for ld used by GCC... " >&6; } - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } -fi -if ${acl_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi -fi - -LD="$acl_cv_path_LD" -if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi -test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${acl_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &5 -$as_echo "$acl_cv_prog_gnu_ld" >&6; } -with_gnu_ld=$acl_cv_prog_gnu_ld - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 -$as_echo_n "checking for shared library run path origin... " >&6; } -if ${acl_cv_rpath+:} false; then : - $as_echo_n "(cached) " >&6 -else - - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 -$as_echo "$acl_cv_rpath" >&6; } - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - # Check whether --enable-rpath was given. -if test "${enable_rpath+set}" = set; then : - enableval=$enable_rpath; : -else - enable_rpath=yes -fi - - - - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi - - - - - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libiconv-prefix was given. -if test "${with_libiconv_prefix+set}" = set; then : - withval=$with_libiconv_prefix; - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi - -fi - - LIBICONV= - LTLIBICONV= - INCICONV= - LIBICONV_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='iconv ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$acl_hardcode_direct" = yes; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a" - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBICONV_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBICONV; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBICONV="${LIBICONV}${LIBICONV:+ }$dep" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep" - ;; - esac - done - fi - else - LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir" - done - fi - - - - - - - - - - - - - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 -$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } -if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -CFPreferencesCopyAppValue(NULL, NULL) - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_CFPreferencesCopyAppValue=yes -else - gt_cv_func_CFPreferencesCopyAppValue=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5 -$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; } - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - -$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5 -$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; } -if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then : - $as_echo_n "(cached) " >&6 -else - gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -CFLocaleCopyCurrent(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_CFLocaleCopyCurrent=yes -else - gt_cv_func_CFLocaleCopyCurrent=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$gt_save_LIBS" -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5 -$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; } - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - -$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h - - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - - - - - - - LIBINTL= - LTLIBINTL= - POSUB= - - case " $gt_needs " in - *" need-formatstring-macros "*) gt_api_version=3 ;; - *" need-ngettext "*) gt_api_version=2 ;; - *) gt_api_version=1 ;; - esac - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" - - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - - - if test $gt_api_version -ge 3; then - gt_revision_test_code=' -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -' - else - gt_revision_test_code= - fi - if test $gt_api_version -ge 2; then - gt_expression_test_code=' + * ngettext ("", "", 0)' - else - gt_expression_test_code= - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 -$as_echo_n "checking for GNU gettext in libc... " >&6; } -if eval \${$gt_func_gnugettext_libc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; -int -main () -{ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$gt_func_gnugettext_libc=yes" -else - eval "$gt_func_gnugettext_libc=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$gt_func_gnugettext_libc - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - - - - - - am_save_CPPFLAGS="$CPPFLAGS" - - for element in $INCICONV; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 -$as_echo_n "checking for iconv... " >&6; } -if ${am_cv_func_iconv+:} false; then : - $as_echo_n "(cached) " >&6 -else - - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -int -main () -{ -iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - am_cv_lib_iconv=yes - am_cv_func_iconv=yes -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$am_save_LIBS" - fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 -$as_echo "$am_cv_func_iconv" >&6; } - if test "$am_cv_func_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 -$as_echo_n "checking for working iconv... " >&6; } -if ${am_cv_func_iconv_works+:} false; then : - $as_echo_n "(cached) " >&6 -else - - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - if test "$cross_compiling" = yes; then : - case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -int main () -{ - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - return 1; - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - am_cv_func_iconv_works=yes -else - am_cv_func_iconv_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LIBS="$am_save_LIBS" - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 -$as_echo "$am_cv_func_iconv_works" >&6; } - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no - fi - if test "$am_func_iconv" = yes; then - -$as_echo "#define HAVE_ICONV 1" >>confdefs.h - - fi - if test "$am_cv_lib_iconv" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5 -$as_echo_n "checking how to link with libiconv... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5 -$as_echo "$LIBICONV" >&6; } - else - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - - - - - - - - - use_additional=yes - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - -# Check whether --with-libintl-prefix was given. -if test "${with_libintl_prefix+set}" = set; then : - withval=$with_libintl_prefix; - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi - -fi - - LIBINTL= - LTLIBINTL= - INCINTL= - LIBINTL_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='intl ' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIBINTL="${LIBINTL}${LIBINTL:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$value" - else - : - fi - else - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - if test "$acl_hardcode_direct" = yes; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - haveit= - for x in $LDFLAGS $LIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }$found_a" - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir -l$name" - fi - fi - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIBINTL_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INCINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - INCINTL="${INCINTL}${INCINTL:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - if test -n "$found_la"; then - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIBINTL; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - LIBINTL="${LIBINTL}${LIBINTL:+ }$dep" - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }$dep" - ;; - esac - done - fi - else - LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - else - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - for found_dir in $ltrpathdirs; do - LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-R$found_dir" - done - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 -$as_echo_n "checking for GNU gettext in libintl... " >&6; } -if eval \${$gt_func_gnugettext_libintl+:} false; then : - $as_echo_n "(cached) " >&6 -else - gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); -int -main () -{ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$gt_func_gnugettext_libintl=yes" -else - eval "$gt_func_gnugettext_libintl=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *); -int -main () -{ -bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("") - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS" -fi -eval ac_res=\$$gt_func_gnugettext_libintl - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - fi - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - -$as_echo "#define ENABLE_NLS 1" >>confdefs.h - - else - USE_NLS=no - fi - fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5 -$as_echo_n "checking whether to use NLS... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 -$as_echo "$USE_NLS" >&6; } - if test "$USE_NLS" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 -$as_echo_n "checking where the gettext function comes from... " >&6; } - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5 -$as_echo "$gt_source" >&6; } - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 -$as_echo_n "checking how to link with libintl... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 -$as_echo "$LIBINTL" >&6; } - - for element in $INCINTL; do - haveit= - for x in $CPPFLAGS; do - - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - eval x=\"$x\" - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" - - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element" - fi - done - - fi - - -$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h - - -$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h - - fi - - POSUB=po - fi - - - - INTLLIBS="$LIBINTL" - - - - - - - -GETTEXT_PACKAGE=devhelp - - -cat >>confdefs.h <<_ACEOF -#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" -_ACEOF - - -# Extract the first word of "glib-mkenums", so it can be a program name with args. -set dummy glib-mkenums; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_MKENUMS+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GLIB_MKENUMS in - [\\/]* | ?:[\\/]*) - ac_cv_path_GLIB_MKENUMS="$GLIB_MKENUMS" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_MKENUMS="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS -if test -n "$GLIB_MKENUMS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_MKENUMS" >&5 -$as_echo "$GLIB_MKENUMS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - - - - - - - - if test -n "$PYTHON"; then - # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.3" >&5 -$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; } - prog="import sys -# split strings by '.' and convert to numeric. Append some zeros -# because we need at least 4 digits for the hex conversion. -# map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0] -minverhex = 0 -# xrange is not present in Python 3.0 and range returns an iterator -for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -sys.exit(sys.hexversion < minverhex)" - if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 - ($PYTHON -c "$prog") >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - as_fn_error $? "too old" "$LINENO" 5 -fi - am_display_PYTHON=$PYTHON - else - # Otherwise, try each interpreter until we find one that satisfies - # VERSION. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.3" >&5 -$as_echo_n "checking for a Python interpreter with version >= 2.3... " >&6; } -if ${am_cv_pathless_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - - for am_cv_pathless_PYTHON in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do - test "$am_cv_pathless_PYTHON" = none && break - prog="import sys -# split strings by '.' and convert to numeric. Append some zeros -# because we need at least 4 digits for the hex conversion. -# map returns an iterator in Python 3.0 and a list in 2.x -minver = list(map(int, '2.3'.split('.'))) + [0, 0, 0] -minverhex = 0 -# xrange is not present in Python 3.0 and range returns an iterator -for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] -sys.exit(sys.hexversion < minverhex)" - if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 - ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - break -fi - done -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -$as_echo "$am_cv_pathless_PYTHON" >&6; } - # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. - if test "$am_cv_pathless_PYTHON" = none; then - PYTHON=: - else - # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. -set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PYTHON+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $PYTHON in - [\\/]* | ?:[\\/]*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -PYTHON=$ac_cv_path_PYTHON -if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi - am_display_PYTHON=$am_cv_pathless_PYTHON - fi - - - if test "$PYTHON" = :; then - no - else - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -$as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if ${am_cv_python_version+:} false; then : - $as_echo_n "(cached) " >&6 -else - am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } - PYTHON_VERSION=$am_cv_python_version - - - - PYTHON_PREFIX='${prefix}' - - PYTHON_EXEC_PREFIX='${exec_prefix}' - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if ${am_cv_python_platform+:} false; then : - $as_echo_n "(cached) " >&6 -else - am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -$as_echo "$am_cv_python_platform" >&6; } - PYTHON_PLATFORM=$am_cv_python_platform - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if ${am_cv_python_pythondir+:} false; then : - $as_echo_n "(cached) " >&6 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 +$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } +if ${am_cv_python_pythondir+:} false; then : + $as_echo_n "(cached) " >&6 else if test "x$prefix" = xNONE then @@ -15440,297 +13450,7 @@ - - - LIBGD_MODULE_DIR=libgd - - - - - - LIBGD_MODULES="gtk+-3.0 >= 3.7.10" - LIBGD_GIR_INCLUDES="Gtk-3.0" - LIBGD_SOURCES="" - - if true; then - LIBGD_STATIC_TRUE= - LIBGD_STATIC_FALSE='#' -else - LIBGD_STATIC_TRUE='#' - LIBGD_STATIC_FALSE= -fi - - - # gtk-hacks: collection of Gtk+ hacks and workarounds - if false; then - LIBGD_GTK_HACKS_TRUE= - LIBGD_GTK_HACKS_FALSE='#' -else - LIBGD_GTK_HACKS_TRUE='#' - LIBGD_GTK_HACKS_FALSE= -fi - - - - # main-view: - if false; then - LIBGD_MAIN_VIEW_TRUE= - LIBGD_MAIN_VIEW_FALSE='#' -else - LIBGD_MAIN_VIEW_TRUE='#' - LIBGD_MAIN_VIEW_FALSE= -fi - - - - # main-icon-view: - if false; then - LIBGD_MAIN_ICON_VIEW_TRUE= - LIBGD_MAIN_ICON_VIEW_FALSE='#' -else - LIBGD_MAIN_ICON_VIEW_TRUE='#' - LIBGD_MAIN_ICON_VIEW_FALSE= -fi - - - - # main-list-view: - if false; then - LIBGD_MAIN_LIST_VIEW_TRUE= - LIBGD_MAIN_LIST_VIEW_FALSE='#' -else - LIBGD_MAIN_LIST_VIEW_TRUE='#' - LIBGD_MAIN_LIST_VIEW_FALSE= -fi - - - - # main-toolbar: - if false; then - LIBGD_MAIN_TOOLBAR_TRUE= - LIBGD_MAIN_TOOLBAR_FALSE='#' -else - LIBGD_MAIN_TOOLBAR_TRUE='#' - LIBGD_MAIN_TOOLBAR_FALSE= -fi - - - - # header-bar: - if true; then - LIBGD_HEADER_BAR_TRUE= - LIBGD_HEADER_BAR_FALSE='#' -else - LIBGD_HEADER_BAR_TRUE='#' - LIBGD_HEADER_BAR_FALSE= -fi - - - - -$as_echo "#define LIBGD_HEADER_BAR 1" >>confdefs.h - - - - # margin-container: - if false; then - LIBGD_MARGIN_CONTAINER_TRUE= - LIBGD_MARGIN_CONTAINER_FALSE='#' -else - LIBGD_MARGIN_CONTAINER_TRUE='#' - LIBGD_MARGIN_CONTAINER_FALSE= -fi - - - - # notification: - if false; then - LIBGD_NOTIFICATION_TRUE= - LIBGD_NOTIFICATION_FALSE='#' -else - LIBGD_NOTIFICATION_TRUE='#' - LIBGD_NOTIFICATION_FALSE= -fi - - - - # revealer: - if false; then - LIBGD_REVEALER_TRUE= - LIBGD_REVEALER_FALSE='#' -else - LIBGD_REVEALER_TRUE='#' - LIBGD_REVEALER_FALSE= -fi - - - - # stack: - if false; then - LIBGD_STACK_TRUE= - LIBGD_STACK_FALSE='#' -else - LIBGD_STACK_TRUE='#' - LIBGD_STACK_FALSE= -fi - - - - # tagged-entry: Gtk+ widget - if false; then - LIBGD_TAGGED_ENTRY_TRUE= - LIBGD_TAGGED_ENTRY_FALSE='#' -else - LIBGD_TAGGED_ENTRY_TRUE='#' - LIBGD_TAGGED_ENTRY_FALSE= -fi - - - - # vapi: vala bindings support - if false; then - LIBGD_VAPI_TRUE= - LIBGD_VAPI_FALSE='#' -else - LIBGD_VAPI_TRUE='#' - LIBGD_VAPI_FALSE= -fi - - - - # gir: gobject introspection support - if false; then - LIBGD_GIR_TRUE= - LIBGD_GIR_FALSE='#' -else - LIBGD_GIR_TRUE='#' - LIBGD_GIR_FALSE= -fi - - - - # _header-button: - if true; then - LIBGD__HEADER_BUTTON_TRUE= - LIBGD__HEADER_BUTTON_FALSE='#' -else - LIBGD__HEADER_BUTTON_TRUE='#' - LIBGD__HEADER_BUTTON_FALSE= -fi - - - -$as_echo "#define LIBGD__HEADER_BUTTON 1" >>confdefs.h - - - - # _view-common: - if false; then - LIBGD__VIEW_COMMON_TRUE= - LIBGD__VIEW_COMMON_FALSE='#' -else - LIBGD__VIEW_COMMON_TRUE='#' - LIBGD__VIEW_COMMON_FALSE= -fi - - - - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGD" >&5 -$as_echo_n "checking for LIBGD... " >&6; } - -if test -n "$LIBGD_CFLAGS"; then - pkg_cv_LIBGD_CFLAGS="$LIBGD_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$LIBGD_MODULES \""; } >&5 - ($PKG_CONFIG --exists --print-errors " $LIBGD_MODULES ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBGD_CFLAGS=`$PKG_CONFIG --cflags " $LIBGD_MODULES " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$LIBGD_LIBS"; then - pkg_cv_LIBGD_LIBS="$LIBGD_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" \$LIBGD_MODULES \""; } >&5 - ($PKG_CONFIG --exists --print-errors " $LIBGD_MODULES ") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBGD_LIBS=`$PKG_CONFIG --libs " $LIBGD_MODULES " 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - LIBGD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " $LIBGD_MODULES " 2>&1` - else - LIBGD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " $LIBGD_MODULES " 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBGD_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements ( $LIBGD_MODULES ) were not met: - -$LIBGD_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 LIBGD_CFLAGS -and LIBGD_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 LIBGD_CFLAGS -and LIBGD_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 - LIBGD_CFLAGS=$pkg_cv_LIBGD_CFLAGS - LIBGD_LIBS=$pkg_cv_LIBGD_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - - - - -ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile data/Makefile data/libdevhelp-3.0.pc data/devhelp.desktop.in data/icons/Makefile data/dtd/Makefile libgd/Makefile misc/Makefile misc/gedit-plugin/Makefile contrib/Makefile" +ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile data/Makefile data/libdevhelp-3.0.pc data/devhelp.desktop.in data/icons/Makefile data/dtd/Makefile misc/Makefile misc/gedit-plugin/Makefile contrib/Makefile" cat >confcache <<\_ACEOF @@ -15858,78 +13578,10 @@ as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WITH_WEBKIT2_TRUE}" && test -z "${WITH_WEBKIT2_FALSE}"; then - as_fn_error $? "conditional \"WITH_WEBKIT2\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${LIBGD_STATIC_TRUE}" && test -z "${LIBGD_STATIC_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_STATIC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_GTK_HACKS_TRUE}" && test -z "${LIBGD_GTK_HACKS_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_GTK_HACKS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_MAIN_VIEW_TRUE}" && test -z "${LIBGD_MAIN_VIEW_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_MAIN_VIEW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_MAIN_ICON_VIEW_TRUE}" && test -z "${LIBGD_MAIN_ICON_VIEW_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_MAIN_ICON_VIEW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_MAIN_LIST_VIEW_TRUE}" && test -z "${LIBGD_MAIN_LIST_VIEW_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_MAIN_LIST_VIEW\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_MAIN_TOOLBAR_TRUE}" && test -z "${LIBGD_MAIN_TOOLBAR_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_MAIN_TOOLBAR\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_HEADER_BAR_TRUE}" && test -z "${LIBGD_HEADER_BAR_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_HEADER_BAR\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_MARGIN_CONTAINER_TRUE}" && test -z "${LIBGD_MARGIN_CONTAINER_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_MARGIN_CONTAINER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_NOTIFICATION_TRUE}" && test -z "${LIBGD_NOTIFICATION_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_NOTIFICATION\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_REVEALER_TRUE}" && test -z "${LIBGD_REVEALER_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_REVEALER\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_STACK_TRUE}" && test -z "${LIBGD_STACK_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_STACK\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_TAGGED_ENTRY_TRUE}" && test -z "${LIBGD_TAGGED_ENTRY_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_TAGGED_ENTRY\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_VAPI_TRUE}" && test -z "${LIBGD_VAPI_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_VAPI\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD_GIR_TRUE}" && test -z "${LIBGD_GIR_FALSE}"; then - as_fn_error $? "conditional \"LIBGD_GIR\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD__HEADER_BUTTON_TRUE}" && test -z "${LIBGD__HEADER_BUTTON_FALSE}"; then - as_fn_error $? "conditional \"LIBGD__HEADER_BUTTON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${LIBGD__VIEW_COMMON_TRUE}" && test -z "${LIBGD__VIEW_COMMON_FALSE}"; then - as_fn_error $? "conditional \"LIBGD__VIEW_COMMON\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -16327,7 +13979,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Devhelp $as_me 3.8.2, which was +This file was extended by Devhelp $as_me 3.10.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16394,7 +14046,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Devhelp config.status 3.8.2 +Devhelp config.status 3.10.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -16791,13 +14443,6 @@ -# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake < 1.5. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - _ACEOF @@ -16810,7 +14455,6 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; - "po-directories") CONFIG_COMMANDS="$CONFIG_COMMANDS po-directories" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; @@ -16819,7 +14463,6 @@ "data/devhelp.desktop.in") CONFIG_FILES="$CONFIG_FILES data/devhelp.desktop.in" ;; "data/icons/Makefile") CONFIG_FILES="$CONFIG_FILES data/icons/Makefile" ;; "data/dtd/Makefile") CONFIG_FILES="$CONFIG_FILES data/dtd/Makefile" ;; - "libgd/Makefile") CONFIG_FILES="$CONFIG_FILES libgd/Makefile" ;; "misc/Makefile") CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;; "misc/gedit-plugin/Makefile") CONFIG_FILES="$CONFIG_FILES misc/gedit-plugin/Makefile" ;; "contrib/Makefile") CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; @@ -18144,119 +15787,6 @@ chmod +x "$ofile" ;; - "po-directories":C) - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 @@ -18318,5 +15848,4 @@ echo echo "Prefix: $prefix" -echo "WebKit2: $with_webkit2" echo diff -Nru devhelp-3.8.2/configure.ac devhelp-3.10.2/configure.ac --- devhelp-3.8.2/configure.ac 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/configure.ac 2013-11-11 15:03:17.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) AC_INIT([Devhelp], - [3.8.2], + [3.10.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp], [devhelp], [http://live.gnome.org/devhelp]) @@ -44,35 +44,20 @@ GNOME_COMPILE_WARNINGS([maximum]) -AC_ARG_WITH(webkit2, - [AC_HELP_STRING([--with-webkit2], [build with WebKit2 [default=yes]])], - [],[with_webkit2=yes]) - -if test "x$with_webkit2" != xno; then - WEBKITGTK_PC_NAME=webkit2gtk-3.0 - WEBKITGTK_REQUIRED_VERSION=1.10.0 - AC_DEFINE([HAVE_WEBKIT2],[1],[Define if building with WebKit2]) -else - WEBKITGTK_PC_NAME=webkitgtk-3.0 - WEBKITGTK_REQUIRED_VERSION=1.6.0 -fi -AM_CONDITIONAL(WITH_WEBKIT2, test "x$with_webkit2" != xno) -AC_SUBST(WEBKITGTK_PC_NAME) - AC_CHECK_LIBM AC_SUBST(LIBM) PKG_CHECK_MODULES(DEVHELP, [ gthread-2.0 >= 2.10.0 - gtk+-3.0 >= 3.5.6 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION - gio-2.0 >= 2.32 + gtk+-3.0 >= 3.9.8 + webkit2gtk-3.0 >= 2.0.0 + gio-2.0 >= 2.37.3 ]) PKG_CHECK_MODULES(LIBDEVHELP, [ - gtk+-3.0 >= 3.5.6 - gio-2.0 >= 2.32 - $WEBKITGTK_PC_NAME >= $WEBKITGTK_REQUIRED_VERSION + gtk+-3.0 >= 3.9.8 + gio-2.0 >= 2.37.3 + webkit2gtk-3.0 >= 2.0.0 ]) AC_ARG_WITH(zlib, [ --with-zlib=DIR use zlib in DIR], zlibdir=$with_zlib) @@ -96,9 +81,6 @@ # i18n stuff IT_PROG_INTLTOOL([0.40.0]) -AM_GNU_GETTEXT_VERSION([0.17]) -AM_GNU_GETTEXT([external]) - GETTEXT_PACKAGE=devhelp AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name for gettext]) @@ -107,11 +89,6 @@ AM_PATH_PYTHON([2.3],[],[no]) -LIBGD_INIT([ - header-bar - static -]) - AC_CONFIG_FILES([ Makefile po/Makefile.in @@ -121,7 +98,6 @@ data/devhelp.desktop.in data/icons/Makefile data/dtd/Makefile -libgd/Makefile misc/Makefile misc/gedit-plugin/Makefile contrib/Makefile @@ -131,5 +107,4 @@ echo echo "Prefix: $prefix" -echo "WebKit2: $with_webkit2" echo diff -Nru devhelp-3.8.2/contrib/Makefile.in devhelp-3.10.2/contrib/Makefile.in --- devhelp-3.8.2/contrib/Makefile.in 2013-05-15 11:07:34.000000000 +0000 +++ devhelp-3.10.2/contrib/Makefile.in 2013-11-11 15:03:29.000000000 +0000 @@ -53,15 +53,11 @@ subdir = contrib DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -111,12 +107,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -124,7 +118,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -133,7 +126,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -141,27 +133,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -180,7 +162,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -194,10 +175,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru devhelp-3.8.2/data/Makefile.in devhelp-3.10.2/data/Makefile.in --- devhelp-3.8.2/data/Makefile.in 2013-05-15 11:07:35.000000000 +0000 +++ devhelp-3.10.2/data/Makefile.in 2013-11-11 15:03:29.000000000 +0000 @@ -55,15 +55,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/devhelp.desktop.in.in $(srcdir)/libdevhelp-3.0.pc.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -185,12 +181,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -198,7 +192,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -207,7 +200,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -215,27 +207,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -254,7 +236,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -268,10 +249,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru devhelp-3.8.2/data/devhelp.desktop.in devhelp-3.10.2/data/devhelp.desktop.in --- devhelp-3.8.2/data/devhelp.desktop.in 2013-05-15 11:07:51.000000000 +0000 +++ devhelp-3.10.2/data/devhelp.desktop.in 2013-11-11 15:03:44.000000000 +0000 @@ -12,4 +12,4 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=devhelp X-GNOME-Bugzilla-Component=General -X-GNOME-Bugzilla-Version=3.8.2 +X-GNOME-Bugzilla-Version=3.10.2 diff -Nru devhelp-3.8.2/data/dtd/Makefile.in devhelp-3.10.2/data/dtd/Makefile.in --- devhelp-3.8.2/data/dtd/Makefile.in 2013-05-15 11:07:35.000000000 +0000 +++ devhelp-3.10.2/data/dtd/Makefile.in 2013-11-11 15:03:29.000000000 +0000 @@ -54,15 +54,11 @@ subdir = data/dtd DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -141,12 +137,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -154,7 +148,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -163,7 +156,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -171,27 +163,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -210,7 +192,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -224,10 +205,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru devhelp-3.8.2/data/icons/Makefile.in devhelp-3.10.2/data/icons/Makefile.in --- devhelp-3.8.2/data/icons/Makefile.in 2013-05-15 11:07:35.000000000 +0000 +++ devhelp-3.10.2/data/icons/Makefile.in 2013-11-11 15:03:29.000000000 +0000 @@ -54,15 +54,11 @@ subdir = data/icons DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -144,12 +140,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -157,7 +151,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -166,7 +159,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -174,27 +166,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -213,7 +195,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -227,10 +208,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru devhelp-3.8.2/data/libdevhelp-3.0.pc.in devhelp-3.10.2/data/libdevhelp-3.0.pc.in --- devhelp-3.8.2/data/libdevhelp-3.0.pc.in 2013-02-04 15:31:17.000000000 +0000 +++ devhelp-3.10.2/data/libdevhelp-3.0.pc.in 2013-07-08 21:01:16.000000000 +0000 @@ -5,7 +5,7 @@ Name: devhelp Description: devhelp -Requires: gtk+-3.0 @WEBKITGTK_PC_NAME@ +Requires: gtk+-3.0 webkit2gtk-3.0 Version: @VERSION@ Libs: -L${libdir} -ldevhelp-3 Cflags: -I${includedir}/devhelp-3.0 diff -Nru devhelp-3.8.2/data/org.gnome.devhelp.gschema.xml devhelp-3.10.2/data/org.gnome.devhelp.gschema.xml --- devhelp-3.8.2/data/org.gnome.devhelp.gschema.xml 2013-03-25 06:27:36.000000000 +0000 +++ devhelp-3.10.2/data/org.gnome.devhelp.gschema.xml 2013-08-21 13:43:41.000000000 +0000 @@ -70,6 +70,11 @@ + + false + Whether the assistant window should be maximized + Whether the assistant window should be maximized. + 350 Width of the assistant window diff -Nru devhelp-3.8.2/debian/changelog devhelp-3.10.2/debian/changelog --- devhelp-3.8.2/debian/changelog 2013-12-20 01:44:24.000000000 +0000 +++ devhelp-3.10.2/debian/changelog 2014-01-20 19:42:00.000000000 +0000 @@ -1,3 +1,14 @@ +devhelp (3.10.2-0ubuntu1~trusty1) trusty; urgency=medium + + * New upstream release + * debian/control.in,rules: + - Bump build-deps according to configure.ac + - Support for webkit2gtk-3.0 only + * debian/libdevhelp-3-2.symbols: + - Updated symbols + + -- Rico Tzschichholz Mon, 20 Jan 2014 16:34:26 +0100 + devhelp (3.8.2-2ubuntu1) trusty; urgency=medium * Use dh-autoreconf to update libtool. diff -Nru devhelp-3.8.2/debian/control devhelp-3.10.2/debian/control --- devhelp-3.8.2/debian/control 2013-12-20 01:57:30.000000000 +0000 +++ devhelp-3.10.2/debian/control 2014-01-20 19:42:11.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Frederic Peters , Michael Biebl +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Michael Biebl Homepage: https://wiki.gnome.org/devhelp Build-Depends: cdbs, debhelper (>= 8), @@ -15,9 +15,9 @@ gnome-pkg-tools, gnome-common, intltool, - libglib2.0-dev (>= 2.32), - libgtk-3-dev (>= 3.5.6), - libwebkitgtk-3.0-dev (>= 1.6.0), + libglib2.0-dev (>= 2.37.3), + libgtk-3-dev (>= 3.9.8), + libwebkit2gtk-3.0-dev (>= 2.0.0), libxml-parser-perl, python3-dev Standards-Version: 3.9.4 @@ -40,8 +40,8 @@ Architecture: any Depends: ${misc:Depends}, libdevhelp-3-2 (= ${binary:Version}), - libgtk-3-dev (>= 3.5.6), - libwebkitgtk-3.0-dev (>= 1.6.0) + libgtk-3-dev (>= 3.9.8), + libwebkit2gtk-3.0-dev (>= 2.0.0) Description: Library providing documentation browser functionality (development) This library provides embedable widgets from the Devhelp program to be integrated in tools like the Anjuta IDE for browsing API reference diff -Nru devhelp-3.8.2/debian/control.in devhelp-3.10.2/debian/control.in --- devhelp-3.8.2/debian/control.in 2013-12-20 01:53:17.000000000 +0000 +++ devhelp-3.10.2/debian/control.in 2014-01-20 19:41:18.000000000 +0000 @@ -11,9 +11,9 @@ gnome-pkg-tools, gnome-common, intltool, - libglib2.0-dev (>= 2.32), - libgtk-3-dev (>= 3.5.6), - libwebkitgtk-3.0-dev (>= 1.6.0), + libglib2.0-dev (>= 2.37.3), + libgtk-3-dev (>= 3.9.8), + libwebkit2gtk-3.0-dev (>= 2.0.0), libxml-parser-perl, python3-dev Standards-Version: 3.9.4 @@ -36,8 +36,8 @@ Architecture: any Depends: ${misc:Depends}, libdevhelp-3-2 (= ${binary:Version}), - libgtk-3-dev (>= 3.5.6), - libwebkitgtk-3.0-dev (>= 1.6.0) + libgtk-3-dev (>= 3.9.8), + libwebkit2gtk-3.0-dev (>= 2.0.0) Description: Library providing documentation browser functionality (development) This library provides embedable widgets from the Devhelp program to be integrated in tools like the Anjuta IDE for browsing API reference diff -Nru devhelp-3.8.2/debian/libdevhelp-3-2.symbols devhelp-3.10.2/debian/libdevhelp-3-2.symbols --- devhelp-3.8.2/debian/libdevhelp-3-2.symbols 2013-07-31 20:40:41.000000000 +0000 +++ devhelp-3.10.2/debian/libdevhelp-3-2.symbols 2014-01-20 19:41:07.000000000 +0000 @@ -80,6 +80,7 @@ dh_link_unref@Base 2.91.5 dh_open_link_flags_get_type@Base 2.91.5 dh_parser_read_file@Base 2.91.5 + dh_preferences_get_type@Base 3.10.2 dh_preferences_show_dialog@Base 2.91.5 dh_settings_get@Base 3.7.91 dh_settings_get_selected_fonts@Base 3.7.91 diff -Nru devhelp-3.8.2/debian/rules devhelp-3.10.2/debian/rules --- devhelp-3.8.2/debian/rules 2013-12-20 01:57:26.000000000 +0000 +++ devhelp-3.10.2/debian/rules 2014-01-20 15:42:00.000000000 +0000 @@ -8,8 +8,6 @@ include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -DEB_CONFIGURE_EXTRA_FLAGS += --without-webkit2 - DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4 X_TOOLS += misc/devhelp.vim \ @@ -34,4 +32,3 @@ pre-build:: cp misc/devhelp.el debian/devhelp.emacsen-startup - cd m4/ && ln -fs ../libgd/libgd.m4 diff -Nru devhelp-3.8.2/libgd/Makefile.am devhelp-3.10.2/libgd/Makefile.am --- devhelp-3.8.2/libgd/Makefile.am 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/Makefile.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,247 +0,0 @@ -NULL = -CLEANFILES = -MAINTAINERCLEANFILES = -EXTRA_DIST = -noinst_DATA = - -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -DPREFIX=\"$(prefix)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DG_LOG_DOMAIN=\"libgd\" \ - -DG_DISABLE_DEPRECATED \ - $(LIBGD_CFLAGS) \ - $(NULL) - -noinst_PROGRAMS = - -if LIBGD_STATIC -noinst_LTLIBRARIES = libgd.la -else -pkglib_LTLIBRARIES = libgd.la -endif - -libgd_la_LIBADD = $(LIBGD_LIBS) $(LIBM) -libgd_la_LDFLAGS = -avoid-version -libgd_la_SOURCES = libgd/gd.h -nodist_libgd_la_SOURCES = - -if LIBGD_GTK_HACKS -gtk_hacks_sources = \ - libgd/gd-entry-focus-hack.c \ - libgd/gd-entry-focus-hack.h \ - libgd/gd-icon-utils.c \ - libgd/gd-icon-utils.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(gtk_hacks_sources) -EXTRA_DIST += $(gtk_hacks_sources) -endif - -if LIBGD__VIEW_COMMON -view_common_sources = \ - libgd/gd-main-view-generic.c \ - libgd/gd-main-view-generic.h \ - libgd/gd-styled-text-renderer.c \ - libgd/gd-styled-text-renderer.h \ - libgd/gd-two-lines-renderer.c \ - libgd/gd-two-lines-renderer.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(view_common_sources) -EXTRA_DIST += $(view_common_sources) -endif - -if LIBGD_MAIN_ICON_VIEW -main_icon_view_sources = \ - libgd/gd-main-icon-view.c \ - libgd/gd-main-icon-view.h \ - libgd/gd-toggle-pixbuf-renderer.c \ - libgd/gd-toggle-pixbuf-renderer.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(main_icon_view_sources) -EXTRA_DIST += $(main_icon_view_sources) -endif - -if LIBGD_MAIN_LIST_VIEW -main_list_view_sources = \ - libgd/gd-main-list-view.c \ - libgd/gd-main-list-view.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(main_list_view_sources) -EXTRA_DIST += $(main_list_view_sources) -endif - -if LIBGD_MAIN_VIEW -main_view_sources = \ - libgd/gd-main-view.c \ - libgd/gd-main-view.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(main_view_sources) -EXTRA_DIST += $(main_view_sources) -endif - -if LIBGD_MAIN_TOOLBAR -main_toolbar_sources = \ - libgd/gd-main-toolbar.c \ - libgd/gd-main-toolbar.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(main_toolbar_sources) -EXTRA_DIST += $(main_toolbar_sources) -endif - -if LIBGD_HEADER_BAR -header_bar_sources = \ - libgd/gd-header-bar.c \ - libgd/gd-header-bar.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(header_bar_sources) -EXTRA_DIST += $(header_bar_sources) - -noinst_PROGRAMS += test-header-bar -test_header_bar_SOURCES = \ - test-header-bar.c \ - $(NULL) -test_header_bar_LDADD = \ - $(LIBGD_LIBS) \ - libgd.la \ - $(NULL) -endif - -if LIBGD__HEADER_BUTTON -header_button_sources = \ - libgd/gd-header-button.c \ - libgd/gd-header-button.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(header_button_sources) -EXTRA_DIST += $(header_button_sources) -endif - -if LIBGD_MARGIN_CONTAINER -margin_container_sources = \ - libgd/gd-margin-container.c \ - libgd/gd-margin-container.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(margin_container_sources) -EXTRA_DIST += $(margin_container_sources) -endif - -if LIBGD_NOTIFICATION -notification_sources = \ - libgd/gd-notification.c \ - libgd/gd-notification.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(notification_sources) -EXTRA_DIST += $(notification_sources) -endif - -if LIBGD_REVEALER -revealer_sources = \ - libgd/gd-revealer.c \ - libgd/gd-revealer.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(revealer_sources) -EXTRA_DIST += $(revealer_sources) - -noinst_PROGRAMS += test-revealer -test_revealer_SOURCES = \ - test-revealer.c \ - $(NULL) -test_revealer_LDADD = \ - $(LIBGD_LIBS) \ - libgd.la \ - $(NULL) -endif - -if LIBGD_STACK -stack_sources = \ - libgd/gd-stack.c \ - libgd/gd-stack.h \ - libgd/gd-stack-switcher.c \ - libgd/gd-stack-switcher.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(stack_sources) -EXTRA_DIST += $(stack_sources) - -noinst_PROGRAMS += test-stack -test_stack_SOURCES = \ - test-stack.c \ - $(NULL) -test_stack_LDADD = \ - $(LIBGD_LIBS) \ - libgd.la \ - $(NULL) -endif - -if LIBGD_TAGGED_ENTRY -tagged_entry_sources = \ - libgd/gd-tagged-entry.c \ - libgd/gd-tagged-entry.h \ - $(NULL) - -nodist_libgd_la_SOURCES += $(tagged_entry_sources) -EXTRA_DIST += $(tagged_entry_sources) -endif - -if LIBGD_GIR -include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = Gd-1.0.gir - -Gd-1.0.gir: libgd.la Makefile -Gd_1_0_gir_NAMESPACE = Gd -Gd_1_0_gir_VERSION = 1.0 -Gd_1_0_gir_LIBS = libgd.la -Gd_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -Gd_1_0_gir_SCANNERFLAGS = \ - --warn-all \ - --symbol-prefix=gd \ - --identifier-prefix=Gd \ - --c-include="libgd/gd.h" \ - $(NULL) -Gd_1_0_gir_INCLUDES = $(LIBGD_GIR_INCLUDES) -Gd_1_0_gir_FILES = $(nodist_libgd_la_SOURCES) - -if LIBGD_STATIC -noinst_DATA += $(srcdir)/Gd-1.0.gir -EXTRA_DIST += $(srcdir)/Gd-1.0.gir -MAINTAINERCLEANFILES += $(srcdir)/Gd-1.0.gir -else -girdir= $(pkgdatadir)/gir-1.0 -typelibdir= $(pkglibdir)/girepository-1.0 - -gir_DATA = $(INTROSPECTION_GIRS) -typelib_DATA = $(gir_DATA:.gir=.typelib) - -CLEANFILES += $(gir_DATA) $(typelib_DATA) -endif -endif - -if LIBGD_VAPI -VAPIS = $(srcdir)/gd-1.0.vapi - -$(srcdir)/gd-1.0.vapi: $(srcdir)/Gd-1.0.gir - $(AM_V_GEN)$(VAPIGEN) \ - --library gd-1.0 \ - --pkg gtk+-3.0 \ - $< -#This 'touch' is a workaround for vapigen not touching the dest file if -#its content hasn't changed, which causes the rule to generate the .vapi -#file to always trigger - @touch $@ - -noinst_DATA += $(VAPIS) -EXTRA_DIST += $(VAPIS) -MAINTAINERCLEANFILES += $(VAPIS) -endif - --include $(top_srcdir)/git.mk diff -Nru devhelp-3.8.2/libgd/Makefile.in devhelp-3.10.2/libgd/Makefile.in --- devhelp-3.8.2/libgd/Makefile.in 2013-05-15 11:07:35.000000000 +0000 +++ devhelp-3.10.2/libgd/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,1142 +0,0 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - - - -VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ - case $$MAKEFLAGS in \ - *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ - esac; \ - test $$am__dry = yes; \ - } -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) -@LIBGD_GTK_HACKS_TRUE@am__append_1 = $(gtk_hacks_sources) -@LIBGD_GTK_HACKS_TRUE@am__append_2 = $(gtk_hacks_sources) -@LIBGD__VIEW_COMMON_TRUE@am__append_3 = $(view_common_sources) -@LIBGD__VIEW_COMMON_TRUE@am__append_4 = $(view_common_sources) -@LIBGD_MAIN_ICON_VIEW_TRUE@am__append_5 = $(main_icon_view_sources) -@LIBGD_MAIN_ICON_VIEW_TRUE@am__append_6 = $(main_icon_view_sources) -@LIBGD_MAIN_LIST_VIEW_TRUE@am__append_7 = $(main_list_view_sources) -@LIBGD_MAIN_LIST_VIEW_TRUE@am__append_8 = $(main_list_view_sources) -@LIBGD_MAIN_VIEW_TRUE@am__append_9 = $(main_view_sources) -@LIBGD_MAIN_VIEW_TRUE@am__append_10 = $(main_view_sources) -@LIBGD_MAIN_TOOLBAR_TRUE@am__append_11 = $(main_toolbar_sources) -@LIBGD_MAIN_TOOLBAR_TRUE@am__append_12 = $(main_toolbar_sources) -@LIBGD_HEADER_BAR_TRUE@am__append_13 = $(header_bar_sources) -@LIBGD_HEADER_BAR_TRUE@am__append_14 = $(header_bar_sources) -@LIBGD_HEADER_BAR_TRUE@am__append_15 = test-header-bar -@LIBGD__HEADER_BUTTON_TRUE@am__append_16 = $(header_button_sources) -@LIBGD__HEADER_BUTTON_TRUE@am__append_17 = $(header_button_sources) -@LIBGD_MARGIN_CONTAINER_TRUE@am__append_18 = $(margin_container_sources) -@LIBGD_MARGIN_CONTAINER_TRUE@am__append_19 = $(margin_container_sources) -@LIBGD_NOTIFICATION_TRUE@am__append_20 = $(notification_sources) -@LIBGD_NOTIFICATION_TRUE@am__append_21 = $(notification_sources) -@LIBGD_REVEALER_TRUE@am__append_22 = $(revealer_sources) -@LIBGD_REVEALER_TRUE@am__append_23 = $(revealer_sources) -@LIBGD_REVEALER_TRUE@am__append_24 = test-revealer -@LIBGD_STACK_TRUE@am__append_25 = $(stack_sources) -@LIBGD_STACK_TRUE@am__append_26 = $(stack_sources) -@LIBGD_STACK_TRUE@am__append_27 = test-stack -@LIBGD_TAGGED_ENTRY_TRUE@am__append_28 = $(tagged_entry_sources) -@LIBGD_TAGGED_ENTRY_TRUE@am__append_29 = $(tagged_entry_sources) -@LIBGD_GIR_TRUE@@LIBGD_STATIC_TRUE@am__append_30 = $(srcdir)/Gd-1.0.gir -@LIBGD_GIR_TRUE@@LIBGD_STATIC_TRUE@am__append_31 = $(srcdir)/Gd-1.0.gir -@LIBGD_GIR_TRUE@@LIBGD_STATIC_TRUE@am__append_32 = $(srcdir)/Gd-1.0.gir -@LIBGD_GIR_TRUE@@LIBGD_STATIC_FALSE@am__append_33 = $(gir_DATA) $(typelib_DATA) -@LIBGD_VAPI_TRUE@am__append_34 = $(VAPIS) -@LIBGD_VAPI_TRUE@am__append_35 = $(VAPIS) -@LIBGD_VAPI_TRUE@am__append_36 = $(VAPIS) -subdir = libgd -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__uninstall_files_from_dir = { \ - test -z "$$files" \ - || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ - || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ - $(am__cd) "$$dir" && rm -f $$files; }; \ - } -am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(girdir)" \ - "$(DESTDIR)$(typelibdir)" -LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES) -am__DEPENDENCIES_1 = -libgd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_libgd_la_OBJECTS = -am__objects_1 = -@LIBGD_GTK_HACKS_TRUE@am__objects_2 = gd-entry-focus-hack.lo \ -@LIBGD_GTK_HACKS_TRUE@ gd-icon-utils.lo $(am__objects_1) -@LIBGD_GTK_HACKS_TRUE@am__objects_3 = $(am__objects_2) -@LIBGD__VIEW_COMMON_TRUE@am__objects_4 = gd-main-view-generic.lo \ -@LIBGD__VIEW_COMMON_TRUE@ gd-styled-text-renderer.lo \ -@LIBGD__VIEW_COMMON_TRUE@ gd-two-lines-renderer.lo \ -@LIBGD__VIEW_COMMON_TRUE@ $(am__objects_1) -@LIBGD__VIEW_COMMON_TRUE@am__objects_5 = $(am__objects_4) -@LIBGD_MAIN_ICON_VIEW_TRUE@am__objects_6 = gd-main-icon-view.lo \ -@LIBGD_MAIN_ICON_VIEW_TRUE@ gd-toggle-pixbuf-renderer.lo \ -@LIBGD_MAIN_ICON_VIEW_TRUE@ $(am__objects_1) -@LIBGD_MAIN_ICON_VIEW_TRUE@am__objects_7 = $(am__objects_6) -@LIBGD_MAIN_LIST_VIEW_TRUE@am__objects_8 = gd-main-list-view.lo \ -@LIBGD_MAIN_LIST_VIEW_TRUE@ $(am__objects_1) -@LIBGD_MAIN_LIST_VIEW_TRUE@am__objects_9 = $(am__objects_8) -@LIBGD_MAIN_VIEW_TRUE@am__objects_10 = gd-main-view.lo \ -@LIBGD_MAIN_VIEW_TRUE@ $(am__objects_1) -@LIBGD_MAIN_VIEW_TRUE@am__objects_11 = $(am__objects_10) -@LIBGD_MAIN_TOOLBAR_TRUE@am__objects_12 = gd-main-toolbar.lo \ -@LIBGD_MAIN_TOOLBAR_TRUE@ $(am__objects_1) -@LIBGD_MAIN_TOOLBAR_TRUE@am__objects_13 = $(am__objects_12) -@LIBGD_HEADER_BAR_TRUE@am__objects_14 = gd-header-bar.lo \ -@LIBGD_HEADER_BAR_TRUE@ $(am__objects_1) -@LIBGD_HEADER_BAR_TRUE@am__objects_15 = $(am__objects_14) -@LIBGD__HEADER_BUTTON_TRUE@am__objects_16 = gd-header-button.lo \ -@LIBGD__HEADER_BUTTON_TRUE@ $(am__objects_1) -@LIBGD__HEADER_BUTTON_TRUE@am__objects_17 = $(am__objects_16) -@LIBGD_MARGIN_CONTAINER_TRUE@am__objects_18 = gd-margin-container.lo \ -@LIBGD_MARGIN_CONTAINER_TRUE@ $(am__objects_1) -@LIBGD_MARGIN_CONTAINER_TRUE@am__objects_19 = $(am__objects_18) -@LIBGD_NOTIFICATION_TRUE@am__objects_20 = gd-notification.lo \ -@LIBGD_NOTIFICATION_TRUE@ $(am__objects_1) -@LIBGD_NOTIFICATION_TRUE@am__objects_21 = $(am__objects_20) -@LIBGD_REVEALER_TRUE@am__objects_22 = gd-revealer.lo $(am__objects_1) -@LIBGD_REVEALER_TRUE@am__objects_23 = $(am__objects_22) -@LIBGD_STACK_TRUE@am__objects_24 = gd-stack.lo gd-stack-switcher.lo \ -@LIBGD_STACK_TRUE@ $(am__objects_1) -@LIBGD_STACK_TRUE@am__objects_25 = $(am__objects_24) -@LIBGD_TAGGED_ENTRY_TRUE@am__objects_26 = gd-tagged-entry.lo \ -@LIBGD_TAGGED_ENTRY_TRUE@ $(am__objects_1) -@LIBGD_TAGGED_ENTRY_TRUE@am__objects_27 = $(am__objects_26) -nodist_libgd_la_OBJECTS = $(am__objects_3) $(am__objects_5) \ - $(am__objects_7) $(am__objects_9) $(am__objects_11) \ - $(am__objects_13) $(am__objects_15) $(am__objects_17) \ - $(am__objects_19) $(am__objects_21) $(am__objects_23) \ - $(am__objects_25) $(am__objects_27) -libgd_la_OBJECTS = $(am_libgd_la_OBJECTS) $(nodist_libgd_la_OBJECTS) -AM_V_lt = $(am__v_lt_@AM_V@) -am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) -am__v_lt_0 = --silent -libgd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libgd_la_LDFLAGS) $(LDFLAGS) -o $@ -@LIBGD_STATIC_FALSE@am_libgd_la_rpath = -rpath $(pkglibdir) -@LIBGD_STATIC_TRUE@am_libgd_la_rpath = -@LIBGD_HEADER_BAR_TRUE@am__EXEEXT_1 = test-header-bar$(EXEEXT) -@LIBGD_REVEALER_TRUE@am__EXEEXT_2 = test-revealer$(EXEEXT) -@LIBGD_STACK_TRUE@am__EXEEXT_3 = test-stack$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) -am__test_header_bar_SOURCES_DIST = test-header-bar.c -@LIBGD_HEADER_BAR_TRUE@am_test_header_bar_OBJECTS = \ -@LIBGD_HEADER_BAR_TRUE@ test-header-bar.$(OBJEXT) \ -@LIBGD_HEADER_BAR_TRUE@ $(am__objects_1) -test_header_bar_OBJECTS = $(am_test_header_bar_OBJECTS) -@LIBGD_HEADER_BAR_TRUE@test_header_bar_DEPENDENCIES = \ -@LIBGD_HEADER_BAR_TRUE@ $(am__DEPENDENCIES_1) libgd.la \ -@LIBGD_HEADER_BAR_TRUE@ $(am__DEPENDENCIES_1) -am__test_revealer_SOURCES_DIST = test-revealer.c -@LIBGD_REVEALER_TRUE@am_test_revealer_OBJECTS = \ -@LIBGD_REVEALER_TRUE@ test-revealer.$(OBJEXT) $(am__objects_1) -test_revealer_OBJECTS = $(am_test_revealer_OBJECTS) -@LIBGD_REVEALER_TRUE@test_revealer_DEPENDENCIES = \ -@LIBGD_REVEALER_TRUE@ $(am__DEPENDENCIES_1) libgd.la \ -@LIBGD_REVEALER_TRUE@ $(am__DEPENDENCIES_1) -am__test_stack_SOURCES_DIST = test-stack.c -@LIBGD_STACK_TRUE@am_test_stack_OBJECTS = test-stack.$(OBJEXT) \ -@LIBGD_STACK_TRUE@ $(am__objects_1) -test_stack_OBJECTS = $(am_test_stack_OBJECTS) -@LIBGD_STACK_TRUE@test_stack_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@LIBGD_STACK_TRUE@ libgd.la $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_@AM_V@) -am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -CCLD = $(CC) -LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_@AM_V@) -am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libgd_la_SOURCES) $(nodist_libgd_la_SOURCES) \ - $(test_header_bar_SOURCES) $(test_revealer_SOURCES) \ - $(test_stack_SOURCES) -DIST_SOURCES = $(libgd_la_SOURCES) $(am__test_header_bar_SOURCES_DIST) \ - $(am__test_revealer_SOURCES_DIST) \ - $(am__test_stack_SOURCES_DIST) -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac -DATA = $(gir_DATA) $(noinst_DATA) $(typelib_DATA) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DEVHELP_CFLAGS = @DEVHELP_CFLAGS@ -DEVHELP_LIBS = @DEVHELP_LIBS@ -DLLTOOL = @DLLTOOL@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ -GLIB_MKENUMS = @GLIB_MKENUMS@ -GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ -GREP = @GREP@ -GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ -LIBDEVHELP_CFLAGS = @LIBDEVHELP_CFLAGS@ -LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ -LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ -LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ -LIBM = @LIBM@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MANIFEST_TOOL = @MANIFEST_TOOL@ -MKDIR_P = @MKDIR_P@ -MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ -MSGMERGE = @MSGMERGE@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ -PYTHON = @PYTHON@ -PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_PLATFORM = @PYTHON_PLATFORM@ -PYTHON_PREFIX = @PYTHON_PREFIX@ -PYTHON_VERSION = @PYTHON_VERSION@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ -XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ -ZLIB_CFLAGS = @ZLIB_CFLAGS@ -ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ -ZLIB_LIBS = @ZLIB_LIBS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_AR = @ac_ct_AR@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -gsettingsschemadir = @gsettingsschemadir@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -intltool__v_merge_options_ = @intltool__v_merge_options_@ -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -pkgpyexecdir = @pkgpyexecdir@ -pkgpythondir = @pkgpythondir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -pyexecdir = @pyexecdir@ -pythondir = @pythondir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -NULL = -CLEANFILES = $(am__append_33) -MAINTAINERCLEANFILES = $(am__append_32) $(am__append_36) -EXTRA_DIST = $(am__append_2) $(am__append_4) $(am__append_6) \ - $(am__append_8) $(am__append_10) $(am__append_12) \ - $(am__append_14) $(am__append_17) $(am__append_19) \ - $(am__append_21) $(am__append_23) $(am__append_26) \ - $(am__append_29) $(am__append_31) $(am__append_35) -noinst_DATA = $(am__append_30) $(am__append_34) -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -DPREFIX=\"$(prefix)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DG_LOG_DOMAIN=\"libgd\" \ - -DG_DISABLE_DEPRECATED \ - $(LIBGD_CFLAGS) \ - $(NULL) - -@LIBGD_STATIC_TRUE@noinst_LTLIBRARIES = libgd.la -@LIBGD_STATIC_FALSE@pkglib_LTLIBRARIES = libgd.la -libgd_la_LIBADD = $(LIBGD_LIBS) $(LIBM) -libgd_la_LDFLAGS = -avoid-version -libgd_la_SOURCES = libgd/gd.h -nodist_libgd_la_SOURCES = $(am__append_1) $(am__append_3) \ - $(am__append_5) $(am__append_7) $(am__append_9) \ - $(am__append_11) $(am__append_13) $(am__append_16) \ - $(am__append_18) $(am__append_20) $(am__append_22) \ - $(am__append_25) $(am__append_28) -@LIBGD_GTK_HACKS_TRUE@gtk_hacks_sources = \ -@LIBGD_GTK_HACKS_TRUE@ libgd/gd-entry-focus-hack.c \ -@LIBGD_GTK_HACKS_TRUE@ libgd/gd-entry-focus-hack.h \ -@LIBGD_GTK_HACKS_TRUE@ libgd/gd-icon-utils.c \ -@LIBGD_GTK_HACKS_TRUE@ libgd/gd-icon-utils.h \ -@LIBGD_GTK_HACKS_TRUE@ $(NULL) - -@LIBGD__VIEW_COMMON_TRUE@view_common_sources = \ -@LIBGD__VIEW_COMMON_TRUE@ libgd/gd-main-view-generic.c \ -@LIBGD__VIEW_COMMON_TRUE@ libgd/gd-main-view-generic.h \ -@LIBGD__VIEW_COMMON_TRUE@ libgd/gd-styled-text-renderer.c \ -@LIBGD__VIEW_COMMON_TRUE@ libgd/gd-styled-text-renderer.h \ -@LIBGD__VIEW_COMMON_TRUE@ libgd/gd-two-lines-renderer.c \ -@LIBGD__VIEW_COMMON_TRUE@ libgd/gd-two-lines-renderer.h \ -@LIBGD__VIEW_COMMON_TRUE@ $(NULL) - -@LIBGD_MAIN_ICON_VIEW_TRUE@main_icon_view_sources = \ -@LIBGD_MAIN_ICON_VIEW_TRUE@ libgd/gd-main-icon-view.c \ -@LIBGD_MAIN_ICON_VIEW_TRUE@ libgd/gd-main-icon-view.h \ -@LIBGD_MAIN_ICON_VIEW_TRUE@ libgd/gd-toggle-pixbuf-renderer.c \ -@LIBGD_MAIN_ICON_VIEW_TRUE@ libgd/gd-toggle-pixbuf-renderer.h \ -@LIBGD_MAIN_ICON_VIEW_TRUE@ $(NULL) - -@LIBGD_MAIN_LIST_VIEW_TRUE@main_list_view_sources = \ -@LIBGD_MAIN_LIST_VIEW_TRUE@ libgd/gd-main-list-view.c \ -@LIBGD_MAIN_LIST_VIEW_TRUE@ libgd/gd-main-list-view.h \ -@LIBGD_MAIN_LIST_VIEW_TRUE@ $(NULL) - -@LIBGD_MAIN_VIEW_TRUE@main_view_sources = \ -@LIBGD_MAIN_VIEW_TRUE@ libgd/gd-main-view.c \ -@LIBGD_MAIN_VIEW_TRUE@ libgd/gd-main-view.h \ -@LIBGD_MAIN_VIEW_TRUE@ $(NULL) - -@LIBGD_MAIN_TOOLBAR_TRUE@main_toolbar_sources = \ -@LIBGD_MAIN_TOOLBAR_TRUE@ libgd/gd-main-toolbar.c \ -@LIBGD_MAIN_TOOLBAR_TRUE@ libgd/gd-main-toolbar.h \ -@LIBGD_MAIN_TOOLBAR_TRUE@ $(NULL) - -@LIBGD_HEADER_BAR_TRUE@header_bar_sources = \ -@LIBGD_HEADER_BAR_TRUE@ libgd/gd-header-bar.c \ -@LIBGD_HEADER_BAR_TRUE@ libgd/gd-header-bar.h \ -@LIBGD_HEADER_BAR_TRUE@ $(NULL) - -@LIBGD_HEADER_BAR_TRUE@test_header_bar_SOURCES = \ -@LIBGD_HEADER_BAR_TRUE@ test-header-bar.c \ -@LIBGD_HEADER_BAR_TRUE@ $(NULL) - -@LIBGD_HEADER_BAR_TRUE@test_header_bar_LDADD = \ -@LIBGD_HEADER_BAR_TRUE@ $(LIBGD_LIBS) \ -@LIBGD_HEADER_BAR_TRUE@ libgd.la \ -@LIBGD_HEADER_BAR_TRUE@ $(NULL) - -@LIBGD__HEADER_BUTTON_TRUE@header_button_sources = \ -@LIBGD__HEADER_BUTTON_TRUE@ libgd/gd-header-button.c \ -@LIBGD__HEADER_BUTTON_TRUE@ libgd/gd-header-button.h \ -@LIBGD__HEADER_BUTTON_TRUE@ $(NULL) - -@LIBGD_MARGIN_CONTAINER_TRUE@margin_container_sources = \ -@LIBGD_MARGIN_CONTAINER_TRUE@ libgd/gd-margin-container.c \ -@LIBGD_MARGIN_CONTAINER_TRUE@ libgd/gd-margin-container.h \ -@LIBGD_MARGIN_CONTAINER_TRUE@ $(NULL) - -@LIBGD_NOTIFICATION_TRUE@notification_sources = \ -@LIBGD_NOTIFICATION_TRUE@ libgd/gd-notification.c \ -@LIBGD_NOTIFICATION_TRUE@ libgd/gd-notification.h \ -@LIBGD_NOTIFICATION_TRUE@ $(NULL) - -@LIBGD_REVEALER_TRUE@revealer_sources = \ -@LIBGD_REVEALER_TRUE@ libgd/gd-revealer.c \ -@LIBGD_REVEALER_TRUE@ libgd/gd-revealer.h \ -@LIBGD_REVEALER_TRUE@ $(NULL) - -@LIBGD_REVEALER_TRUE@test_revealer_SOURCES = \ -@LIBGD_REVEALER_TRUE@ test-revealer.c \ -@LIBGD_REVEALER_TRUE@ $(NULL) - -@LIBGD_REVEALER_TRUE@test_revealer_LDADD = \ -@LIBGD_REVEALER_TRUE@ $(LIBGD_LIBS) \ -@LIBGD_REVEALER_TRUE@ libgd.la \ -@LIBGD_REVEALER_TRUE@ $(NULL) - -@LIBGD_STACK_TRUE@stack_sources = \ -@LIBGD_STACK_TRUE@ libgd/gd-stack.c \ -@LIBGD_STACK_TRUE@ libgd/gd-stack.h \ -@LIBGD_STACK_TRUE@ libgd/gd-stack-switcher.c \ -@LIBGD_STACK_TRUE@ libgd/gd-stack-switcher.h \ -@LIBGD_STACK_TRUE@ $(NULL) - -@LIBGD_STACK_TRUE@test_stack_SOURCES = \ -@LIBGD_STACK_TRUE@ test-stack.c \ -@LIBGD_STACK_TRUE@ $(NULL) - -@LIBGD_STACK_TRUE@test_stack_LDADD = \ -@LIBGD_STACK_TRUE@ $(LIBGD_LIBS) \ -@LIBGD_STACK_TRUE@ libgd.la \ -@LIBGD_STACK_TRUE@ $(NULL) - -@LIBGD_TAGGED_ENTRY_TRUE@tagged_entry_sources = \ -@LIBGD_TAGGED_ENTRY_TRUE@ libgd/gd-tagged-entry.c \ -@LIBGD_TAGGED_ENTRY_TRUE@ libgd/gd-tagged-entry.h \ -@LIBGD_TAGGED_ENTRY_TRUE@ $(NULL) - -@LIBGD_GIR_TRUE@INTROSPECTION_GIRS = Gd-1.0.gir -@LIBGD_GIR_TRUE@Gd_1_0_gir_NAMESPACE = Gd -@LIBGD_GIR_TRUE@Gd_1_0_gir_VERSION = 1.0 -@LIBGD_GIR_TRUE@Gd_1_0_gir_LIBS = libgd.la -@LIBGD_GIR_TRUE@Gd_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -@LIBGD_GIR_TRUE@Gd_1_0_gir_SCANNERFLAGS = \ -@LIBGD_GIR_TRUE@ --warn-all \ -@LIBGD_GIR_TRUE@ --symbol-prefix=gd \ -@LIBGD_GIR_TRUE@ --identifier-prefix=Gd \ -@LIBGD_GIR_TRUE@ --c-include="libgd/gd.h" \ -@LIBGD_GIR_TRUE@ $(NULL) - -@LIBGD_GIR_TRUE@Gd_1_0_gir_INCLUDES = $(LIBGD_GIR_INCLUDES) -@LIBGD_GIR_TRUE@Gd_1_0_gir_FILES = $(nodist_libgd_la_SOURCES) -@LIBGD_GIR_TRUE@@LIBGD_STATIC_FALSE@girdir = $(pkgdatadir)/gir-1.0 -@LIBGD_GIR_TRUE@@LIBGD_STATIC_FALSE@typelibdir = $(pkglibdir)/girepository-1.0 -@LIBGD_GIR_TRUE@@LIBGD_STATIC_FALSE@gir_DATA = $(INTROSPECTION_GIRS) -@LIBGD_GIR_TRUE@@LIBGD_STATIC_FALSE@typelib_DATA = $(gir_DATA:.gir=.typelib) -@LIBGD_VAPI_TRUE@VAPIS = $(srcdir)/gd-1.0.vapi -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libgd/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign libgd/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgd.la: $(libgd_la_OBJECTS) $(libgd_la_DEPENDENCIES) $(EXTRA_libgd_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgd_la_LINK) $(am_libgd_la_rpath) $(libgd_la_OBJECTS) $(libgd_la_LIBADD) $(LIBS) - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -test-header-bar$(EXEEXT): $(test_header_bar_OBJECTS) $(test_header_bar_DEPENDENCIES) $(EXTRA_test_header_bar_DEPENDENCIES) - @rm -f test-header-bar$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_header_bar_OBJECTS) $(test_header_bar_LDADD) $(LIBS) -test-revealer$(EXEEXT): $(test_revealer_OBJECTS) $(test_revealer_DEPENDENCIES) $(EXTRA_test_revealer_DEPENDENCIES) - @rm -f test-revealer$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_revealer_OBJECTS) $(test_revealer_LDADD) $(LIBS) -test-stack$(EXEEXT): $(test_stack_OBJECTS) $(test_stack_DEPENDENCIES) $(EXTRA_test_stack_DEPENDENCIES) - @rm -f test-stack$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_stack_OBJECTS) $(test_stack_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-entry-focus-hack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-header-bar.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-header-button.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-icon-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-main-icon-view.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-main-list-view.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-main-toolbar.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-main-view-generic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-main-view.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-margin-container.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-notification.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-revealer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-stack-switcher.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-stack.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-styled-text-renderer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-tagged-entry.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-toggle-pixbuf-renderer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gd-two-lines-renderer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-header-bar.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-revealer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-stack.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - -gd-entry-focus-hack.lo: libgd/gd-entry-focus-hack.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-entry-focus-hack.lo -MD -MP -MF $(DEPDIR)/gd-entry-focus-hack.Tpo -c -o gd-entry-focus-hack.lo `test -f 'libgd/gd-entry-focus-hack.c' || echo '$(srcdir)/'`libgd/gd-entry-focus-hack.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-entry-focus-hack.Tpo $(DEPDIR)/gd-entry-focus-hack.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-entry-focus-hack.c' object='gd-entry-focus-hack.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-entry-focus-hack.lo `test -f 'libgd/gd-entry-focus-hack.c' || echo '$(srcdir)/'`libgd/gd-entry-focus-hack.c - -gd-icon-utils.lo: libgd/gd-icon-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-icon-utils.lo -MD -MP -MF $(DEPDIR)/gd-icon-utils.Tpo -c -o gd-icon-utils.lo `test -f 'libgd/gd-icon-utils.c' || echo '$(srcdir)/'`libgd/gd-icon-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-icon-utils.Tpo $(DEPDIR)/gd-icon-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-icon-utils.c' object='gd-icon-utils.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-icon-utils.lo `test -f 'libgd/gd-icon-utils.c' || echo '$(srcdir)/'`libgd/gd-icon-utils.c - -gd-main-view-generic.lo: libgd/gd-main-view-generic.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-main-view-generic.lo -MD -MP -MF $(DEPDIR)/gd-main-view-generic.Tpo -c -o gd-main-view-generic.lo `test -f 'libgd/gd-main-view-generic.c' || echo '$(srcdir)/'`libgd/gd-main-view-generic.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-main-view-generic.Tpo $(DEPDIR)/gd-main-view-generic.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-main-view-generic.c' object='gd-main-view-generic.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-main-view-generic.lo `test -f 'libgd/gd-main-view-generic.c' || echo '$(srcdir)/'`libgd/gd-main-view-generic.c - -gd-styled-text-renderer.lo: libgd/gd-styled-text-renderer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-styled-text-renderer.lo -MD -MP -MF $(DEPDIR)/gd-styled-text-renderer.Tpo -c -o gd-styled-text-renderer.lo `test -f 'libgd/gd-styled-text-renderer.c' || echo '$(srcdir)/'`libgd/gd-styled-text-renderer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-styled-text-renderer.Tpo $(DEPDIR)/gd-styled-text-renderer.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-styled-text-renderer.c' object='gd-styled-text-renderer.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-styled-text-renderer.lo `test -f 'libgd/gd-styled-text-renderer.c' || echo '$(srcdir)/'`libgd/gd-styled-text-renderer.c - -gd-two-lines-renderer.lo: libgd/gd-two-lines-renderer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-two-lines-renderer.lo -MD -MP -MF $(DEPDIR)/gd-two-lines-renderer.Tpo -c -o gd-two-lines-renderer.lo `test -f 'libgd/gd-two-lines-renderer.c' || echo '$(srcdir)/'`libgd/gd-two-lines-renderer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-two-lines-renderer.Tpo $(DEPDIR)/gd-two-lines-renderer.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-two-lines-renderer.c' object='gd-two-lines-renderer.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-two-lines-renderer.lo `test -f 'libgd/gd-two-lines-renderer.c' || echo '$(srcdir)/'`libgd/gd-two-lines-renderer.c - -gd-main-icon-view.lo: libgd/gd-main-icon-view.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-main-icon-view.lo -MD -MP -MF $(DEPDIR)/gd-main-icon-view.Tpo -c -o gd-main-icon-view.lo `test -f 'libgd/gd-main-icon-view.c' || echo '$(srcdir)/'`libgd/gd-main-icon-view.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-main-icon-view.Tpo $(DEPDIR)/gd-main-icon-view.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-main-icon-view.c' object='gd-main-icon-view.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-main-icon-view.lo `test -f 'libgd/gd-main-icon-view.c' || echo '$(srcdir)/'`libgd/gd-main-icon-view.c - -gd-toggle-pixbuf-renderer.lo: libgd/gd-toggle-pixbuf-renderer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-toggle-pixbuf-renderer.lo -MD -MP -MF $(DEPDIR)/gd-toggle-pixbuf-renderer.Tpo -c -o gd-toggle-pixbuf-renderer.lo `test -f 'libgd/gd-toggle-pixbuf-renderer.c' || echo '$(srcdir)/'`libgd/gd-toggle-pixbuf-renderer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-toggle-pixbuf-renderer.Tpo $(DEPDIR)/gd-toggle-pixbuf-renderer.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-toggle-pixbuf-renderer.c' object='gd-toggle-pixbuf-renderer.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-toggle-pixbuf-renderer.lo `test -f 'libgd/gd-toggle-pixbuf-renderer.c' || echo '$(srcdir)/'`libgd/gd-toggle-pixbuf-renderer.c - -gd-main-list-view.lo: libgd/gd-main-list-view.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-main-list-view.lo -MD -MP -MF $(DEPDIR)/gd-main-list-view.Tpo -c -o gd-main-list-view.lo `test -f 'libgd/gd-main-list-view.c' || echo '$(srcdir)/'`libgd/gd-main-list-view.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-main-list-view.Tpo $(DEPDIR)/gd-main-list-view.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-main-list-view.c' object='gd-main-list-view.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-main-list-view.lo `test -f 'libgd/gd-main-list-view.c' || echo '$(srcdir)/'`libgd/gd-main-list-view.c - -gd-main-view.lo: libgd/gd-main-view.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-main-view.lo -MD -MP -MF $(DEPDIR)/gd-main-view.Tpo -c -o gd-main-view.lo `test -f 'libgd/gd-main-view.c' || echo '$(srcdir)/'`libgd/gd-main-view.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-main-view.Tpo $(DEPDIR)/gd-main-view.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-main-view.c' object='gd-main-view.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-main-view.lo `test -f 'libgd/gd-main-view.c' || echo '$(srcdir)/'`libgd/gd-main-view.c - -gd-main-toolbar.lo: libgd/gd-main-toolbar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-main-toolbar.lo -MD -MP -MF $(DEPDIR)/gd-main-toolbar.Tpo -c -o gd-main-toolbar.lo `test -f 'libgd/gd-main-toolbar.c' || echo '$(srcdir)/'`libgd/gd-main-toolbar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-main-toolbar.Tpo $(DEPDIR)/gd-main-toolbar.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-main-toolbar.c' object='gd-main-toolbar.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-main-toolbar.lo `test -f 'libgd/gd-main-toolbar.c' || echo '$(srcdir)/'`libgd/gd-main-toolbar.c - -gd-header-bar.lo: libgd/gd-header-bar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-header-bar.lo -MD -MP -MF $(DEPDIR)/gd-header-bar.Tpo -c -o gd-header-bar.lo `test -f 'libgd/gd-header-bar.c' || echo '$(srcdir)/'`libgd/gd-header-bar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-header-bar.Tpo $(DEPDIR)/gd-header-bar.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-header-bar.c' object='gd-header-bar.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-header-bar.lo `test -f 'libgd/gd-header-bar.c' || echo '$(srcdir)/'`libgd/gd-header-bar.c - -gd-header-button.lo: libgd/gd-header-button.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-header-button.lo -MD -MP -MF $(DEPDIR)/gd-header-button.Tpo -c -o gd-header-button.lo `test -f 'libgd/gd-header-button.c' || echo '$(srcdir)/'`libgd/gd-header-button.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-header-button.Tpo $(DEPDIR)/gd-header-button.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-header-button.c' object='gd-header-button.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-header-button.lo `test -f 'libgd/gd-header-button.c' || echo '$(srcdir)/'`libgd/gd-header-button.c - -gd-margin-container.lo: libgd/gd-margin-container.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-margin-container.lo -MD -MP -MF $(DEPDIR)/gd-margin-container.Tpo -c -o gd-margin-container.lo `test -f 'libgd/gd-margin-container.c' || echo '$(srcdir)/'`libgd/gd-margin-container.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-margin-container.Tpo $(DEPDIR)/gd-margin-container.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-margin-container.c' object='gd-margin-container.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-margin-container.lo `test -f 'libgd/gd-margin-container.c' || echo '$(srcdir)/'`libgd/gd-margin-container.c - -gd-notification.lo: libgd/gd-notification.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-notification.lo -MD -MP -MF $(DEPDIR)/gd-notification.Tpo -c -o gd-notification.lo `test -f 'libgd/gd-notification.c' || echo '$(srcdir)/'`libgd/gd-notification.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-notification.Tpo $(DEPDIR)/gd-notification.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-notification.c' object='gd-notification.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-notification.lo `test -f 'libgd/gd-notification.c' || echo '$(srcdir)/'`libgd/gd-notification.c - -gd-revealer.lo: libgd/gd-revealer.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-revealer.lo -MD -MP -MF $(DEPDIR)/gd-revealer.Tpo -c -o gd-revealer.lo `test -f 'libgd/gd-revealer.c' || echo '$(srcdir)/'`libgd/gd-revealer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-revealer.Tpo $(DEPDIR)/gd-revealer.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-revealer.c' object='gd-revealer.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-revealer.lo `test -f 'libgd/gd-revealer.c' || echo '$(srcdir)/'`libgd/gd-revealer.c - -gd-stack.lo: libgd/gd-stack.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-stack.lo -MD -MP -MF $(DEPDIR)/gd-stack.Tpo -c -o gd-stack.lo `test -f 'libgd/gd-stack.c' || echo '$(srcdir)/'`libgd/gd-stack.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-stack.Tpo $(DEPDIR)/gd-stack.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-stack.c' object='gd-stack.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-stack.lo `test -f 'libgd/gd-stack.c' || echo '$(srcdir)/'`libgd/gd-stack.c - -gd-stack-switcher.lo: libgd/gd-stack-switcher.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-stack-switcher.lo -MD -MP -MF $(DEPDIR)/gd-stack-switcher.Tpo -c -o gd-stack-switcher.lo `test -f 'libgd/gd-stack-switcher.c' || echo '$(srcdir)/'`libgd/gd-stack-switcher.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-stack-switcher.Tpo $(DEPDIR)/gd-stack-switcher.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-stack-switcher.c' object='gd-stack-switcher.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-stack-switcher.lo `test -f 'libgd/gd-stack-switcher.c' || echo '$(srcdir)/'`libgd/gd-stack-switcher.c - -gd-tagged-entry.lo: libgd/gd-tagged-entry.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gd-tagged-entry.lo -MD -MP -MF $(DEPDIR)/gd-tagged-entry.Tpo -c -o gd-tagged-entry.lo `test -f 'libgd/gd-tagged-entry.c' || echo '$(srcdir)/'`libgd/gd-tagged-entry.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/gd-tagged-entry.Tpo $(DEPDIR)/gd-tagged-entry.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libgd/gd-tagged-entry.c' object='gd-tagged-entry.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gd-tagged-entry.lo `test -f 'libgd/gd-tagged-entry.c' || echo '$(srcdir)/'`libgd/gd-tagged-entry.c - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs -install-girDATA: $(gir_DATA) - @$(NORMAL_INSTALL) - @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(girdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(girdir)" || exit $$?; \ - done - -uninstall-girDATA: - @$(NORMAL_UNINSTALL) - @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) -install-typelibDATA: $(typelib_DATA) - @$(NORMAL_INSTALL) - @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(typelibdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(typelibdir)" || exit $$?; \ - done - -uninstall-typelibDATA: - @$(NORMAL_UNINSTALL) - @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir) - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - if test -z '$(STRIP)'; then \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - install; \ - else \ - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ - fi -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -clean: clean-am - -clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-girDATA install-typelibDATA - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-girDATA uninstall-pkglibLTLIBRARIES \ - uninstall-typelibDATA - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-girDATA install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip install-typelibDATA \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-girDATA \ - uninstall-pkglibLTLIBRARIES uninstall-typelibDATA - - -@LIBGD_GIR_TRUE@include $(INTROSPECTION_MAKEFILE) - -@LIBGD_GIR_TRUE@Gd-1.0.gir: libgd.la Makefile - -@LIBGD_VAPI_TRUE@$(srcdir)/gd-1.0.vapi: $(srcdir)/Gd-1.0.gir -@LIBGD_VAPI_TRUE@ $(AM_V_GEN)$(VAPIGEN) \ -@LIBGD_VAPI_TRUE@ --library gd-1.0 \ -@LIBGD_VAPI_TRUE@ --pkg gtk+-3.0 \ -@LIBGD_VAPI_TRUE@ $< -#This 'touch' is a workaround for vapigen not touching the dest file if -#its content hasn't changed, which causes the rule to generate the .vapi -#file to always trigger -@LIBGD_VAPI_TRUE@ @touch $@ - --include $(top_srcdir)/git.mk - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Nru devhelp-3.8.2/libgd/README devhelp-3.10.2/libgd/README --- devhelp-3.8.2/libgd/README 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,131 +0,0 @@ -===== -libgd -===== - -Introduction -============ - -libgd is a library used by various GNOME 3 styled applications. -However, it is not a typical library, since it doesn't guarantee -API/ABI stability, nor does it has official releases tarballs. Only -the files actually used by your project will be shipped with its -tarball. Only the necessary dependencies will be checked during -configure time and used at runtime. - -Each application can configure libgd depending on its needs and will -be able to either link dynamically (privately) or statically link with -a specific development version. - -GObject Introspection based bindings generation such as Javascript or -Vala are also supported. - -More Background ---------------- - -libgd originates from the GNOME Documents project (written by Cosimo -Cecchi), which was one of the first application to follow the novel -GNOME 3 application design. - -Since other applications have similar needs, it makes sense to try to -reuse and improve the exisiting work. However, the design being not -frozen, and the code being not yet mattured enough and proven, it is -not possible for the developpers to guarantee API and propose the -addition to the respective projects (Gtk+, or GLib for example) right -now. Sharing the code allows to experiment, discuss and test together -before proposing it upstream. - -Traditionnally, this problem is solved by copying often outdated -snippets of code around (due to no API/ABI guaratee), often not -centralized (libegg). - -In the past, there used to be some common aging GNOME application -libraries above Gtk+ which have been slowly deprecated in favour of -Gtk+ (gnomeui and friends). - -All approaches have pros and cons. A configurable git submodule -has the following advantages: - -- no direct code copying necessary because API/ABI breakage (history - is preserved etc..) -- code is shared and maintained in a common project -- you can stick to a particular upstream version, or branch off your - own version easily if needed (hopefully you find your way back upstream) -- update the submodule version when your project is ready -- the libgd options should help you to configure a library to suit - your needs, taking care of some of autofoo stuff for you - -Usage -===== - -In order to use libgd, an application using autotools needs to: - -1. from the top-level project directory, add the submodule: - - git submodule add git://git.gnome.org/libgd - -2. in autogen.sh, it is recommended to add before autoreconf call: - - git submodule update --init --recursive - -3. in top-level Makefile.am: - - add -I libgd to ACLOCAL_AMFLAGS - - add libgd to SUBDIRS, before the project src directory - -4. in project configure.ac: - - add LIBGD_INIT([list-of-options]) after your project - dependencies checks - - add libgd/Makefile to AC_CONFIG_FILES - -5. from your program Makefile.am, you may now for example: - - link with $(top_builddir)/libgd/libgd.la, and include - (adjust your AM_CPPFLAGS as necessary) - -You may be interested to look at the commit switching GNOME Boxes from -private libgd usage to the libgd submodule: - -http://git.gnome.org/browse/gnome-boxes/commit/?id=395652458d8b311a25ecb27cc42287602a122b1f - -Note for example that the submodule url is "../libgd", which is a -better alternative for projects hosted on git.gnome.org. It will allow -the submodule update to reuse the address and the credentials given to -the toplevel project. - -LIBGD_INIT options -================== - -- gtk-hacks - -- header-bar - -- main-icon-view - -- main-toolbar - -- margin-container - -- notification - -- revealer - -- stack - -- static - -- tagged-entry - -- vapi - -- gir - -How to modify or add an API? -============================ - - -TODO -==== - -- add translation support -- add some form of build test -- document: options, modification process -- eventually add documentation generation -- some licensing check -- more modularity (not all in libgd.m4/Makefile.am) -- CSS styling and data: shared only with gnome-themes-standard? diff -Nru devhelp-3.8.2/libgd/libgd/gd-header-bar.c devhelp-3.10.2/libgd/libgd/gd-header-bar.c --- devhelp-3.8.2/libgd/libgd/gd-header-bar.c 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/libgd/gd-header-bar.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1350 +0,0 @@ -/* - * Copyright (c) 2013 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "gd-header-bar.h" - -#include - -/* TODO - * - wm communication - */ - -#define DEFAULT_SPACING 8 -#define DEFAULT_HPADDING 8 -#define DEFAULT_VPADDING 6 - -struct _GdHeaderBarPrivate -{ - gchar *title; - gchar *subtitle; - - GtkWidget *title_label; - GtkWidget *subtitle_label; - GtkWidget *labels_box; - GtkWidget *labels_sizing_box; - - GtkWidget *custom_title; - GdkWindow *event_window; - gint spacing; - gint hpadding; - gint vpadding; - - GList *children; -}; - -typedef struct _Child Child; -struct _Child -{ - GtkWidget *widget; - GtkPackType pack_type; -}; - -enum { - PROP_0, - PROP_TITLE, - PROP_SUBTITLE, - PROP_CUSTOM_TITLE, - PROP_SPACING, - PROP_HPADDING, - PROP_VPADDING -}; - -enum { - CHILD_PROP_0, - CHILD_PROP_PACK_TYPE, - CHILD_PROP_POSITION -}; - -static void gd_header_buildable_init (GtkBuildableIface *iface); - -G_DEFINE_TYPE_WITH_CODE (GdHeaderBar, gd_header_bar, GTK_TYPE_CONTAINER, - G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE, - gd_header_buildable_init)); - -static void -boldify_label (GtkWidget *label) -{ - PangoAttrList *attrs; - attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); - pango_attr_list_unref (attrs); -} - -static void -smallify_label (GtkWidget *label) -{ - PangoAttrList *attrs; - attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL)); - gtk_label_set_attributes (GTK_LABEL (label), attrs); - pango_attr_list_unref (attrs); - - gtk_style_context_add_class (gtk_widget_get_style_context (label), "dim-label"); -} - -static void -get_css_padding_and_border (GtkWidget *widget, - GtkBorder *border) -{ - GtkStyleContext *context; - GtkStateFlags state; - GtkBorder tmp; - - context = gtk_widget_get_style_context (widget); - state = gtk_widget_get_state_flags (widget); - - gtk_style_context_get_padding (context, state, border); - gtk_style_context_get_border (context, state, &tmp); - border->top += tmp.top; - border->right += tmp.right; - border->bottom += tmp.bottom; - border->left += tmp.left; -} - -static void -init_sizing_box (GdHeaderBar *bar) -{ - GdHeaderBarPrivate *priv = bar->priv; - GtkWidget *w; - - /* We use this box to always request size for the two labels (title and subtitle) - * as if they were always visible, but then allocate the real label box - * with its actual size, to keep it center-aligned in case we have only the title. - */ - priv->labels_sizing_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - - w = gtk_label_new (NULL); - boldify_label (w); - gtk_box_pack_start (GTK_BOX (priv->labels_sizing_box), w, FALSE, FALSE, 0); - gtk_label_set_line_wrap (GTK_LABEL (w), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END); - - w = gtk_label_new (NULL); - smallify_label (w); - gtk_box_pack_start (GTK_BOX (priv->labels_sizing_box), w, FALSE, FALSE, 0); - gtk_label_set_line_wrap (GTK_LABEL (w), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END); - - gtk_widget_show_all (priv->labels_sizing_box); -} - -static void -gd_header_bar_init (GdHeaderBar *bar) -{ - GtkStyleContext *context; - GdHeaderBarPrivate *priv; - - priv = G_TYPE_INSTANCE_GET_PRIVATE (bar, GD_TYPE_HEADER_BAR, GdHeaderBarPrivate); - bar->priv = priv; - - gtk_widget_set_has_window (GTK_WIDGET (bar), FALSE); - gtk_widget_set_redraw_on_allocate (GTK_WIDGET (bar), FALSE); - - priv->labels_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_set_parent (priv->labels_box, GTK_WIDGET (bar)); - gtk_widget_set_valign (priv->labels_box, GTK_ALIGN_CENTER); - gtk_widget_show (priv->labels_box); - - init_sizing_box (bar); - - priv->title_label = gtk_label_new (""); - boldify_label (priv->title_label); - gtk_box_pack_start (GTK_BOX (priv->labels_box), priv->title_label, FALSE, FALSE, 0); - gtk_label_set_line_wrap (GTK_LABEL (priv->title_label), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (priv->title_label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (priv->title_label), PANGO_ELLIPSIZE_END); - gtk_widget_show (priv->title_label); - - priv->subtitle_label = gtk_label_new (""); - smallify_label (priv->subtitle_label); - gtk_box_pack_start (GTK_BOX (priv->labels_box), priv->subtitle_label, FALSE, FALSE, 0); - gtk_label_set_line_wrap (GTK_LABEL (priv->subtitle_label), FALSE); - gtk_label_set_single_line_mode (GTK_LABEL (priv->subtitle_label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (priv->subtitle_label), PANGO_ELLIPSIZE_END); - - priv->title = NULL; - priv->custom_title = NULL; - priv->children = NULL; - priv->spacing = DEFAULT_SPACING; - priv->hpadding = DEFAULT_HPADDING; - priv->vpadding = DEFAULT_VPADDING; - - context = gtk_widget_get_style_context (GTK_WIDGET (bar)); - gtk_style_context_add_class (context, "header-bar"); - gtk_style_context_add_class (context, GTK_STYLE_CLASS_HORIZONTAL); -} - -static gint -count_visible_children (GdHeaderBar *bar) -{ - GList *l; - Child *child; - gint n; - - n = 0; - for (l = bar->priv->children; l; l = l->next) - { - child = l->data; - if (gtk_widget_get_visible (child->widget)) - n++; - } - - return n; -} - -static void -gd_header_bar_get_size (GtkWidget *widget, - GtkOrientation orientation, - gint *minimum_size, - gint *natural_size) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - GList *l; - gint nvis_children; - gint minimum, natural; - GtkBorder css_borders; - - minimum = natural = 0; - nvis_children = 0; - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - gtk_widget_get_preferred_width (priv->labels_sizing_box, - &minimum, &natural); - else - gtk_widget_get_preferred_height (priv->labels_sizing_box, - &minimum, &natural); - - for (l = priv->children; l; l = l->next) - { - Child *child = l->data; - - if (gtk_widget_get_visible (child->widget)) - { - gint child_minimum, child_natural; - - if (orientation == GTK_ORIENTATION_HORIZONTAL) - gtk_widget_get_preferred_width (child->widget, - &child_minimum, &child_natural); - else - gtk_widget_get_preferred_height (child->widget, - &child_minimum, &child_natural); - - if (GTK_ORIENTATION_HORIZONTAL == orientation) - { - minimum += child_minimum; - natural += child_natural; - } - else - { - minimum = MAX (minimum, child_minimum); - natural = MAX (natural, child_natural); - } - nvis_children += 1; - } - } - - if (nvis_children > 0 && orientation == GTK_ORIENTATION_HORIZONTAL) - { - minimum += nvis_children * priv->spacing; - natural += nvis_children * priv->spacing; - } - - get_css_padding_and_border (widget, &css_borders); - - if (GTK_ORIENTATION_HORIZONTAL == orientation) - { - minimum += 2 * priv->hpadding + css_borders.left + css_borders.right; - natural += 2 * priv->hpadding + css_borders.left + css_borders.right; - } - else - { - minimum += 2 * priv->vpadding + css_borders.top + css_borders.bottom; - natural += 2 * priv->vpadding + css_borders.top + css_borders.bottom; - } - - if (minimum_size) - *minimum_size = minimum; - - if (natural_size) - *natural_size = natural; -} - -static void -gd_header_bar_compute_size_for_orientation (GtkWidget *widget, - gint avail_size, - gint *minimum_size, - gint *natural_size) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - GList *children; - gint required_size = 0; - gint required_natural = 0; - gint child_size; - gint child_natural; - gint nvis_children; - GtkBorder css_borders; - - avail_size -= 2 * priv->vpadding; - - nvis_children = 0; - - for (children = priv->children; children != NULL; children = children->next) - { - Child *child = children->data; - - if (gtk_widget_get_visible (child->widget)) - { - gtk_widget_get_preferred_width_for_height (child->widget, - avail_size, &child_size, &child_natural); - - required_size += child_size; - required_natural += child_natural; - - nvis_children += 1; - } - } - - gtk_widget_get_preferred_width (priv->labels_sizing_box, - &child_size, &child_natural); - required_size += child_size; - required_natural += child_natural; - - if (nvis_children > 0) - { - required_size += nvis_children * priv->spacing; - required_natural += nvis_children * priv->spacing; - } - - get_css_padding_and_border (widget, &css_borders); - - required_size += 2 * priv->hpadding + css_borders.left + css_borders.right; - required_natural += 2 * priv->hpadding + css_borders.left + css_borders.right; - - if (minimum_size) - *minimum_size = required_size; - - if (natural_size) - *natural_size = required_natural; -} - -static void -gd_header_bar_compute_size_for_opposing_orientation (GtkWidget *widget, - gint avail_size, - gint *minimum_size, - gint *natural_size) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - Child *child; - GList *children; - gint nvis_children; - gint computed_minimum = 0; - gint computed_natural = 0; - GtkRequestedSize *sizes; - GtkPackType packing; - gint size; - gint i; - gint child_size; - gint child_minimum; - gint child_natural; - GtkBorder css_borders; - - nvis_children = count_visible_children (bar); - - if (nvis_children <= 0) - return; - - sizes = g_newa (GtkRequestedSize, nvis_children); - size = avail_size - 2 * priv->hpadding; - - /* Retrieve desired size for visible children */ - for (i = 0, children = priv->children; children; children = children->next) - { - child = children->data; - - if (gtk_widget_get_visible (child->widget)) - { - gtk_widget_get_preferred_width (child->widget, - &sizes[i].minimum_size, - &sizes[i].natural_size); - - size -= sizes[i].minimum_size; - sizes[i].data = child; - i += 1; - } - } - - /* Bring children up to size first */ - size = gtk_distribute_natural_allocation (MAX (0, size), nvis_children, sizes); - - /* Allocate child positions. */ - for (packing = GTK_PACK_START; packing <= GTK_PACK_END; ++packing) - { - for (i = 0, children = priv->children; children; children = children->next) - { - child = children->data; - - /* If widget is not visible, skip it. */ - if (!gtk_widget_get_visible (child->widget)) - continue; - - /* If widget is packed differently skip it, but still increment i, - * since widget is visible and will be handled in next loop - * iteration. - */ - if (child->pack_type != packing) - { - i++; - continue; - } - - child_size = sizes[i].minimum_size; - - gtk_widget_get_preferred_height_for_width (child->widget, - child_size, &child_minimum, &child_natural); - - computed_minimum = MAX (computed_minimum, child_minimum); - computed_natural = MAX (computed_natural, child_natural); - } - i += 1; - } - - gtk_widget_get_preferred_height (priv->labels_sizing_box, - &child_minimum, &child_natural); - computed_minimum = MAX (computed_minimum, child_minimum); - computed_natural = MAX (computed_natural, child_natural); - - get_css_padding_and_border (widget, &css_borders); - - computed_minimum += 2 * priv->vpadding + css_borders.top + css_borders.bottom; - computed_natural += 2 * priv->vpadding + css_borders.top + css_borders.bottom; - - if (minimum_size) - *minimum_size = computed_minimum; - - if (natural_size) - *natural_size = computed_natural; -} - -static void -gd_header_bar_get_preferred_width (GtkWidget *widget, - gint *minimum_size, - gint *natural_size) -{ - gd_header_bar_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size); -} - -static void -gd_header_bar_get_preferred_height (GtkWidget *widget, - gint *minimum_size, - gint *natural_size) -{ - gd_header_bar_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size); -} - -static void -gd_header_bar_get_preferred_width_for_height (GtkWidget *widget, - gint height, - gint *minimum_width, - gint *natural_width) -{ - gd_header_bar_compute_size_for_orientation (widget, height, minimum_width, natural_width); -} - -static void -gd_header_bar_get_preferred_height_for_width (GtkWidget *widget, - gint width, - gint *minimum_height, - gint *natural_height) -{ - gd_header_bar_compute_size_for_opposing_orientation (widget, width, minimum_height, natural_height); -} - -static void -gd_header_bar_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - GtkRequestedSize *sizes; - gint width, height; - gint nvis_children; - gint title_minimum_size; - gint title_natural_size; - gint side[2]; - GList *l; - gint i; - Child *child; - GtkPackType packing; - GtkAllocation child_allocation; - gint x; - gint child_size; - GtkTextDirection direction; - GtkBorder css_borders; - - gtk_widget_set_allocation (widget, allocation); - - if (gtk_widget_get_realized (widget)) - gdk_window_move_resize (priv->event_window, - allocation->x, - allocation->y, - allocation->width, - allocation->height); - - direction = gtk_widget_get_direction (widget); - nvis_children = count_visible_children (bar); - sizes = g_newa (GtkRequestedSize, nvis_children); - - get_css_padding_and_border (widget, &css_borders); - width = allocation->width - nvis_children * priv->spacing - - 2 * priv->hpadding - css_borders.left - css_borders.right; - height = allocation->height - 2 * priv->vpadding - css_borders.top - css_borders.bottom; - - i = 0; - for (l = priv->children; l; l = l->next) - { - child = l->data; - if (!gtk_widget_get_visible (child->widget)) - continue; - - gtk_widget_get_preferred_width_for_height (child->widget, - height, - &sizes[i].minimum_size, - &sizes[i].natural_size); - width -= sizes[i].minimum_size; - i++; - } - - if (priv->custom_title) - { - gtk_widget_get_preferred_width_for_height (priv->custom_title, - height, - &title_minimum_size, - &title_natural_size); - } - else - { - gtk_widget_get_preferred_width_for_height (priv->labels_box, - height, - &title_minimum_size, - &title_natural_size); - } - width -= title_natural_size; - - width = gtk_distribute_natural_allocation (MAX (0, width), nvis_children, sizes); - - side[0] = side[1] = 0; - for (packing = GTK_PACK_START; packing <= GTK_PACK_END; packing++) - { - child_allocation.y = allocation->y + priv->vpadding + css_borders.top; - child_allocation.height = height; - if (packing == GTK_PACK_START) - x = allocation->x + priv->hpadding + css_borders.left; - else - x = allocation->x + allocation->width - priv->hpadding - css_borders.right; - - if (packing == GTK_PACK_START) - { - l = priv->children; - i = 0; - } - else - { - l = g_list_last (priv->children); - i = nvis_children - 1; - } - - for (; l != NULL; (packing == GTK_PACK_START) ? (l = l->next) : (l = l->prev)) - { - child = l->data; - if (!gtk_widget_get_visible (child->widget)) - continue; - - if (child->pack_type != packing) - goto next; - - child_size = sizes[i].minimum_size; - - child_allocation.width = child_size; - - if (packing == GTK_PACK_START) - { - child_allocation.x = x; - x += child_size; - x += priv->spacing; - } - else - { - x -= child_size; - child_allocation.x = x; - x -= priv->spacing; - } - - side[packing] += child_size + priv->spacing; - - if (direction == GTK_TEXT_DIR_RTL) - child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width; - - gtk_widget_size_allocate (child->widget, &child_allocation); - - next: - if (packing == GTK_PACK_START) - i++; - else - i--; - } - } - - child_allocation.y = allocation->y + priv->vpadding + css_borders.top; - child_allocation.height = height; - - width = MAX(side[0], side[1]); - - if (allocation->width - 2 * width >= title_natural_size) - child_size = MIN (title_natural_size, allocation->width - 2 * width); - else if (allocation->width - side[0] - side[1] >= title_natural_size) - child_size = MIN (title_natural_size, allocation->width - side[0] - side[1]); - else - child_size = allocation->width - side[0] - side[1]; - - child_allocation.x = allocation->x + (allocation->width - child_size) / 2; - child_allocation.width = child_size; - - if (allocation->x + side[0] > child_allocation.x) - child_allocation.x = allocation->x + side[0]; - else if (allocation->x + allocation->width - side[1] < child_allocation.x + child_allocation.width) - child_allocation.x = allocation->x + allocation->width - side[1] - child_allocation.width; - - if (direction == GTK_TEXT_DIR_RTL) - child_allocation.x = allocation->x + allocation->width - (child_allocation.x - allocation->x) - child_allocation.width; - - if (priv->custom_title) - gtk_widget_size_allocate (priv->custom_title, &child_allocation); - else - gtk_widget_size_allocate (priv->labels_box, &child_allocation); -} - -/** - * gd_header_bar_set_title: - * @bar: a #GdHeaderBar - * @title: (allow-none): a title - * - * Sets the title of the #GdHeaderBar. The title should help a user - * identify the current view. A good title should not include the - * application name. - * - **/ -void -gd_header_bar_set_title (GdHeaderBar *bar, - const gchar *title) -{ - GdHeaderBarPrivate *priv; - char *new_title; - - g_return_if_fail (GD_IS_HEADER_BAR (bar)); - - priv = bar->priv; - - new_title = g_strdup (title); - g_free (priv->title); - priv->title = new_title; - - gtk_label_set_label (GTK_LABEL (priv->title_label), priv->title); - gtk_widget_queue_resize (GTK_WIDGET (bar)); - - g_object_notify (G_OBJECT (bar), "title"); -} - -/** - * gd_header_bar_get_title: - * @bar: a #GdHeaderBar - * - * Retrieves the title of the header. See gd_header_bar_set_title(). - * - * Return value: the title of the header, or %NULL if none has - * been set explicitely. The returned string is owned by the widget - * and must not be modified or freed. - **/ -const gchar * -gd_header_bar_get_title (GdHeaderBar *bar) -{ - g_return_val_if_fail (GD_IS_HEADER_BAR (bar), NULL); - - return bar->priv->title; -} - -/** - * gd_header_bar_set_subtitle: - * @bar: a #GdHeaderBar - * @subtitle: (allow-none): a subtitle - * - * Sets the subtitle of the #GdHeaderBar. The subtitle should give a user - * an additional detail to help him identify the current view. - * - **/ -void -gd_header_bar_set_subtitle (GdHeaderBar *bar, - const gchar *subtitle) -{ - GdHeaderBarPrivate *priv; - char *new_subtitle; - - g_return_if_fail (GD_IS_HEADER_BAR (bar)); - - priv = bar->priv; - - new_subtitle = g_strdup (subtitle); - g_free (priv->subtitle); - priv->subtitle = new_subtitle; - - gtk_label_set_label (GTK_LABEL (priv->subtitle_label), priv->subtitle); - gtk_widget_set_visible (priv->subtitle_label, (priv->subtitle != NULL)); - - gtk_widget_queue_resize (GTK_WIDGET (bar)); - - g_object_notify (G_OBJECT (bar), "subtitle"); -} - -/** - * gd_header_bar_get_subtitle: - * @bar: a #GdHeaderBar - * - * Retrieves the subtitle of the header. See gd_header_bar_set_subtitle(). - * - * Return value: the subtitle of the header, or %NULL if none has - * been set explicitely. The returned string is owned by the widget - * and must not be modified or freed. - **/ -const gchar * -gd_header_bar_get_subtitle (GdHeaderBar *bar) -{ - g_return_val_if_fail (GD_IS_HEADER_BAR (bar), NULL); - - return bar->priv->subtitle; -} - -/** - * gd_header_bar_set_custom_title: - * @bar: a #GdHeaderBar - * @title_widget: (allow-none): a custom widget to use for a title - * - * Sets a custom title for the #GdHeaderBar. The title should help a - * user identify the current view. This supercedes any title set by - * gd_header_bar_set_title(). You should set the custom title to %NULL, - * for the header title label to be visible again. - * - **/ -void -gd_header_bar_set_custom_title (GdHeaderBar *bar, - GtkWidget *title_widget) -{ - GdHeaderBarPrivate *priv; - - g_return_if_fail (GD_IS_HEADER_BAR (bar)); - if (title_widget) - g_return_if_fail (GTK_IS_WIDGET (title_widget)); - - priv = bar->priv; - - /* No need to do anything if the custom widget stays the same */ - if (priv->custom_title == title_widget) - return; - - if (priv->custom_title) - { - GtkWidget *custom = priv->custom_title; - - priv->custom_title = NULL; - gtk_widget_unparent (custom); - g_object_unref (custom); - } - - if (title_widget) - { - priv->custom_title = g_object_ref (title_widget); - - gtk_widget_hide (priv->labels_box); - - gtk_widget_set_parent (priv->custom_title, GTK_WIDGET (bar)); - gtk_widget_set_valign (priv->custom_title, GTK_ALIGN_CENTER); - - gtk_widget_show (title_widget); - } - else - { - gtk_widget_show (priv->labels_box); - } - - gtk_widget_queue_resize (GTK_WIDGET (bar)); - - g_object_notify (G_OBJECT (bar), "custom-title"); -} - -/** - * gd_header_bar_get_custom_title: - * @bar: a #GdHeaderBar - * - * Retrieves the custom title widget of the header. See - * gd_header_bar_set_custom_title(). - * - * Return value: (transfer none): the custom title widget of the header, or %NULL if - * none has been set explicitely. - **/ -GtkWidget * -gd_header_bar_get_custom_title (GdHeaderBar *bar) -{ - g_return_val_if_fail (GD_IS_HEADER_BAR (bar), NULL); - - return bar->priv->custom_title; -} - -static void -gd_header_bar_finalize (GObject *object) -{ - GdHeaderBar *bar = GD_HEADER_BAR (object); - GdHeaderBarPrivate *priv = bar->priv; - - g_free (priv->title); - g_free (priv->subtitle); - - g_list_free (priv->children); - - G_OBJECT_CLASS (gd_header_bar_parent_class)->finalize (object); -} - -static void -gd_header_bar_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GdHeaderBar *bar = GD_HEADER_BAR (object); - GdHeaderBarPrivate *priv = bar->priv; - - switch (prop_id) - { - case PROP_TITLE: - g_value_set_string (value, priv->title); - break; - - case PROP_SUBTITLE: - g_value_set_string (value, priv->subtitle); - break; - - case PROP_CUSTOM_TITLE: - g_value_set_object (value, priv->custom_title); - break; - - case PROP_SPACING: - g_value_set_int (value, priv->spacing); - break; - - case PROP_HPADDING: - g_value_set_int (value, priv->hpadding); - break; - - case PROP_VPADDING: - g_value_set_int (value, priv->vpadding); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gd_header_bar_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GdHeaderBar *bar = GD_HEADER_BAR (object); - GdHeaderBarPrivate *priv = bar->priv; - - switch (prop_id) - { - case PROP_TITLE: - gd_header_bar_set_title (bar, g_value_get_string (value)); - break; - - case PROP_SUBTITLE: - gd_header_bar_set_subtitle (bar, g_value_get_string (value)); - break; - - case PROP_CUSTOM_TITLE: - gd_header_bar_set_custom_title (bar, g_value_get_object (value)); - break; - - case PROP_SPACING: - priv->spacing = g_value_get_int (value); - gtk_widget_queue_resize (GTK_WIDGET (bar)); - break; - - case PROP_HPADDING: - priv->hpadding = g_value_get_int (value); - gtk_widget_queue_resize (GTK_WIDGET (bar)); - break; - - case PROP_VPADDING: - priv->vpadding = g_value_get_int (value); - gtk_widget_queue_resize (GTK_WIDGET (bar)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gd_header_bar_pack (GdHeaderBar *bar, - GtkWidget *widget, - GtkPackType pack_type) -{ - Child *child; - - g_return_if_fail (gtk_widget_get_parent (widget) == NULL); - - child = g_new (Child, 1); - child->widget = widget; - child->pack_type = pack_type; - - bar->priv->children = g_list_append (bar->priv->children, child); - - gtk_widget_freeze_child_notify (widget); - gtk_widget_set_parent (widget, GTK_WIDGET (bar)); - gtk_widget_child_notify (widget, "pack-type"); - gtk_widget_child_notify (widget, "position"); - gtk_widget_thaw_child_notify (widget); -} - -static void -gd_header_bar_add (GtkContainer *container, - GtkWidget *child) -{ - gd_header_bar_pack (GD_HEADER_BAR (container), child, GTK_PACK_START); -} - -static GList * -find_child_link (GdHeaderBar *bar, - GtkWidget *widget) -{ - GList *l; - Child *child; - - for (l = bar->priv->children; l; l = l->next) - { - child = l->data; - if (child->widget == widget) - return l; - } - - return NULL; -} - -static void -gd_header_bar_remove (GtkContainer *container, - GtkWidget *widget) -{ - GdHeaderBar *bar = GD_HEADER_BAR (container); - GList *l; - Child *child; - - l = find_child_link (bar, widget); - if (l) - { - child = l->data; - gtk_widget_unparent (child->widget); - bar->priv->children = g_list_remove_link (bar->priv->children, l); - g_free (child); - gtk_widget_queue_resize (GTK_WIDGET (container)); - } -} - -static void -gd_header_bar_forall (GtkContainer *container, - gboolean include_internals, - GtkCallback callback, - gpointer callback_data) -{ - GdHeaderBar *bar = GD_HEADER_BAR (container); - GdHeaderBarPrivate *priv = bar->priv; - Child *child; - GList *children; - - children = priv->children; - while (children) - { - child = children->data; - children = children->next; - if (child->pack_type == GTK_PACK_START) - (* callback) (child->widget, callback_data); - } - - if (include_internals) - { - if (priv->custom_title) - (* callback) (priv->custom_title, callback_data); - else - (* callback) (priv->labels_box, callback_data); - } - - children = g_list_last (priv->children); - while (children) - { - child = children->data; - children = children->prev; - if (child->pack_type == GTK_PACK_END) - (* callback) (child->widget, callback_data); - } -} - -static GType -gd_header_bar_child_type (GtkContainer *container) -{ - return GTK_TYPE_WIDGET; -} - -static void -gd_header_bar_get_child_property (GtkContainer *container, - GtkWidget *widget, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - GList *l; - Child *child; - - l = find_child_link (GD_HEADER_BAR (container), widget); - child = l->data; - - switch (property_id) - { - case CHILD_PROP_PACK_TYPE: - g_value_set_enum (value, child->pack_type); - break; - - case CHILD_PROP_POSITION: - g_value_set_int (value, g_list_position (GD_HEADER_BAR (container)->priv->children, l)); - break; - - default: - GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); - break; - } -} - -static void -gd_header_bar_set_child_property (GtkContainer *container, - GtkWidget *widget, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - GList *l; - Child *child; - - l = find_child_link (GD_HEADER_BAR (container), widget); - child = l->data; - - switch (property_id) - { - case CHILD_PROP_PACK_TYPE: - child->pack_type = g_value_get_enum (value); - break; - default: - GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID (container, property_id, pspec); - break; - } -} - -static gboolean -gd_header_bar_button_press (GtkWidget *toolbar, - GdkEventButton *event) -{ - GtkWidget *window; - - if (gdk_event_triggers_context_menu ((GdkEvent *) event)) - { - - /* FIXME menu ? */ - - return FALSE; - } - - if (event->type != GDK_BUTTON_PRESS) - return FALSE; - - window = gtk_widget_get_toplevel (toolbar); - - if (window) - { - gtk_window_begin_move_drag (GTK_WINDOW (window), - event->button, - event->x_root, - event->y_root, - event->time); - - return TRUE; - } - - return FALSE; -} - -static void -gd_header_bar_realize (GtkWidget *widget) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - GtkAllocation allocation; - GdkWindow *window; - GdkWindowAttr attributes; - gint attributes_mask; - - gtk_widget_get_allocation (widget, &allocation); - gtk_widget_set_realized (widget, TRUE); - - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = allocation.x; - attributes.y = allocation.y; - attributes.width = allocation.width; - attributes.height = allocation.height; - attributes.wclass = GDK_INPUT_ONLY; - attributes.event_mask = gtk_widget_get_events (widget); - attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | - GDK_BUTTON_RELEASE_MASK | - GDK_TOUCH_MASK); - attributes_mask = GDK_WA_X | GDK_WA_Y; - - window = gtk_widget_get_parent_window (widget); - gtk_widget_set_window (widget, window); - g_object_ref (window); - - priv->event_window = gdk_window_new (window, - &attributes, attributes_mask); - gdk_window_set_user_data (priv->event_window, widget); -} -static void -gd_header_bar_unrealize (GtkWidget *widget) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - - if (priv->event_window) - { - gdk_window_set_user_data (priv->event_window, NULL); - gdk_window_destroy (priv->event_window); - priv->event_window = NULL; - } - - GTK_WIDGET_CLASS (gd_header_bar_parent_class)->unrealize (widget); -} - -static void -gd_header_bar_map (GtkWidget *widget) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - - GTK_WIDGET_CLASS (gd_header_bar_parent_class)->map (widget); - - if (priv->event_window) - gdk_window_show_unraised (priv->event_window); -} - -static void -gd_header_bar_unmap (GtkWidget *widget) -{ - GdHeaderBar *bar = GD_HEADER_BAR (widget); - GdHeaderBarPrivate *priv = bar->priv; - - if (priv->event_window) - gdk_window_hide (priv->event_window); - - GTK_WIDGET_CLASS (gd_header_bar_parent_class)->unmap (widget); -} - -static gint -gd_header_bar_draw (GtkWidget *widget, - cairo_t *cr) -{ - GtkStyleContext *context; - - context = gtk_widget_get_style_context (widget); - - gtk_render_background (context, cr, 0, 0, - gtk_widget_get_allocated_width (widget), - gtk_widget_get_allocated_height (widget)); - gtk_render_frame (context, cr, 0, 0, - gtk_widget_get_allocated_width (widget), - gtk_widget_get_allocated_height (widget)); - - - GTK_WIDGET_CLASS (gd_header_bar_parent_class)->draw (widget, cr); - - return TRUE; -} - -static void -gd_header_bar_class_init (GdHeaderBarClass *class) -{ - GObjectClass *object_class = G_OBJECT_CLASS (class); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); - GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class); - - object_class->get_property = gd_header_bar_get_property; - object_class->set_property = gd_header_bar_set_property; - object_class->finalize = gd_header_bar_finalize; - - widget_class->size_allocate = gd_header_bar_size_allocate; - widget_class->get_preferred_width = gd_header_bar_get_preferred_width; - widget_class->get_preferred_height = gd_header_bar_get_preferred_height; - widget_class->get_preferred_height_for_width = gd_header_bar_get_preferred_height_for_width; - widget_class->get_preferred_width_for_height = gd_header_bar_get_preferred_width_for_height; - widget_class->button_press_event = gd_header_bar_button_press; - widget_class->realize = gd_header_bar_realize; - widget_class->unrealize = gd_header_bar_unrealize; - widget_class->map = gd_header_bar_map; - widget_class->unmap = gd_header_bar_unmap; - widget_class->draw = gd_header_bar_draw; - - container_class->add = gd_header_bar_add; - container_class->remove = gd_header_bar_remove; - container_class->forall = gd_header_bar_forall; - container_class->child_type = gd_header_bar_child_type; - container_class->set_child_property = gd_header_bar_set_child_property; - container_class->get_child_property = gd_header_bar_get_child_property; - gtk_container_class_handle_border_width (container_class); - - gtk_container_class_install_child_property (container_class, - CHILD_PROP_PACK_TYPE, - g_param_spec_enum ("pack-type", - "Pack type", - "A GtkPackType indicating whether the child is packed with reference to the start or end of the parent", - GTK_TYPE_PACK_TYPE, GTK_PACK_START, - G_PARAM_READWRITE)); - gtk_container_class_install_child_property (container_class, - CHILD_PROP_POSITION, - g_param_spec_int ("position", - "Position", - "The index of the child in the parent", - -1, G_MAXINT, 0, - G_PARAM_READABLE)); - - g_object_class_install_property (object_class, - PROP_TITLE, - g_param_spec_string ("title", - "Title", - "The title to display", - NULL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_SUBTITLE, - g_param_spec_string ("subtitle", - "Subtitle", - "The subtitle to display", - NULL, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_CUSTOM_TITLE, - g_param_spec_object ("custom-title", - "Custom Title", - "Custom title widget to display", - GTK_TYPE_WIDGET, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT | - G_PARAM_STATIC_STRINGS)); - - g_object_class_install_property (object_class, - PROP_SPACING, - g_param_spec_int ("spacing", - "Spacing", - "The amount of space between children", - 0, G_MAXINT, - DEFAULT_SPACING, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_HPADDING, - g_param_spec_int ("hpadding", - "Horizontal padding", - "The amount of space to the left and right of children", - 0, G_MAXINT, - DEFAULT_HPADDING, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, - PROP_VPADDING, - g_param_spec_int ("vpadding", - "Vertical padding", - "The amount of space to the above and below children", - 0, G_MAXINT, - DEFAULT_VPADDING, - G_PARAM_READWRITE)); - - g_type_class_add_private (object_class, sizeof (GdHeaderBarPrivate)); -} - -static void -gd_header_buildable_add_child (GtkBuildable *buildable, - GtkBuilder *builder, - GObject *child, - const gchar *type) -{ - if (type && strcmp (type, "title") == 0) - gd_header_bar_set_custom_title (GD_HEADER_BAR (buildable), GTK_WIDGET (child)); - else if (!type) - gtk_container_add (GTK_CONTAINER (buildable), GTK_WIDGET (child)); - else - GTK_BUILDER_WARN_INVALID_CHILD_TYPE (GD_HEADER_BAR (buildable), type); -} - -static void -gd_header_buildable_init (GtkBuildableIface *iface) -{ - iface->add_child = gd_header_buildable_add_child; -} - -void -gd_header_bar_pack_start (GdHeaderBar *bar, - GtkWidget *child) -{ - gd_header_bar_pack (bar, child, GTK_PACK_START); -} - -void -gd_header_bar_pack_end (GdHeaderBar *bar, - GtkWidget *child) -{ - gd_header_bar_pack (bar, child, GTK_PACK_END); -} - -GtkWidget * -gd_header_bar_new (void) -{ - return GTK_WIDGET (g_object_new (GD_TYPE_HEADER_BAR, NULL)); -} diff -Nru devhelp-3.8.2/libgd/libgd/gd-header-bar.h devhelp-3.10.2/libgd/libgd/gd-header-bar.h --- devhelp-3.8.2/libgd/libgd/gd-header-bar.h 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/libgd/gd-header-bar.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2013 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef __GD_HEADER_BAR_H__ -#define __GD_HEADER_BAR_H__ - -#include - -G_BEGIN_DECLS - -#define GD_TYPE_HEADER_BAR (gd_header_bar_get_type ()) -#define GD_HEADER_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GD_TYPE_HEADER_BAR, GdHeaderBar)) -#define GD_HEADER_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GD_TYPE_HEADER_BAR, GdHeaderBarClass)) -#define GD_IS_HEADER_BAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GD_TYPE_HEADER_BAR)) -#define GD_IS_HEADER_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GD_TYPE_HEADER_BAR)) -#define GD_HEADER_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GD_TYPE_HEADER_BAR, GdHeaderBarClass)) - -typedef struct _GdHeaderBar GdHeaderBar; -typedef struct _GdHeaderBarPrivate GdHeaderBarPrivate; -typedef struct _GdHeaderBarClass GdHeaderBarClass; - -struct _GdHeaderBar -{ - GtkContainer container; - - /*< private >*/ - GdHeaderBarPrivate *priv; -}; - -struct _GdHeaderBarClass -{ - GtkContainerClass parent_class; - - /* Padding for future expansion */ - void (*_gd_reserved1) (void); - void (*_gd_reserved2) (void); - void (*_gd_reserved3) (void); - void (*_gd_reserved4) (void); -}; - -GType gd_header_bar_get_type (void) G_GNUC_CONST; -GtkWidget *gd_header_bar_new (void); -void gd_header_bar_set_title (GdHeaderBar *bar, - const char *title); -const char * gd_header_bar_get_title (GdHeaderBar *bar); -void gd_header_bar_set_subtitle (GdHeaderBar *bar, - const gchar *subtitle); -const gchar *gd_header_bar_get_subtitle (GdHeaderBar *bar); -void gd_header_bar_set_custom_title (GdHeaderBar *bar, - GtkWidget *title_widget); -GtkWidget * gd_header_bar_get_custom_title (GdHeaderBar *bar); -void gd_header_bar_pack_start (GdHeaderBar *bar, - GtkWidget *child); -void gd_header_bar_pack_end (GdHeaderBar *bar, - GtkWidget *child); - -G_END_DECLS - -#endif /* __GD_HEADER_BAR_H__ */ diff -Nru devhelp-3.8.2/libgd/libgd/gd-header-button.c devhelp-3.10.2/libgd/libgd/gd-header-button.c --- devhelp-3.8.2/libgd/libgd/gd-header-button.c 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/libgd/gd-header-button.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,488 +0,0 @@ -/* - * Copyright (c) 2013 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "gd-header-button.h" - -typedef GTypeInterface GdHeaderButtonIface; -typedef GdHeaderButtonIface GdHeaderButtonInterface; -#define GD_HEADER_BUTTON_GET_IFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GD_TYPE_HEADER_BUTTON, GdHeaderButtonIface)) - -G_DEFINE_INTERFACE (GdHeaderButton, gd_header_button, GTK_TYPE_BUTTON) - -enum { - PROP_0, - PROP_LABEL, - PROP_USE_MARKUP, - PROP_SYMBOLIC_ICON_NAME -}; - -static void -gd_header_button_default_init (GdHeaderButtonIface *iface) -{ - GParamSpec *pspec; - - /** - * GdHeaderButton:label: - * - * The label of the #GdHeaderButton object. - */ - pspec = g_param_spec_string ("label", - "Text label", - "Label displayed by the button", - NULL, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - g_object_interface_install_property (iface, pspec); - - /** - * GdHeaderButton:use-markup: - * - * Whether the label of the #GdHeaderButton object should use markup. - */ - pspec = g_param_spec_boolean ("use-markup", - "Use markup", - "Whether the label should use markup", - FALSE, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - g_object_interface_install_property (iface, pspec); - - /** - * GdHeaderButton:symbolic-icon-name: - * - * The symbolic icon name of the #GdHeaderButton object. - */ - pspec = g_param_spec_string ("symbolic-icon-name", - "Symbolic icon name", - "The name of the symbolic icon displayed by the button", - NULL, - G_PARAM_READWRITE | - G_PARAM_STATIC_STRINGS); - g_object_interface_install_property (iface, pspec); -} - -/** - * gd_header_button_get_label: - * @self: - * - * Returns: (transfer full): - */ -gchar * -gd_header_button_get_label (GdHeaderButton *self) -{ - gchar *label; - g_object_get (self, "label", &label, NULL); - - return label; -} - -/** - * gd_header_button_set_label: - * @self: - * @label: (allow-none): - * - */ -void -gd_header_button_set_label (GdHeaderButton *self, - const gchar *label) -{ - g_object_set (self, "label", label, NULL); -} - -/** - * gd_header_button_get_symbolic_icon_name: - * @self: - * - * Returns: (transfer full): - */ -gchar * -gd_header_button_get_symbolic_icon_name (GdHeaderButton *self) -{ - gchar *symbolic_icon_name; - g_object_get (self, "symbolic-icon-name", &symbolic_icon_name, NULL); - - return symbolic_icon_name; -} - -/** - * gd_header_button_set_symbolic_icon_name: - * @self: - * @symbolic_icon_name: (allow-none): - * - */ -void -gd_header_button_set_symbolic_icon_name (GdHeaderButton *self, - const gchar *symbolic_icon_name) -{ - if (symbolic_icon_name != NULL && - !g_str_has_suffix (symbolic_icon_name, "-symbolic")) - { - g_warning ("gd_header_button_set_symbolic_icon_name was called with " - "a non-symbolic name."); - return; - } - - g_object_set (self, "symbolic-icon-name", symbolic_icon_name, NULL); -} - -/** - * gd_header_button_get_use_markup: - * @self: - * - * Returns: - */ -gboolean -gd_header_button_get_use_markup (GdHeaderButton *self) -{ - gboolean use_markup; - - g_object_get (self, "use-markup", &use_markup, NULL); - return use_markup; -} - -/** - * gd_header_button_set_use_markup: - * @self: - * @use_markup: - * - */ -void -gd_header_button_set_use_markup (GdHeaderButton *self, - gboolean use_markup) -{ - g_object_set (self, "use-markup", use_markup, NULL); -} - -/* generic implementation for all private subclasses */ -typedef struct _GdHeaderButtonPrivate GdHeaderButtonPrivate; -struct _GdHeaderButtonPrivate { - gchar *label; - gchar *symbolic_icon_name; - - gboolean use_markup; -}; - -#define GET_PRIVATE(inst) G_TYPE_INSTANCE_GET_PRIVATE (inst, G_OBJECT_TYPE (inst), GdHeaderButtonPrivate) -#define GET_PARENT_CLASS(inst) g_type_class_peek_parent (G_OBJECT_GET_CLASS (inst)) - -static void -rebuild_child (GdHeaderButton *self) -{ - GdHeaderButtonPrivate *priv = GET_PRIVATE (self); - GtkStyleContext *context; - GtkWidget *button_child, *label; - - gtk_widget_set_valign (GTK_WIDGET (self), GTK_ALIGN_CENTER); - - button_child = gtk_bin_get_child (GTK_BIN (self)); - if (button_child != NULL) - gtk_widget_destroy (button_child); - - button_child = NULL; - context = gtk_widget_get_style_context (GTK_WIDGET (self)); - - if (priv->symbolic_icon_name != NULL) - { - button_child = gtk_image_new_from_icon_name (priv->symbolic_icon_name, GTK_ICON_SIZE_MENU); - if (priv->label != NULL) - gtk_widget_set_tooltip_text (GTK_WIDGET (self), priv->label); - - gtk_style_context_remove_class (context, "text-button"); - gtk_style_context_add_class (context, "image-button"); - } - else if (priv->label != NULL) - { - label = gtk_label_new (priv->label); - gtk_label_set_use_markup (GTK_LABEL (label), priv->use_markup); - - if (GTK_IS_MENU_BUTTON (self)) - { - GtkWidget *arrow; - - button_child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_container_add (GTK_CONTAINER (button_child), label); - - arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE); - gtk_container_add (GTK_CONTAINER (button_child), arrow); - } - else - { - button_child = label; - } - - gtk_style_context_remove_class (context, "image-button"); - gtk_style_context_add_class (context, "text-button"); - } - - if (button_child) - { - gtk_widget_show_all (button_child); - gtk_container_add (GTK_CONTAINER (self), button_child); - } -} - -static void -button_set_label (GdHeaderButton *self, - const gchar *label) -{ - GdHeaderButtonPrivate *priv = GET_PRIVATE (self); - - if (g_strcmp0 (priv->label, label) != 0) - { - g_free (priv->label); - priv->label = g_strdup (label); - - rebuild_child (self); - g_object_notify (G_OBJECT (self), "label"); - } -} - -static void -button_set_use_markup (GdHeaderButton *self, - gboolean use_markup) -{ - GdHeaderButtonPrivate *priv = GET_PRIVATE (self); - - if (priv->use_markup != use_markup) - { - priv->use_markup = use_markup; - - rebuild_child (self); - g_object_notify (G_OBJECT (self), "use-markup"); - } -} - -static void -button_set_symbolic_icon_name (GdHeaderButton *self, - const gchar *symbolic_icon_name) -{ - GdHeaderButtonPrivate *priv = GET_PRIVATE (self); - - if (g_strcmp0 (priv->symbolic_icon_name, symbolic_icon_name) != 0) - { - g_free (priv->symbolic_icon_name); - priv->symbolic_icon_name = g_strdup (symbolic_icon_name); - - rebuild_child (self); - g_object_notify (G_OBJECT (self), "symbolic-icon-name"); - } -} - -static void -gd_header_button_generic_finalize (GObject *object) -{ - GdHeaderButton *self = GD_HEADER_BUTTON (object); - GdHeaderButtonPrivate *priv = GET_PRIVATE (self); - - g_free (priv->label); - g_free (priv->symbolic_icon_name); - - G_OBJECT_CLASS (GET_PARENT_CLASS (object))->finalize (object); -} - -static void -gd_header_button_generic_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - GdHeaderButton *self = GD_HEADER_BUTTON (object); - - switch (prop_id) - { - case PROP_LABEL: - button_set_label (self, g_value_get_string (value)); - break; - case PROP_USE_MARKUP: - button_set_use_markup (self, g_value_get_boolean (value)); - break; - case PROP_SYMBOLIC_ICON_NAME: - button_set_symbolic_icon_name (self, g_value_get_string (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gd_header_button_generic_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - GdHeaderButton *self = GD_HEADER_BUTTON (object); - GdHeaderButtonPrivate *priv = GET_PRIVATE (self); - - switch (prop_id) - { - case PROP_LABEL: - g_value_set_string (value, priv->label); - break; - case PROP_USE_MARKUP: - g_value_set_boolean (value, priv->use_markup); - break; - case PROP_SYMBOLIC_ICON_NAME: - g_value_set_string (value, priv->symbolic_icon_name); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gd_header_button_generic_iface_init (GdHeaderButtonIface *iface) -{ -} - -static void -gd_header_button_generic_class_init (gpointer klass) -{ - GObjectClass *oclass = G_OBJECT_CLASS (klass); - - oclass->get_property = gd_header_button_generic_get_property; - oclass->set_property = gd_header_button_generic_set_property; - oclass->finalize = gd_header_button_generic_finalize; - - g_object_class_override_property (oclass, PROP_LABEL, "label"); - g_object_class_override_property (oclass, PROP_USE_MARKUP, "use-markup"); - g_object_class_override_property (oclass, PROP_SYMBOLIC_ICON_NAME, "symbolic-icon-name"); - - g_type_class_add_private (klass, sizeof (GdHeaderButtonPrivate)); -} - -/* private subclasses */ -typedef GtkButtonClass GdHeaderSimpleButtonClass; -G_DEFINE_TYPE_WITH_CODE (GdHeaderSimpleButton, gd_header_simple_button, GTK_TYPE_BUTTON, - G_IMPLEMENT_INTERFACE (GD_TYPE_HEADER_BUTTON, gd_header_button_generic_iface_init)) - -static void -gd_header_simple_button_class_init (GdHeaderSimpleButtonClass *klass) -{ - gd_header_button_generic_class_init (klass); -} - -static void -gd_header_simple_button_init (GdHeaderSimpleButton *self) -{ -} - -typedef GtkToggleButtonClass GdHeaderToggleButtonClass; -G_DEFINE_TYPE_WITH_CODE (GdHeaderToggleButton, gd_header_toggle_button, GTK_TYPE_TOGGLE_BUTTON, - G_IMPLEMENT_INTERFACE (GD_TYPE_HEADER_BUTTON, gd_header_button_generic_iface_init)) - -static void -gd_header_toggle_button_class_init (GdHeaderToggleButtonClass *klass) -{ - gd_header_button_generic_class_init (klass); -} - -static void -gd_header_toggle_button_init (GdHeaderToggleButton *self) -{ -} - -typedef GtkMenuButtonClass GdHeaderMenuButtonClass; -G_DEFINE_TYPE_WITH_CODE (GdHeaderMenuButton, gd_header_menu_button, GTK_TYPE_MENU_BUTTON, - G_IMPLEMENT_INTERFACE (GD_TYPE_HEADER_BUTTON, gd_header_button_generic_iface_init)) - -static void -gd_header_menu_button_class_init (GdHeaderMenuButtonClass *klass) -{ - gd_header_button_generic_class_init (klass); -} - -static void -gd_header_menu_button_init (GdHeaderMenuButton *self) -{ -} - -typedef GtkRadioButtonClass GdHeaderRadioButtonClass; -G_DEFINE_TYPE_WITH_CODE (GdHeaderRadioButton, gd_header_radio_button, GTK_TYPE_RADIO_BUTTON, - G_IMPLEMENT_INTERFACE (GD_TYPE_HEADER_BUTTON, gd_header_button_generic_iface_init)) - -static void -gd_header_radio_button_constructed (GObject *object) -{ - GdHeaderRadioButton *self = (GdHeaderRadioButton *) (object); - - G_OBJECT_CLASS (GET_PARENT_CLASS (object))->constructed (object); - - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (self), FALSE); -} - -static void -gd_header_radio_button_class_init (GdHeaderRadioButtonClass *klass) -{ - GObjectClass *oclass = G_OBJECT_CLASS (klass); - - oclass->constructed = gd_header_radio_button_constructed; - - gd_header_button_generic_class_init (klass); -} - -static void -gd_header_radio_button_init (GdHeaderRadioButton *self) -{ -} - -/** - * gd_header_simple_button_new: - * - * Returns: (transfer none): - */ -GtkWidget * -gd_header_simple_button_new (void) -{ - return g_object_new (GD_TYPE_HEADER_SIMPLE_BUTTON, NULL); -} - -/** - * gd_header_toggle_button_new: - * - * Returns: (transfer none): - */ -GtkWidget * -gd_header_toggle_button_new (void) -{ - return g_object_new (GD_TYPE_HEADER_TOGGLE_BUTTON, NULL); -} - -/** - * gd_header_radio_button_new: - * - * Returns: (transfer none): - */ -GtkWidget * -gd_header_radio_button_new (void) -{ - return g_object_new (GD_TYPE_HEADER_RADIO_BUTTON, NULL); -} - -/** - * gd_header_menu_button_new: - * - * Returns: (transfer none): - */ -GtkWidget * -gd_header_menu_button_new (void) -{ - return g_object_new (GD_TYPE_HEADER_MENU_BUTTON, NULL); -} diff -Nru devhelp-3.8.2/libgd/libgd/gd-header-button.h devhelp-3.10.2/libgd/libgd/gd-header-button.h --- devhelp-3.8.2/libgd/libgd/gd-header-button.h 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/libgd/gd-header-button.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2013 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef __GD_HEADER_BUTTON_H__ -#define __GD_HEADER_BUTTON_H__ - -#include - -G_BEGIN_DECLS - -#define GD_TYPE_HEADER_BUTTON (gd_header_button_get_type ()) -#define GD_HEADER_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GD_TYPE_HEADER_BUTTON, GdHeaderButton)) -#define GD_IS_HEADER_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GD_TYPE_HEADER_BUTTON)) - -typedef struct _GdHeaderButton GdHeaderButton; - -GType gd_header_button_get_type (void) G_GNUC_CONST; - -void gd_header_button_set_label (GdHeaderButton *self, - const gchar *label); -void gd_header_button_set_symbolic_icon_name (GdHeaderButton *self, - const gchar *symbolic_icon_name); -gchar * gd_header_button_get_label (GdHeaderButton *self); -gchar * gd_header_button_get_symbolic_icon_name (GdHeaderButton *self); - -#define GD_TYPE_HEADER_SIMPLE_BUTTON (gd_header_simple_button_get_type ()) -typedef GtkButton GdHeaderSimpleButton; -GType gd_header_simple_button_get_type (void) G_GNUC_CONST; -GtkWidget * gd_header_simple_button_new (void); - -#define GD_TYPE_HEADER_TOGGLE_BUTTON (gd_header_toggle_button_get_type ()) -typedef GtkToggleButton GdHeaderToggleButton; -GType gd_header_toggle_button_get_type (void) G_GNUC_CONST; -GtkWidget * gd_header_toggle_button_new (void); - -#define GD_TYPE_HEADER_RADIO_BUTTON (gd_header_radio_button_get_type ()) -typedef GtkRadioButton GdHeaderRadioButton; -GType gd_header_radio_button_get_type (void) G_GNUC_CONST; -GtkWidget * gd_header_radio_button_new (void); - -#define GD_TYPE_HEADER_MENU_BUTTON (gd_header_menu_button_get_type ()) -typedef GtkMenuButton GdHeaderMenuButton; -GType gd_header_menu_button_get_type (void) G_GNUC_CONST; -GtkWidget * gd_header_menu_button_new (void); - -G_END_DECLS - -#endif /* __GD_HEADER_BUTTON_H__ */ diff -Nru devhelp-3.8.2/libgd/libgd/gd.h devhelp-3.10.2/libgd/libgd/gd.h --- devhelp-3.8.2/libgd/libgd/gd.h 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/libgd/gd.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2012 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef __GD_H__ -#define __GD_H__ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -G_BEGIN_DECLS - -#ifdef LIBGD_GTK_HACKS -# include -# include -#endif - -#ifdef LIBGD__VIEW_COMMON -# include -# include -# include -# include -#endif - -#ifdef LIBGD_MAIN_ICON_VIEW -# include -#endif - -#ifdef LIBGD_MAIN_LIST_VIEW -# include -#endif - -#ifdef LIBGD_MAIN_VIEW -# include -#endif - -#ifdef LIBGD_MAIN_TOOLBAR -# include -#endif - -#ifdef LIBGD_HEADER_BAR -# include -#endif - -#ifdef LIBGD__HEADER_BUTTON -# include -#endif - -#ifdef LIBGD_MARGIN_CONTAINER -# include -#endif - -#ifdef LIBGD_TAGGED_ENTRY -# include -#endif - -#ifdef LIBGD_NOTIFICATION -# include -#endif - -#ifdef LIBGD_REVEALER -# include -#endif - -#ifdef LIBGD_STACK -# include -# include -#endif - -G_END_DECLS - -#endif /* __GD_H__ */ diff -Nru devhelp-3.8.2/libgd/libgd.m4 devhelp-3.10.2/libgd/libgd.m4 --- devhelp-3.8.2/libgd/libgd.m4 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/libgd.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -dnl The option stuff below is based on the similar code from Automake - -# _LIBGD_MANGLE_OPTION(NAME) -# ------------------------- -# Convert NAME to a valid m4 identifier, by replacing invalid characters -# with underscores, and prepend the _LIBGD_OPTION_ suffix to it. -AC_DEFUN([_LIBGD_MANGLE_OPTION], -[[_LIBGD_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _LIBGD_SET_OPTION(NAME) -# ---------------------- -# Set option NAME. If NAME begins with a digit, treat it as a requested -# Guile version number, and define _LIBGD_GUILE_VERSION to that number. -# Otherwise, define the option using _LIBGD_MANGLE_OPTION. -AC_DEFUN([_LIBGD_SET_OPTION], -[m4_define(_LIBGD_MANGLE_OPTION([$1]), 1)]) - -# _LIBGD_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of libgd options. -AC_DEFUN([_LIBGD_SET_OPTIONS], -[m4_foreach_w([_LIBGD_Option], [$1], [_LIBGD_SET_OPTION(_LIBGD_Option)])]) - -# _LIBGD_IF_OPTION_SET(NAME,IF-SET,IF-NOT-SET) -# ------------------------------------------- -# Check if option NAME is set. -AC_DEFUN([_LIBGD_IF_OPTION_SET], -[m4_ifset(_LIBGD_MANGLE_OPTION([$1]),[$2],[$3])]) - -dnl LIBGD_INIT([OPTIONS], [DIR]) -dnl ---------------------------- -dnl OPTIONS A whitespace-seperated list of options. -dnl DIR libgd submodule directory (defaults to 'libgd') -AC_DEFUN([LIBGD_INIT], [ - _LIBGD_SET_OPTIONS([$1]) - AC_SUBST([LIBGD_MODULE_DIR],[m4_if([$2],,[libgd],[$2])]) - - AC_REQUIRE([LT_INIT]) - AC_REQUIRE([AC_CHECK_LIBM]) - AC_SUBST(LIBM) - LIBGD_MODULES="gtk+-3.0 >= 3.7.10" - LIBGD_GIR_INCLUDES="Gtk-3.0" - LIBGD_SOURCES="" - - AM_CONDITIONAL([LIBGD_STATIC],[_LIBGD_IF_OPTION_SET([static],[true],[false])]) - - # gtk-hacks: collection of Gtk+ hacks and workarounds - AM_CONDITIONAL([LIBGD_GTK_HACKS],[_LIBGD_IF_OPTION_SET([gtk-hacks],[true],[false])]) - _LIBGD_IF_OPTION_SET([gtk-hacks],[ - AC_DEFINE([LIBGD_GTK_HACKS], [1], [Description]) - ]) - - # main-view: - AM_CONDITIONAL([LIBGD_MAIN_VIEW],[_LIBGD_IF_OPTION_SET([main-view],[true],[false])]) - _LIBGD_IF_OPTION_SET([main-view],[ - _LIBGD_SET_OPTION([main-icon-view]) - _LIBGD_SET_OPTION([main-list-view]) - AC_DEFINE([LIBGD_MAIN_VIEW], [1], [Description]) - ]) - - # main-icon-view: - AM_CONDITIONAL([LIBGD_MAIN_ICON_VIEW],[_LIBGD_IF_OPTION_SET([main-icon-view],[true],[false])]) - _LIBGD_IF_OPTION_SET([main-icon-view],[ - _LIBGD_SET_OPTION([_view-common]) - AC_DEFINE([LIBGD_MAIN_ICON_VIEW], [1], [Description]) - ]) - - # main-list-view: - AM_CONDITIONAL([LIBGD_MAIN_LIST_VIEW],[_LIBGD_IF_OPTION_SET([main-list-view],[true],[false])]) - _LIBGD_IF_OPTION_SET([main-list-view],[ - _LIBGD_SET_OPTION([_view-common]) - AC_DEFINE([LIBGD_MAIN_LIST_VIEW], [1], [Description]) - ]) - - # main-toolbar: - AM_CONDITIONAL([LIBGD_MAIN_TOOLBAR],[_LIBGD_IF_OPTION_SET([main-toolbar],[true],[false])]) - _LIBGD_IF_OPTION_SET([main-toolbar],[ - _LIBGD_SET_OPTION([_header-button]) - AC_DEFINE([LIBGD_MAIN_TOOLBAR], [1], [Description]) - ]) - - # header-bar: - AM_CONDITIONAL([LIBGD_HEADER_BAR],[_LIBGD_IF_OPTION_SET([header-bar],[true],[false])]) - _LIBGD_IF_OPTION_SET([header-bar],[ - _LIBGD_SET_OPTION([_header-button]) - AC_DEFINE([LIBGD_HEADER_BAR], [1], [Description]) - ]) - - # margin-container: - AM_CONDITIONAL([LIBGD_MARGIN_CONTAINER],[_LIBGD_IF_OPTION_SET([margin-container],[true],[false])]) - _LIBGD_IF_OPTION_SET([margin-container],[ - AC_DEFINE([LIBGD_MARGIN_CONTAINER], [1], [Description]) - ]) - - # notification: - AM_CONDITIONAL([LIBGD_NOTIFICATION],[_LIBGD_IF_OPTION_SET([notification],[true],[false])]) - _LIBGD_IF_OPTION_SET([notification],[ - AC_DEFINE([LIBGD_NOTIFICATION], [1], [Description]) - ]) - - # revealer: - AM_CONDITIONAL([LIBGD_REVEALER],[_LIBGD_IF_OPTION_SET([revealer],[true],[false])]) - _LIBGD_IF_OPTION_SET([revealer],[ - AC_DEFINE([LIBGD_REVEALER], [1], [Description]) - ]) - - # stack: - AM_CONDITIONAL([LIBGD_STACK],[_LIBGD_IF_OPTION_SET([stack],[true],[false])]) - _LIBGD_IF_OPTION_SET([stack],[ - _LIBGD_SET_OPTION([_header-button]) - AC_DEFINE([LIBGD_STACK], [1], [Description]) - ]) - - # tagged-entry: Gtk+ widget - AM_CONDITIONAL([LIBGD_TAGGED_ENTRY],[_LIBGD_IF_OPTION_SET([tagged-entry],[true],[false])]) - _LIBGD_IF_OPTION_SET([tagged-entry],[ - AC_DEFINE([LIBGD_TAGGED_ENTRY], [1], [Description]) - ]) - - # vapi: vala bindings support - AM_CONDITIONAL([LIBGD_VAPI],[ _LIBGD_IF_OPTION_SET([vapi],[true],[false])]) - _LIBGD_IF_OPTION_SET([vapi],[ - _LIBGD_SET_OPTION([gir]) - dnl check for vapigen - AC_PATH_PROG(VAPIGEN, vapigen, no) - AS_IF([test x$VAPIGEN = "xno"], - [AC_MSG_ERROR([Cannot find the "vapigen compiler in your PATH])]) - ]) - - # gir: gobject introspection support - AM_CONDITIONAL([LIBGD_GIR],[ _LIBGD_IF_OPTION_SET([gir],[true],[false])]) - _LIBGD_IF_OPTION_SET([gir],[ - GOBJECT_INTROSPECTION_REQUIRE([0.9.6]) - ]) - - # _header-button: - AM_CONDITIONAL([LIBGD__HEADER_BUTTON],[_LIBGD_IF_OPTION_SET([_header-button],[true],[false])]) - _LIBGD_IF_OPTION_SET([_header-button],[ - AC_DEFINE([LIBGD__HEADER_BUTTON], [1], [Description]) - ]) - - # _view-common: - AM_CONDITIONAL([LIBGD__VIEW_COMMON],[_LIBGD_IF_OPTION_SET([_view-common],[true],[false])]) - _LIBGD_IF_OPTION_SET([_view-common],[ - AC_DEFINE([LIBGD__VIEW_COMMON], [1], [Description]) - ]) - - PKG_CHECK_MODULES(LIBGD, [ $LIBGD_MODULES ]) - AC_SUBST(LIBGD_GIR_INCLUDES) - AC_SUBST(LIBGD_SOURCES) -]) diff -Nru devhelp-3.8.2/libgd/test-header-bar.c devhelp-3.10.2/libgd/test-header-bar.c --- devhelp-3.8.2/libgd/test-header-bar.c 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/test-header-bar.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -#include -#include - -static void -on_switch_clicked (GtkWidget *button, - GdHeaderBar *bar) -{ - GtkWidget *image = NULL; - static gboolean use_custom = TRUE; - - if (use_custom) - { - image = gtk_image_new_from_icon_name ("face-wink-symbolic", GTK_ICON_SIZE_MENU); - use_custom = FALSE; - } - else - { - use_custom = TRUE; - } - - gd_header_bar_set_custom_title (bar, image); -} - -gint -main (gint argc, - gchar ** argv) -{ - GtkWidget *window, *bar, *box, *button; - - gtk_init (&argc, &argv); - - if (g_getenv ("RTL")) - gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL); - else - gtk_widget_set_default_direction (GTK_TEXT_DIR_LTR); - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_size_request (window, 300, 300); - - box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add (GTK_CONTAINER (window), box); - - bar = gd_header_bar_new (); - gtk_box_pack_start (GTK_BOX (box), bar, FALSE, TRUE, 0); - - gd_header_bar_set_title (GD_HEADER_BAR (bar), "Title Title Title Title Title Title"); - gd_header_bar_set_subtitle (GD_HEADER_BAR (bar), "Subtitle Subtitle Subtitle Subtitle Subtitle Subtitle"); - button = gtk_button_new_with_label ("Switch"); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - gtk_style_context_add_class (gtk_widget_get_style_context (button), GTK_STYLE_CLASS_RAISED); - gd_header_bar_pack_start (GD_HEADER_BAR (bar), button); - g_signal_connect (button, "clicked", G_CALLBACK (on_switch_clicked), bar); - - button = gtk_button_new_with_label ("Done"); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - gtk_style_context_add_class (gtk_widget_get_style_context (button), "suggested-action"); - - gd_header_bar_pack_end (GD_HEADER_BAR (bar), button); - - button = gtk_button_new_with_label ("Almost"); - gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - gtk_style_context_add_class (gtk_widget_get_style_context (button), GTK_STYLE_CLASS_RAISED); - gd_header_bar_pack_end (GD_HEADER_BAR (bar), button); - - gtk_widget_show_all (window); - gtk_main (); - - gtk_widget_destroy (window); - - return 0; -} diff -Nru devhelp-3.8.2/libgd/test-revealer.c devhelp-3.10.2/libgd/test-revealer.c --- devhelp-3.8.2/libgd/test-revealer.c 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/test-revealer.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -#include -#include - -gint -main (gint argc, - gchar ** argv) -{ - GtkWidget *window, *revealer, *box, *widget, *entry; - - gtk_init (&argc, &argv); - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_size_request (window, 300, 300); - - box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - widget = gtk_toggle_button_new_with_label ("Revealed"); - gtk_container_add (GTK_CONTAINER (box), widget); - gtk_container_add (GTK_CONTAINER (window), box); - - revealer = gd_revealer_new (); - entry = gtk_entry_new (); - gtk_container_add (GTK_CONTAINER (revealer), entry); - gtk_container_add (GTK_CONTAINER (box), revealer); - - g_object_bind_property (widget, "active", revealer, "reveal-child", 0); - - gtk_widget_show_all (window); - gtk_main (); - - gtk_widget_destroy (window); - - return 0; -} diff -Nru devhelp-3.8.2/libgd/test-stack.c devhelp-3.10.2/libgd/test-stack.c --- devhelp-3.8.2/libgd/test-stack.c 2013-04-17 07:27:09.000000000 +0000 +++ devhelp-3.10.2/libgd/test-stack.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,177 +0,0 @@ -#include -#include -#include - -GtkWidget *stack; -GtkWidget *switcher; -GtkWidget *w1; - -static void -set_visible_child (GtkWidget *button, gpointer data) -{ - gd_stack_set_visible_child (GD_STACK (stack), GTK_WIDGET (data)); -} - -static void -set_visible_child_name (GtkWidget *button, gpointer data) -{ - gd_stack_set_visible_child_name (GD_STACK (stack), (const char *)data); -} - -static void -toggle_homogeneous (GtkWidget *button, gpointer data) -{ - gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); - gd_stack_set_homogeneous (GD_STACK (stack), active); -} - -static void -toggle_icon_name (GtkWidget *button, gpointer data) -{ - gboolean active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); - gtk_container_child_set (GTK_CONTAINER (stack), w1, - "symbolic-icon-name", active ? "edit-find-symbolic" : NULL, - NULL); -} - -static void -toggle_transitions (GtkWidget *combo, gpointer data) -{ - int id = gtk_combo_box_get_active (GTK_COMBO_BOX (combo)); - gd_stack_set_transition_type (GD_STACK (stack), id); -} - -gint -main (gint argc, - gchar ** argv) -{ - GtkWidget *window, *box, *button, *hbox, *combo; - GtkWidget *w2, *w3; - GtkListStore* store; - GtkWidget *tree_view; - GtkTreeViewColumn *column; - GtkCellRenderer *renderer; - GtkWidget *scrolled_win; - int i; - GtkTreeIter iter; - - gtk_init (&argc, &argv); - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_widget_set_size_request (window, 300, 300); - - box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_container_add (GTK_CONTAINER (window), box); - - switcher = gd_stack_switcher_new (); - gtk_box_pack_start (GTK_BOX (box), switcher, FALSE, FALSE, 0); - - stack = gd_stack_new (); - - /* Make transitions longer so we can see that they work */ - gd_stack_set_transition_duration (GD_STACK (stack), 500); - - gtk_widget_set_halign (stack, GTK_ALIGN_START); - gtk_container_add (GTK_CONTAINER (box), stack); - - gd_stack_switcher_set_stack (GD_STACK_SWITCHER (switcher), GD_STACK (stack)); - - w1 = gtk_text_view_new (); - gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (w1)), - "This is a\nTest\nBalh!", -1); - - gtk_container_add_with_properties (GTK_CONTAINER (stack), w1, - "name", "1", - "title", "1", - NULL); - - w2 = gtk_button_new_with_label ("Gazoooooooooooooooonk"); - gtk_container_add (GTK_CONTAINER (stack), w2); - gtk_container_child_set (GTK_CONTAINER (stack), w2, - "name", "2", - "title", "2", - NULL); - - - scrolled_win = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_widget_set_size_request (scrolled_win, 100, 200); - - - store = gtk_list_store_new (1, G_TYPE_STRING); - - for (i = 0; i < 40; i++) - gtk_list_store_insert_with_values (store, &iter, i, 0, "Testvalule", -1); - - tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); - - gtk_container_add (GTK_CONTAINER (scrolled_win), tree_view); - w3 = scrolled_win; - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ("Target", renderer, - "text", 0, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column); - - gd_stack_add_titled (GD_STACK (stack), w3, "3", "3"); - - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_container_add (GTK_CONTAINER (box), hbox); - - button = gtk_button_new_with_label ("1"); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) set_visible_child, w1); - - button = gtk_button_new_with_label ("2"); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) set_visible_child, w2); - - button = gtk_button_new_with_label ("3"); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) set_visible_child, w3); - - button = gtk_button_new_with_label ("1"); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) set_visible_child_name, (gpointer) "1"); - - button = gtk_button_new_with_label ("2"); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) set_visible_child_name, (gpointer) "2"); - - button = gtk_button_new_with_label ("3"); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) set_visible_child_name, (gpointer) "3"); - - button = gtk_check_button_new_with_label ("homogeneous"); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), - gd_stack_get_homogeneous (GD_STACK (stack))); - gtk_container_add (GTK_CONTAINER (hbox), button); - g_signal_connect (button, "clicked", (GCallback) toggle_homogeneous, NULL); - - button = gtk_toggle_button_new_with_label ("Add symbolic icon"); - g_signal_connect (button, "toggled", (GCallback) toggle_icon_name, NULL); - gtk_container_add (GTK_CONTAINER (hbox), button); - - combo = gtk_combo_box_text_new (); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), - "NONE"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), - "CROSSFADE"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), - "SLIDE_RIGHT"); - gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), - "SLIDE_LEFT"); - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - - gtk_container_add (GTK_CONTAINER (hbox), combo); - g_signal_connect (combo, "changed", (GCallback) toggle_transitions, NULL); - - gtk_widget_show_all (window); - gtk_main (); - - gtk_widget_destroy (window); - - return 0; -} diff -Nru devhelp-3.8.2/m4/gettext.m4 devhelp-3.10.2/m4/gettext.m4 --- devhelp-3.8.2/m4/gettext.m4 2013-02-01 12:34:13.000000000 +0000 +++ devhelp-3.10.2/m4/gettext.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,381 +0,0 @@ -# gettext.m4 serial 60 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2006. - -dnl Macro to add for using GNU gettext. - -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. If NEEDSYMBOL is specified and is -dnl 'need-formatstring-macros', then GNU gettext implementations that don't -dnl support the ISO C 99 formatstring macros will be ignored. -dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])])]) - define([gt_included_intl], - ifelse([$1], [external], - ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), - [yes])) - define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) - gt_NEEDS_INIT - AM_GNU_GETTEXT_NEED([$2]) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Sometimes libintl requires libiconv, so first search for libiconv. - dnl Ideally we would do this search only after the - dnl if test "$USE_NLS" = "yes"; then - dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT - dnl the configure script would need to contain the same shell code - dnl again, outside any 'if'. There are two solutions: - dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. - dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. - dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not - dnl documented, we avoid it. - ifelse(gt_included_intl, yes, , [ - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - ]) - - dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. - gt_INTL_MACOSX - - dnl Set USE_NLS. - AC_REQUIRE([AM_NLS]) - - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no - USE_INCLUDED_LIBINTL=no - ]) - LIBINTL= - LTLIBINTL= - POSUB= - - dnl Add a version number to the cache macros. - case " $gt_needs " in - *" need-formatstring-macros "*) gt_api_version=3 ;; - *" need-ngettext "*) gt_api_version=2 ;; - *) gt_api_version=1 ;; - esac - gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc" - gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl" - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - if test $gt_api_version -ge 3; then - gt_revision_test_code=' -#ifndef __GNU_GETTEXT_SUPPORTED_REVISION -#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1) -#endif -changequote(,)dnl -typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1]; -changequote([,])dnl -' - else - gt_revision_test_code= - fi - if test $gt_api_version -ge 2; then - gt_expression_test_code=' + * ngettext ("", "", 0)' - else - gt_expression_test_code= - fi - - AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], - [AC_TRY_LINK([#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], - [eval "$gt_func_gnugettext_libc=yes"], - [eval "$gt_func_gnugettext_libc=no"])]) - - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then - dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - [$gt_func_gnugettext_libintl], - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [eval "$gt_func_gnugettext_libintl=yes"], - [eval "$gt_func_gnugettext_libintl=no"]) - dnl Now see whether libintl exists and depends on libiconv. - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -$gt_revision_test_code -extern int _nl_msg_cat_cntr; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias (const char *);], - [bindtextdomain ("", ""); -return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - eval "$gt_func_gnugettext_libintl=yes" - ]) - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - fi - - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ - || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools; }; then - gt_use_preinstalled_gnugettext=yes - else - dnl Reset the values set by searching for libintl. - LIBINTL= - LTLIBINTL= - INCINTL= - fi - - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` - fi - - CATOBJEXT= - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=.gmo - fi - ]) - - if test -n "$INTL_MACOSX_LIBS"; then - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Some extra flags are needed during linking. - LIBINTL="$LIBINTL $INTL_MACOSX_LIBS" - LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS" - fi - fi - - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) - else - USE_NLS=no - fi - fi - - AC_MSG_CHECKING([whether to use NLS]) - AC_MSG_RESULT([$USE_NLS]) - if test "$USE_NLS" = "yes"; then - AC_MSG_CHECKING([where the gettext function comes from]) - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - gt_source="external libintl" - else - gt_source="libc" - fi - else - gt_source="included intl directory" - fi - AC_MSG_RESULT([$gt_source]) - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi - - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, - [Define if the GNU dcgettext() function is already present or preinstalled.]) - fi - - dnl We need to process the po/ directory. - POSUB=po - fi - - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then - BUILD_INCLUDED_LIBINTL=yes - fi - - dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share - AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLOBJS= - if test "$USE_INCLUDED_LIBINTL" = yes; then - INTLOBJS="\$(GETTOBJS)" - fi - AC_SUBST(INTLOBJS) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) - - dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) - - -dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized. -m4_define([gt_NEEDS_INIT], -[ - m4_divert_text([DEFAULTS], [gt_needs=]) - m4_define([gt_NEEDS_INIT], []) -]) - - -dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL]) -AC_DEFUN([AM_GNU_GETTEXT_NEED], -[ - m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"]) -]) - - -dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) -AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) diff -Nru devhelp-3.8.2/m4/iconv.m4 devhelp-3.10.2/m4/iconv.m4 --- devhelp-3.8.2/m4/iconv.m4 2013-02-01 12:34:13.000000000 +0000 +++ devhelp-3.10.2/m4/iconv.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,180 +0,0 @@ -# iconv.m4 serial AM6 (gettext-0.17) -dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_DEFUN([AM_ICONV_LINKFLAGS_BODY], -[ - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) -]) - -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi - ]) - if test "$am_cv_func_iconv" = yes; then - AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ - dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. - am_save_LIBS="$LIBS" - if test $am_cv_lib_iconv = yes; then - LIBS="$LIBS $LIBICONV" - fi - AC_TRY_RUN([ -#include -#include -int main () -{ - /* Test against AIX 5.1 bug: Failures are not distinguishable from successful - returns. */ - { - iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); - if (cd_utf8_to_88591 != (iconv_t)(-1)) - { - static const char input[] = "\342\202\254"; /* EURO SIGN */ - char buf[10]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_utf8_to_88591, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if (res == 0) - return 1; - } - } -#if 0 /* This bug could be worked around by the caller. */ - /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ - { - iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); - if (cd_88591_to_utf8 != (iconv_t)(-1)) - { - static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; - char buf[50]; - const char *inptr = input; - size_t inbytesleft = strlen (input); - char *outptr = buf; - size_t outbytesleft = sizeof (buf); - size_t res = iconv (cd_88591_to_utf8, - (char **) &inptr, &inbytesleft, - &outptr, &outbytesleft); - if ((int)res > 0) - return 1; - } - } -#endif - /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is - provided. */ - if (/* Try standardized names. */ - iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) - /* Try IRIX, OSF/1 names. */ - && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) - /* Try AIX names. */ - && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) - /* Try HP-UX names. */ - && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) - return 1; - return 0; -}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], - [case "$host_os" in - aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; - *) am_cv_func_iconv_works="guessing yes" ;; - esac]) - LIBS="$am_save_LIBS" - ]) - case "$am_cv_func_iconv_works" in - *no) am_func_iconv=no am_cv_lib_iconv=no ;; - *) am_func_iconv=yes ;; - esac - else - am_func_iconv=no am_cv_lib_iconv=no - fi - if test "$am_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, - [Define if you have the iconv() function and it works.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) -]) - -AC_DEFUN([AM_ICONV], -[ - AM_ICONV_LINK - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) diff -Nru devhelp-3.8.2/m4/intlmacosx.m4 devhelp-3.10.2/m4/intlmacosx.m4 --- devhelp-3.8.2/m4/intlmacosx.m4 2013-02-01 12:34:14.000000000 +0000 +++ devhelp-3.10.2/m4/intlmacosx.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -# intlmacosx.m4 serial 1 (gettext-0.17) -dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include ], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) -]) diff -Nru devhelp-3.8.2/m4/lib-ld.m4 devhelp-3.10.2/m4/lib-ld.m4 --- devhelp-3.8.2/m4/lib-ld.m4 2013-02-01 12:34:14.000000000 +0000 +++ devhelp-3.10.2/m4/lib-ld.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) diff -Nru devhelp-3.8.2/m4/lib-link.m4 devhelp-3.10.2/m4/lib-link.m4 --- devhelp-3.8.2/m4/lib-link.m4 2013-02-01 12:34:14.000000000 +0000 +++ devhelp-3.10.2/m4/lib-link.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,709 +0,0 @@ -# lib-link.m4 serial 13 (gettext-0.17) -dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -AC_PREREQ(2.54) - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname -dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - LIB[]NAME[]_PREFIX= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - AC_SUBST([LIB]NAME[_PREFIX]) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl acl_libext, -dnl acl_shlibext, -dnl acl_hardcode_libdir_flag_spec, -dnl acl_hardcode_libdir_separator, -dnl acl_hardcode_direct, -dnl acl_hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - dnl Tell automake >= 1.10 to complain if config.rpath is missing. - m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])]) - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - acl_libext="$acl_cv_libext" - acl_shlibext="$acl_cv_shlibext" - acl_libname_spec="$acl_cv_libname_spec" - acl_library_names_spec="$acl_cv_library_names_spec" - acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - acl_hardcode_direct="$acl_cv_hardcode_direct" - acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found -dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl Autoconf >= 2.61 supports dots in --with options. - define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], -[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - LIB[]NAME[]_PREFIX= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - eval libname=\"$acl_libname_spec\" # typically: libname=lib$name - if test -n "$acl_shlibext"; then - shrext=".$acl_shlibext" # typically: shrext=.so - else - shrext= - fi - if test $use_additional = yes; then - dir="$additional_libdir" - dnl The same code as in the loop below: - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - dnl First look for a shared library. - if test -n "$acl_shlibext"; then - if test -f "$dir/$libname$shrext"; then - found_dir="$dir" - found_so="$dir/$libname$shrext" - else - if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then - ver=`(cd "$dir" && \ - for f in "$libname$shrext".*; do echo "$f"; done \ - | sed -e "s,^$libname$shrext\\\\.,," \ - | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ - | sed 1q ) 2>/dev/null` - if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then - found_dir="$dir" - found_so="$dir/$libname$shrext.$ver" - fi - else - eval library_names=\"$acl_library_names_spec\" - for f in $library_names; do - if test -f "$dir/$f"; then - found_dir="$dir" - found_so="$dir/$f" - break - fi - done - fi - fi - fi - dnl Then look for a static library. - if test "X$found_dir" = "X"; then - if test -f "$dir/$libname.$acl_libext"; then - found_dir="$dir" - found_a="$dir/$libname.$acl_libext" - fi - fi - if test "X$found_dir" != "X"; then - if test -f "$dir/$libname.la"; then - found_la="$dir/$libname.la" - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$acl_hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$acl_hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */$acl_libdirstem | */$acl_libdirstem/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` - LIB[]NAME[]_PREFIX="$basedir" - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" - done - dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -dnl For those cases where a variable contains several -L and -l options -dnl referring to unknown libraries and directories, this macro determines the -dnl necessary additional linker options for the runtime path. -dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL]) -dnl sets LDADDVAR to linker options needed together with LIBSVALUE. -dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed, -dnl otherwise linking without libtool is assumed. -AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -[ - AC_REQUIRE([AC_LIB_RPATH]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - $1= - if test "$enable_rpath" != no; then - if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode directories into the resulting - dnl binary. - rpathdirs= - next= - for opt in $2; do - if test -n "$next"; then - dir="$next" - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then - rpathdirs="$rpathdirs $dir" - fi - next= - else - case $opt in - -L) next=yes ;; - -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` - dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then - rpathdirs="$rpathdirs $dir" - fi - next= ;; - *) next= ;; - esac - fi - done - if test "X$rpathdirs" != "X"; then - if test -n ""$3""; then - dnl libtool is used for linking. Use -R options. - for dir in $rpathdirs; do - $1="${$1}${$1:+ }-R$dir" - done - else - dnl The linker is used for linking directly. - if test -n "$acl_hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user - dnl must pass all path elements in one option. - alldirs= - for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" - done - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="$flag" - else - dnl The -rpath options are cumulative. - for dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$dir" - eval flag=\"$acl_hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - $1="${$1}${$1:+ }$flag" - done - fi - fi - fi - fi - fi - AC_SUBST([$1]) -]) diff -Nru devhelp-3.8.2/m4/lib-prefix.m4 devhelp-3.10.2/m4/lib-prefix.m4 --- devhelp-3.8.2/m4/lib-prefix.m4 2013-02-01 12:34:14.000000000 +0000 +++ devhelp-3.10.2/m4/lib-prefix.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,185 +0,0 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/$acl_libdirstem" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux* | gnu* | k*bsd*-gnu) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". -AC_DEFUN([AC_LIB_PREPARE_MULTILIB], -[ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; - esac - fi - done - IFS="$acl_save_IFS" - fi -]) diff -Nru devhelp-3.8.2/m4/po.m4 devhelp-3.10.2/m4/po.m4 --- devhelp-3.8.2/m4/po.m4 2013-02-01 12:34:14.000000000 +0000 +++ devhelp-3.10.2/m4/po.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,449 +0,0 @@ -# po.m4 serial 15 (gettext-0.17) -dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ(2.50) - -dnl Checks for all prerequisites of the po subdirectory. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake - AC_REQUIRE([AM_NLS])dnl - - dnl Release version of the gettext macros. This is used to ensure that - dnl the gettext macros and po/Makefile.in.in are in sync. - AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Test whether it is GNU msgfmt >= 0.15. -changequote(,)dnl - case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; - *) MSGFMT_015=$MSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([MSGFMT_015]) -changequote(,)dnl - case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;; - *) GMSGFMT_015=$GMSGFMT ;; - esac -changequote([,])dnl - AC_SUBST([GMSGFMT_015]) - - dnl Search for GNU xgettext 0.12 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Test whether it is GNU xgettext >= 0.15. -changequote(,)dnl - case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in - '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;; - *) XGETTEXT_015=$XGETTEXT ;; - esac -changequote([,])dnl - AC_SUBST([XGETTEXT_015]) - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) - - dnl Installation directories. - dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we - dnl have to define it here, so that it can be used in po/Makefile. - test -n "$localedir" || localedir='${datadir}/locale' - AC_SUBST([localedir]) - - dnl Support for AM_XGETTEXT_OPTION. - test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= - AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) - - AC_CONFIG_COMMANDS([po-directories], [[ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - # Treat a directory as a PO directory if and only if it has a - # POTFILES.in file. This allows packages to have multiple PO - # directories under different names or in different locations. - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - POMAKEFILEDEPS="POTFILES.in" - # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$OBSOLETE_ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake < 1.5. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS" - else - # The set of available languages was given in configure.in. - # Hide the ALL_LINGUAS assigment from automake < 1.5. - eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS' - fi - # Compute POFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po) - # Compute UPDATEPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update) - # Compute DUMMYPOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop) - # Compute GMOFILES - # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo) - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - UPDATEPOFILES= - DUMMYPOFILES= - GMOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done]], - [# Capture the value of obsolete ALL_LINGUAS because we need it to compute - # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it - # from automake < 1.5. - eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - -dnl Postprocesses a Makefile in a directory containing PO files. -AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE], -[ - # When this code is run, in config.status, two variables have already been - # set: - # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in, - # - LINGUAS is the value of the environment variable LINGUAS at configure - # time. - -changequote(,)dnl - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - # Find a way to echo strings without interpreting backslash. - if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='echo' - else - if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then - gt_echo='printf %s\n' - else - echo_func () { - cat < "$ac_file.tmp" - if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` - cat >> "$ac_file.tmp" < /dev/null; then - # Add dependencies that cannot be formulated as a simple suffix rule. - for lang in $ALL_LINGUAS; do - frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'` - cat >> "$ac_file.tmp" <> "$ac_file.tmp" <, 1996. - -AC_PREREQ(2.50) - -# Search path for a program which passes the given test. - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([AM_PATH_PROG_WITH_TEST], -[ -# Prepare PATH_SEPARATOR. -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Find out how to test for executable files. Don't use a zero-byte file, -# as systems may use methods other than mode bits to determine executability. -cat >conf$$.file <<_ASEOF -#! /bin/sh -exit 0 -_ASEOF -chmod +x conf$$.file -if test -x conf$$.file >/dev/null 2>&1; then - ac_executable_p="test -x" -else - ac_executable_p="test -f" -fi -rm -f conf$$.file - -# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - [[\\/]]* | ?:[[\\/]]*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in ifelse([$5], , $PATH, [$5]); do - IFS="$ac_save_IFS" - test -z "$ac_dir" && ac_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then - echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext" - break 2 - fi - fi - done - done - IFS="$ac_save_IFS" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) diff -Nru devhelp-3.8.2/misc/Makefile.in devhelp-3.10.2/misc/Makefile.in --- devhelp-3.8.2/misc/Makefile.in 2013-05-15 11:07:35.000000000 +0000 +++ devhelp-3.10.2/misc/Makefile.in 2013-11-11 15:03:29.000000000 +0000 @@ -53,15 +53,11 @@ subdir = misc DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -151,12 +147,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -164,7 +158,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -173,7 +166,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -181,27 +173,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -220,7 +202,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -234,10 +215,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru devhelp-3.8.2/misc/gedit-plugin/Makefile.in devhelp-3.10.2/misc/gedit-plugin/Makefile.in --- devhelp-3.8.2/misc/gedit-plugin/Makefile.in 2013-05-15 11:07:35.000000000 +0000 +++ devhelp-3.10.2/misc/gedit-plugin/Makefile.in 2013-11-11 15:03:29.000000000 +0000 @@ -55,15 +55,11 @@ DIST_COMMON = $(plugin_PYTHON) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -144,12 +140,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -157,7 +151,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -166,7 +159,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -174,27 +166,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -213,7 +195,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -227,10 +208,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ diff -Nru devhelp-3.8.2/po/POTFILES.in devhelp-3.10.2/po/POTFILES.in --- devhelp-3.8.2/po/POTFILES.in 2013-02-04 15:31:17.000000000 +0000 +++ devhelp-3.10.2/po/POTFILES.in 2013-11-11 08:32:55.000000000 +0000 @@ -4,9 +4,10 @@ [type: gettext/gsettings]data/org.gnome.devhelp.gschema.xml misc/gedit-plugin/devhelp.desktop.in misc/gedit-plugin/devhelp.py -[type: gettext/glade]src/devhelp.ui +[type: gettext/glade]src/devhelp-menu.ui src/dh-app.c src/dh-assistant.c +[type: gettext/glade]src/dh-assistant.ui src/dh-assistant-view.c src/dh-book.c src/dh-book-tree.c @@ -14,7 +15,8 @@ src/dh-link.c src/dh-main.c src/dh-parser.c +[type: gettext/glade]src/dh-preferences.ui src/dh-sidebar.c src/dh-util.c src/dh-window.c -src/eggfindbar.c +[type: gettext/glade]src/dh-window.ui diff -Nru devhelp-3.8.2/po/as.po devhelp-3.10.2/po/as.po --- devhelp-3.8.2/po/as.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/as.po 2013-09-23 16:26:46.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: devhelp master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-03-12 15:56+0530\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-13 15:39+0530\n" "Last-Translator: Nilamdyuti Goswami \n" "Language-Team: Assamese \n" "Language: as\n" @@ -22,8 +22,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -112,58 +112,68 @@ msgstr "কিতাপসমূহ UI ত ভাষা দ্বাৰা দলবদ্ধ কৰা হব নে" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized" +msgstr "সহায়ক উইন্ডোক ডাঙৰ কৰা হব নে" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized." +msgstr "সহায়ক উইন্ডোক ডাঙৰ কৰা হব নে।" + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "সহায়ক উইন্ডোৰ প্ৰস্থ" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "সহায়ক উইন্ডোৰ প্ৰস্থ।" -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "সহায়ক উইন্ডোৰ উচ্চতা" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "সহায়ক উইন্ডোৰ উচ্চতা।" -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "সহায়ক উইন্ডোৰ X অৱস্থান" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "সহায়ক উইন্ডোৰ X অৱস্থান।" -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "সহায়ক উইন্ডোৰ Y অৱস্থান" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "সহায়ক উইন্ডোৰ Y অৱস্থান।" -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "চিস্টেম ফন্টসমূহ ব্যৱহাৰ কৰক" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "চিস্টেম অবিকল্পিত ফন্টসমূহ ব্যৱহাৰ কৰক।" -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "লিখনীৰ বাবে ফন্ট" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "ভিন্ন প্ৰস্থৰ সৈতে লিখনীৰ বাবে ফন্ট।" -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "নিৰ্দিষ্ট প্ৰস্থ লিখনীৰ বাবে ফন্ট" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "নিৰ্দিষ্ট প্ৰস্থৰ সৈতে লিখনীৰ বাবে ফন্ট, যেনে ক'ড উদাহৰণসমূহ।" @@ -183,156 +193,140 @@ msgid "Show API Documentation for the word at the cursor" msgstr "কাৰ্চাৰত শব্দৰ বাবে API তথ্যচিত্ৰ দেখুৱাওক" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "নতুন উইন্ডো" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +#| msgid "New window" +msgid "New _Window" +msgstr "নতুন উইন্ডো (_W)" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +#| msgid "Preferences" +msgid "_Preferences" +msgstr "পছন্দসমূহ (_P)" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +#| msgid "About Devhelp" +msgid "_About Devhelp" +msgstr "Devhelp ৰ বিষয়ে (_A)" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +#| msgid "Quit" +msgid "_Quit" +msgstr "প্ৰস্থান কৰক (_Q)" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "পছন্দসমূহ" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Devhelp ৰ বিষয়ে" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "প্ৰস্থান কৰক" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "নতুন টেব (_T)" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "প্ৰিন্ট কৰক (_P)" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "সন্ধান কৰক (_F)" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "ডাঙৰ লিখনী (_L)" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "সৰু লিখনী (_m)" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "স্বাভাৱিক আকাৰ (_N)" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "ভাষা দ্বাৰা দলবদ্ধ কৰক (_G)" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "সামৰ্থবান" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "শীৰ্ষক" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "কিতাপ নিচাঙ" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "চিস্টেম ফন্টসমূহ ব্যৱহাৰ কৰক (_U)" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "ভিন্ন প্ৰস্থ (_V):" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "নিৰ্দিষ্ট প্ৰস্থ (_F):" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "ফন্টসমূহ" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "GNOME ৰ বাবে এজন উন্নয়নকাৰীৰ সহায় ব্ৰাউছাৰ" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "DevHelp ৱেবছাইট" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — সহায়ক" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "কিতাপ:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "ভাষা:%s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "ভাষা: অবিৱৰিত" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "কিতাপ" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "পৃষ্ঠা" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "কিৱাৰ্ড" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "ফলন" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "ধৰণ" @@ -402,12 +396,11 @@ msgstr "কিতাপ অসংকোচিত কৰিব নোৱাৰি '%s': %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "বৰ্তমান" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "সকলো কিতাপ" @@ -447,51 +440,69 @@ msgid "400%" msgstr "৪০০%" -#: ../src/dh-window.c:654 -#| msgid "_Back" +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "অনুৰোধ কৰা সংযোগ খোলোতে ত্ৰুটি।" + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "ৰিক্ত পৃষ্ঠা" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "নতুন টেব (_T)" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "প্ৰিন্ট কৰক (_P)" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "সন্ধান কৰক (_F)" + +#: ../src/dh-window.ui.h:4 +#| msgid "_Larger text" +msgid "_Larger Text" +msgstr "ডাঙৰ লিখনী (_L)" + +#: ../src/dh-window.ui.h:5 +#| msgid "S_maller text" +msgid "S_maller Text" +msgstr "সৰু লিখনী (_m)" + +#: ../src/dh-window.ui.h:6 +#| msgid "_Normal size" +msgid "_Normal Size" +msgstr "স্বাভাৱিক আকাৰ (_N)" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "পিছলৈ" -#: ../src/dh-window.c:659 -#| msgid "_Forward" +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "আগলৈ" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "অনুৰোধ কৰা সংযোগ খোলোতে ত্ৰুটি।" +#~ msgid "Find:" +#~ msgstr "সন্ধান কৰক:" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "ৰিক্ত পৃষ্ঠা" +#~ msgid "Find Previous" +#~ msgstr "পূৰ্বৱৰ্তী বিচাৰক" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "সন্ধান স্ট্ৰিংৰ পূৰ্বৱৰ্তী উপস্থিতি সন্ধান কৰক" + +#~ msgid "Find Next" +#~ msgstr "পৰৱৰ্তী বিচাৰক" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "সন্ধান স্ট্ৰিংৰ পৰৱৰ্তী উপস্থিতি সন্ধান কৰক" + +#~ msgid "C_ase Sensitive" +#~ msgstr "ফলা সংবেদ্য (_a)" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "সন্ধান কৰক:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "পূৰ্বৱৰ্তী বিচাৰক" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "সন্ধান স্ট্ৰিংৰ পূৰ্বৱৰ্তী উপস্থিতি সন্ধান কৰক" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "পৰৱৰ্তী বিচাৰক" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "সন্ধান স্ট্ৰিংৰ পৰৱৰ্তী উপস্থিতি সন্ধান কৰক" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "ফলা সংবেদ্য (_a)" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "ফলা সংবেদ্য সন্ধান অদল বদল কৰক" +#~ msgid "Toggle case sensitive search" +#~ msgstr "ফলা সংবেদ্য সন্ধান অদল বদল কৰক" #~| msgid "_New Window" #~ msgid "_Window" diff -Nru devhelp-3.8.2/po/be.po devhelp-3.10.2/po/be.po --- devhelp-3.8.2/po/be.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/be.po 2013-09-23 16:26:46.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2004 Devhelp authors # Vital Khilko , 2003. # Wladzimir Manulenka , 2010. -# Ihar Hrachyshka , 2012. +# Ihar Hrachyshka , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: devhelp master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" "PO-Revision-Date: 2012-09-09 14:51+0300\n" "Last-Translator: Ihar Hrachyshka \n" "Language-Team: Belarusian \n" @@ -20,8 +20,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -35,7 +35,9 @@ #: ../data/devhelp.desktop.in.in.h:4 msgid "documentation;information;manual;developer;api;" -msgstr "дакументацыя;інфармацыя;звесткі;даведнік;падручнік;распрацоўшчык;праграміст;api;" +msgstr "" +"дакументацыя;інфармацыя;звесткі;даведнік;падручнік;распрацоўшчык;праграміст;" +"api;" #: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" @@ -110,58 +112,66 @@ msgstr "Ці трэба групаваць кнігі па мове ў інтэрфейсе праграмы" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Ці трэба максімалізаваць дапаможнае акно" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Ці трэба максімалізаваць дапаможнае акно." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Шырыня дапаможнага акна" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Шырыня дапаможнага акна." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Вышыня дапаможнага акна" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Вышыня дапаможнага акна." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Размяшчэнне дапаможнага акна па X-восі" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Размяшчэнне дапаможнага акна па X-восі." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Размяшчэнне дапаможнага акна па Y-восі" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Размяшчэнне дапаможнага акна па Y-восі." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Ужыць сістэмныя шрыфты" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Ужыць прадвызначаныя сістэмныя шрыфты." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Шрыфт тэксту" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Шрыфт зменнай шырыні." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Роўнашырокі шрыфт" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Роўнашырокі шрыфт з літарамі аднаго памеру, напрыклад, для ўзораў коду." @@ -182,158 +192,138 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Паказаць дакументацыю API для слова пад курсорам" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Новае акно" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Новае _акно" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Настройкі" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Аб Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Выйсці" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Настройкі" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Аб Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Выйсці" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Новая _картка" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Надрукаваць" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Шукаць" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Большы тэкст" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Меншы тэкст" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Звычайны памер" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Групаваць па мове" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Уключана" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Назва" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Кніжная паліца" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Ужыць сістэмныя шрыфты" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Шрыфт _зменнай шырыні: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Роўнашырокі шрыфт:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Шрыфты" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Ігар Грачышка \n" "Уладзімір Мануленка " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Памочнік праграміста GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Сеціўная пляцоўка Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp: Памочнік" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Кніга:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Мова: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Мова: невядома" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Кніга" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Старонка" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Ключавое слова" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Функцыя" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Структура" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Макраазначэнне" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Пералік" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Тып" @@ -410,11 +400,11 @@ msgstr "Не ўдалося распакаваць кнігу \"%s\": %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Бягучы" -#: ../src/dh-sidebar.c:474 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Усе кнігі" @@ -454,47 +444,43 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -msgid "Back" -msgstr "Назад" - -#: ../src/dh-window.c:659 -msgid "Forward" -msgstr "Наперад" - -#: ../src/dh-window.c:919 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Памылка адкрыцця запатрабаванай спасылкі." -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Пустая старонка" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Шукаць:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Шукаць раней" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Знайсці папярэдняе супадзенне з крытэрыем пошуку" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Шукаць далей" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Знайсці наступнае супадзенне з крытэрыем пошуку" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Улічваць рэгістр літар" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Уключыць/выключыць улік рэгістра літар" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Новая _картка" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Надрукаваць" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Шукаць" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Большы тэкст" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Меншы тэкст" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Звычайны памер" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Назад" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Наперад" diff -Nru devhelp-3.8.2/po/ca.po devhelp-3.10.2/po/ca.po --- devhelp-3.8.2/po/ca.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/ca.po 2013-11-11 08:33:00.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-02-10 18:27+0100\n" +"POT-Creation-Date: 2013-10-13 20:28+0000\n" +"PO-Revision-Date: 2013-10-13 22:28+0200\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -23,8 +23,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:214 ../src/dh-app.c:400 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" @@ -115,58 +115,66 @@ "Si a la interfície d'usuari els llibres s'haurien d'agrupar per llenguatge" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Si la finestra auxiliar s'ha de maximitzar" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Si la finestra auxiliar s'ha de maximitzar." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Amplada de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "L'amplada de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Alçada de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Alçada de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Posició X de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "La posició X de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Posició Y de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "La posició Y de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Utilitza els tipus de lletra del sistema" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Utilitza els tipus de lletra predeterminats del sistema." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Tipus de lletra per al text" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Tipus de lletra per al text d'amplada variable." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Tipus de lletra per al text de mida fixa" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Tipus de lletra per al text d'amplada fixa, com ara en els exemples de codi." @@ -190,159 +198,103 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Mostra la documentació de l'API per a la paraula sota el cursor" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Finestra nova" - -#: ../src/devhelp.ui.h:2 -msgid "Preferences" -msgstr "Preferències" - -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Quant al Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Surt" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "_Pestanya nova" - -#: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "Im_primeix" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Cerca" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "Text més _gran" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Text més _petit" +#: ../src/devhelp-menu.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Finestra _nova" + +#: ../src/devhelp-menu.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Preferències" + +#: ../src/devhelp-menu.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Quant al Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Surt" -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "Mida _normal" - -#: ../src/devhelp.ui.h:11 -msgid "_Group by language" -msgstr "A_grupa per llenguatge" - -#: ../src/devhelp.ui.h:12 -msgid "Enabled" -msgstr "Habilitat" - -#: ../src/devhelp.ui.h:13 -msgid "Title" -msgstr "Títol" - -#: ../src/devhelp.ui.h:14 -msgid "Book Shelf" -msgstr "Prestatgeria" - -#: ../src/devhelp.ui.h:15 -msgid "_Use system fonts" -msgstr "_Utilitza els tipus de lletra del sistema" - -#: ../src/devhelp.ui.h:16 -msgid "_Variable width: " -msgstr "Amplada _variable: " - -#: ../src/devhelp.ui.h:17 -msgid "_Fixed width:" -msgstr "Amplada _fixa:" - -#: ../src/devhelp.ui.h:18 -msgid "Fonts" -msgstr "Tipus de lletra" - -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:206 msgid "translator_credits" msgstr "" "Aleix Badia i Bosch \n" "Xavier Conde Rueda \n" "Gil Forcada " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:216 msgid "A developers' help browser for GNOME" msgstr "Un navegador d'ajuda per a desenvolupadors del GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:224 msgid "DevHelp Website" msgstr "Pàgina web del Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Auxiliar" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Llibre:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:242 #, c-format msgid "Language: %s" msgstr "Llenguatge: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:243 msgid "Language: Undefined" msgstr "Llenguatge: no definit" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Llibre" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Pàgina" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Paraula clau" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Funció" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Estructura" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enumeració" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Tipus" @@ -418,240 +370,123 @@ msgid "Cannot uncompress book '%s': %s" msgstr "No s'ha pogut descomprimir el llibre «%s»: %s" +#: ../src/dh-preferences.ui.h:1 +msgid "Preferences" +msgstr "Preferències" + +#: ../src/dh-preferences.ui.h:2 +msgid "_Group by language" +msgstr "A_grupa per llenguatge" + +#: ../src/dh-preferences.ui.h:3 +msgid "Enabled" +msgstr "Habilitat" + +#: ../src/dh-preferences.ui.h:4 +msgid "Title" +msgstr "Títol" + +#: ../src/dh-preferences.ui.h:5 +msgid "Book Shelf" +msgstr "Prestatgeria" + +#: ../src/dh-preferences.ui.h:6 +msgid "_Use system fonts" +msgstr "_Utilitza els tipus de lletra del sistema" + +#: ../src/dh-preferences.ui.h:7 +msgid "_Variable width: " +msgstr "Amplada _variable: " + +#: ../src/dh-preferences.ui.h:8 +msgid "_Fixed width:" +msgstr "Amplada _fixa:" + +#: ../src/dh-preferences.ui.h:9 +msgid "Fonts" +msgstr "Tipus de lletra" + #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Actual" -#: ../src/dh-sidebar.c:474 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Tots els llibres" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:86 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:87 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:88 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:89 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:90 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:91 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:92 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:94 +#: ../src/dh-window.c:93 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:95 +#: ../src/dh-window.c:94 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -msgid "Back" -msgstr "Enrere" - -#: ../src/dh-window.c:659 -msgid "Forward" -msgstr "Endavant" - -#: ../src/dh-window.c:919 +#: ../src/dh-window.c:864 msgid "Error opening the requested link." msgstr "S'ha produït un error en obrir l'enllaç sol·licitat." -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 msgid "Empty Page" msgstr "Pàgina buida" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Cerca:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Cerca l'anterior" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Cerca l'ocurrència anterior de la cadena de cerca" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Cerca la següent" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Cerca l'ocurrència següent de la cadena de cerca" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Diferencia entre minúscules i majúscules" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Commuta la cerca diferenciant les minúscules de les majúscules" - -#~ msgid "_Window" -#~ msgstr "_Finestra" - -#~ msgid "_Close" -#~ msgstr "Tan_ca" - -#~ msgid "_Edit" -#~ msgstr "_Edita" - -#~ msgid "_Copy" -#~ msgstr "_Copia" - -#~ msgid "Find _Next" -#~ msgstr "Cerca el següe_nt" - -#~ msgid "Find _Previous" -#~ msgstr "Cerca l'_anterior" - -#~ msgid "_View" -#~ msgstr "_Visualitza" - -#~ msgid "Fullscreen" -#~ msgstr "Pantalla completa" - -#~ msgid "_Go" -#~ msgstr "_Vés a" - -#~ msgid "_Search Tab" -#~ msgstr "Pestanya de _cerca" - -#~ msgid "_Contents Tab" -#~ msgstr "Pestanya de _continguts" - -#~ msgid "Go to the previous page" -#~ msgstr "Vés a la pàgina anterior" - -#~ msgid "Go to the next page" -#~ msgstr "Vés a la pàgina següent" - -#~ msgid "Decrease the text size" -#~ msgstr "Redueix la mida del text" - -#~ msgid "Increase the text size" -#~ msgstr "Augmenta la mida del text" - -#~ msgid "Focus the Devhelp window with the search field active" -#~ msgstr "Dóna el focus a la finestra del Devhelp amb el camp de cerca actiu" - -#~ msgid "Search in:" -#~ msgstr "Cerca a:" - -#~ msgid "Contents" -#~ msgstr "Continguts" - -#~ msgid "Search" -#~ msgstr "Cerca" - -#~ msgid "_File" -#~ msgstr "_Fitxer" - -#~ msgid "_Help" -#~ msgstr "A_juda" - -#~ msgid "Use the normal text size" -#~ msgstr "Utilitza la mida de text normal" - -#~ msgid "Leave fullscreen mode" -#~ msgstr "Surt del mode de pantalla completa" - -#~ msgid "Display in full screen" -#~ msgstr "Mostra a pantalla completa" - -#~ msgid "Larger" -#~ msgstr "Més gran" - -#~ msgid "Smaller" -#~ msgstr "Més petit" - -#~ msgid "Preferences…" -#~ msgstr "Preferències…" - -#~ msgid "Fonts" -#~ msgstr "Tipus de lletra" - -#~ msgid "Preferences..." -#~ msgstr "Preferències..." - -#~ msgid "Show advanced search options" -#~ msgstr "Mostra les opcions de cerca avançades" - -#~ msgid "Whether the advanced search options are shown." -#~ msgstr "Si es mostren les opcions de cerca avançada." - -#~ msgid "Searching" -#~ msgstr "Cerca" - -#~ msgid "_Show advanced search options" -#~ msgstr "Mo_stra les opcions de cerca avançada" - -#~ msgid "" -#~ "name and link elements are required inside on line %d, column " -#~ "%d" -#~ msgstr "" -#~ "Els elements «name» (nom) i «link» (enllaç) són necessaris dins de " -#~ " a la línia %d, columna %d" - -#~ msgid "Could not create book parser" -#~ msgstr "No s'ha pogut crear l'analitzador del llibre" - -#~ msgid "Could not create markup parser" -#~ msgstr "No s'ha pogut crear l'analitzador de marques" - -#~ msgid "Devhelp is not built with zlib support" -#~ msgstr "El Devhelp s'ha muntat sense habilitar l'ús de la zlib" - -#~ msgid "Browse Contents" -#~ msgstr "Navega pels continguts" - -#~ msgid "Specify the size and location of the window" -#~ msgstr "Especifica la mida i la ubicació de la finestra" - -#~ msgid "WIDTHxHEIGHT+XOFF+YOFF" -#~ msgstr "AMPLADAxALÇADA+Despl_X+Despl_Y" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "_Pestanya nova" -#~ msgid "Cannot set UI: %s" -#~ msgstr "No s'ha pogut definir l'IU: %s" +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "Im_primeix" -#~ msgid "Location of the paned" -#~ msgstr "Ubicació de la subfinestra" +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Cerca" -#~ msgid "The location of the paned separator." -#~ msgstr "La ubicació del separador de la subfinestra." +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Text més _gran" -#~ msgid " " -#~ msgstr " " +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Text més _petit" -#~ msgid "Devhelp project page" -#~ msgstr "Pàgina del projecte Devhelp" +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Mida _normal" -#~ msgid "Bug report Devhelp" -#~ msgstr "Envia un informe d'error del Devhelp" +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Enrere" -#~ msgid "" -#~ "Select a subject in the contents to the left or switch to the search tab " -#~ "to find what you are looking for." -#~ msgstr "" -#~ "Per trobar el que esteu buscant seleccioneu un tema dels continguts de " -#~ "l'esquerra o commuteu a la pestanya de cerca." +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Endavant" diff -Nru devhelp-3.8.2/po/ca@valencia.po devhelp-3.10.2/po/ca@valencia.po --- devhelp-3.8.2/po/ca@valencia.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/ca@valencia.po 2013-11-11 08:33:00.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-10 18:28+0100\n" -"PO-Revision-Date: 2013-02-10 18:27+0100\n" +"POT-Creation-Date: 2013-10-13 22:29+0200\n" +"PO-Revision-Date: 2013-10-13 22:28+0200\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" "Language: ca-XV\n" @@ -22,8 +22,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:344 -#: ../src/dh-window.c:633 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:214 ../src/dh-app.c:400 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" @@ -114,58 +114,66 @@ "Si a la interfície d'usuari els llibres s'haurien d'agrupar per llenguatge" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Si la finestra auxiliar s'ha de maximitzar" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Si la finestra auxiliar s'ha de maximitzar." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Amplada de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "L'amplada de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Alçada de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Alçada de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Posició X de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "La posició X de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Posició Y de la finestra auxiliar" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "La posició Y de la finestra auxiliar." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Utilitza els tipus de lletra del sistema" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Utilitza els tipus de lletra predeterminats del sistema." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Tipus de lletra per al text" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Tipus de lletra per al text d'amplada variable." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Tipus de lletra per al text de mida fixa" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Tipus de lletra per al text d'amplada fixa, com ara en els exemples de codi." @@ -189,159 +197,103 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Mostra la documentació de l'API per a la paraula sota el cursor" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Finestra nova" - -#: ../src/devhelp.ui.h:2 -msgid "Preferences" -msgstr "Preferències" - -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Quant al Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Ix" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "_Pestanya nova" - -#: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "Im_primeix" +#: ../src/devhelp-menu.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Finestra _nova" + +#: ../src/devhelp-menu.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Preferències" + +#: ../src/devhelp-menu.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Quant al Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "I_x" -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Cerca" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "Text més _gran" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Text més _petit" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "Mida _normal" - -#: ../src/devhelp.ui.h:11 -msgid "_Group by language" -msgstr "A_grupa per llenguatge" - -#: ../src/devhelp.ui.h:12 -msgid "Enabled" -msgstr "Habilitat" - -#: ../src/devhelp.ui.h:13 -msgid "Title" -msgstr "Títol" - -#: ../src/devhelp.ui.h:14 -msgid "Book Shelf" -msgstr "Prestatgeria" - -#: ../src/devhelp.ui.h:15 -msgid "_Use system fonts" -msgstr "_Utilitza els tipus de lletra del sistema" - -#: ../src/devhelp.ui.h:16 -msgid "_Variable width: " -msgstr "Amplada _variable: " - -#: ../src/devhelp.ui.h:17 -msgid "_Fixed width:" -msgstr "Amplada _fixa:" - -#: ../src/devhelp.ui.h:18 -msgid "Fonts" -msgstr "Tipus de lletra" - -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:206 msgid "translator_credits" msgstr "" "Aleix Badia i Bosch \n" "Xavier Conde Rueda \n" "Gil Forcada " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:216 msgid "A developers' help browser for GNOME" msgstr "Un navegador d'ajuda per a desenvolupadors del GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:224 msgid "DevHelp Website" msgstr "Pàgina web del Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Auxiliar" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Llibre:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:242 #, c-format msgid "Language: %s" msgstr "Llenguatge: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:243 msgid "Language: Undefined" msgstr "Llenguatge: no definit" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Llibre" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Pàgina" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Paraula clau" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Funció" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Estructura" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enumeració" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Tipus" @@ -417,12 +369,48 @@ msgid "Cannot uncompress book '%s': %s" msgstr "No s'ha pogut descomprimir el llibre «%s»: %s" +#: ../src/dh-preferences.ui.h:1 +msgid "Preferences" +msgstr "Preferències" + +#: ../src/dh-preferences.ui.h:2 +msgid "_Group by language" +msgstr "A_grupa per llenguatge" + +#: ../src/dh-preferences.ui.h:3 +msgid "Enabled" +msgstr "Habilitat" + +#: ../src/dh-preferences.ui.h:4 +msgid "Title" +msgstr "Títol" + +#: ../src/dh-preferences.ui.h:5 +msgid "Book Shelf" +msgstr "Prestatgeria" + +#: ../src/dh-preferences.ui.h:6 +msgid "_Use system fonts" +msgstr "_Utilitza els tipus de lletra del sistema" + +#: ../src/dh-preferences.ui.h:7 +msgid "_Variable width: " +msgstr "Amplada _variable: " + +#: ../src/dh-preferences.ui.h:8 +msgid "_Fixed width:" +msgstr "Amplada _fixa:" + +#: ../src/dh-preferences.ui.h:9 +msgid "Fonts" +msgstr "Tipus de lletra" + #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Actual" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Tots els llibres" @@ -462,195 +450,42 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:664 -msgid "Back" -msgstr "Arrere" - -#: ../src/dh-window.c:669 -msgid "Forward" -msgstr "Avant" - -#: ../src/dh-window.c:936 +#: ../src/dh-window.c:864 msgid "Error opening the requested link." msgstr "S'ha produït un error en obrir l'enllaç sol·licitat." -#: ../src/dh-window.c:1286 ../src/dh-window.c:1472 +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 msgid "Empty Page" msgstr "Pàgina buida" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Cerca:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Cerca l'anterior" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Cerca l'ocurrència anterior de la cadena de cerca" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Cerca la següent" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Cerca l'ocurrència següent de la cadena de cerca" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Diferencia entre minúscules i majúscules" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Commuta la cerca diferenciant les minúscules de les majúscules" - -#~ msgid "_Window" -#~ msgstr "_Finestra" - -#~ msgid "_Close" -#~ msgstr "Tan_ca" - -#~ msgid "_Edit" -#~ msgstr "_Edita" - -#~ msgid "_Copy" -#~ msgstr "_Copia" - -#~ msgid "Find _Next" -#~ msgstr "Cerca el següe_nt" - -#~ msgid "Find _Previous" -#~ msgstr "Cerca l'_anterior" - -#~ msgid "_View" -#~ msgstr "_Visualitza" - -#~ msgid "Fullscreen" -#~ msgstr "Pantalla completa" - -#~ msgid "_Go" -#~ msgstr "_Vés a" - -#~ msgid "_Search Tab" -#~ msgstr "Pestanya de _cerca" - -#~ msgid "_Contents Tab" -#~ msgstr "Pestanya de _continguts" - -#~ msgid "Go to the previous page" -#~ msgstr "Vés a la pàgina anterior" - -#~ msgid "Go to the next page" -#~ msgstr "Vés a la pàgina següent" - -#~ msgid "Decrease the text size" -#~ msgstr "Redueix la mida del text" - -#~ msgid "Increase the text size" -#~ msgstr "Augmenta la mida del text" - -#~ msgid "Focus the Devhelp window with the search field active" -#~ msgstr "Dóna el focus a la finestra del Devhelp amb el camp de cerca actiu" - -#~ msgid "Search in:" -#~ msgstr "Cerca a:" - -#~ msgid "Contents" -#~ msgstr "Continguts" - -#~ msgid "Search" -#~ msgstr "Cerca" - -#~ msgid "_File" -#~ msgstr "_Fitxer" - -#~ msgid "_Help" -#~ msgstr "A_juda" - -#~ msgid "Use the normal text size" -#~ msgstr "Utilitza la mida de text normal" - -#~ msgid "Leave fullscreen mode" -#~ msgstr "Surt del mode de pantalla completa" - -#~ msgid "Display in full screen" -#~ msgstr "Mostra a pantalla completa" - -#~ msgid "Larger" -#~ msgstr "Més gran" - -#~ msgid "Smaller" -#~ msgstr "Més petit" - -#~ msgid "Preferences…" -#~ msgstr "Preferències…" - -#~ msgid "Fonts" -#~ msgstr "Tipus de lletra" - -#~ msgid "Preferences..." -#~ msgstr "Preferències..." - -#~ msgid "Show advanced search options" -#~ msgstr "Mostra les opcions de cerca avançades" - -#~ msgid "Whether the advanced search options are shown." -#~ msgstr "Si es mostren les opcions de cerca avançada." - -#~ msgid "Searching" -#~ msgstr "Cerca" - -#~ msgid "_Show advanced search options" -#~ msgstr "Mo_stra les opcions de cerca avançada" - -#~ msgid "" -#~ "name and link elements are required inside on line %d, column " -#~ "%d" -#~ msgstr "" -#~ "Els elements «name» (nom) i «link» (enllaç) són necessaris dins de " -#~ " a la línia %d, columna %d" - -#~ msgid "Could not create book parser" -#~ msgstr "No s'ha pogut crear l'analitzador del llibre" - -#~ msgid "Could not create markup parser" -#~ msgstr "No s'ha pogut crear l'analitzador de marques" - -#~ msgid "Devhelp is not built with zlib support" -#~ msgstr "El Devhelp s'ha muntat sense habilitar l'ús de la zlib" - -#~ msgid "Browse Contents" -#~ msgstr "Navega pels continguts" - -#~ msgid "Specify the size and location of the window" -#~ msgstr "Especifica la mida i la ubicació de la finestra" - -#~ msgid "WIDTHxHEIGHT+XOFF+YOFF" -#~ msgstr "AMPLADAxALÇADA+Despl_X+Despl_Y" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "_Pestanya nova" -#~ msgid "Cannot set UI: %s" -#~ msgstr "No s'ha pogut definir l'IU: %s" +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "Im_primeix" -#~ msgid "Location of the paned" -#~ msgstr "Ubicació de la subfinestra" +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Cerca" -#~ msgid "The location of the paned separator." -#~ msgstr "La ubicació del separador de la subfinestra." +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Text més _gran" -#~ msgid " " -#~ msgstr " " +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Text més _petit" -#~ msgid "Devhelp project page" -#~ msgstr "Pàgina del projecte Devhelp" +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Mida _normal" -#~ msgid "Bug report Devhelp" -#~ msgstr "Envia un informe d'error del Devhelp" +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Arrere" -#~ msgid "" -#~ "Select a subject in the contents to the left or switch to the search tab " -#~ "to find what you are looking for." -#~ msgstr "" -#~ "Per trobar el que esteu buscant seleccioneu un tema dels continguts de " -#~ "l'esquerra o commuteu a la pestanya de cerca." +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Avant" diff -Nru devhelp-3.8.2/po/cs.po devhelp-3.10.2/po/cs.po --- devhelp-3.8.2/po/cs.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/cs.po 2013-09-03 07:09:30.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-02-18 09:52+0100\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-05-29 12:37+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "Language: cs\n" @@ -26,8 +26,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "DevHelp" @@ -116,58 +116,66 @@ msgstr "Zda by knihy měly být v uživatelském rozhraní seskupeny podle jazyka" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Jestli má být asistenční okno po spuštění maximalizované." + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Jestli má být asistenční okno po spuštění maximalizované." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Šířka asistenčního okna" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Šířka asistenčního okna." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Výška asistenčního okna" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Výška asistenčního okna." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Pozice X asistenčního okna" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Souřadnice X pro asistenční okno." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Pozice Y asistenčního okna" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Souřadnice Y pro asistenční okno." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Používat systémová písma" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Používat výchozí písma systému." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Písmo pro text" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Písmo pro text s proměnnou šířkou." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Písmo pro text s pevnou šířkou" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Písmo pro text s pevnou šířkou, například ukázky kódu." @@ -187,159 +195,139 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Zobrazit dokumentaci API pro slovo pod kurzorem" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nové okno" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nové _okno" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Předvolby" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "O _aplikaci DevHelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "U_končit" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Předvolby" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "O aplikaci DevHelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Ukončit" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nová _karta" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Tisk" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Hledat" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "Větší t_ext" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Menší text" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Normální velikost" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Seskupit podle jazyka" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Zapnuto" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Název" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Knihovnička" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "Po_užívat systémová písma" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Pr_oměnná šířka:" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "P_evná šířka:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Písma" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Miloslav Trmač \n" "Lucas Lommer \n" "Marek Černocký " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Prohlížeč nápovědy vývojáře pro GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Webové stránky DevHelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "DevHelp — Asistent" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Kniha:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Jazyk: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Jazyk: neurčen" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Kniha" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Strana" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Klíčové slovo" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Funkce" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Type" @@ -410,11 +398,11 @@ msgstr "Nelze dekomprimovat knihu „%s“: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Aktuální" -#: ../src/dh-sidebar.c:474 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Všechny knihy" @@ -454,46 +442,42 @@ msgid "400%" msgstr "400 %" -#: ../src/dh-window.c:654 -msgid "Back" -msgstr "Zpět" - -#: ../src/dh-window.c:659 -msgid "Forward" -msgstr "Vpřed" - -#: ../src/dh-window.c:919 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Chyba při otevírání požadovaného odkazu." -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Prázdná strana" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Najít:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Hledat předchozí" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Vyhledat předchozí výskyt hledaného řetězce" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Hledat následující" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Vyhledat další výskyt hledaného řetězce" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Rozlišov_at malá a velká písmena" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Přepnout citlivost na velikost písmen" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nová _karta" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Tisk" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Hledat" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Větší t_ext" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Menší text" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Normální velikost" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Zpět" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Vpřed" diff -Nru devhelp-3.8.2/po/da.po devhelp-3.10.2/po/da.po --- devhelp-3.8.2/po/da.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/da.po 2013-09-23 16:26:46.000000000 +0000 @@ -1,10 +1,10 @@ # Danish translation of DevHelp. -# Copyright (C) 2001-2010, 2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # This file is distributed under the same license as the devhelp package. # # Ole Laursen , 2001, 02, 03, 04. # Martin Willemoes Hansen , 2004. -# Ask Hjorth Larsen , 2007, 08, 09, 10, 12. +# Ask Hjorth Larsen , 2007, 08, 09, 10, 12, 13. # # Konventioner # ------------ @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 14:54+0100\n" -"PO-Revision-Date: 2013-03-16 17:44+0100\n" +"POT-Creation-Date: 2013-09-17 18:27+0200\n" +"PO-Revision-Date: 2013-09-16 22:04+0200\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -27,8 +27,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:347 -#: ../src/dh-window.c:647 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" @@ -118,58 +118,66 @@ msgstr "Om bøger skal grupperes efter sprog i brugerfladen" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Om hjælpervinduet skal maksimeres" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Om hjælpervinduet skal maksimeres." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Hjælpervinduets bredde" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Hjælpervinduets bredde." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Højde af hjælpervinduet" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Hjælpervinduets højde." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Hjælpervinduets x-position" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Hjælpervinduets x-position." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Hjælpervinduets y-position" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Hjælpervinduets y-position." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Brug systemskrifttyper" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Brug systemets standard-skrifttyper." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Skrifttype for tekst" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Skrifttype til tekst med variabel bredde." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Skrifttype for tekst med fast bredde" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Skrifttype til tekst med fast bredde, såsom kodeeksempler." @@ -189,79 +197,59 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Vis API-dokumentation for ordet ved markøren" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nyt vindue" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nyt _vindue" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Indstillinger" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Om Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Afslut" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Indstillinger" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Om Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Afslut" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nyt _Faneblad" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Udskriv" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Find" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Større tekst" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Mindre tekst" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Normal størrelse" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Gruppér efter sprog" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Aktiveret" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Titel" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Boghylde" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Brug systemskrifttype" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Variabel bredde: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Fast bredde:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Skifttyper" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Ole Laursen\n" @@ -271,80 +259,80 @@ "Dansk-gruppen \n" "Mere info: http://www.dansk-gruppen.dk" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "En hjælpefremviser for udviklere til GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Hjemmeside for Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Udviklerhjælp" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Bog:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Sprog: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Sprog: udefineret" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Bog" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Side" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Nøgleord" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Funktion" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Makro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Type" @@ -417,93 +405,110 @@ msgstr "Kan ikke udpakke bogen \"%s\": %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Nuværende" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Alle bøger" -#: ../src/dh-window.c:85 +#: ../src/dh-window.c:86 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:87 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:88 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:89 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:90 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:91 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:92 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:93 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:94 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:678 +#: ../src/dh-window.c:864 +msgid "Error opening the requested link." +msgstr "Fejl ved åbning af den forespurgte henvisning." + +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 +msgid "Empty Page" +msgstr "Tom side" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nyt _Faneblad" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Udskriv" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Find" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Større tekst" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Mindre tekst" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Normal størrelse" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Tilbage" -#: ../src/dh-window.c:683 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Fremad" -#: ../src/dh-window.c:952 -msgid "Error opening the requested link." -msgstr "Fejl ved åbning af den forespurgte henvisning." +#~ msgid "Find:" +#~ msgstr "Find:" -#: ../src/dh-window.c:1302 ../src/dh-window.c:1488 -msgid "Empty Page" -msgstr "Tom side" +#~ msgid "Find Previous" +#~ msgstr "Find forrige" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Find forrige træfning af søgestrengen" + +#~ msgid "Find Next" +#~ msgstr "Find næste" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Find næste træfning af søgestrengen" + +#~ msgid "C_ase Sensitive" +#~ msgstr "_Versalfølsom" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Find:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Find forrige" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Find forrige træfning af søgestrengen" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Find næste" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Find næste træfning af søgestrengen" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Versalfølsom" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Slå versalfølsom søgning til/fra" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Slå versalfølsom søgning til/fra" #~ msgid "_Window" #~ msgstr "_Vindue" diff -Nru devhelp-3.8.2/po/de.po devhelp-3.10.2/po/de.po --- devhelp-3.8.2/po/de.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/de.po 2013-10-06 14:48:01.000000000 +0000 @@ -13,24 +13,22 @@ msgid "" msgstr "" "Project-Id-Version: devhelp master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-03-04 08:47+0100\n" -"Last-Translator: Mario Blättermann \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-09-26 12:25+0200\n" +"PO-Revision-Date: 2013-09-26 12:26+0100\n" +"Last-Translator: Christian Kirbach \n" "Language-Team: Deutsch \n" -"Language: \n" +"Language: de_DE\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Poedit-Language: German\n" -"X-Poedit-Country: GERMANY\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.5.4\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:214 ../src/dh-app.c:400 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" @@ -123,58 +121,66 @@ "sollen" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Legt fest, ob das Assistent-Fenster maximiert sein soll" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Legt fest, ob das Assistent-Fenster maximiert sein soll." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Breite des Zusatzfensters" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Die Breite des Zusatzfensters." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Höhe des Zusatzfensters" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Die Höhe des Zusatzfensters." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Horizontale Position des Zusatzfensters" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Die horizontale Position des Zusatzfensters." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Vertikale Position des Zusatzfensters" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Die vertikale Position des Zusatzfensters." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Systemschrift verwenden" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Die vom System vorgegebenen Schriften verwenden." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Textschrift" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Schrift für Text variabler Schriftzeichenbreite." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Schrift für dicktengleichen Text" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Schrift für Text gleicher Schriftzeichenbreite wie z.B. Programmcode." @@ -194,79 +200,23 @@ msgid "Show API Documentation for the word at the cursor" msgstr "API-Dokumentation für das Wort an der Zeigerposition anzeigen" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Neues Fenster" - -#: ../src/devhelp.ui.h:2 -msgid "Preferences" -msgstr "Einstellungen" - -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Info zu Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Beenden" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Neuer _Reiter" - -#: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Drucken" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Suchen" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Größerer Text" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Kleinerer Text" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Normale Größe" - -#: ../src/devhelp.ui.h:11 -msgid "_Group by language" -msgstr "Nach Sprache _gruppieren" - -#: ../src/devhelp.ui.h:12 -msgid "Enabled" -msgstr "Aktiviert" - -#: ../src/devhelp.ui.h:13 -msgid "Title" -msgstr "Titel" - -#: ../src/devhelp.ui.h:14 -msgid "Book Shelf" -msgstr "Büchersammlung" +#: ../src/devhelp-menu.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Neues _Fenster" + +#: ../src/devhelp-menu.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Einstellungen" + +#: ../src/devhelp-menu.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Info zu Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Beenden" -#: ../src/devhelp.ui.h:15 -msgid "_Use system fonts" -msgstr "S_ystemschrift verwenden" - -#: ../src/devhelp.ui.h:16 -msgid "_Variable width: " -msgstr "_Variable Breite: " - -#: ../src/devhelp.ui.h:17 -msgid "_Fixed width:" -msgstr "_Dicktengleichheit:" - -#: ../src/devhelp.ui.h:18 -msgid "Fonts" -msgstr "Schriften" - -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:206 msgid "translator_credits" msgstr "" "Christian Meyer\n" @@ -274,80 +224,80 @@ "Christian Kirbach\n" "Mario Blättermann" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:216 msgid "A developers' help browser for GNOME" msgstr "Ein GNOME-Hilfe-Browser für Entwickler" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:224 msgid "DevHelp Website" msgstr "DevHelp-Webseite" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Assistent" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Buch:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:242 #, c-format msgid "Language: %s" msgstr "Sprache: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:243 msgid "Language: Undefined" msgstr "Sprache: Nicht definiert" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Buch" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Seite" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Schlüsselwort" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Funktion" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Struct (Datenstruktur)" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum (Aufzählung)" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Type (Datentyp)" @@ -396,17 +346,19 @@ #: ../src/dh-parser.c:218 #, c-format msgid "" -"\"name\" and \"link\" elements are required inside on line %d, column %d" -msgstr "" -"»name« sowie »link«-Elemente innerhalb erforderlich in Zeile %d, Spalte " +"\"name\" and \"link\" elements are required inside on line %d, column " "%d" +msgstr "" +"»name« sowie »link«-Elemente innerhalb erforderlich in Zeile %d, " +"Spalte %d" #: ../src/dh-parser.c:298 #, c-format msgid "" "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" -"»name« sowie »link«-Elemente innerhalb »%s« erforderlich - Zeile %d, Spalte %d" +"»name« sowie »link«-Elemente innerhalb »%s« erforderlich - Zeile %d, Spalte " +"%d" #: ../src/dh-parser.c:311 #, c-format @@ -419,94 +371,147 @@ msgid "Cannot uncompress book '%s': %s" msgstr "Buch »%s« konnte nicht entpackt werden: %s" +#: ../src/dh-preferences.ui.h:1 +msgid "Preferences" +msgstr "Einstellungen" + +#: ../src/dh-preferences.ui.h:2 +msgid "_Group by language" +msgstr "Nach Sprache _gruppieren" + +#: ../src/dh-preferences.ui.h:3 +msgid "Enabled" +msgstr "Aktiviert" + +#: ../src/dh-preferences.ui.h:4 +msgid "Title" +msgstr "Titel" + +#: ../src/dh-preferences.ui.h:5 +msgid "Book Shelf" +msgstr "Büchersammlung" + +#: ../src/dh-preferences.ui.h:6 +msgid "_Use system fonts" +msgstr "S_ystemschrift verwenden" + +#: ../src/dh-preferences.ui.h:7 +msgid "_Variable width: " +msgstr "_Variable Breite: " + +#: ../src/dh-preferences.ui.h:8 +msgid "_Fixed width:" +msgstr "_Dicktengleichheit:" + +#: ../src/dh-preferences.ui.h:9 +msgid "Fonts" +msgstr "Schriften" + #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Aktuell" -#: ../src/dh-sidebar.c:474 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Alle Bücher" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:86 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:87 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:88 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:89 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:90 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:91 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:92 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:94 +#: ../src/dh-window.c:93 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:95 +#: ../src/dh-window.c:94 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 +#: ../src/dh-window.c:864 +msgid "Error opening the requested link." +msgstr "Fehler beim Öffnen des angeforderten Verweises." + +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 +msgid "Empty Page" +msgstr "Leere Seite" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Neuer _Reiter" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Drucken" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Suchen" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Größerer Text" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Kleinerer Text" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Normale Größe" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Zurück" -#: ../src/dh-window.c:659 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Vor" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "Fehler beim Öffnen des angeforderten Verweises." +#~ msgid "Find:" +#~ msgstr "Suchen:" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "Leere Seite" +#~ msgid "Find Previous" +#~ msgstr "Rückwärts suchen" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Vorheriges Ergebnis der Suche anzeigen" + +#~ msgid "Find Next" +#~ msgstr "Weitersuchen" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Nächstes Ergebnis der Suche anzeigen" + +#~ msgid "C_ase Sensitive" +#~ msgstr "Groß-/Kleinschreibung _berücksichtigen" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Suchen:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Rückwärts suchen" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Vorheriges Ergebnis der Suche anzeigen" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Weitersuchen" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Nächstes Ergebnis der Suche anzeigen" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Groß-/Kleinschreibung _berücksichtigen" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Groß-/Kleinschreibung bei Suche berücksichtigen" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Groß-/Kleinschreibung bei Suche berücksichtigen" #~ msgid "_Window" #~ msgstr "_Fenster" diff -Nru devhelp-3.8.2/po/el.po devhelp-3.10.2/po/el.po --- devhelp-3.8.2/po/el.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/el.po 2013-11-11 08:33:00.000000000 +0000 @@ -8,29 +8,31 @@ # Athanasios Lefteris , 2007, 2009. # Michael Kotsarinis , 2011. # Dimitris Spingos (Δημήτρης Σπίγγος) , 2012, 2013. +# Efstathios Iosifidis , 2013. +# msgid "" msgstr "" "Project-Id-Version: devhelp.HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhel" -"p&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-06 10:10+0000\n" -"PO-Revision-Date: 2013-03-09 09:31+0300\n" -"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" -"Language-Team: team@gnome.gr\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=devhelp&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-10-13 20:29+0000\n" +"PO-Revision-Date: 2013-10-23 12:23+0300\n" +"Last-Translator: Efstathios Iosifidis \n" +"Language-Team: Greek, Modern (1453-) \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" +"X-Generator: Gtranslator 2.91.6\n" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" "X-Project-Style: gnome\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:345 -#: ../src/dh-window.c:633 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:214 ../src/dh-app.c:400 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" @@ -120,58 +122,66 @@ "Αν τα βιβλία θα πρέπει να ομαδοποιούνται κατά γλώσσα στη διεπαφή χρήστη" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Εάν το βοηθητικό παράθυρο θα πρέπει να εμφανίζεται μεγιστοποιημένο" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Εάν το βοηθητικό παράθυρο θα πρέπει να εμφανίζεται μεγιστοποιημένο." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Πλάτος του βοηθητικού παραθύρου" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Το πλάτος κύριου βοηθητικού παραθύρου." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Ύψος βοηθητικού παραθύρου" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Το ύψος του βοηθητικού παραθύρου." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Θέση Χ του βοηθητικού παραθύρου" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Η θέση Χ του βοηθητικού παραθύρου." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Θέση Y του βοηθητικού παραθύρου" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Η θέση Y του βοηθητικού παραθύρου." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Χρήση γραμματοσειρών συστήματος" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Χρήση προεπιλεγμένων γραμματοσειρών συστήματος." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Γραμματοσειρά κειμένου" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Γραμματοσειρά κειμένου μεταβλητού πλάτους." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Γραμματοσειρά για κείμενο σταθερού πλάτους" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Γραμματοσειρά κειμένου με σταθερό πλάτος, όπως τα παραδείγματα κώδικα." @@ -193,79 +203,23 @@ "Εμφάνιση τεκμηρίωσης API -Διεπαφής προγραμματισμού εφαρμογών- για τη λέξη " "στην οποία βρίσκεται ο δρομέας" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Νέο παράθυρο" - -#: ../src/devhelp.ui.h:2 -msgid "Preferences" -msgstr "Προτιμήσεις" - -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Περί DevHelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Έξοδος" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Νέα καρ_τέλα" - -#: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "Ε_κτύπωση" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Εύρεση" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Μεγαλύτερο κείμενο" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Μικ_ρότερο κείμενο" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Κανονικό μέγεθος" - -#: ../src/devhelp.ui.h:11 -msgid "_Group by language" -msgstr "Ο_μαδοποίηση κατά γλώσσα" - -#: ../src/devhelp.ui.h:12 -msgid "Enabled" -msgstr "Ενεργοποιημένο" - -#: ../src/devhelp.ui.h:13 -msgid "Title" -msgstr "Τίτλος" - -#: ../src/devhelp.ui.h:14 -msgid "Book Shelf" -msgstr "Ράφι βιβλίων" - -#: ../src/devhelp.ui.h:15 -msgid "_Use system fonts" -msgstr "_Χρήση γραμματοσειρών συστήματος" - -#: ../src/devhelp.ui.h:16 -msgid "_Variable width: " -msgstr "_Μεταβλητό πλάτος: " - -#: ../src/devhelp.ui.h:17 -msgid "_Fixed width:" -msgstr "_Σταθερό πλάτος:" - -#: ../src/devhelp.ui.h:18 -msgid "Fonts" -msgstr "Γραμματοσειρές" +#: ../src/devhelp-menu.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Νέο παρά_θυρο" + +#: ../src/devhelp-menu.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Προτιμήσεις" + +#: ../src/devhelp-menu.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "Πε_ρί DevHelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Τερματισμός" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:206 msgid "translator_credits" msgstr "" "Δημήτρης Σπίγγος \n" @@ -273,82 +227,83 @@ "Stylianos Papanastasiou \n" "George Fragos \n" "Τζένη Πετούμενου \n" -"Michael Kotsarinis " +"Michael Kotsarinis \n" +"Ευστάθιος Ιωσηφίδης " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:216 msgid "A developers' help browser for GNOME" msgstr "Περιηγητής βοήθειας για τους προγραμματιστές του GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:224 msgid "DevHelp Website" msgstr "Ιστοσελίδα DevHelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Βοηθός — Devhelp" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Βιβλίο:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:242 #, c-format msgid "Language: %s" msgstr "Γλώσσα: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:243 msgid "Language: Undefined" msgstr "Γλώσσα: Δεν ορίσθηκε" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Βιβλίο" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Σελίδα" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Λέξη κλειδί" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Λειτουργία" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Δομή" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Μάκρο" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Απαρίθμηση" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Τύπος" @@ -409,26 +364,62 @@ msgid "" "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" -"\"name\" και \"link\" στοιχείων απαιτούνται εντός του '%s' στη γραμμή %d, στήλη " -"%d" +"\"name\" και \"link\" στοιχείων απαιτούνται εντός του '%s' στη γραμμή %d, " +"στήλη %d" #: ../src/dh-parser.c:311 #, c-format msgid "\"type\" element is required inside on line %d, column %d" -msgstr "\"type\" στοιχείο απαιττείται εντός του στη γραμμή %d, στήλη %d" +msgstr "" +"\"type\" στοιχείο απαιττείται εντός του στη γραμμή %d, στήλη %d" #: ../src/dh-parser.c:514 #, c-format msgid "Cannot uncompress book '%s': %s" msgstr "Αδυναμία αποσυμπίεσης βιβλίου '%s': %s" +#: ../src/dh-preferences.ui.h:1 +msgid "Preferences" +msgstr "Προτιμήσεις" + +#: ../src/dh-preferences.ui.h:2 +msgid "_Group by language" +msgstr "Ο_μαδοποίηση κατά γλώσσα" + +#: ../src/dh-preferences.ui.h:3 +msgid "Enabled" +msgstr "Ενεργοποιημένο" + +#: ../src/dh-preferences.ui.h:4 +msgid "Title" +msgstr "Τίτλος" + +#: ../src/dh-preferences.ui.h:5 +msgid "Book Shelf" +msgstr "Ράφι βιβλίων" + +#: ../src/dh-preferences.ui.h:6 +msgid "_Use system fonts" +msgstr "_Χρήση γραμματοσειρών συστήματος" + +#: ../src/dh-preferences.ui.h:7 +msgid "_Variable width: " +msgstr "_Μεταβλητό πλάτος: " + +#: ../src/dh-preferences.ui.h:8 +msgid "_Fixed width:" +msgstr "_Σταθερό πλάτος:" + +#: ../src/dh-preferences.ui.h:9 +msgid "Fonts" +msgstr "Γραμματοσειρές" + #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Τρέχον" -#: ../src/dh-sidebar.c:481 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Όλα τα βιβλία" @@ -468,51 +459,66 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:664 -#| msgid "_Back" +#: ../src/dh-window.c:864 +msgid "Error opening the requested link." +msgstr "Σφάλμα στο άνοιγμα της επιλεγμένης σύνδεσης." + +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 +msgid "Empty Page" +msgstr "Κενή Σελίδα" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Νέα καρ_τέλα" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "Ε_κτύπωση" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Εύρεση" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Με_γαλύτερο κείμενο" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Μι_κρότερο κείμενο" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Κανονικό μέγεθος" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Πίσω" -#: ../src/dh-window.c:669 -#| msgid "_Forward" +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Μπροστά" -#: ../src/dh-window.c:936 -msgid "Error opening the requested link." -msgstr "Σφάλμα στο άνοιγμα της επιλεγμένης σύνδεσης." +#~ msgid "Find:" +#~ msgstr "Εύρεση:" -#: ../src/dh-window.c:1286 ../src/dh-window.c:1472 -msgid "Empty Page" -msgstr "Κενή Σελίδα" +#~ msgid "Find Previous" +#~ msgstr "Εύρεση προηγούμενου" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Εύρεση προηγούμενης εμφάνισης του ζητούμενου αλφαριθμητικού" + +#~ msgid "Find Next" +#~ msgstr "Εύρεση επόμενου" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Εύρεση επόμενης εμφάνισης του ζητούμενου αλφαριθμητικού" + +#~ msgid "C_ase Sensitive" +#~ msgstr "Δ_ιάκριση πεζών/κεφαλαίων" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Εύρεση:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Εύρεση προηγούμενου" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Εύρεση προηγούμενης εμφάνισης του ζητούμενου αλφαριθμητικού" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Εύρεση επόμενου" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Εύρεση επόμενης εμφάνισης του ζητούμενου αλφαριθμητικού" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Δ_ιάκριση πεζών/κεφαλαίων" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Εναλλαγή διάκρισης πεζών/κεφαλαίων κατά την αναζήτηση" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Εναλλαγή διάκρισης πεζών/κεφαλαίων κατά την αναζήτηση" #~ msgid "_Window" #~ msgstr "Πα_ράθυρο" diff -Nru devhelp-3.8.2/po/es.po devhelp-3.10.2/po/es.po --- devhelp-3.8.2/po/es.po 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/po/es.po 2013-11-11 08:32:55.000000000 +0000 @@ -11,21 +11,21 @@ "Project-Id-Version: devhelp.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-02-04 17:44+0100\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-08-27 19:32+0200\n" "Last-Translator: Daniel Mustieles \n" -"Language-Team: Español \n" +"Language-Team: Español; Castellano \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Gtranslator 2.91.5\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "DevHelp" @@ -109,65 +109,75 @@ #: ../data/org.gnome.devhelp.gschema.xml.h:17 msgid "Group by language" -msgstr "Agrupar por idioma" +msgstr "Agrupar por lenguaje" #: ../data/org.gnome.devhelp.gschema.xml.h:18 msgid "Whether books should be grouped by language in the UI" -msgstr "Indica si se deben agrupar por idioma los libros en la IU" +msgstr "Indica si se deben agrupar por lenguaje los libros en la IU" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the assistant window should be maximixed" +msgid "Whether the assistant window should be maximized" +msgstr "Indica si la ventana del asistente debe estar maximizada" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the assistant window should be maximixed." +msgid "Whether the assistant window should be maximized." +msgstr "Indica si la ventana del asistente debe estar maximizada." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Anchura de la ventana del asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "La anchura de la ventana del asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Altura de la ventana del asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "La altura de la ventana del asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Posición X de la ventana del asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "La posición X de la ventana del asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Posición Y de la ventana del asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "La posición Y de la ventana del asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" -msgstr "Usar tipografía del sistema" +msgstr "Usar la tipografía del sistema" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Usar la tipografía predeterminada del sistema." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Tipografía para el texto" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Tipografía para el texto con ancho variable." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Tipografía para el texto de anchura fija" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Tipografía para el texto con anchura fija, tal como los ejemplos de código." @@ -188,158 +198,138 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Muestra la documentación de la API para la palabra bajo el cursor" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Ventana nueva" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "_Ventana nueva" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "Prefere_ncias" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Acerca de DevHelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Salir" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Preferencias" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Acerca de DevHelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Salir" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "_Pestaña nueva" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Imprimir" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Buscar" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "Texto más gran_de" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Texto _más pequeño" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "Tamaño _normal" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" -msgstr "_Agrupar por idioma" +msgstr "_Agrupar por lenguaje" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Activada" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Título" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Biblioteca" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Usar tipografía del sistema" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Anchura _variable: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "Anchura _fija:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Tipografías" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Jorge González , 2007-2009\n" "Francisco Javier F. Serrador , 2003, 2004, 2006" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Un visor de ayuda para desarrolladores de GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Página web de DevHelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Asistente" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Libro:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" -msgstr "Idioma: %s" +msgstr "lenguaje: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" -msgstr "Idioma: indefinido" +msgstr "Lenguaje: indefinido" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Libro" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Página" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Palabra clave" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Función" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Estructura" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enumerar" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Tipo" @@ -389,19 +379,19 @@ #: ../src/dh-parser.c:218 #, c-format msgid "" -"\"name\" and \"link\" elements are required inside on line %d, column %" -"d" +"\"name\" and \"link\" elements are required inside on line %d, column " +"%d" msgstr "" -"son necesarios los elementos «nombre» y «enlace» dentro de en la línea %" -"d, columna %d" +"son necesarios los elementos «nombre» y «enlace» dentro de en la línea " +"%d, columna %d" #: ../src/dh-parser.c:298 #, c-format msgid "" "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" -"son necesarios los elementos «nombre» y «enlace» dentro de «%s» en la línea %d, " -"columna %d" +"son necesarios los elementos «nombre» y «enlace» dentro de «%s» en la línea " +"%d, columna %d" #: ../src/dh-parser.c:311 #, c-format @@ -416,12 +406,11 @@ msgstr "No se pudo descomprimir el libro «%s»: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Actual" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Todos los libros" @@ -461,51 +450,66 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -#| msgid "_Back" +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "Error al abrir el enlace solicitado." + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "Página vacía" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "_Pestaña nueva" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Imprimir" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Buscar" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Texto más _grande" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Texto más _pequeño" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Tamaño _normal" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Atrás" -#: ../src/dh-window.c:659 -#| msgid "_Forward" +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Adelante" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "Error al abrir el enlace solicitado." +#~ msgid "Find:" +#~ msgstr "Buscar:" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "Página vacía" +#~ msgid "Find Previous" +#~ msgstr "Buscar anterior" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Buscar la coincidencia anterior de la cadena buscada" + +#~ msgid "Find Next" +#~ msgstr "Buscar siguiente" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Buscar la siguiente coincidencia de la cadena buscada" + +#~ msgid "C_ase Sensitive" +#~ msgstr "Coincidir con c_apitalización" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Buscar:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Buscar anterior" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Buscar la coincidencia anterior de la cadena buscada" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Buscar siguiente" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Buscar la siguiente coincidencia de la cadena buscada" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Coincidir con c_apitalización" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Conmutar búsqueda discriminando capitalización" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Conmutar búsqueda discriminando capitalización" #~ msgid "_Window" #~ msgstr "_Ventana" @@ -607,8 +611,8 @@ #~ msgstr "_Mostrar las opciones de búsqueda avanzadas" #~ msgid "" -#~ "name and link elements are required inside on line %d, column %" -#~ "d" +#~ "name and link elements are required inside on line %d, column " +#~ "%d" #~ msgstr "" #~ "los elementos nombre y enlace se requieren dentro de en la " #~ "línea %d, columna %d" diff -Nru devhelp-3.8.2/po/eu.po devhelp-3.10.2/po/eu.po --- devhelp-3.8.2/po/eu.po 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/po/eu.po 2013-05-15 11:10:50.000000000 +0000 @@ -2,195 +2,170 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Iñaki Larrañaga Murgoitio , 2011. +# Iñaki Larrañaga Murgoitio , 2011, 2013. msgid "" msgstr "" "Project-Id-Version: devhelp_eu\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-03-27 21:12+0000\n" -"PO-Revision-Date: 2011-03-29 15:37+0200\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-03-26 09:25+0100\n" +"PO-Revision-Date: 2013-03-24 13:16+0100\n" +"Last-Translator: Iñaki Larrañaga Murgoitio \n" "Language-Team: Basque \n" +"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n\n" -"\n" -"\n" - -#: ../data/devhelp.desktop.in.in.h:1 -msgid "Developer's Help program" -msgstr "Garatzaileen Laguntza-programa" +"X-Generator: Lokalize 1.4\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:2 ../src/dh-main.c:281 -#: ../src/dh-window.c:741 ../src/dh-window.c:1049 ../src/dh-window.c:1884 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:347 +#: ../src/dh-window.c:647 msgid "Devhelp" msgstr "Devhelp" +#: ../data/devhelp.desktop.in.in.h:2 +msgid "Developer's Help program" +msgstr "Garatzaileen Laguntza-programa" + #: ../data/devhelp.desktop.in.in.h:3 msgid "Documentation Browser" msgstr "Dokumentazio-arakatzailea" -#: ../data/devhelp.schemas.in.h:1 -msgid "Books disabled" -msgstr "Liburuak desgaituta" +#: ../data/devhelp.desktop.in.in.h:4 +msgid "documentation;information;manual;developer;api;" +msgstr "dokumentazioa;informazioa;eskuliburua;garatzailea;APIa;" -#: ../data/devhelp.schemas.in.h:2 -msgid "Font for fixed width text" -msgstr "Zabalera finkoko testuaren letra-tipoa" - -#: ../data/devhelp.schemas.in.h:3 -msgid "Font for text" -msgstr "Testuaren letra-tipoa" - -#: ../data/devhelp.schemas.in.h:4 -msgid "Font for text with fixed width, such as code examples." -msgstr "" -"Zabalera finkoko testuaren letra-tipoa, kode-adibideen testuarena, esate " -"baterako." +#: ../data/org.gnome.devhelp.gschema.xml.h:1 +msgid "Main window maximized state" +msgstr "Maximizatutako leiho nagusiaren egoera" -#: ../data/devhelp.schemas.in.h:5 -msgid "Font for text with variable width." -msgstr "Zabalera aldakorreko testuaren letra-tipoa." +#: ../data/org.gnome.devhelp.gschema.xml.h:2 +msgid "Whether the main window should start maximized." +msgstr "Leiho nagusia maximizatuta ireki behar den ala ez adierazten du." -#: ../data/devhelp.schemas.in.h:6 -msgid "Group by language" -msgstr "Elkartu hizkuntzaren arabera" +#: ../data/org.gnome.devhelp.gschema.xml.h:3 +msgid "Width of the main window" +msgstr "Leiho nagusiaren zabalera" -#: ../data/devhelp.schemas.in.h:7 -msgid "Height of assistant window" -msgstr "Leiho laguntzailearen altuera" +#: ../data/org.gnome.devhelp.gschema.xml.h:4 +msgid "The width of the main window." +msgstr "Leiho nagusiaren zabalera." -#: ../data/devhelp.schemas.in.h:8 +#: ../data/org.gnome.devhelp.gschema.xml.h:5 msgid "Height of main window" msgstr "Leiho nagusiaren altuera" -#: ../data/devhelp.schemas.in.h:9 -msgid "List of books disabled by the user." -msgstr "Erabiltzaileak desgaitutako liburuen zerrenda." - -#: ../data/devhelp.schemas.in.h:10 -msgid "Main window maximized state" -msgstr "Maximizatutako leiho nagusiaren egoera" - -#: ../data/devhelp.schemas.in.h:11 -msgid "Selected tab: \"content\" or \"search\"" -msgstr "Hautatutako fitxa: \"edukia\" edo \"bilatu\"" +#: ../data/org.gnome.devhelp.gschema.xml.h:6 +msgid "The height of the main window." +msgstr "Leiho nagusiaren altuera." -#: ../data/devhelp.schemas.in.h:12 -msgid "The X position of the assistant window." -msgstr "Leiho laguntzailearen X posizioa." +#: ../data/org.gnome.devhelp.gschema.xml.h:7 +msgid "X position of main window" +msgstr "Leiho nagusiaren X posizioa" -#: ../data/devhelp.schemas.in.h:13 +#: ../data/org.gnome.devhelp.gschema.xml.h:8 msgid "The X position of the main window." msgstr "Leiho nagusiaren X posizioa." -#: ../data/devhelp.schemas.in.h:14 -msgid "The Y position of the assistant window." -msgstr "Leiho laguntzailearen Y posizioa." +#: ../data/org.gnome.devhelp.gschema.xml.h:9 +msgid "Y position of main window" +msgstr "Leiho nagusiaren Y posizioa" -#: ../data/devhelp.schemas.in.h:15 +#: ../data/org.gnome.devhelp.gschema.xml.h:10 msgid "The Y position of the main window." msgstr "Leiho nagusiaren Y posizioa." -#: ../data/devhelp.schemas.in.h:16 -msgid "The height of the assistant window." -msgstr "Leiho laguntzailearen altuera." - -#: ../data/devhelp.schemas.in.h:17 -msgid "The height of the main window." -msgstr "Leiho nagusiaren altuera." - -#: ../data/devhelp.schemas.in.h:18 -msgid "The width of the assistant window." -msgstr "Leiho laguntzailearen zabalera." +#: ../data/org.gnome.devhelp.gschema.xml.h:11 +msgid "Width of the index and search pane" +msgstr "Indexazio- eta bilaketa-panelaren zabalera" -#: ../data/devhelp.schemas.in.h:19 +#: ../data/org.gnome.devhelp.gschema.xml.h:12 msgid "The width of the index and search pane." msgstr "Indexazio- eta bilaketa-panelaren zabalera." -#: ../data/devhelp.schemas.in.h:20 -msgid "The width of the main window." -msgstr "Leiho nagusiaren zabalera." +#: ../data/org.gnome.devhelp.gschema.xml.h:13 +msgid "Selected tab: \"content\" or \"search\"" +msgstr "Hautatutako fitxa: \"edukia\" edo \"bilatu\"" -#: ../data/devhelp.schemas.in.h:21 -msgid "Use system fonts" -msgstr "Erabili sistemako letra-tipoak" +#: ../data/org.gnome.devhelp.gschema.xml.h:14 +msgid "Which of the tabs is selected: \"content\" or \"search\"." +msgstr "Fitxetako zein dagoen hautatuta: \"content\" edo \"search\"." -#: ../data/devhelp.schemas.in.h:22 -msgid "Use the system default fonts." -msgstr "Erabili sistemaren letra-tipo lehenetsiak." +#: ../data/org.gnome.devhelp.gschema.xml.h:15 +msgid "Books disabled" +msgstr "Liburuak desgaituta" -#: ../data/devhelp.schemas.in.h:23 -msgid "Whether books should be grouped by language in the UI" -msgstr "Liburuak hizkuntzaren arabera elkartu behar diren interfazean edo ez" +#: ../data/org.gnome.devhelp.gschema.xml.h:16 +msgid "List of books disabled by the user." +msgstr "Erabiltzaileak desgaitutako liburuen zerrenda." -#: ../data/devhelp.schemas.in.h:24 -msgid "Whether the main window should start maximized." -msgstr "Leiho nagusia maximizatuta ireki behar den ala ez adierazten du." +#: ../data/org.gnome.devhelp.gschema.xml.h:17 +msgid "Group by language" +msgstr "Elkartu hizkuntzaren arabera" -#: ../data/devhelp.schemas.in.h:25 -msgid "Which of the tabs is selected: \"content\" or \"search\"." -msgstr "Fitxetako zein dagoen hautatuta: \"content\" edo \"search\"." +#: ../data/org.gnome.devhelp.gschema.xml.h:18 +msgid "Whether books should be grouped by language in the UI" +msgstr "Liburuak hizkuntzaren arabera elkartu behar diren interfazean edo ez" -#: ../data/devhelp.schemas.in.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:19 msgid "Width of the assistant window" msgstr "Leiho laguntzailearen zabalera" -#: ../data/devhelp.schemas.in.h:27 -msgid "Width of the index and search pane" -msgstr "Indexazio- eta bilaketa-panelaren zabalera" +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "The width of the assistant window." +msgstr "Leiho laguntzailearen zabalera." -#: ../data/devhelp.schemas.in.h:28 -msgid "Width of the main window" -msgstr "Leiho nagusiaren zabalera" +#: ../data/org.gnome.devhelp.gschema.xml.h:21 +msgid "Height of assistant window" +msgstr "Leiho laguntzailearen altuera" + +#: ../data/org.gnome.devhelp.gschema.xml.h:22 +msgid "The height of the assistant window." +msgstr "Leiho laguntzailearen altuera." -#: ../data/devhelp.schemas.in.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "X position of assistant window" msgstr "Leiho laguntzailearen X posizioa" -#: ../data/devhelp.schemas.in.h:30 -msgid "X position of main window" -msgstr "Leiho nagusiaren X posizioa" +#: ../data/org.gnome.devhelp.gschema.xml.h:24 +msgid "The X position of the assistant window." +msgstr "Leiho laguntzailearen X posizioa." -#: ../data/devhelp.schemas.in.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "Y position of assistant window" msgstr "Leiho laguntzailearen Y posizioa" -#: ../data/devhelp.schemas.in.h:32 -msgid "Y position of main window" -msgstr "Leiho nagusiaren Y posizioa" - -#: ../data/ui/devhelp.builder.h:1 -msgid "Book Shelf" -msgstr "Liburutegia" +#: ../data/org.gnome.devhelp.gschema.xml.h:26 +msgid "The Y position of the assistant window." +msgstr "Leiho laguntzailearen Y posizioa." -#: ../data/ui/devhelp.builder.h:2 -msgid "Fonts" -msgstr "Letra-tipoak" +#: ../data/org.gnome.devhelp.gschema.xml.h:27 +msgid "Use system fonts" +msgstr "Erabili sistemako letra-tipoak" -#: ../data/ui/devhelp.builder.h:3 -msgid "Preferences" -msgstr "Hobespenak" +#: ../data/org.gnome.devhelp.gschema.xml.h:28 +msgid "Use the system default fonts." +msgstr "Erabili sistemaren letra-tipo lehenetsiak." -#: ../data/ui/devhelp.builder.h:4 -msgid "_Fixed width:" -msgstr "Zabalera _finkatua:" +#: ../data/org.gnome.devhelp.gschema.xml.h:29 +msgid "Font for text" +msgstr "Testuaren letra-tipoa" -#: ../data/ui/devhelp.builder.h:5 -msgid "_Group by language" -msgstr "_Elkartu hizkuntzaren arabera" +#: ../data/org.gnome.devhelp.gschema.xml.h:30 +msgid "Font for text with variable width." +msgstr "Zabalera aldakorreko testuaren letra-tipoa." -#: ../data/ui/devhelp.builder.h:6 -msgid "_Use system fonts" -msgstr "_Erabili sistemako letra-tipoak" +#: ../data/org.gnome.devhelp.gschema.xml.h:31 +msgid "Font for fixed width text" +msgstr "Zabalera finkoko testuaren letra-tipoa" -#: ../data/ui/devhelp.builder.h:7 -msgid "_Variable width: " -msgstr "Zabalera _aldakorra: " +#: ../data/org.gnome.devhelp.gschema.xml.h:32 +msgid "Font for text with fixed width, such as code examples." +msgstr "" +"Zabalera finkoko testuaren letra-tipoa, kode-adibideen testuarena, esate " +"baterako." #: ../misc/gedit-plugin/devhelp.desktop.in.h:1 msgid "Devhelp support" @@ -208,21 +183,105 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Erakutsi API dokumentazioa kurtsorea dagoen hitzerako" +#: ../src/devhelp.ui.h:1 +msgid "New window" +msgstr "Leiho berria" + +#: ../src/devhelp.ui.h:2 +msgid "Preferences" +msgstr "Hobespenak" + +#: ../src/devhelp.ui.h:3 +msgid "About Devhelp" +msgstr "Devhelp-i buruz" + +#: ../src/devhelp.ui.h:4 +msgid "Quit" +msgstr "Irten" + +#: ../src/devhelp.ui.h:5 +msgid "New _Tab" +msgstr "_Fitxa berria" + +#: ../src/devhelp.ui.h:6 +msgid "_Print" +msgstr "_Inprimatu" + +#: ../src/devhelp.ui.h:7 +msgid "_Find" +msgstr "_Bilatu" + +#: ../src/devhelp.ui.h:8 +msgid "_Larger text" +msgstr "Testu _handiagoa" + +#: ../src/devhelp.ui.h:9 +msgid "S_maller text" +msgstr "Testu _txikiagoa" + +#: ../src/devhelp.ui.h:10 +msgid "_Normal size" +msgstr "Tamaina _normala" + +#: ../src/devhelp.ui.h:11 +msgid "_Group by language" +msgstr "_Elkartu hizkuntzaren arabera" + +#: ../src/devhelp.ui.h:12 +msgid "Enabled" +msgstr "Gaituta" + +#: ../src/devhelp.ui.h:13 +msgid "Title" +msgstr "Titulua" + +#: ../src/devhelp.ui.h:14 +msgid "Book Shelf" +msgstr "Liburutegia" + +#: ../src/devhelp.ui.h:15 +msgid "_Use system fonts" +msgstr "_Erabili sistemako letra-tipoak" + +#: ../src/devhelp.ui.h:16 +msgid "_Variable width: " +msgstr "Zabalera _aldakorra: " + +#: ../src/devhelp.ui.h:17 +msgid "_Fixed width:" +msgstr "Zabalera _finkatua:" + +#: ../src/devhelp.ui.h:18 +msgid "Fonts" +msgstr "Letra-tipoak" + +#: ../src/dh-app.c:157 +msgid "translator_credits" +msgstr "Hizkuntza Politikarako Sailburuordetza" + +#: ../src/dh-app.c:164 +msgid "A developers' help browser for GNOME" +msgstr "GNOMErako garatzaileen laguntza-arakatzailea" + +#: ../src/dh-app.c:172 +msgid "DevHelp Website" +msgstr "Devhelp-en webgunea" + #. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:74 +#: ../src/dh-assistant.c:121 msgid "Devhelp — Assistant" msgstr "Devhelp — Laguntzailea" -#: ../src/dh-assistant-view.c:336 +#: ../src/dh-assistant-view.c:403 msgid "Book:" msgstr "Liburua:" -#: ../src/dh-book.c:252 +#: ../src/dh-book.c:255 #, c-format msgid "Language: %s" msgstr "Hizkuntza: %s" -#: ../src/dh-book.c:253 +#: ../src/dh-book.c:256 msgid "Language: Undefined" msgstr "Hizkuntza: definitu gabea" @@ -277,31 +336,35 @@ msgid "Type" msgstr "Mota" -#: ../src/dh-main.c:47 +#: ../src/dh-main.c:43 +msgid "Opens a new Devhelp window" +msgstr "Devhelp-en leiho berria irekitzen du" + +#: ../src/dh-main.c:48 msgid "Search for a keyword" msgstr "Gako-hitz bat bilatzen du" -#: ../src/dh-main.c:52 -msgid "Quit any running Devhelp" -msgstr "Irten exekutatzen ari diren Devhelp guztiak" +#: ../src/dh-main.c:49 ../src/dh-main.c:54 +msgid "KEYWORD" +msgstr "GAKO-HITZA" + +#: ../src/dh-main.c:53 +msgid "Search and display any hit in the assistant window" +msgstr "Bilatu eta erakutsi leiho laguntzaileko atzipen guztiak" -#: ../src/dh-main.c:57 +#: ../src/dh-main.c:58 msgid "Display the version and exit" msgstr "Bistaratu bertsioa eta irten" -#: ../src/dh-main.c:62 -msgid "Focus the Devhelp window with the search field active" -msgstr "Devhelp leihoa fokuratzen du bilaketa-eremu aktiboarekin" - -#: ../src/dh-main.c:67 -msgid "Search and display any hit in the assistant window" -msgstr "Bilatu eta erakutsi leiho laguntzaileko atzipen guztiak" +#: ../src/dh-main.c:63 +msgid "Quit any running Devhelp" +msgstr "Irten exekutatzen ari diren Devhelp guztiak" #: ../src/dh-parser.c:97 ../src/dh-parser.c:199 ../src/dh-parser.c:263 #: ../src/dh-parser.c:273 #, c-format msgid "Expected '%s', got '%s' at line %d, column %d" -msgstr "'%s' espero z(ir)en, '%s' jaso d(ir)a %d lerroan, %d zutabean" +msgstr "'%s' espero zen, '%s' jaso da %d lerroan, %d zutabean" #: ../src/dh-parser.c:114 #, c-format @@ -310,7 +373,8 @@ #: ../src/dh-parser.c:143 #, c-format -msgid "\"title\", \"name\" and \"link\" elements are required at line %d, column %d" +msgid "" +"\"title\", \"name\" and \"link\" elements are required at line %d, column %d" msgstr "" "\"title\", \"name\" eta \"link\" elementuak behar dira %d lerroan, %d " "zutabean" @@ -318,15 +382,16 @@ #: ../src/dh-parser.c:218 #, c-format msgid "" -"\"name\" and \"link\" elements are required inside on line %d, column %" -"d" +"\"name\" and \"link\" elements are required inside on line %d, column " +"%d" msgstr "" "\"name\" eta \"link\" elementuak behar dira barruan %d lerroan, %d " "zutabean" #: ../src/dh-parser.c:298 #, c-format -msgid "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" +msgid "" +"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" "\"name\" eta \"link\" elementuak behar dira '%s' barruan %d lerroan, %d " "zutabean" @@ -341,186 +406,64 @@ msgid "Cannot uncompress book '%s': %s" msgstr "Ezin da deskonprimatu '%s' liburua: %s" -#: ../src/dh-search.c:500 -msgid "All books" -msgstr "Liburu guztiak" +#. Setup the Current/All Files selector +#: ../src/dh-sidebar.c:478 +msgid "Current" +msgstr "Unekoa" -#: ../src/dh-search.c:1118 -msgid "Search in:" -msgstr "Bilatu hemen:" +#: ../src/dh-sidebar.c:481 +msgid "All Books" +msgstr "Liburu guztiak" -#: ../src/dh-window.c:99 +#: ../src/dh-window.c:85 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:100 +#: ../src/dh-window.c:86 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:101 +#: ../src/dh-window.c:87 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:102 +#: ../src/dh-window.c:88 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:103 +#: ../src/dh-window.c:89 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:104 +#: ../src/dh-window.c:90 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:105 +#: ../src/dh-window.c:91 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:106 +#: ../src/dh-window.c:92 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:107 +#: ../src/dh-window.c:93 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:736 -msgid "translator_credits" -msgstr "Hizkuntza Politikarako Sailburuordetza" - -#: ../src/dh-window.c:743 -msgid "A developers' help browser for GNOME" -msgstr "GNOMErako garatzaileen laguntza-arakatzailea" - -#: ../src/dh-window.c:750 -msgid "DevHelp Website" -msgstr "Devhelp-en webgunea" - -#: ../src/dh-window.c:774 -msgid "_File" -msgstr "_Fitxategia" - -#: ../src/dh-window.c:775 -msgid "_Edit" -msgstr "_Editatu" - -#: ../src/dh-window.c:776 -msgid "_View" -msgstr "_Ikuspegia" - -#: ../src/dh-window.c:777 -msgid "_Go" -msgstr "_Joan" - -#: ../src/dh-window.c:778 -msgid "_Help" -msgstr "_Laguntza" - -#. File menu -#: ../src/dh-window.c:781 -msgid "_New Window" -msgstr "_Leiho berria" - -#: ../src/dh-window.c:783 -msgid "New _Tab" -msgstr "_Fitxa berria" - -#: ../src/dh-window.c:785 -msgid "_Print…" -msgstr "_Inprimatu..." +#: ../src/dh-window.c:678 +msgid "Back" +msgstr "Atzera" + +#: ../src/dh-window.c:683 +msgid "Forward" +msgstr "Aurrera" -#: ../src/dh-window.c:797 ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Bilatu hurrengoa" - -#: ../src/dh-window.c:799 ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Bilatu aurrekoa" - -#: ../src/dh-window.c:806 -msgid "Go to the previous page" -msgstr "Joan aurreko orrira" - -#: ../src/dh-window.c:809 -msgid "Go to the next page" -msgstr "Joan hurrengo orrira" - -#: ../src/dh-window.c:812 -msgid "_Contents Tab" -msgstr "_Edukien fitxa" - -#: ../src/dh-window.c:815 -msgid "_Search Tab" -msgstr "_Bilatu fitxa" - -#. View menu -#: ../src/dh-window.c:819 -msgid "_Larger Text" -msgstr "_Testu handiagoa" - -#: ../src/dh-window.c:820 -msgid "Increase the text size" -msgstr "Handitu testuaren tamaina" - -#: ../src/dh-window.c:822 -msgid "S_maller Text" -msgstr "T_estu txikiagoa" - -#: ../src/dh-window.c:823 -msgid "Decrease the text size" -msgstr "Txikitu testuaren tamaina" - -#: ../src/dh-window.c:825 -msgid "_Normal Size" -msgstr "_Tamaina normala" - -#: ../src/dh-window.c:826 -msgid "Use the normal text size" -msgstr "Erabili testu-tamaina normala" - -#: ../src/dh-window.c:835 -msgid "Leave fullscreen mode" -msgstr "Utzi pantaila osoko modua" - -#: ../src/dh-window.c:842 -msgid "Display in full screen" -msgstr "Erakutsi pantaila osoko moduan" - -#. Translators: This refers to text size -#: ../src/dh-window.c:962 -msgid "Larger" -msgstr "Handiagoa" - -#. Translators: This refers to text size -#: ../src/dh-window.c:965 -msgid "Smaller" -msgstr "Txikiagoa" - -#. i18n: please don't translate -#. * "Devhelp", it's a name, not a -#. * generic word. -#: ../src/dh-window.c:1114 -msgid "About Devhelp" -msgstr "Devhelp-i buruz" - -#: ../src/dh-window.c:1119 -msgid "Preferences…" -msgstr "Hobespenak..." - -#: ../src/dh-window.c:1161 -msgid "Contents" -msgstr "Edukia" - -#: ../src/dh-window.c:1171 -msgid "Search" -msgstr "Bilatu" - -#: ../src/dh-window.c:1349 +#: ../src/dh-window.c:952 msgid "Error opening the requested link." msgstr "Errorea eskatutako esteka irekitzean." -#: ../src/dh-window.c:1671 ../src/dh-window.c:1912 +#: ../src/dh-window.c:1302 ../src/dh-window.c:1488 msgid "Empty Page" msgstr "Orri hutsa" @@ -528,10 +471,18 @@ msgid "Find:" msgstr "Bilatu:" +#: ../src/eggfindbar.c:329 +msgid "Find Previous" +msgstr "Bilatu aurrekoa" + #: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 msgid "Find previous occurrence of the search string" msgstr "Bilatu bilaketa-katearen aurreko agerraldia" +#: ../src/eggfindbar.c:342 +msgid "Find Next" +msgstr "Bilatu hurrengoa" + #: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 msgid "Find next occurrence of the search string" msgstr "Bilatu bilaketa-katearen hurrengo agerraldia" @@ -544,3 +495,65 @@ msgid "Toggle case sensitive search" msgstr "Txandakatu maiuskulak eta minuskulak bereizten dituen bilaketa" +#~ msgid "Focus the Devhelp window with the search field active" +#~ msgstr "Devhelp leihoa fokuratzen du bilaketa-eremu aktiboarekin" + +#~ msgid "Search in:" +#~ msgstr "Bilatu hemen:" + +#~ msgid "_File" +#~ msgstr "_Fitxategia" + +#~ msgid "_Edit" +#~ msgstr "_Editatu" + +#~ msgid "_View" +#~ msgstr "_Ikuspegia" + +#~ msgid "_Go" +#~ msgstr "_Joan" + +#~ msgid "_Help" +#~ msgstr "_Laguntza" + +#~ msgid "Go to the previous page" +#~ msgstr "Joan aurreko orrira" + +#~ msgid "Go to the next page" +#~ msgstr "Joan hurrengo orrira" + +#~ msgid "_Contents Tab" +#~ msgstr "_Edukien fitxa" + +#~ msgid "_Search Tab" +#~ msgstr "_Bilatu fitxa" + +#~ msgid "Increase the text size" +#~ msgstr "Handitu testuaren tamaina" + +#~ msgid "Decrease the text size" +#~ msgstr "Txikitu testuaren tamaina" + +#~ msgid "Use the normal text size" +#~ msgstr "Erabili testu-tamaina normala" + +#~ msgid "Leave fullscreen mode" +#~ msgstr "Utzi pantaila osoko modua" + +#~ msgid "Display in full screen" +#~ msgstr "Erakutsi pantaila osoko moduan" + +#~ msgid "Larger" +#~ msgstr "Handiagoa" + +#~ msgid "Smaller" +#~ msgstr "Txikiagoa" + +#~ msgid "Preferences…" +#~ msgstr "Hobespenak..." + +#~ msgid "Contents" +#~ msgstr "Edukia" + +#~ msgid "Search" +#~ msgstr "Bilatu" diff -Nru devhelp-3.8.2/po/fi.po devhelp-3.10.2/po/fi.po --- devhelp-3.8.2/po/fi.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/fi.po 2013-09-23 16:26:46.000000000 +0000 @@ -6,28 +6,29 @@ # # Gnome 2012-03 Finnish translation sprint participants: # Niklas Laxström -# Jiri Grönroos , 2012, 2013. +# Jiri Grönroos , 2012, 2013. +# msgid "" msgstr "" "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-03-09 17:22+0200\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-05 22:59+0300\n" "Last-Translator: Jiri Grönroos \n" -"Language-Team: Finnish \n" +"Language-Team: suomi \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-POT-Import-Date: 2012-02-19 15:17:00+0000\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Gtranslator 2.91.6\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -42,8 +43,8 @@ #: ../data/devhelp.desktop.in.in.h:4 msgid "documentation;information;manual;developer;api;" msgstr "" -"documentation;information;manual;developer;api;dokumentaatio;käsikirja;ohje;ke" -"hittäjä;kehitys;ohjelmointirajapinta;" +"documentation;information;manual;developer;api;dokumentaatio;käsikirja;ohje;" +"kehittäjä;kehitys;ohjelmointirajapinta;" #: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" @@ -118,58 +119,68 @@ msgstr "Ryhmitelläänkö kirjat kielen mukaan käyttöliittymässä" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized" +msgstr "Näytetäänkö apuikkuna suurennettuna" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized." +msgstr "Näytetäänkö apuikkuna suurennettuna." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Apuikkunan leveys" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Apuikkunan leveys." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Apuikkunan korkeus" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Apuikkunan korkeus." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Apuikkunan X-koordinaatti" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Apuikkunan X-koordinaatti." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Apuikkunan Y-koordinaatti" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Apuikkunan Y-koordinaatti." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Käytä järjestelmän kirjasimia" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Käytä järjestelmän oletuskirjasimia." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Tekstin kirjasin" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Kirjasin vaihtelevan levyistä kirjasinta käyttäville teksteille." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Tasalevyisen tekstin kirjasin" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Kirjasin tasalevyisillä kirjasinta käyttäville teksteille kuten esimerkiksi " @@ -191,160 +202,145 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Näytä API-dokumentaatio kohdistimen kohdalla olevalle sanalle" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Uusi ikkuna" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +#| msgid "New window" +msgid "New _Window" +msgstr "_Uusi ikkuna" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +#| msgid "Preferences" +msgid "_Preferences" +msgstr "_Asetukset" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +#| msgid "About Devhelp" +msgid "_About Devhelp" +msgstr "_Tietoja - Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +#| msgid "Quit" +msgid "_Quit" +msgstr "_Lopeta" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Asetukset" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Tietoja Devhelpistä" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Lopeta" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Uusi _välilehti" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Tulosta" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Etsi" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Suurempi teksti" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Pienempi teksti" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Tavallinen koko" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Ryhmittele kielen mukaan" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Käytössä" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Otsikko" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Kirjahylly" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Käytä järjestelmän kirjasimia" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Vaihtelevan levyinen: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Tasalevyinen:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Kirjasimet" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" +"Jiri Grönroos 2012-2013\n" "Tommi Vainikainen, 2010-2011.\n" "Ilkka Tuohela, 2004-2005.\n" "\n" "http://gnome.fi/" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Gnomen ohjeselain kehittäjille" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Devhelp-sivusto" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — apuikkuna" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Kirja:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Kieli: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Kieli: määrittelemätön" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Kirja" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Sivu" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Avainsana" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Funktio" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Type" @@ -420,12 +416,11 @@ msgstr "Kirjan ”%s” pakkausta ei voitu avata: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Nykyinen" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Kaikki kirjat" @@ -465,51 +460,69 @@ msgid "400%" msgstr "400 %" -#: ../src/dh-window.c:654 -#| msgid "_Back" +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "Linkin avaaminen epäonnistui." + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "Tyhjä sivu" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Uusi _välilehti" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Tulosta" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Etsi" + +#: ../src/dh-window.ui.h:4 +#| msgid "_Larger text" +msgid "_Larger Text" +msgstr "_Suurempi teksti" + +#: ../src/dh-window.ui.h:5 +#| msgid "S_maller text" +msgid "S_maller Text" +msgstr "_Pienempi teksti" + +#: ../src/dh-window.ui.h:6 +#| msgid "_Normal size" +msgid "_Normal Size" +msgstr "_Tavallinen koko" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Edellinen" -#: ../src/dh-window.c:659 -#| msgid "_Forward" +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Seuraava" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "Linkin avaaminen epäonnistui." +#~ msgid "Find:" +#~ msgstr "Etsi:" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "Tyhjä sivu" +#~ msgid "Find Previous" +#~ msgstr "Etsi edellinen" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Etsi haettavan merkkijonon edellinen osuma" + +#~ msgid "Find Next" +#~ msgstr "Etsi seuraava" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Etsi haettavan merkkijonon seuraava osuma" + +#~ msgid "C_ase Sensitive" +#~ msgstr "_Huomioi kirjainkoko" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Etsi:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Etsi edellinen" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Etsi haettavan merkkijonon edellinen osuma" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Etsi seuraava" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Etsi haettavan merkkijonon seuraava osuma" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Huomioi kirjainkoko" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Huomioidaanko kirjainkoko hauissa" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Huomioidaanko kirjainkoko hauissa" #~| msgid "_New Window" #~ msgid "_Window" diff -Nru devhelp-3.8.2/po/fr.po devhelp-3.10.2/po/fr.po --- devhelp-3.8.2/po/fr.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/fr.po 2013-09-03 07:09:30.000000000 +0000 @@ -19,8 +19,8 @@ "Project-Id-Version: devhelp master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-03-14 15:29+0100\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-08-22 12:26+0200\n" "Last-Translator: Alain Lojewski \n" "Language-Team: GNOME French Team \n" "Language: \n" @@ -30,8 +30,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -123,58 +123,66 @@ "Indique si les livres doivent être groupés par langage dans l'interface" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Indique si la fenêtre de l'assitant doit démarrer maximisée." + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Indique si la fenêtre de l'assistant doit démarrer maximisée." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Largeur de la fenêtre de l'assistant" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "La largeur de la fenêtre de l'assistant." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "La hauteur de la fenêtre de l'assistant" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "La hauteur de la fenêtre de l'assistant." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Position X de la fenêtre de l'assistant" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "La position X de la fenêtre de l'assistant." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Position Y de la fenêtre de l'assistant" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "La position Y de la fenêtre de l'assistant." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Utiliser les polices de caractères du système" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Utiliser les polices de caractères par défaut du système." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Police de caractères" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Police de caractères à largeur variable." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Police de caractères à chasse fixe" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Police pour les caractères à largeur fixe, comme pour les exemples de code." @@ -198,79 +206,59 @@ msgstr "" "Affiche la documentation des API pour le mot à l'emplacement du curseur" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nouvelle fenêtre" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nouvelle _fenêtre" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Préférences" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "À _propos de Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Quitter" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Préférences" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "À propos de Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Quitter" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nouvel _onglet" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Imprimer" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "Re_chercher" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "A_grandir le texte" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Ré_duire le texte" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "Taille _normale" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Grouper par langage" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Activé" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Titre" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Bibliothèque" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Utiliser les polices de caractères du système" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Largeur _variable : " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "Largeur _fixe :" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Polices" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Christophe Fergeau \n" @@ -283,80 +271,80 @@ "Damien Durand \n" "Stéphane Raimbault " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Un navigateur d'aide pour les développeurs GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Site Web de Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Assistant" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Livre :" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Langage : %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Langage : non défini" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Livre" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Page" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Mot-clé" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Fonction" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Type" @@ -432,11 +420,11 @@ msgstr "Impossible de décompresser le livre « %s » : %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Actuel" -#: ../src/dh-sidebar.c:474 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Tous les livres" @@ -476,49 +464,66 @@ msgid "400%" msgstr "400 %" -#: ../src/dh-window.c:654 +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "Erreur lors de l'ouverture du lien demandé." + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "Page vide" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nouvel _onglet" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Imprimer" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "Re_chercher" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "A_grandir le texte" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Ré_duire le texte" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Taille _normale" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Précédent" -#: ../src/dh-window.c:659 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Suivant" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "Erreur lors de l'ouverture du lien demandé." +#~ msgid "Find:" +#~ msgstr "Rechercher :" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "Page vide" +#~ msgid "Find Previous" +#~ msgstr "Rechercher le précédent" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Recherche la précédente occurrence de la chaîne" + +#~ msgid "Find Next" +#~ msgstr "Rechercher le suivant" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Recherche l'occurrence suivante de la chaîne" + +#~ msgid "C_ase Sensitive" +#~ msgstr "_Sensible à la casse" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Rechercher :" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Rechercher le précédent" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Recherche la précédente occurrence de la chaîne" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Rechercher le suivant" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Recherche l'occurrence suivante de la chaîne" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Sensible à la casse" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Bascule la sensibilité à la casse de la recherche" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Bascule la sensibilité à la casse de la recherche" #~ msgid "_Window" #~ msgstr "_Fenêtre" diff -Nru devhelp-3.8.2/po/gl.po devhelp-3.10.2/po/gl.po --- devhelp-3.8.2/po/gl.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/gl.po 2013-11-11 08:32:55.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: devhelp-master-po-gl-1953\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-07 01:16+0100\n" -"PO-Revision-Date: 2013-02-07 01:16+0200\n" +"POT-Creation-Date: 2013-08-27 03:03+0200\n" +"PO-Revision-Date: 2013-08-27 03:04+0200\n" "Last-Translator: Fran Dieguez \n" "Language-Team: gnome-l10n-gl@gnome.org\n" "Language: gl\n" @@ -28,8 +28,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:345 -#: ../src/dh-window.c:633 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -121,58 +121,66 @@ msgstr "Indica se os libros se deben agrupar por idioma na UI" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Indica se a xanela asistente debería estar maximizada." + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Indica se a xanela asistente debería estar maximizada." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "A anchura da xanela do asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "A largura da xanela do asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Altura da xanela do asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "A altura da xanela do asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Posición X da xanela do asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "A posición X da xanela do asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Posición Y da xanela do asistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "A posición Y da xanela do asistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Usar os tipos de letra do sistema" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Usar os tipos de letra predeterminados do sistema." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Tipo de letra para o texto" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Tipo de letra para o texto de ancho variábel." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Tipo de letra para o texto de ancho fixo" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Tipo de letra para o texto de ancho fixo, tal como os exemplos de código." @@ -193,80 +201,60 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Mostra a documentación da API para a palabra onde está o cursor" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nova xanela" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nova _xanela" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Preferencias" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "Sobre _Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Saír" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Preferencias" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Sobre Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Saír" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nova _lapela" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "Im_primir" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Buscar" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "Texto máis _grande" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Texto máis _pequeno" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "Tamaño _normal" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "A_grupar por idioma" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Activada" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Título" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Biblioteca" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Usar os tipos de letra do sistema" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Anchura _variábel:" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "Anchura _fixa:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Tipos de fonte" # (pofilter) accelerators: accelerator _ is missing from translation -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Fran Dieguez , 2009,2010\n" @@ -277,80 +265,80 @@ "\n" "Proxecto Trasno http://trasno.net" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Un visor de axuda para desenvolvedores de GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Sitio web de DevHelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Asistente" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Libro:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Idioma: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Idioma: non definido" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Libro" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Páxina" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Palabra chave" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Función" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Estrutura" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enumerado" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Tipo" @@ -424,93 +412,110 @@ msgstr "Non foi posíbel descomprimir o libro «%s»: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Actual" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Todos os libros" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:94 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:664 +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "Produciuse un erro ao abrir a ligazón solicitada." + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "Páxina baleira" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nova _lapela" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "Im_primir" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Buscar" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Texto máis _grande" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Texto máis _pequeno" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Tamaño _normal" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Atrás" -#: ../src/dh-window.c:669 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Adiante" -#: ../src/dh-window.c:936 -msgid "Error opening the requested link." -msgstr "Produciuse un erro ao abrir a ligazón solicitada." +#~ msgid "Find:" +#~ msgstr "Buscar:" -#: ../src/dh-window.c:1286 ../src/dh-window.c:1472 -msgid "Empty Page" -msgstr "Páxina baleira" +#~ msgid "Find Previous" +#~ msgstr "Buscar anterior" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Buscar a anterior aparición da cadea de busca" + +#~ msgid "Find Next" +#~ msgstr "Buscar seguinte" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Buscar a seguinte coincidencia da cadea buscada" + +#~ msgid "C_ase Sensitive" +#~ msgstr "Coincidir con c_apitalización" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Buscar:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Buscar anterior" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Buscar a anterior aparición da cadea de busca" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Buscar seguinte" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Buscar a seguinte coincidencia da cadea buscada" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Coincidir con c_apitalización" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Activar/desactivar a busca discriminando a capitalización" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Activar/desactivar a busca discriminando a capitalización" #~ msgid "_Window" #~ msgstr "_Xanela" diff -Nru devhelp-3.8.2/po/he.po devhelp-3.10.2/po/he.po --- devhelp-3.8.2/po/he.po 2013-02-04 15:31:17.000000000 +0000 +++ devhelp-3.10.2/po/he.po 2013-09-23 16:26:46.000000000 +0000 @@ -7,22 +7,20 @@ msgstr "" "Project-Id-Version: sss.txt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-02 13:33+0200\n" -"PO-Revision-Date: 2013-02-02 13:33+0200\n" -"Last-Translator: Yaron Shahrabani \n" +"POT-Creation-Date: 2013-09-22 13:40+0300\n" +"PO-Revision-Date: 2013-09-22 13:41+0300\n" +"Last-Translator: Yosef Or Boczko \n" "Language-Team: Hebrew \n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.0\n" +"X-Generator: Poedit 1.5.4\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 -#: ../src/dh-app.c:162 -#: ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "DevHelp" @@ -112,58 +110,66 @@ msgstr "Whether books should be grouped by language in the UI" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Whether the assistant window should be maximixed" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Whether the assistant window should be maximixed." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Width of the assistant window" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "The width of the assistant window." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Height of assistant window" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "The height of the assistant window." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "X position of assistant window" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "The X position of the assistant window." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Y position of assistant window" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "The Y position of the assistant window." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Use system fonts" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Use the system default fonts." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Font for text" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Font for text with variable width." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Font for fixed width text" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Font for text with fixed width, such as code examples." @@ -183,79 +189,59 @@ msgid "Show API Documentation for the word at the cursor" msgstr "הצגת תיעוד API עבור המילה שתחת הסמן" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "חלון חדש" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "חלון _חדש" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "ה_עדפות" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "על _אודות DevHelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "י_ציאה" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "העדפות" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "על אודות DevHelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "יציאה" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "_לשונית חדשה" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "ה_דפסה" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_חיפוש" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "ה_גדלת הטקסט" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "ה_קטנת טקסט" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "גודל _רגיל" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_קיבוץ לפי שפה" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "פעיל" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "כותרת" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "מדף ספרים" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "שימוש ב_גופני המערכת" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "רוחב _משתנה: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_רוחב קבוע:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "גופנים" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "יאיר הרשקוביץ \n" @@ -264,80 +250,80 @@ "פרויקט תרגום GNOME לעברית:\n" "‏http://gnome-il.berlios.de" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "דפדפן עזרה למפתחים עבור GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "האתר של Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — המסייע" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "ספר:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:242 #, c-format msgid "Language: %s" msgstr "שפה: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:243 msgid "Language: Undefined" msgstr "שפה: בלתי מוגדרת" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "ספר" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "עמוד" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "מילת מפתח" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "פונקציה" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "מבנה" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "מקרו" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "מניה" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "סוג" @@ -349,8 +335,7 @@ msgid "Search for a keyword" msgstr "Search for a keyword" -#: ../src/dh-main.c:49 -#: ../src/dh-main.c:54 +#: ../src/dh-main.c:49 ../src/dh-main.c:54 msgid "KEYWORD" msgstr "KEYWORD" @@ -366,9 +351,7 @@ msgid "Quit any running Devhelp" msgstr "Quit any running Devhelp" -#: ../src/dh-parser.c:97 -#: ../src/dh-parser.c:199 -#: ../src/dh-parser.c:263 +#: ../src/dh-parser.c:97 ../src/dh-parser.c:199 ../src/dh-parser.c:263 #: ../src/dh-parser.c:273 #, c-format msgid "Expected '%s', got '%s' at line %d, column %d" @@ -381,18 +364,26 @@ #: ../src/dh-parser.c:143 #, c-format -msgid "\"title\", \"name\" and \"link\" elements are required at line %d, column %d" -msgstr "\"title\", \"name\" and \"link\" elements are required at line %d, column %d" +msgid "" +"\"title\", \"name\" and \"link\" elements are required at line %d, column %d" +msgstr "" +"\"title\", \"name\" and \"link\" elements are required at line %d, column %d" #: ../src/dh-parser.c:218 #, c-format -msgid "\"name\" and \"link\" elements are required inside on line %d, column %d" -msgstr "\"name\" and \"link\" elements are required inside on line %d, column %d" +msgid "" +"\"name\" and \"link\" elements are required inside on line %d, column " +"%d" +msgstr "" +"\"name\" and \"link\" elements are required inside on line %d, column " +"%d" #: ../src/dh-parser.c:298 #, c-format -msgid "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" -msgstr "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" +msgid "" +"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" +msgstr "" +"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" #: ../src/dh-parser.c:311 #, c-format @@ -405,97 +396,110 @@ msgstr "Cannot uncompress book '%s': %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "נוכחי" -#: ../src/dh-sidebar.c:474 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "כל הספרים" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:86 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:87 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:88 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:89 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:90 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:91 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:92 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:94 +#: ../src/dh-window.c:93 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:95 +#: ../src/dh-window.c:94 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 +#: ../src/dh-window.c:864 +msgid "Error opening the requested link." +msgstr "שגיאה בפתיחת הקישור המבוקש." + +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 +msgid "Empty Page" +msgstr "דף ריק" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "_לשונית חדשה" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "ה_דפסה" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_חיפוש" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "ה_גדלת הטקסט" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "ה_קטנת טקסט" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "גודל _רגיל" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "חזרה" -#: ../src/dh-window.c:659 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "קדימה" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "שגיאה בפתיחת הקישור המבוקש." +#~ msgid "Find:" +#~ msgstr "חיפוש:" -#: ../src/dh-window.c:1269 -#: ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "דף ריק" +#~ msgid "Find Previous" +#~ msgstr "חיפוש הקודם" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "חיפוש המופע הקודם של מחרוזת החיפוש" + +#~ msgid "Find Next" +#~ msgstr "חיפוש הבא" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "חיפוש המופע הבא של מחרוזת החיפוש" + +#~ msgid "C_ase Sensitive" +#~ msgstr "תלוי ר_שיות" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "חיפוש:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "חיפוש הקודם" - -#: ../src/eggfindbar.c:333 -#: ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "חיפוש המופע הקודם של מחרוזת החיפוש" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "חיפוש הבא" - -#: ../src/eggfindbar.c:346 -#: ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "חיפוש המופע הבא של מחרוזת החיפוש" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "תלוי ר_שיות" - -#: ../src/eggfindbar.c:362 -#: ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "הפעלה/כיבוי של חיפוש תלוי רשיות" +#~ msgid "Toggle case sensitive search" +#~ msgstr "הפעלה/כיבוי של חיפוש תלוי רשיות" #~ msgid "_Window" #~ msgstr "_חלון" diff -Nru devhelp-3.8.2/po/hu.po devhelp-3.10.2/po/hu.po --- devhelp-3.8.2/po/hu.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/hu.po 2013-09-03 07:09:30.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: devhelp master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-03-16 19:21+0100\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-08-21 18:38+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -22,8 +22,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -113,58 +113,68 @@ msgstr "A könyvek nyelv szerint csoportosítandók-e a felületen" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized" +msgstr "Az asszisztensablak maximális méretű legyen-e" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized." +msgstr "Az asszisztensablak maximális méretű legyen-e." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Asszisztensablak szélessége" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Az asszisztensablak szélessége." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Asszisztensablak magassága" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Az asszisztensablak magassága." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Asszisztensablak X-pozíciója" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Az asszisztensablak X-pozíciója." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Asszisztensablak Y-pozíciója" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Az asszisztensablak Y-pozíciója." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "A rendszer betűkészletének használata" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "A rendszer alapértelmezett betűkészleteinek használata." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Szöveg betűkészlete" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Változó szélességű szöveg betűkészlete." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Rögzített szélességű szöveg betűkészlete" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Rögzített szélességű szöveg, mint a példakódok betűkészlete." @@ -184,156 +194,136 @@ msgid "Show API Documentation for the word at the cursor" msgstr "API dokumentáció megjelenítése a kurzornál található szóhoz" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Új ablak" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Új _ablak" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Beállítások" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "A Devhelp _névjegye" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Kilépés" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Beállítások" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "A Devhelp névjegye" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Kilépés" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Új _lap" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Nyomtatás" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Keresés" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Nagyobb szöveg" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Kisebb szöve_g" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Normál méret" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Csoportosítás nyelv szerint" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Engedélyezve" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Cím" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Könyvespolc" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "A _rendszer betűkészletének használata" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Változó szélességű: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Rögzített szélességű:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Betűkészletek" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "Kelemen Gábor " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Fejlesztők súgóböngészője GNOME-hoz" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "A Devhelp weboldala" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp – Asszisztens" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Könyv:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Nyelv: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Nyelv: nincs megadva" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Könyv" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Oldal" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Kulcsszó" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Függvény" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struktúra" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Makró" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Felsorolás" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Típus" @@ -408,12 +398,11 @@ msgstr "Nem lehet kicsomagolni a könyvet („%s”): %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Jelenlegi" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Minden könyv" @@ -453,51 +442,66 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -#| msgid "_Back" +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "Hiba a kért hivatkozás megnyitásakor." + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "Üres oldal" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Új _lap" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Nyomtatás" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Keresés" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Nagyobb szöveg" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Kisebb szöve_g" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Normál méret" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Vissza" -#: ../src/dh-window.c:659 -#| msgid "_Forward" +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Előre" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "Hiba a kért hivatkozás megnyitásakor." +#~ msgid "Find:" +#~ msgstr "Keresés:" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "Üres oldal" +#~ msgid "Find Previous" +#~ msgstr "Előző keresése" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "A keresendő karakterlánc előző előfordulásának keresése" + +#~ msgid "Find Next" +#~ msgstr "Következő keresése" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "A keresendő karakterlánc következő előfordulásának keresése" + +#~ msgid "C_ase Sensitive" +#~ msgstr "Na_gybetűérzékeny" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Keresés:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Előző keresése" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "A keresendő karakterlánc előző előfordulásának keresése" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Következő keresése" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "A keresendő karakterlánc következő előfordulásának keresése" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Na_gybetűérzékeny" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Váltás a kis- és nagybetűérzékeny keresés között" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Váltás a kis- és nagybetűérzékeny keresés között" #~| msgid "_New Window" #~ msgid "_Window" diff -Nru devhelp-3.8.2/po/id.po devhelp-3.10.2/po/id.po --- devhelp-3.8.2/po/id.po 2012-08-28 15:48:19.000000000 +0000 +++ devhelp-3.10.2/po/id.po 2013-09-23 16:26:46.000000000 +0000 @@ -4,31 +4,29 @@ # Mikiya 2010 # Dirgita , 2010. # Dirgita , 2010. -# Andika Triwidada , 2010, 2012. +# Andika Triwidada , 2010, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: devhelp.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-07-21 14:17+0000\n" -"PO-Revision-Date: 2012-07-28 08:45+0700\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-23 09:54+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: GNOME Indonesian Translation Team \n" -"Language: \n" +"Language: id_ID\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Poedit-Language: Indonesian\n" -"X-Poedit-Country: Indonesia\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Poedit 1.5.7\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:167 ../src/dh-app.c:350 -#: ../src/dh-window.c:958 ../src/dh-window.c:1857 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -40,399 +38,319 @@ msgid "Documentation Browser" msgstr "Peramban Dokumentasi" -#: ../data/devhelp.schemas.in.h:1 +#: ../data/devhelp.desktop.in.in.h:4 +msgid "documentation;information;manual;developer;api;" +msgstr "dokumentasi;informasi;manual;pengembang;api;" + +#: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" msgstr "Ukuran maksimal jendela utama" -#: ../data/devhelp.schemas.in.h:2 +#: ../data/org.gnome.devhelp.gschema.xml.h:2 msgid "Whether the main window should start maximized." msgstr "Memulai jendela utama dengan ukuran maksimal." -#: ../data/devhelp.schemas.in.h:3 +#: ../data/org.gnome.devhelp.gschema.xml.h:3 msgid "Width of the main window" msgstr "Lebar jendela utama" -#: ../data/devhelp.schemas.in.h:4 +#: ../data/org.gnome.devhelp.gschema.xml.h:4 msgid "The width of the main window." msgstr "Lebar jendela utama." -#: ../data/devhelp.schemas.in.h:5 +#: ../data/org.gnome.devhelp.gschema.xml.h:5 msgid "Height of main window" msgstr "Tinggi jendela utama" -#: ../data/devhelp.schemas.in.h:6 +#: ../data/org.gnome.devhelp.gschema.xml.h:6 msgid "The height of the main window." msgstr "Tinggi jendela utama." -#: ../data/devhelp.schemas.in.h:7 +#: ../data/org.gnome.devhelp.gschema.xml.h:7 msgid "X position of main window" msgstr "Posisi X jendela utama" -#: ../data/devhelp.schemas.in.h:8 +#: ../data/org.gnome.devhelp.gschema.xml.h:8 msgid "The X position of the main window." msgstr "Posisi X jendela utama." -#: ../data/devhelp.schemas.in.h:9 +#: ../data/org.gnome.devhelp.gschema.xml.h:9 msgid "Y position of main window" msgstr "Posisi Y jendela utama" -#: ../data/devhelp.schemas.in.h:10 +#: ../data/org.gnome.devhelp.gschema.xml.h:10 msgid "The Y position of the main window." msgstr "Posisi Y jendela utama." -#: ../data/devhelp.schemas.in.h:11 -msgid "Width of the assistant window" -msgstr "Lebar jendela pembantu" - -#: ../data/devhelp.schemas.in.h:12 -msgid "The width of the assistant window." -msgstr "Lebar jendela pembantu." - -#: ../data/devhelp.schemas.in.h:13 -msgid "Height of assistant window" -msgstr "Tinggi jendela pembantu" - -#: ../data/devhelp.schemas.in.h:14 -msgid "The height of the assistant window." -msgstr "Tinggi jendela pembantu." - -#: ../data/devhelp.schemas.in.h:15 -msgid "X position of assistant window" -msgstr "Posisi X jendela pembantu" - -#: ../data/devhelp.schemas.in.h:16 -msgid "The X position of the assistant window." -msgstr "Posisi X jendela pembantu." - -#: ../data/devhelp.schemas.in.h:17 -msgid "Y position of assistant window" -msgstr "Posisi Y jendela pembantu" - -#: ../data/devhelp.schemas.in.h:18 -msgid "The Y position of the assistant window." -msgstr "Posisi Y jendela pembantu." - -#: ../data/devhelp.schemas.in.h:19 +#: ../data/org.gnome.devhelp.gschema.xml.h:11 msgid "Width of the index and search pane" msgstr "Lebar untuk panel indeks dan pencarian" -#: ../data/devhelp.schemas.in.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:12 msgid "The width of the index and search pane." msgstr "Lebar untuk panel indeks dan pencarian." -#: ../data/devhelp.schemas.in.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:13 msgid "Selected tab: \"content\" or \"search\"" msgstr "Tab yang dipilih: \"isi\" atau \"pencarian\"" -#: ../data/devhelp.schemas.in.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:14 msgid "Which of the tabs is selected: \"content\" or \"search\"." msgstr "Tab yang dipilih: \"isi\" atau \"pencarian\"." -#: ../data/devhelp.schemas.in.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:15 msgid "Books disabled" msgstr "Buku yang dinonaktifkan" -#: ../data/devhelp.schemas.in.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:16 msgid "List of books disabled by the user." msgstr "Daftar buku yang dinonaktifkan oleh pengguna." -#: ../data/devhelp.schemas.in.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:17 msgid "Group by language" msgstr "Kelompokkan menurut bahasa" -#: ../data/devhelp.schemas.in.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:18 msgid "Whether books should be grouped by language in the UI" msgstr "Apakah buku-buku mesti dikelompokkan menurut bahasa dalam UI" -#: ../data/devhelp.schemas.in.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Apakah jendela bantu mesti dimaksimalkan" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Apakah jendela bantu mesti dimaksimalkan." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 +msgid "Width of the assistant window" +msgstr "Lebar jendela pembantu" + +#: ../data/org.gnome.devhelp.gschema.xml.h:22 +msgid "The width of the assistant window." +msgstr "Lebar jendela pembantu." + +#: ../data/org.gnome.devhelp.gschema.xml.h:23 +msgid "Height of assistant window" +msgstr "Tinggi jendela pembantu" + +#: ../data/org.gnome.devhelp.gschema.xml.h:24 +msgid "The height of the assistant window." +msgstr "Tinggi jendela pembantu." + +#: ../data/org.gnome.devhelp.gschema.xml.h:25 +msgid "X position of assistant window" +msgstr "Posisi X jendela pembantu" + +#: ../data/org.gnome.devhelp.gschema.xml.h:26 +msgid "The X position of the assistant window." +msgstr "Posisi X jendela pembantu." + +#: ../data/org.gnome.devhelp.gschema.xml.h:27 +msgid "Y position of assistant window" +msgstr "Posisi Y jendela pembantu" + +#: ../data/org.gnome.devhelp.gschema.xml.h:28 +msgid "The Y position of the assistant window." +msgstr "Posisi Y jendela pembantu." + +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Gunakan fonta sistem" -#: ../data/devhelp.schemas.in.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Menggunakan fonta bawaan sistem." -#: ../data/devhelp.schemas.in.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Fonta untuk teks" -#: ../data/devhelp.schemas.in.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Fonta untuk teks dengan lebar bervariasi." -#: ../data/devhelp.schemas.in.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Fonta untuk teks dengan lebar tetap" -#: ../data/devhelp.schemas.in.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Fonta untuk teks lebar tetap, seperti contoh kode." -#: ../data/ui/devhelp.builder.h:1 -msgid "New window" -msgstr "Jendela baru" - -#: ../data/ui/devhelp.builder.h:2 -msgid "Preferences" -msgstr "Preferensi" - -#: ../data/ui/devhelp.builder.h:3 -msgid "About Devhelp" -msgstr "Tentang Devhelp" - -#: ../data/ui/devhelp.builder.h:4 -msgid "Quit" -msgstr "Keluar" - -#: ../data/ui/devhelp.builder.h:5 -msgid "_Window" -msgstr "Je_ndela" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 +msgid "Devhelp support" +msgstr "Dukungan Devhelp" -#: ../data/ui/devhelp.builder.h:6 -msgid "New _Tab" -msgstr "_Tab Baru" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 +msgid "Makes F2 bring up Devhelp for the word at the cursor" +msgstr "Dengan tombol F2, membuka Devhelp untuk kata pada kursor" -#: ../data/ui/devhelp.builder.h:7 -msgid "_Print" -msgstr "_Cetak" +#: ../misc/gedit-plugin/devhelp.py:69 +msgid "Show API Documentation" +msgstr "Tunjukkan Dokumentasi API" -#: ../data/ui/devhelp.builder.h:8 -msgid "_Close" -msgstr "_Tutup" - -#: ../data/ui/devhelp.builder.h:9 -msgid "_Edit" -msgstr "_Sunting" - -#: ../data/ui/devhelp.builder.h:10 -msgid "_Copy" -msgstr "_Salin" +#: ../misc/gedit-plugin/devhelp.py:71 +msgid "Show API Documentation for the word at the cursor" +msgstr "Menunjukkan Dokumentasi API untuk kata pada kursor" -#: ../data/ui/devhelp.builder.h:11 -msgid "_Find" -msgstr "C_ari" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "_Jendela Baru" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Preferensi" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "Tent_ang Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Keluar" -#: ../data/ui/devhelp.builder.h:12 -msgid "Find _Next" -msgstr "Cari Sela_njutnya" - -#: ../data/ui/devhelp.builder.h:13 -msgid "Find _Previous" -msgstr "Cari Se_belumnya" - -#: ../data/ui/devhelp.builder.h:14 -msgid "_View" -msgstr "_Tampilan" - -#: ../data/ui/devhelp.builder.h:15 -msgid "_Larger text" -msgstr "Teks _lebih besar" - -#: ../data/ui/devhelp.builder.h:16 -msgid "S_maller text" -msgstr "Teks lebih _kecil" - -#: ../data/ui/devhelp.builder.h:17 -msgid "_Normal size" -msgstr "Ukuran _normal" - -#: ../data/ui/devhelp.builder.h:18 -msgid "Fullscreen" -msgstr "Layar penuh" - -#: ../data/ui/devhelp.builder.h:19 -msgid "_Go" -msgstr "_Ke" - -#: ../data/ui/devhelp.builder.h:20 -msgid "_Back" -msgstr "Mun_dur" - -#: ../data/ui/devhelp.builder.h:21 -msgid "_Forward" -msgstr "Ma_ju" - -#: ../data/ui/devhelp.builder.h:22 -msgid "_Search Tab" -msgstr "Tab Penca_rian" - -#: ../data/ui/devhelp.builder.h:23 -msgid "_Contents Tab" -msgstr "Tab _Isi" - -#: ../data/ui/devhelp.builder.h:24 -msgid "Go to the previous page" -msgstr "Halaman sebelumnya" - -#: ../data/ui/devhelp.builder.h:25 -msgid "Go to the next page" -msgstr "Halaman selanjutnya" - -#: ../data/ui/devhelp.builder.h:26 -msgid "Decrease the text size" -msgstr "Memperkecil ukuran teks" - -#: ../data/ui/devhelp.builder.h:27 -msgid "Increase the text size" -msgstr "Memperbesar ukuran teks" +#: ../src/devhelp.ui.h:5 +msgid "Preferences" +msgstr "Preferensi" -#: ../data/ui/devhelp.builder.h:28 +#: ../src/devhelp.ui.h:6 msgid "_Group by language" msgstr "_Kelompokkan menurut bahasa" -#: ../data/ui/devhelp.builder.h:29 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Diaktifkan" -#: ../data/ui/devhelp.builder.h:30 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Judul" -#: ../data/ui/devhelp.builder.h:31 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Rak Buku" -#: ../data/ui/devhelp.builder.h:32 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "G_unakan fonta sistem" -#: ../data/ui/devhelp.builder.h:33 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Lebar _variabel: " -#: ../data/ui/devhelp.builder.h:34 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Lebar tetap:" -#: ../data/ui/devhelp.builder.h:35 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Fonta" -#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 -msgid "Devhelp support" -msgstr "Dukungan Devhelp" - -#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 -msgid "Makes F2 bring up Devhelp for the word at the cursor" -msgstr "Dengan tombol F2, membuka Devhelp untuk kata pada kursor" - -#: ../misc/gedit-plugin/devhelp.py:69 -msgid "Show API Documentation" -msgstr "Tunjukkan Dokumentasi API" - -#: ../misc/gedit-plugin/devhelp.py:71 -msgid "Show API Documentation for the word at the cursor" -msgstr "Menunjukkan Dokumentasi API untuk kata pada kursor" - -#: ../src/dh-app.c:162 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Mikiya , 2010.\n" -"Andika Triwidada , 2010, 2012.\n" +"Andika Triwidada , 2010, 2012, 2013.\n" "Dirgita , 2010." -#: ../src/dh-app.c:169 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Peramban bantuan GNOME bagi pengembang" -#: ../src/dh-app.c:177 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Situs Web Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:76 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Pembantu" -#: ../src/dh-assistant-view.c:395 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Buku:" -#: ../src/dh-book.c:252 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Bahasa: %s" -#: ../src/dh-book.c:253 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Bahasa: Tak didefinisikan" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Buku" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Halaman" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Kata Kunci" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Fungsi" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struktur" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Makro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enumerasi" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Jenis" -#: ../src/dh-main.c:48 +#: ../src/dh-main.c:43 msgid "Opens a new Devhelp window" msgstr "Buka jendela Devhelp baru" -#: ../src/dh-main.c:53 -msgid "Focus the Devhelp window with the search field active" -msgstr "Jendela Devhelp terfokus pada kolom pencarian yang aktif" - -#: ../src/dh-main.c:58 +#: ../src/dh-main.c:48 msgid "Search for a keyword" msgstr "Mencari kata kunci" -#: ../src/dh-main.c:59 ../src/dh-main.c:64 +#: ../src/dh-main.c:49 ../src/dh-main.c:54 msgid "KEYWORD" msgstr "KATA KUNCI" -#: ../src/dh-main.c:63 +#: ../src/dh-main.c:53 msgid "Search and display any hit in the assistant window" msgstr "Mencari dan menampilkan semua hasil di jendela pembantu" -#: ../src/dh-main.c:68 +#: ../src/dh-main.c:58 msgid "Display the version and exit" msgstr "Menampilkan versi dan keluar" -#: ../src/dh-main.c:73 +#: ../src/dh-main.c:63 msgid "Quit any running Devhelp" msgstr "Keluar dari semua Devhelp yang sedang berjalan" @@ -479,92 +397,87 @@ msgid "Cannot uncompress book '%s': %s" msgstr "Tidak dapat mendekompresi buku '%s': %s" -#: ../src/dh-search.c:492 -msgid "All books" -msgstr "Semua buku" - -#: ../src/dh-search.c:1110 -msgid "Search in:" -msgstr "Cari di:" +#. Setup the Current/All Files selector +#: ../src/dh-sidebar.c:531 +msgid "Current" +msgstr "Kini" + +#: ../src/dh-sidebar.c:534 +msgid "All Books" +msgstr "Semua Buku" -#: ../src/dh-window.c:100 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:101 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:102 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:103 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:104 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:105 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:106 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:107 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:108 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:1046 -msgid "Contents" -msgstr "Isi" - -#: ../src/dh-window.c:1056 -msgid "Search" -msgstr "Cari" - -#: ../src/dh-window.c:1266 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Galat sewaktu membuka tautan yang diminta." -#: ../src/dh-window.c:1638 ../src/dh-window.c:1885 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Halaman Kosong" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Cari:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Temukan Sebelumnya" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Menuju string yang ditemukan sebelumnya" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Cari Selanjutnya" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Menuju string yang ditemukan sebelumnya" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Sesuai Bes_ar/Kecil Huruf" - -# Teks keterangan. -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Mencari dengan menyesuaikan besar atau kecilnya huruf" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "_Tab Baru" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Cetak" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "C_ari" +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Teks Lebih _Besar" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Teks Lebih _Kecil" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Ukuran _Normal" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Mundur" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Maju" diff -Nru devhelp-3.8.2/po/it.po devhelp-3.10.2/po/it.po --- devhelp-3.8.2/po/it.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/it.po 2013-09-03 07:09:30.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-11 21:26+0100\n" -"PO-Revision-Date: 2013-02-11 21:26+0100\n" +"POT-Creation-Date: 2013-08-24 19:14+0200\n" +"PO-Revision-Date: 2013-08-24 19:14+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" @@ -19,11 +19,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Gtranslator 2.91.6\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:344 -#: ../src/dh-window.c:633 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -116,58 +117,66 @@ msgstr "Indica se raggruppare le guide nella UI in base al linguaggio" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Massimizza la finestra dell'assistente" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Indica se la finestra dell'assistente deve essere massimizzata." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Larghezza della finestra assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "La larghezza della finestra assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Altezza della finestra assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "L'altezza della finestra assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Posizione X della finestra assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "La posizione X della finestra assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Posizione Y della finestra assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "La posizione Y della finestra assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Usa i tipi di carattere di sistema" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Usa i tipi di carattere di sistema predefiniti." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Tipo di carattere per il testo" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Tipo di carattere per il testo ad ampiezza variabile." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Tipo di carattere per testo ad ampiezza fissa" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Tipo di carattere per il testo ad ampiezza fissa, come esempi di codice." @@ -192,163 +201,138 @@ msgstr "" "Mostra la documentazione delle API per la parola alla posizione del cursore" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nuova finestra" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nuova _finestra" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "Preferen_ze" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "I_nformazioni su Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Esci" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Preferenze" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Informazioni su Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Esci" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nuova _scheda" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "Stam_pa" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "Tr_ova" - -# GNOME-2-22 -# tradotto come in Ephy, non so se anche -# gli originali coincidono --Luca -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "Testo più _grande" - -# GNOME-2-22 -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Testo più _piccolo" - -# GNOME-2-22 -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "Dimensione _normale" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "Ra_ggruppare per linguaggio" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Abilitato" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Titolo" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Raccolta libri" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Usare i tipi di carattere di sistema" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Larghezza _variabile:" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "Larghezza _fissa:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Tipi di carattere" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Milo Casagrande \n" "Francesco Marletta " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Un visualizzatore per la documentazione di sviluppo per GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Sito web di DevHelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Assistente" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Libro:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Linguaggio: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Linguaggio: non definito" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Libro" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Pagina" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Parola chiave" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Function" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Type" @@ -427,91 +411,91 @@ msgstr "Impossibile decomprimere il libro «%s»: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Attuale" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Tutti i libri" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:94 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:664 -msgid "Back" -msgstr "Indietro" - -#: ../src/dh-window.c:669 -msgid "Forward" -msgstr "Avanti" - -#: ../src/dh-window.c:936 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Errore nell'aprire il collegamento richiesto." -#: ../src/dh-window.c:1286 ../src/dh-window.c:1472 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Pagina vuota" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Trova:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Trova precedente" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Trova l'occorrenza precedente della stringa di ricerca" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Trova successiva" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Trova l'occorrenza successiva della stringa di ricerca" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nuova _scheda" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "Stam_pa" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "Tr_ova" + +# GNOME-2-22 +# tradotto come in Ephy, non so se anche +# gli originali coincidono --Luca +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Testo più _grande" + +# GNOME-2-22 +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Testo più _piccolo" # GNOME-2-22 -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "M_aiuscole/minuscole" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Considera o meno differenti maiuscole e minuscole nella ricerca" +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Dimensione _normale" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Indietro" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Avanti" diff -Nru devhelp-3.8.2/po/ja.po devhelp-3.10.2/po/ja.po --- devhelp-3.8.2/po/ja.po 2012-08-07 14:43:10.000000000 +0000 +++ devhelp-3.10.2/po/ja.po 2013-09-23 16:26:46.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2001-2011 devhelp's COPYRIGHT HOLDE # Takeshi Aihana , 2001-2009. # Takayuki KUSANO , 2010. -# Jiro Matsuzawa , 2011-2012. +# Jiro Matsuzawa , 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: devhelp gnome-2-32\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-07-24 08:12+0000\n" -"PO-Revision-Date: 2012-07-29 18:05+0900\n" +"POT-Creation-Date: 2013-09-19 13:13+0000\n" +"PO-Revision-Date: 2013-09-21 09:28+0900\n" "Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -19,304 +19,228 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:167 ../src/dh-app.c:350 -#: ../src/dh-window.c:958 ../src/dh-window.c:1857 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" #: ../data/devhelp.desktop.in.in.h:2 msgid "Developer's Help program" -msgstr "開発者向けのヘルプ・ブラウザーです" +msgstr "開発者向けのヘルプブラウザーです" #: ../data/devhelp.desktop.in.in.h:3 msgid "Documentation Browser" -msgstr "ドキュメント・ブラウザー" +msgstr "ドキュメントブラウザー" -#: ../data/devhelp.schemas.in.h:1 +#: ../data/devhelp.desktop.in.in.h:4 +msgid "documentation;information;manual;developer;api;" +msgstr "documentation;information;manual;developer;api;ドキュメンテーション;ドキュメント;情報;リファレンスマニュアル;開発者;" + +#: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" -msgstr "メイン・ウィンドウの最大化" +msgstr "メインウィンドウの最大化" -#: ../data/devhelp.schemas.in.h:2 +#: ../data/org.gnome.devhelp.gschema.xml.h:2 msgid "Whether the main window should start maximized." -msgstr "メイン・ウィンドウを最大サイズで起動するかどうかです。" +msgstr "メインウィンドウを最大サイズで起動するかどうかです。" -#: ../data/devhelp.schemas.in.h:3 +#: ../data/org.gnome.devhelp.gschema.xml.h:3 msgid "Width of the main window" -msgstr "メイン・ウィンドウの幅" +msgstr "メインウィンドウの幅" -#: ../data/devhelp.schemas.in.h:4 +#: ../data/org.gnome.devhelp.gschema.xml.h:4 msgid "The width of the main window." -msgstr "メイン・ウィンドウの幅です。" +msgstr "メインウィンドウの幅です。" -#: ../data/devhelp.schemas.in.h:5 +#: ../data/org.gnome.devhelp.gschema.xml.h:5 msgid "Height of main window" -msgstr "メイン・ウィンドウの高さ" +msgstr "メインウィンドウの高さ" -#: ../data/devhelp.schemas.in.h:6 +#: ../data/org.gnome.devhelp.gschema.xml.h:6 msgid "The height of the main window." -msgstr "メイン・ウィンドウの高さです。" +msgstr "メインウィンドウの高さです。" -#: ../data/devhelp.schemas.in.h:7 +#: ../data/org.gnome.devhelp.gschema.xml.h:7 msgid "X position of main window" -msgstr "メイン・ウィンドウの位置X" +msgstr "メインウィンドウの位置X" -#: ../data/devhelp.schemas.in.h:8 +#: ../data/org.gnome.devhelp.gschema.xml.h:8 msgid "The X position of the main window." -msgstr "メイン・ウィンドウを表示するX座標です。" +msgstr "メインウィンドウを表示するX座標です。" -#: ../data/devhelp.schemas.in.h:9 +#: ../data/org.gnome.devhelp.gschema.xml.h:9 msgid "Y position of main window" -msgstr "メイン・ウィンドウの位置Y" +msgstr "メインウィンドウの位置Y" -#: ../data/devhelp.schemas.in.h:10 +#: ../data/org.gnome.devhelp.gschema.xml.h:10 msgid "The Y position of the main window." -msgstr "メイン・ウィンドウを表示するY座標です。" - -#: ../data/devhelp.schemas.in.h:11 -msgid "Width of the assistant window" -msgstr "アシスタント・ウィンドウの幅" - -#: ../data/devhelp.schemas.in.h:12 -msgid "The width of the assistant window." -msgstr "アシスタント・ウィンドウの幅です。" +msgstr "メインウィンドウを表示するY座標です。" -#: ../data/devhelp.schemas.in.h:13 -msgid "Height of assistant window" -msgstr "アシスタント・ウィンドウの高さ" - -#: ../data/devhelp.schemas.in.h:14 -msgid "The height of the assistant window." -msgstr "アシスタント・ウィンドウの高さです。" - -#: ../data/devhelp.schemas.in.h:15 -msgid "X position of assistant window" -msgstr "アシスタント・ウィンドウの位置X" - -#: ../data/devhelp.schemas.in.h:16 -msgid "The X position of the assistant window." -msgstr "アシスタント・ウィンドウを表示するX座標です。" - -#: ../data/devhelp.schemas.in.h:17 -msgid "Y position of assistant window" -msgstr "アシスタント・ウィンドウの位置Y" - -#: ../data/devhelp.schemas.in.h:18 -msgid "The Y position of the assistant window." -msgstr "アシスタント・ウィンドウを表示するY座標です。" - -#: ../data/devhelp.schemas.in.h:19 +#: ../data/org.gnome.devhelp.gschema.xml.h:11 msgid "Width of the index and search pane" msgstr "目次と検索ウィンドウの幅" -#: ../data/devhelp.schemas.in.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:12 msgid "The width of the index and search pane." msgstr "目次と検索ウィンドウの幅です。" -#: ../data/devhelp.schemas.in.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:13 msgid "Selected tab: \"content\" or \"search\"" msgstr "選択したタブ: \"content\" または \"search\"" -#: ../data/devhelp.schemas.in.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:14 msgid "Which of the tabs is selected: \"content\" or \"search\"." msgstr "どちらのタブが選択されたか: \"content\" または \"search\"" -#: ../data/devhelp.schemas.in.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:15 msgid "Books disabled" msgstr "無効化されたブック" -#: ../data/devhelp.schemas.in.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:16 msgid "List of books disabled by the user." msgstr "ユーザーによって無効化されたブックの一覧" -#: ../data/devhelp.schemas.in.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:17 msgid "Group by language" -msgstr "言語別に分類するかどうか" +msgstr "言語別に分類する" -#: ../data/devhelp.schemas.in.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:18 msgid "Whether books should be grouped by language in the UI" -msgstr "ブックを言語別に分類して表示するかどうか" +msgstr "ブックを言語別に分類して表示するかどうかの設定です。" + +#: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "アシスタントウィンドウを最大サイズにする" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "アシスタントウィンドウを最大サイズにするかどうかの設定です。" -#: ../data/devhelp.schemas.in.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:21 +msgid "Width of the assistant window" +msgstr "アシスタントウィンドウの幅" + +#: ../data/org.gnome.devhelp.gschema.xml.h:22 +msgid "The width of the assistant window." +msgstr "アシスタントウィンドウの幅です。" + +#: ../data/org.gnome.devhelp.gschema.xml.h:23 +msgid "Height of assistant window" +msgstr "アシスタントウィンドウの高さ" + +#: ../data/org.gnome.devhelp.gschema.xml.h:24 +msgid "The height of the assistant window." +msgstr "アシスタントウィンドウの高さです。" + +#: ../data/org.gnome.devhelp.gschema.xml.h:25 +msgid "X position of assistant window" +msgstr "アシスタントウィンドウの位置X" + +#: ../data/org.gnome.devhelp.gschema.xml.h:26 +msgid "The X position of the assistant window." +msgstr "アシスタントウィンドウを表示するX座標です。" + +#: ../data/org.gnome.devhelp.gschema.xml.h:27 +msgid "Y position of assistant window" +msgstr "アシスタントウィンドウの位置Y" + +#: ../data/org.gnome.devhelp.gschema.xml.h:28 +msgid "The Y position of the assistant window." +msgstr "アシスタントウィンドウを表示するY座標です。" + +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" -msgstr "システムフォントを使うかどうか" +msgstr "システムフォントを使う" -#: ../data/devhelp.schemas.in.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." -msgstr "デスクトップで設定したデフォルトのフォントを使用します。" +msgstr "デスクトップで設定したデフォルトのフォントを使用するかどうかの設定です。" -#: ../data/devhelp.schemas.in.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "文章のフォント" -#: ../data/devhelp.schemas.in.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "可変幅の文を表示する際に使用するフォントです。" -#: ../data/devhelp.schemas.in.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "等幅のフォント" -#: ../data/devhelp.schemas.in.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." -msgstr "等幅 (固定幅) のフォントで、主にサンプル・コードで使用します。" +msgstr "等幅 (固定幅) のフォントで、主にサンプルコードで使用します。" -#: ../data/ui/devhelp.builder.h:1 -msgid "New window" -msgstr "新しいウィンドウ" - -#: ../data/ui/devhelp.builder.h:2 -msgid "Preferences" -msgstr "設定" - -#: ../data/ui/devhelp.builder.h:3 -msgid "About Devhelp" -msgstr "このアプリケーションについて" - -#: ../data/ui/devhelp.builder.h:4 -msgid "Quit" -msgstr "終了" - -#: ../data/ui/devhelp.builder.h:5 -msgid "_Window" -msgstr "ウィンドウ(_W)" - -#: ../data/ui/devhelp.builder.h:6 -msgid "New _Tab" -msgstr "新しいタブ(_T)" - -#: ../data/ui/devhelp.builder.h:7 -msgid "_Print" -msgstr "印刷(_P)" - -#: ../data/ui/devhelp.builder.h:8 -msgid "_Close" -msgstr "閉じる(_C)" - -#: ../data/ui/devhelp.builder.h:9 -msgid "_Edit" -msgstr "編集(_E)" - -#: ../data/ui/devhelp.builder.h:10 -msgid "_Copy" -msgstr "コピー(_C)" - -#: ../data/ui/devhelp.builder.h:11 -msgid "_Find" -msgstr "検索(_F)" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 +msgid "Devhelp support" +msgstr "Devhelp のサポート" -#: ../data/ui/devhelp.builder.h:12 -msgid "Find _Next" -msgstr "次を検索(_N)" - -#: ../data/ui/devhelp.builder.h:13 -msgid "Find _Previous" -msgstr "前を検索(_P)" - -#: ../data/ui/devhelp.builder.h:14 -msgid "_View" -msgstr "表示(_V)" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 +msgid "Makes F2 bring up Devhelp for the word at the cursor" +msgstr "[F2] キーを押してカーソル位置にある単語を Devhelp から検索します" -#: ../data/ui/devhelp.builder.h:15 -msgid "_Larger text" -msgstr "文字を大きくする(_L)" +#: ../misc/gedit-plugin/devhelp.py:69 +msgid "Show API Documentation" +msgstr "API ドキュメントの参照" -#: ../data/ui/devhelp.builder.h:16 -msgid "S_maller text" -msgstr "文字を小さくする(_M)" +#: ../misc/gedit-plugin/devhelp.py:71 +msgid "Show API Documentation for the word at the cursor" +msgstr "カーソル位置にある文字列に対応する API ドキュメントを表示します" -#: ../data/ui/devhelp.builder.h:17 -msgid "_Normal size" -msgstr "通常の大きさ(_N)" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "新しいウィンドウ(_W)" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "設定(_P)" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "このアプリケーションについて(_A)" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "終了(_Q)" -#: ../data/ui/devhelp.builder.h:18 -msgid "Fullscreen" -msgstr "フルスクリーン" - -#: ../data/ui/devhelp.builder.h:19 -msgid "_Go" -msgstr "移動(_G)" - -#: ../data/ui/devhelp.builder.h:20 -msgid "_Back" -msgstr "戻る(_B)" - -#: ../data/ui/devhelp.builder.h:21 -msgid "_Forward" -msgstr "進む(_F)" - -#: ../data/ui/devhelp.builder.h:22 -msgid "_Search Tab" -msgstr "検索タブ(_S)" - -#: ../data/ui/devhelp.builder.h:23 -msgid "_Contents Tab" -msgstr "目次タブ(_C)" - -#: ../data/ui/devhelp.builder.h:24 -msgid "Go to the previous page" -msgstr "前のページに移動します" - -#: ../data/ui/devhelp.builder.h:25 -msgid "Go to the next page" -msgstr "次のページに移動します" - -#: ../data/ui/devhelp.builder.h:26 -msgid "Decrease the text size" -msgstr "文字を一段階小さくします" - -#: ../data/ui/devhelp.builder.h:27 -msgid "Increase the text size" -msgstr "文字を一段階大きくします" +#: ../src/devhelp.ui.h:5 +msgid "Preferences" +msgstr "設定" -#: ../data/ui/devhelp.builder.h:28 +#: ../src/devhelp.ui.h:6 msgid "_Group by language" msgstr "言語別に分類する(_G)" -#: ../data/ui/devhelp.builder.h:29 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "有効" -#: ../data/ui/devhelp.builder.h:30 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "タイトル" -#: ../data/ui/devhelp.builder.h:31 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "本棚" -#: ../data/ui/devhelp.builder.h:32 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "システムフォントを使う(_U)" -#: ../data/ui/devhelp.builder.h:33 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "可変幅(_V): " -#: ../data/ui/devhelp.builder.h:34 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "固定幅(_F):" -#: ../data/ui/devhelp.builder.h:35 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "フォント" -#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 -msgid "Devhelp support" -msgstr "Devhelp のサポート" - -#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 -msgid "Makes F2 bring up Devhelp for the word at the cursor" -msgstr "[F2] キーを押してカーソル位置にある単語を Devhelp から検索します" - -#: ../misc/gedit-plugin/devhelp.py:69 -msgid "Show API Documentation" -msgstr "API ドキュメントの参照" - -#: ../misc/gedit-plugin/devhelp.py:71 -msgid "Show API Documentation for the word at the cursor" -msgstr "カーソル位置にある文字列に対応する API ドキュメントを表示します" - -#: ../src/dh-app.c:162 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "相花 毅 \n" @@ -324,108 +248,104 @@ "松澤 二郎 \n" "日本GNOMEユーザー会 " -#: ../src/dh-app.c:169 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "GNOME の開発者用ヘルプブラウザー" -#: ../src/dh-app.c:177 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Devhelp のウェブサイト" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:76 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — アシスタント" -#: ../src/dh-assistant-view.c:395 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "ブック:" -#: ../src/dh-book.c:252 +#: ../src/dh-book.c:242 #, c-format msgid "Language: %s" msgstr "言語: %s" -#: ../src/dh-book.c:253 +#: ../src/dh-book.c:243 msgid "Language: Undefined" msgstr "言語: 未定義" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "ブック" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "ページ" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "キーワード" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "関数" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "構造体" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "マクロ" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "列挙子" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "型" -#: ../src/dh-main.c:48 +#: ../src/dh-main.c:43 msgid "Opens a new Devhelp window" msgstr "Devhelp の新しいウィンドウを開く" -#: ../src/dh-main.c:53 -msgid "Focus the Devhelp window with the search field active" -msgstr "Devhelp のウィンドウにフォーカスを与えて検索タブを開く" - -#: ../src/dh-main.c:58 +#: ../src/dh-main.c:48 msgid "Search for a keyword" msgstr "キーワードを検索する" -#: ../src/dh-main.c:59 ../src/dh-main.c:64 +#: ../src/dh-main.c:49 ../src/dh-main.c:54 msgid "KEYWORD" msgstr "KEYWORD" -#: ../src/dh-main.c:63 +#: ../src/dh-main.c:53 msgid "Search and display any hit in the assistant window" -msgstr "検索結果をアシスタント・ウィンドウの中に表示する" +msgstr "検索結果をアシスタントウィンドウの中に表示する" -#: ../src/dh-main.c:68 +#: ../src/dh-main.c:58 msgid "Display the version and exit" msgstr "バージョンを表示して終了する" -#: ../src/dh-main.c:73 +#: ../src/dh-main.c:63 msgid "Quit any running Devhelp" msgstr "Devhelp を終了する" @@ -465,93 +385,168 @@ msgid "Cannot uncompress book '%s': %s" msgstr "'%s' というブックを展開できません: %s" -#: ../src/dh-search.c:492 -msgid "All books" -msgstr "すべてのブック" +#. Setup the Current/All Files selector +#: ../src/dh-sidebar.c:531 +msgid "Current" +msgstr "選択中" -#: ../src/dh-search.c:1110 -msgid "Search in:" -msgstr "検索対象:" +#: ../src/dh-sidebar.c:534 +msgid "All Books" +msgstr "すべてのブック" -#: ../src/dh-window.c:100 +#: ../src/dh-window.c:86 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:101 +#: ../src/dh-window.c:87 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:102 +#: ../src/dh-window.c:88 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:103 +#: ../src/dh-window.c:89 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:104 +#: ../src/dh-window.c:90 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:105 +#: ../src/dh-window.c:91 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:106 +#: ../src/dh-window.c:92 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:107 +#: ../src/dh-window.c:93 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:108 +#: ../src/dh-window.c:94 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:1046 -msgid "Contents" -msgstr "目次" - -#: ../src/dh-window.c:1056 -msgid "Search" -msgstr "検索" - -#: ../src/dh-window.c:1266 +#: ../src/dh-window.c:864 msgid "Error opening the requested link." msgstr "要求されたリンクを開くのに失敗しました。" -#: ../src/dh-window.c:1638 ../src/dh-window.c:1885 +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 msgid "Empty Page" msgstr "空のページ" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "検索:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "前を検索" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "先頭に向かって文字列を検索します" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "次を検索" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "後方に向かって文字列を検索します" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "大/小文字を区別する(_A)" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "大/小文字を区別するかどうかを切り換えます" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "新しいタブ(_T)" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "印刷(_P)" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "検索(_F)" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "文字を大きくする(_L)" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "文字を小さくする(_M)" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "通常の大きさ(_N)" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "戻る" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "進む" + +#~ msgid "_Window" +#~ msgstr "ウィンドウ(_W)" + +#~ msgid "_Close" +#~ msgstr "閉じる(_C)" + +#~ msgid "_Edit" +#~ msgstr "編集(_E)" + +#~ msgid "_Copy" +#~ msgstr "コピー(_C)" + +#~ msgid "Find _Next" +#~ msgstr "次を検索(_N)" + +#~ msgid "Find _Previous" +#~ msgstr "前を検索(_P)" + +#~ msgid "_View" +#~ msgstr "表示(_V)" + +#~ msgid "Fullscreen" +#~ msgstr "フルスクリーン" + +#~ msgid "_Go" +#~ msgstr "移動(_G)" + +#~ msgid "_Search Tab" +#~ msgstr "検索タブ(_S)" + +#~ msgid "_Contents Tab" +#~ msgstr "目次タブ(_C)" + +#~ msgid "Go to the previous page" +#~ msgstr "前のページに移動します" + +#~ msgid "Go to the next page" +#~ msgstr "次のページに移動します" + +#~ msgid "Decrease the text size" +#~ msgstr "文字を一段階小さくします" + +#~ msgid "Increase the text size" +#~ msgstr "文字を一段階大きくします" + +#~ msgid "Focus the Devhelp window with the search field active" +#~ msgstr "Devhelp のウィンドウにフォーカスを与えて検索タブを開く" + +#~ msgid "Search in:" +#~ msgstr "検索対象:" + +#~ msgid "Contents" +#~ msgstr "目次" + +#~ msgid "Search" +#~ msgstr "検索" + +#~ msgid "Find:" +#~ msgstr "検索:" + +#~ msgid "Find Previous" +#~ msgstr "前を検索" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "先頭に向かって文字列を検索します" + +#~ msgid "Find Next" +#~ msgstr "次を検索" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "後方に向かって文字列を検索します" + +#~ msgid "C_ase Sensitive" +#~ msgstr "大/小文字を区別する(_A)" + +#~ msgid "Toggle case sensitive search" +#~ msgstr "大/小文字を区別するかどうかを切り換えます" #~ msgid "_File" #~ msgstr "ファイル(_F)" diff -Nru devhelp-3.8.2/po/ko.po devhelp-3.10.2/po/ko.po --- devhelp-3.8.2/po/ko.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/ko.po 2013-09-23 16:26:46.000000000 +0000 @@ -5,15 +5,18 @@ # Seongchong Park , 2004. # Changwoo Ryu , 2006, 2008-2013. # +# - 새로 번역을 업데이트하시는 분은 "translator_credits" 항목에도 추가하세요. +# # 주의: # - 이 프로그램의 이름인 Devhelp는 "개발자 도움말"로 풀어서 번역 # msgid "" msgstr "" "Project-Id-Version: devhelp\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-03-17 00:04+0900\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=devhelp&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-14 00:55+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" "Language: Korean\n" @@ -24,8 +27,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "개발 도움말" @@ -39,7 +42,9 @@ #: ../data/devhelp.desktop.in.in.h:4 msgid "documentation;information;manual;developer;api;" -msgstr "documentation;문서;information;정보;manual;설명서;매뉴얼;developer;개발자;api;레퍼런스;" +msgstr "" +"documentation;문서;information;정보;manual;설명서;매뉴얼;developer;개발자;" +"api;레퍼런스;" #: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" @@ -114,58 +119,66 @@ msgstr "UI에서 문서를 언어별로 모을지 여부" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "도우미 창을 최대화할 지 여부" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "도우미 창을 최대화할 지 여부." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "도우미 창의 너비" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "도우미 창의 너비." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "도우미 창의 높이" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "도우미 창의 높이." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "도우미 창의 가로 위치" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "도우미 창의 가로 위치." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "도우미 창의 세로 위치" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "도우미 창의 세로 위치." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "시스템 글꼴 사용" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "시스템 기본 글꼴을 사용합니다." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "텍스트에 사용할 글꼴" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "가변폭의 텍스트에 사용할 글꼴." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "고정폭 텍스트에 사용할 글꼴" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "고정폭 텍스트에 사용할 글꼴(코드 예제 등)." @@ -186,159 +199,139 @@ msgid "Show API Documentation for the word at the cursor" msgstr "커서 위치에 있는 단어의 API 문서를 봅니다" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "새 창" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "새 창(_W)" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "기본 설정(_P)" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "개발 도움말 정보(_A)" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "끝내기(_Q)" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "기본 설정" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "개발 도움말 정보" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "끝내기" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "새 탭(_T)" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "인쇄(_P)" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "찾기(_F)" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "글씨 크게(_L)" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "글씨 작게(_M)" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "보통 크기(_N)" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "언어별 모음(_G)" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "사용" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "제목" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "책장" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "시스템 글꼴 사용(_U)" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "가변폭(_V):" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "고정폭(_F):" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "글꼴" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "강정희\n" "류창우\n" "박성종" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "그놈 개발자 도움말 브라우저" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "개발 도움말 웹사이트" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "개발 도움말 — 도우미" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "문서:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "언어: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "언어: 지정하지 않음" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "문서" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "페이지" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "키워드" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "함수" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "구조체" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "매크로" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "열거형" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "타입" @@ -409,11 +402,11 @@ msgstr "문서 파일 '%s'을(를) 압축해제할 수 없습니다 : %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "현재" -#: ../src/dh-sidebar.c:474 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "모든 문서" @@ -453,103 +446,42 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -msgid "Back" -msgstr "뒤로" - -#: ../src/dh-window.c:659 -msgid "Forward" -msgstr "앞으로" - -#: ../src/dh-window.c:919 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "요청한 링크를 여는데 오류가 발생했습니다." -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "빈 페이지" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "찾기:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "이전 찾기" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "이전에 나온 검색 문자열을 찾습니다" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "다음 찾기" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "다음에 나온 검색 문자열을 찾습니다" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "대소문자 구별(_A)" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "대소문자를 구별해서 찾을 지 토글합니다" - -#~ msgid "_Window" -#~ msgstr "창(_W)" - -#~ msgid "_Close" -#~ msgstr "닫기(_C)" - -#~ msgid "_Edit" -#~ msgstr "편집(_E)" - -#~ msgid "_Copy" -#~ msgstr "복사(_C)" - -#~ msgid "Find _Next" -#~ msgstr "다음 찾기(_N)" - -#~ msgid "Find _Previous" -#~ msgstr "이전 찾기(_P)" - -#~ msgid "_View" -#~ msgstr "보기(_V)" - -#~ msgid "Fullscreen" -#~ msgstr "전체 화면" - -#~ msgid "_Go" -#~ msgstr "이동(_G)" - -#~ msgid "_Search Tab" -#~ msgstr "검색 탭(_S)" - -#~ msgid "_Contents Tab" -#~ msgstr "차례 탭(_C)" - -#~ msgid "Go to the previous page" -#~ msgstr "이전 페이지로 이동" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "새 탭(_T)" -#~ msgid "Go to the next page" -#~ msgstr "다음 페이지로 이동" +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "인쇄(_P)" -#~ msgid "Decrease the text size" -#~ msgstr "글씨 크기를 줄입니다" +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "찾기(_F)" -#~ msgid "Increase the text size" -#~ msgstr "글씨 크기를 늘립니다" +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "글씨 크게(_L)" -#~ msgid "Focus the Devhelp window with the search field active" -#~ msgstr "포커스를 개발 도움말 창의 검색 입력란에 놓습니다" +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "글씨 작게(_M)" -#~ msgid "Search in:" -#~ msgstr "찾을 범위:" +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "보통 크기(_N)" -#~ msgid "Contents" -#~ msgstr "내용" +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "뒤로" -#~ msgid "Search" -#~ msgstr "검색" +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "앞으로" diff -Nru devhelp-3.8.2/po/lt.po devhelp-3.10.2/po/lt.po --- devhelp-3.8.2/po/lt.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/lt.po 2013-09-03 07:09:30.000000000 +0000 @@ -13,8 +13,8 @@ "Project-Id-Version: lt\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-03-02 23:03+0200\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-08-28 22:38+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: \n" @@ -27,8 +27,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -117,58 +117,68 @@ msgstr "Ar knygos turėtų būti grupuojamos pagal galbą sąsajoje" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized" +msgstr "Ar pagalbinis langas turėtų būti išdidintas" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized." +msgstr "Ar pagalbinis langas turėtų būti išdidintas." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Pagalbinio lango plotis" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Pagalbinio lango plotis." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Pagalbinio lango aukštis" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Pagalbinio lango aukštis." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Pagalbinio lango X koordinatė" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Pagalbinio lango X koordinatė" -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Pagalbinio lango X koordinatė" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Pagalbinio lango Y koordinatė" -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Naudoti sisteminius šriftus" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Naudoti sistemos standartinius šriftus." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Šriftas tekstui" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Šriftas kintamo pločio tekstui." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Šriftas fiksuoto pločio tekstui" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Šriftas fiksuoto pločio tekstui, pavyzdžiui kodo pavyzdžiams." @@ -188,159 +198,139 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Rodyti API dokumentaciją žodžiui ties kursoriumi" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Naujas langas" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Naujas _langas" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Nustatymai" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Apie Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "Iš_eiti" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Nustatymai" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Apie Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Išeiti" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nauja _kortelė" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "S_pausdinti" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Ieškoti" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Didesnis tekstas" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Mažesnis tekstas" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Normalus dydis" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Grupuoti pagal kalbą" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Įjungta" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Pavadinimas" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Knygos lentyna" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Naudoti sisteminius šriftus" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Kintamo pločio šriftas" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Fiksuoto pločio šriftas" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Šriftai" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Išvertė:\n" "Aurimas Černius \n" "Vytautas Liuolia " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "GNOME programuotojo žinynas" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "DevHelp žiniatinklis" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp - pagalbininkas" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Knyga:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Kalba: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Kalba: Nenurodyta" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Knyga" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Puslapis" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Raktažodis" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Funkcija" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Type" @@ -413,12 +403,11 @@ msgstr "Nepavyko išpakuoti knygos '%s': %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Dabartinė" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Visos knygos" @@ -458,49 +447,43 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -#| msgid "_Back" -msgid "Back" -msgstr "Atgal" - -#: ../src/dh-window.c:659 -#| msgid "_Forward" -msgid "Forward" -msgstr "Pirmyn" - -#: ../src/dh-window.c:919 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Klaida atverčiant nuorodą." -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Tuščias puslapis" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Ieškoti:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Rasti ankstesnį" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Rasti ankstesnį užklausos rezultatą" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Rasti kitą" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Rasti kitą užklausos rezultatą" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Skirti r_aidžių dydį" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Skirti raidžių dydį" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nauja _kortelė" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "S_pausdinti" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Ieškoti" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Didesnis tekstas" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Mažesnis tekstas" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Į_prastinis dydis" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Atgal" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Pirmyn" diff -Nru devhelp-3.8.2/po/lv.po devhelp-3.10.2/po/lv.po --- devhelp-3.8.2/po/lv.po 2012-09-30 14:38:40.000000000 +0000 +++ devhelp-3.10.2/po/lv.po 2013-09-23 16:26:46.000000000 +0000 @@ -1,27 +1,28 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Rudolfs , 2011, 2012. +# Rudolfs , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: devhelp\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-24 23:57+0300\n" -"PO-Revision-Date: 2012-09-25 00:07+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=devhelp&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-11 13:09+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:167 ../src/dh-app.c:350 -#: ../src/dh-window.c:958 ../src/dh-window.c:1857 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -33,396 +34,322 @@ msgid "Documentation Browser" msgstr "Dokumentācijas pārlūks" -#: ../data/devhelp.schemas.in.h:1 +#: ../data/devhelp.desktop.in.in.h:4 +msgid "documentation;information;manual;developer;api;" +msgstr "dokumentācija;informācija;rokasgrāmata;izstrāde;api;" + +#: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" msgstr "Galvenā loga maksimizētais stāvoklis" -#: ../data/devhelp.schemas.in.h:2 +#: ../data/org.gnome.devhelp.gschema.xml.h:2 msgid "Whether the main window should start maximized." msgstr "Vai galvenajam logam vajadzētu atvērties maksimizētam." -#: ../data/devhelp.schemas.in.h:3 +#: ../data/org.gnome.devhelp.gschema.xml.h:3 msgid "Width of the main window" msgstr "Galvenā loga platums" -#: ../data/devhelp.schemas.in.h:4 +#: ../data/org.gnome.devhelp.gschema.xml.h:4 msgid "The width of the main window." msgstr "Galvenā loga platums." -#: ../data/devhelp.schemas.in.h:5 +#: ../data/org.gnome.devhelp.gschema.xml.h:5 msgid "Height of main window" msgstr "Galvenā loga augstums" -#: ../data/devhelp.schemas.in.h:6 +#: ../data/org.gnome.devhelp.gschema.xml.h:6 msgid "The height of the main window." msgstr "Galvenā loga augstums." -#: ../data/devhelp.schemas.in.h:7 +#: ../data/org.gnome.devhelp.gschema.xml.h:7 msgid "X position of main window" msgstr "Galvenā loga X novietojums" -#: ../data/devhelp.schemas.in.h:8 +#: ../data/org.gnome.devhelp.gschema.xml.h:8 msgid "The X position of the main window." msgstr "Galvenā loga X novietojums." -#: ../data/devhelp.schemas.in.h:9 +#: ../data/org.gnome.devhelp.gschema.xml.h:9 msgid "Y position of main window" msgstr "Galvenā loga Y novietojums" -#: ../data/devhelp.schemas.in.h:10 +#: ../data/org.gnome.devhelp.gschema.xml.h:10 msgid "The Y position of the main window." msgstr "Galvenā loga Y novietojums." -#: ../data/devhelp.schemas.in.h:11 -msgid "Width of the assistant window" -msgstr "Asistenta loga platums" - -#: ../data/devhelp.schemas.in.h:12 -msgid "The width of the assistant window." -msgstr "Asistenta loga platums." - -#: ../data/devhelp.schemas.in.h:13 -msgid "Height of assistant window" -msgstr "Asistenta loga augstums" - -#: ../data/devhelp.schemas.in.h:14 -msgid "The height of the assistant window." -msgstr "Asistenta loga augstums." - -#: ../data/devhelp.schemas.in.h:15 -msgid "X position of assistant window" -msgstr "Asistenta loga X novietojums" - -#: ../data/devhelp.schemas.in.h:16 -msgid "The X position of the assistant window." -msgstr "Asistenta loga X novietojums." - -#: ../data/devhelp.schemas.in.h:17 -msgid "Y position of assistant window" -msgstr "Asistenta loga Y novietojums" - -#: ../data/devhelp.schemas.in.h:18 -msgid "The Y position of the assistant window." -msgstr "Asistenta loga Y novietojums." - -#: ../data/devhelp.schemas.in.h:19 +#: ../data/org.gnome.devhelp.gschema.xml.h:11 msgid "Width of the index and search pane" msgstr "Rādītāja un meklēšanas rūts platums" -#: ../data/devhelp.schemas.in.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:12 msgid "The width of the index and search pane." msgstr "Rādītāja un meklēšanas rūts platums" -#: ../data/devhelp.schemas.in.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:13 msgid "Selected tab: \"content\" or \"search\"" msgstr "Izvēlētā cilne — “content” (saturs) vai “search” (meklēt)" -#: ../data/devhelp.schemas.in.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:14 msgid "Which of the tabs is selected: \"content\" or \"search\"." msgstr "Kura no cilnēm ir izvēlēta — “content” (saturs) vai “search” (meklēt)" -#: ../data/devhelp.schemas.in.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:15 msgid "Books disabled" msgstr "Grāmatas deaktivētas" -#: ../data/devhelp.schemas.in.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:16 msgid "List of books disabled by the user." msgstr "Saraksts ar grāmatām, ko lietotājs deaktivējis." -#: ../data/devhelp.schemas.in.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:17 msgid "Group by language" msgstr "Grupēt pēc valodas" -#: ../data/devhelp.schemas.in.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:18 msgid "Whether books should be grouped by language in the UI" msgstr "Vai grāmatas saskarnē vajadzētu grupēt pēc valodas" -#: ../data/devhelp.schemas.in.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized" +msgstr "Vai asistenta logam pēc noklusējuma jābūt minimizētam" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized." +msgstr "Vai asistenta logam pēc noklusējuma jābūt minimizētam." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 +msgid "Width of the assistant window" +msgstr "Asistenta loga platums" + +#: ../data/org.gnome.devhelp.gschema.xml.h:22 +msgid "The width of the assistant window." +msgstr "Asistenta loga platums." + +#: ../data/org.gnome.devhelp.gschema.xml.h:23 +msgid "Height of assistant window" +msgstr "Asistenta loga augstums" + +#: ../data/org.gnome.devhelp.gschema.xml.h:24 +msgid "The height of the assistant window." +msgstr "Asistenta loga augstums." + +#: ../data/org.gnome.devhelp.gschema.xml.h:25 +msgid "X position of assistant window" +msgstr "Asistenta loga X novietojums" + +#: ../data/org.gnome.devhelp.gschema.xml.h:26 +msgid "The X position of the assistant window." +msgstr "Asistenta loga X novietojums." + +#: ../data/org.gnome.devhelp.gschema.xml.h:27 +msgid "Y position of assistant window" +msgstr "Asistenta loga Y novietojums" + +#: ../data/org.gnome.devhelp.gschema.xml.h:28 +msgid "The Y position of the assistant window." +msgstr "Asistenta loga Y novietojums." + +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Lietot sistēmas fontus" -#: ../data/devhelp.schemas.in.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Lietot sistēmas noklusējuma fontus." -#: ../data/devhelp.schemas.in.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Fonts tekstam" -#: ../data/devhelp.schemas.in.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Fonts tekstam ar mainīgu platumu." -#: ../data/devhelp.schemas.in.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Fonts fiksēta platuma tekstam" -#: ../data/devhelp.schemas.in.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Fonts tekstam ar fiksētu platumu, teiksim, koda piemēriem." -#: ../data/ui/devhelp.builder.h:1 -msgid "New window" -msgstr "Jauns logs" - -#: ../data/ui/devhelp.builder.h:2 -msgid "Preferences" -msgstr "Iestatījumi" - -#: ../data/ui/devhelp.builder.h:3 -msgid "About Devhelp" -msgstr "Par Devhelp" - -#: ../data/ui/devhelp.builder.h:4 -msgid "Quit" -msgstr "Iziet" - -#: ../data/ui/devhelp.builder.h:5 -msgid "_Window" -msgstr "_Logs" - -#: ../data/ui/devhelp.builder.h:6 -msgid "New _Tab" -msgstr "Jauna _cilne" - -#: ../data/ui/devhelp.builder.h:7 -msgid "_Print" -msgstr "_Drukāt" - -#: ../data/ui/devhelp.builder.h:8 -msgid "_Close" -msgstr "_Aizvērt" - -#: ../data/ui/devhelp.builder.h:9 -msgid "_Edit" -msgstr "R_ediģēt" - -#: ../data/ui/devhelp.builder.h:10 -msgid "_Copy" -msgstr "_Kopēt" - -#: ../data/ui/devhelp.builder.h:11 -msgid "_Find" -msgstr "_Meklēt" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 +msgid "Devhelp support" +msgstr "Devhelp atbalsts" -#: ../data/ui/devhelp.builder.h:12 -msgid "Find _Next" -msgstr "Meklēt _nākamo" - -#: ../data/ui/devhelp.builder.h:13 -msgid "Find _Previous" -msgstr "Meklēt ie_priekšējo" - -#: ../data/ui/devhelp.builder.h:14 -msgid "_View" -msgstr "_Skats" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 +msgid "Makes F2 bring up Devhelp for the word at the cursor" +msgstr "Nospiežot F2, atveras Devhelp vārdam, kas ir pie kursora" -#: ../data/ui/devhelp.builder.h:15 -msgid "_Larger text" -msgstr "_Lielāks teksts" +#: ../misc/gedit-plugin/devhelp.py:69 +msgid "Show API Documentation" +msgstr "Rādīt API dokumentāciju" -#: ../data/ui/devhelp.builder.h:16 -msgid "S_maller text" -msgstr "_Mazāks teksts" +#: ../misc/gedit-plugin/devhelp.py:71 +msgid "Show API Documentation for the word at the cursor" +msgstr "Rādīt API dokumentāciju vārdam pie kursora" -#: ../data/ui/devhelp.builder.h:17 -msgid "_Normal size" -msgstr "_Normāls izmērs" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +#| msgid "New window" +msgid "New _Window" +msgstr "Jauns _logs" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +#| msgid "Preferences" +msgid "_Preferences" +msgstr "_Iestatījumi" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +#| msgid "About Devhelp" +msgid "_About Devhelp" +msgstr "P_ar Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +#| msgid "Quit" +msgid "_Quit" +msgstr "I_ziet" -#: ../data/ui/devhelp.builder.h:18 -msgid "Fullscreen" -msgstr "Pilnekrāns" - -#: ../data/ui/devhelp.builder.h:19 -msgid "_Go" -msgstr "_Iet" - -#: ../data/ui/devhelp.builder.h:20 -msgid "_Back" -msgstr "_Atpakaļ" - -#: ../data/ui/devhelp.builder.h:21 -msgid "_Forward" -msgstr "_Uz priekšu" - -#: ../data/ui/devhelp.builder.h:22 -msgid "_Search Tab" -msgstr "_Meklēšanas cilne" - -#: ../data/ui/devhelp.builder.h:23 -msgid "_Contents Tab" -msgstr "_Satura cilne" - -#: ../data/ui/devhelp.builder.h:24 -msgid "Go to the previous page" -msgstr "Iet uz iepriekšējo lapu" - -#: ../data/ui/devhelp.builder.h:25 -msgid "Go to the next page" -msgstr "Iet uz nākamo lapu" - -#: ../data/ui/devhelp.builder.h:26 -msgid "Decrease the text size" -msgstr "Samazināt teksta izmēru" - -#: ../data/ui/devhelp.builder.h:27 -msgid "Increase the text size" -msgstr "Palielināt teksta izmēru" +#: ../src/devhelp.ui.h:5 +msgid "Preferences" +msgstr "Iestatījumi" -#: ../data/ui/devhelp.builder.h:28 +#: ../src/devhelp.ui.h:6 msgid "_Group by language" msgstr "_Grupēt pēc valodas" -#: ../data/ui/devhelp.builder.h:29 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Aktivēts" -#: ../data/ui/devhelp.builder.h:30 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Nosaukums" -#: ../data/ui/devhelp.builder.h:31 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Grāmatplaukts" -#: ../data/ui/devhelp.builder.h:32 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "Lietot sistēmas font_us" -#: ../data/ui/devhelp.builder.h:33 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Mainīgs platums: " -#: ../data/ui/devhelp.builder.h:34 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Fiksēts platums:" -#: ../data/ui/devhelp.builder.h:35 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Fonti" -#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 -msgid "Devhelp support" -msgstr "Devhelp atbalsts" - -#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 -msgid "Makes F2 bring up Devhelp for the word at the cursor" -msgstr "Nospiežot F2, atveras Devhelp vārdam, kas ir pie kursora" - -#: ../misc/gedit-plugin/devhelp.py:69 -msgid "Show API Documentation" -msgstr "Rādīt API dokumentāciju" - -#: ../misc/gedit-plugin/devhelp.py:71 -msgid "Show API Documentation for the word at the cursor" -msgstr "Rādīt API dokumentāciju vārdam pie kursora" - -#: ../src/dh-app.c:162 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "Rūdolfs Mazurs " -#: ../src/dh-app.c:169 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Izstrādātāju palīdzības pārlūks GNOME videi" -#: ../src/dh-app.c:177 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "DevHelp tīmekļa vietne" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:76 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — asistents" -#: ../src/dh-assistant-view.c:395 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Grāmata:" -#: ../src/dh-book.c:252 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Valoda: %s" -#: ../src/dh-book.c:253 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Valoda: nedefinēta" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Grāmata" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Lapa" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Atslēgvārds" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Funkcija" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struktūra" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Makross" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Tips" -#: ../src/dh-main.c:48 +#: ../src/dh-main.c:43 msgid "Opens a new Devhelp window" msgstr "Atver jaunu Devhelp logu" -#: ../src/dh-main.c:53 -msgid "Focus the Devhelp window with the search field active" -msgstr "Fokusēt Devhelp logu ar aktīviem meklēšanas laukiem" - -#: ../src/dh-main.c:58 +#: ../src/dh-main.c:48 msgid "Search for a keyword" msgstr "Meklēt atslēgvārdu" -#: ../src/dh-main.c:59 ../src/dh-main.c:64 +#: ../src/dh-main.c:49 ../src/dh-main.c:54 msgid "KEYWORD" msgstr "ATSLĒGVĀRDS" -#: ../src/dh-main.c:63 +#: ../src/dh-main.c:53 msgid "Search and display any hit in the assistant window" msgstr "Meklēt un parādīt jebkuru rezultātu asistenta logā" -#: ../src/dh-main.c:68 +#: ../src/dh-main.c:58 msgid "Display the version and exit" msgstr "Rādīt versiju un iziet" -#: ../src/dh-main.c:73 +#: ../src/dh-main.c:63 msgid "Quit any running Devhelp" msgstr "Iziet no jebkura palaista Devhelp" @@ -469,93 +396,174 @@ msgid "Cannot uncompress book '%s': %s" msgstr "Nevar atspiest grāmatu “%s” — %s" -#: ../src/dh-search.c:492 -msgid "All books" +#. Setup the Current/All Files selector +#: ../src/dh-sidebar.c:531 +msgid "Current" +msgstr "Pašreizējais" + +#: ../src/dh-sidebar.c:534 +#| msgid "All books" +msgid "All Books" msgstr "Visas grāmatas" -#: ../src/dh-search.c:1110 -msgid "Search in:" -msgstr "Meklēt iekš:" - -#: ../src/dh-window.c:100 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:101 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:102 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:103 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:104 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:105 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:106 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:107 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:108 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:1046 -msgid "Contents" -msgstr "Saturs" - -#: ../src/dh-window.c:1056 -msgid "Search" -msgstr "Meklēt" - -#: ../src/dh-window.c:1266 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Kļūda, atverot pieprasīto saiti." -#: ../src/dh-window.c:1638 ../src/dh-window.c:1885 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Tukša lapa" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Meklēt:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Meklēt iepriekšējo" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Meklēt iepriekšējo meklētās virknes parādīšanos" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Meklēt nākamo" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Meklēt nākamo meklētās virknes parādīšanos" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Reģistr_jutīgs" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Pārslēgt meklēšanas lielo-mazo burtu jutību" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Jauna _cilne" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Drukāt" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Meklēt" + +#: ../src/dh-window.ui.h:4 +#| msgid "_Larger text" +msgid "_Larger Text" +msgstr "_Lielāks teksts" + +#: ../src/dh-window.ui.h:5 +#| msgid "S_maller text" +msgid "S_maller Text" +msgstr "_Mazāks teksts" + +#: ../src/dh-window.ui.h:6 +#| msgid "_Normal size" +msgid "_Normal Size" +msgstr "_Normāls izmērs" + +#: ../src/dh-window.ui.h:11 +#| msgid "_Back" +msgid "Back" +msgstr "Atpakaļ" + +#: ../src/dh-window.ui.h:12 +#| msgid "_Forward" +msgid "Forward" +msgstr "Uz priekšu" + +#~ msgid "_Window" +#~ msgstr "_Logs" + +#~ msgid "_Close" +#~ msgstr "_Aizvērt" + +#~ msgid "_Edit" +#~ msgstr "R_ediģēt" + +#~ msgid "_Copy" +#~ msgstr "_Kopēt" + +#~ msgid "Find _Next" +#~ msgstr "Meklēt _nākamo" + +#~ msgid "Find _Previous" +#~ msgstr "Meklēt ie_priekšējo" + +#~ msgid "_View" +#~ msgstr "_Skats" + +#~ msgid "Fullscreen" +#~ msgstr "Pilnekrāns" + +#~ msgid "_Go" +#~ msgstr "_Iet" + +#~ msgid "_Search Tab" +#~ msgstr "_Meklēšanas cilne" + +#~ msgid "_Contents Tab" +#~ msgstr "_Satura cilne" + +#~ msgid "Go to the previous page" +#~ msgstr "Iet uz iepriekšējo lapu" + +#~ msgid "Go to the next page" +#~ msgstr "Iet uz nākamo lapu" + +#~ msgid "Decrease the text size" +#~ msgstr "Samazināt teksta izmēru" + +#~ msgid "Increase the text size" +#~ msgstr "Palielināt teksta izmēru" + +#~ msgid "Focus the Devhelp window with the search field active" +#~ msgstr "Fokusēt Devhelp logu ar aktīviem meklēšanas laukiem" + +#~ msgid "Search in:" +#~ msgstr "Meklēt iekš:" + +#~ msgid "Contents" +#~ msgstr "Saturs" + +#~ msgid "Search" +#~ msgstr "Meklēt" + +#~ msgid "Find:" +#~ msgstr "Meklēt:" + +#~ msgid "Find Previous" +#~ msgstr "Meklēt iepriekšējo" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Meklēt iepriekšējo meklētās virknes parādīšanos" + +#~ msgid "Find Next" +#~ msgstr "Meklēt nākamo" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Meklēt nākamo meklētās virknes parādīšanos" + +#~ msgid "C_ase Sensitive" +#~ msgstr "Reģistr_jutīgs" + +#~ msgid "Toggle case sensitive search" +#~ msgstr "Pārslēgt meklēšanas lielo-mazo burtu jutību" #~ msgid "_File" #~ msgstr "_Fails" diff -Nru devhelp-3.8.2/po/ml.po devhelp-3.10.2/po/ml.po --- devhelp-3.8.2/po/ml.po 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/po/ml.po 2013-05-15 11:10:50.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # FSF-India , 2003. # Ani Peter , 2007. -# Anish A , 2012. +# Anish A , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: devhelp.HEAD.ml\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-10-09 22:17+0000\n" -"PO-Revision-Date: 2012-10-15 21:30+0530\n" -"Last-Translator: Anish A \n" +"POT-Creation-Date: 2013-04-17 07:41+0000\n" +"PO-Revision-Date: 2013-04-26 22:51+0530\n" +"Last-Translator: Balasankar C \n" "Language-Team: Swatantra Malayalam Computing\n" "Language: ml\n" "MIME-Version: 1.0\n" @@ -23,8 +23,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:167 ../src/dh-app.c:350 -#: ../src/dh-window.c:958 ../src/dh-window.c:1857 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:347 +#: ../src/dh-window.c:636 msgid "Devhelp" msgstr "Devhelp" @@ -36,319 +36,255 @@ msgid "Documentation Browser" msgstr "ഡോക്യുമെന്‍റേഷന്‍ ബ്രൌസര്‍" -#: ../data/devhelp.schemas.in.h:1 +#: ../data/devhelp.desktop.in.in.h:4 +msgid "documentation;information;manual;developer;api;" +msgstr "documentation;information;manual;developer;api;" + +#: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" msgstr "പ്രധാന ജാലകം ഏറ്റവും കൂടുതല്‍ വലിപ്പത്തില്‍" -#: ../data/devhelp.schemas.in.h:2 +#: ../data/org.gnome.devhelp.gschema.xml.h:2 msgid "Whether the main window should start maximized." msgstr "പ്രധാനപ്പെട്ട ജാലകം വലുതായി ആരംഭിക്കണമോ എന്ന്." -#: ../data/devhelp.schemas.in.h:3 +#: ../data/org.gnome.devhelp.gschema.xml.h:3 msgid "Width of the main window" msgstr "പ്രധാന ജാലകത്തിന്‍റെ വീതി" -#: ../data/devhelp.schemas.in.h:4 +#: ../data/org.gnome.devhelp.gschema.xml.h:4 msgid "The width of the main window." msgstr "പ്രധാന ജാലകത്തിന്‍റെ വീതി." -#: ../data/devhelp.schemas.in.h:5 +#: ../data/org.gnome.devhelp.gschema.xml.h:5 msgid "Height of main window" msgstr "പ്രധാന ജാലകത്തിന്‍റെ ഉയരം" -#: ../data/devhelp.schemas.in.h:6 +#: ../data/org.gnome.devhelp.gschema.xml.h:6 msgid "The height of the main window." msgstr "പ്രധാന ജാലകത്തിന്‍റെ ഉയരം." -#: ../data/devhelp.schemas.in.h:7 +#: ../data/org.gnome.devhelp.gschema.xml.h:7 msgid "X position of main window" msgstr "പ്രധാന ജാലകത്തിന്‍റെ X സ്ഥാനം" -#: ../data/devhelp.schemas.in.h:8 +#: ../data/org.gnome.devhelp.gschema.xml.h:8 msgid "The X position of the main window." msgstr "പ്രധാന ജാലകത്തിന്‍റെ X സ്ഥാനം." -#: ../data/devhelp.schemas.in.h:9 +#: ../data/org.gnome.devhelp.gschema.xml.h:9 msgid "Y position of main window" msgstr "പ്രധാന ജാലകത്തിന്‍റെ Y സ്ഥാനം" -#: ../data/devhelp.schemas.in.h:10 +#: ../data/org.gnome.devhelp.gschema.xml.h:10 msgid "The Y position of the main window." msgstr "പ്രധാന ജാലകത്തിന്‍റെ Y സ്ഥാനം." -#: ../data/devhelp.schemas.in.h:11 -msgid "Width of the assistant window" -msgstr "സഹായി ജാലകത്തിന്‍റെ വീതി" - -#: ../data/devhelp.schemas.in.h:12 -msgid "The width of the assistant window." -msgstr "സഹായി ജാലകത്തിന്‍റെ വീതി." - -#: ../data/devhelp.schemas.in.h:13 -msgid "Height of assistant window" -msgstr "സഹായി ജാലകത്തിന്‍റെ ഉയരം" - -#: ../data/devhelp.schemas.in.h:14 -msgid "The height of the assistant window." -msgstr "സഹായി ജാലകത്തിന്‍റെ ഉയരം." - -#: ../data/devhelp.schemas.in.h:15 -msgid "X position of assistant window" -msgstr "സഹായി ജാലകത്തിന്‍റെ X സ്ഥാനം" - -#: ../data/devhelp.schemas.in.h:16 -msgid "The X position of the assistant window." -msgstr "സഹായി ജാലകത്തിന്‍റെ X സ്ഥാനം." - -#: ../data/devhelp.schemas.in.h:17 -msgid "Y position of assistant window" -msgstr "സഹായി ജാലകത്തിന്‍റെ Y സ്ഥാനം" - -#: ../data/devhelp.schemas.in.h:18 -msgid "The Y position of the assistant window." -msgstr "സഹായി ജാലകത്തിന്‍റെ Y സ്ഥാനം." - -#: ../data/devhelp.schemas.in.h:19 +#: ../data/org.gnome.devhelp.gschema.xml.h:11 msgid "Width of the index and search pane" msgstr "ഇന്‍ഡക്സിന്‍റേയും തിരച്ചില്‍ പാളിയുടേയും വീതി" -#: ../data/devhelp.schemas.in.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:12 msgid "The width of the index and search pane." msgstr "ഇന്‍ഡക്സിന്‍റേയും തിരച്ചില്‍ പാളിയുടേയും വീതി." -#: ../data/devhelp.schemas.in.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:13 msgid "Selected tab: \"content\" or \"search\"" msgstr "\"content\" അല്ലെങ്കില്‍ \"search\" ടാബ് തിരഞ്ഞെടുത്തിരിക്കുന്നു" -#: ../data/devhelp.schemas.in.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:14 msgid "Which of the tabs is selected: \"content\" or \"search\"." msgstr "ഏത് ടാബ് തിരഞ്ഞെടുത്തിരിക്കുന്നു, \"content\" അല്ലെങ്കില്‍ \"search\"." -#: ../data/devhelp.schemas.in.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:15 msgid "Books disabled" msgstr "പുസ്തകങ്ങള്‍ പ്രവര്‍ത്തനരഹിതം" -#: ../data/devhelp.schemas.in.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:16 msgid "List of books disabled by the user." msgstr "ഉപയോക്താവ് പ്രവര്‍ത്തനരഹിതമാക്കിയ ബുക്കുകളുടെ പട്ടിക." -#: ../data/devhelp.schemas.in.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:17 msgid "Group by language" msgstr "ഭാഷ വെച്ച് തരംതിരിക്കുക" -#: ../data/devhelp.schemas.in.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:18 msgid "Whether books should be grouped by language in the UI" msgstr "പുസ്തകങ്ങള്‍ ഭാഷയനുസരിച്ച് തരം തിരിക്കണോ എന്ന്" -#: ../data/devhelp.schemas.in.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Width of the assistant window" +msgstr "സഹായി ജാലകത്തിന്‍റെ വീതി" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "The width of the assistant window." +msgstr "സഹായി ജാലകത്തിന്‍റെ വീതി." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 +msgid "Height of assistant window" +msgstr "സഹായി ജാലകത്തിന്‍റെ ഉയരം" + +#: ../data/org.gnome.devhelp.gschema.xml.h:22 +msgid "The height of the assistant window." +msgstr "സഹായി ജാലകത്തിന്‍റെ ഉയരം." + +#: ../data/org.gnome.devhelp.gschema.xml.h:23 +msgid "X position of assistant window" +msgstr "സഹായി ജാലകത്തിന്‍റെ X സ്ഥാനം" + +#: ../data/org.gnome.devhelp.gschema.xml.h:24 +msgid "The X position of the assistant window." +msgstr "സഹായി ജാലകത്തിന്‍റെ X സ്ഥാനം." + +#: ../data/org.gnome.devhelp.gschema.xml.h:25 +msgid "Y position of assistant window" +msgstr "സഹായി ജാലകത്തിന്‍റെ Y സ്ഥാനം" + +#: ../data/org.gnome.devhelp.gschema.xml.h:26 +msgid "The Y position of the assistant window." +msgstr "സഹായി ജാലകത്തിന്‍റെ Y സ്ഥാനം." + +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Use system fonts" msgstr "സിസ്റ്റമിലുളള ലിപികള്‍ ഉപയോഗിക്കുക." -#: ../data/devhelp.schemas.in.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "Use the system default fonts." msgstr "സിസ്റ്റമില്‍ ഡീഫോള്‍ട്ടായുളള ലിപികള്‍ ഉപയോഗിക്കുക." -#: ../data/devhelp.schemas.in.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Font for text" msgstr "ടെക്സ്റ്റിനുളള ലിപി" -#: ../data/devhelp.schemas.in.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Font for text with variable width." msgstr "വിവിധ വീതിയുളള ടെക്സ്റ്റിനുളള ലിപി." -#: ../data/devhelp.schemas.in.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for fixed width text" msgstr "സ്ഥിരമായ വീതിയുള്ള വാചകത്തിനുള്ള അക്ഷരസഞ്ചയം" -#: ../data/devhelp.schemas.in.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with fixed width, such as code examples." msgstr "സ്ഥിരമായ വീതിയുളള ടെക്സ്റ്റിനുളള ലിപി, കോഡ് ഉദാഹരണങ്ങള്‍ പോലെ." -#: ../data/ui/devhelp.builder.h:1 +#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 +msgid "Devhelp support" +msgstr "Devhelp സപ്പോറ്‍ട്ട്" + +#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 +msgid "Makes F2 bring up Devhelp for the word at the cursor" +msgstr "കഴ്സറിലുളള വാക്കിനായി F2 Devhelp ലഭ്യമാക്കുന്നു" + +#: ../misc/gedit-plugin/devhelp.py:69 +msgid "Show API Documentation" +msgstr "എപിഐ വിവരണം കാണിക്കുക" + +#: ../misc/gedit-plugin/devhelp.py:71 +msgid "Show API Documentation for the word at the cursor" +msgstr "കഴ്സറിലുളള വാക്കിന്റെ API വിവരണം കാണിക്കുക" + +#: ../src/devhelp.ui.h:1 msgid "New window" msgstr "പുതിയ ജാലകം" -#: ../data/ui/devhelp.builder.h:2 +#: ../src/devhelp.ui.h:2 msgid "Preferences" msgstr "സവിശേഷതകള്‍" -#: ../data/ui/devhelp.builder.h:3 +#: ../src/devhelp.ui.h:3 msgid "About Devhelp" msgstr "ഡെവ്ഹെല്‍പ്പിനെകുറിച്ച്" -#: ../data/ui/devhelp.builder.h:4 +#: ../src/devhelp.ui.h:4 msgid "Quit" msgstr "പുറത്ത് കടക്കുക" -#: ../data/ui/devhelp.builder.h:5 -msgid "_Window" -msgstr "_ജാലകം" - -#: ../data/ui/devhelp.builder.h:6 +#: ../src/devhelp.ui.h:5 msgid "New _Tab" msgstr "പുതിയ ടാബ് (_T)" -#: ../data/ui/devhelp.builder.h:7 +#: ../src/devhelp.ui.h:6 msgid "_Print" msgstr "_അച്ചടിയ്ക്കുക" -#: ../data/ui/devhelp.builder.h:8 -msgid "_Close" -msgstr "_അടയ്ക്കുക" - -#: ../data/ui/devhelp.builder.h:9 -msgid "_Edit" -msgstr "മാറ്റുക (_E)" - -#: ../data/ui/devhelp.builder.h:10 -msgid "_Copy" -msgstr "_പകര്‍ത്തുക" - -#: ../data/ui/devhelp.builder.h:11 +#: ../src/devhelp.ui.h:7 msgid "_Find" msgstr "_കണ്ടെത്തുക" -#: ../data/ui/devhelp.builder.h:12 -msgid "Find _Next" -msgstr "_അടുത്തത് കണ്ടുപിടിക്കുക" - -#: ../data/ui/devhelp.builder.h:13 -msgid "Find _Previous" -msgstr "_മുമ്പുളളത് കണ്ടുപിടിക്കുക" - -#: ../data/ui/devhelp.builder.h:14 -msgid "_View" -msgstr "_കാഴ്ച" - -#: ../data/ui/devhelp.builder.h:15 +#: ../src/devhelp.ui.h:8 msgid "_Larger text" msgstr "_വലിയ പദാവലി" -#: ../data/ui/devhelp.builder.h:16 +#: ../src/devhelp.ui.h:9 msgid "S_maller text" msgstr "_ചെറിയ പദാവലി" -#: ../data/ui/devhelp.builder.h:17 +#: ../src/devhelp.ui.h:10 msgid "_Normal size" msgstr "_സാധാരണ വലിപ്പം " -#: ../data/ui/devhelp.builder.h:18 -msgid "Fullscreen" -msgstr "മുഴുവന്‍ തിരശ്ശീലയും" - -#: ../data/ui/devhelp.builder.h:19 -msgid "_Go" -msgstr "പോകുക (_G)" - -#: ../data/ui/devhelp.builder.h:20 -msgid "_Back" -msgstr "പുറകോട്ട് (_B)" - -#: ../data/ui/devhelp.builder.h:21 -msgid "_Forward" -msgstr "മുന്പോട്ട് (_F)" - -#: ../data/ui/devhelp.builder.h:22 -msgid "_Search Tab" -msgstr "ടാബ് _തെരയുക" - -#: ../data/ui/devhelp.builder.h:23 -msgid "_Contents Tab" -msgstr "_ഉള്ളടക്കം ടാബ്" - -#: ../data/ui/devhelp.builder.h:24 -msgid "Go to the previous page" -msgstr "മുമ്പുള്ള താളിലേയ്ക്കു് പോകുക" - -#: ../data/ui/devhelp.builder.h:25 -msgid "Go to the next page" -msgstr "തൊട്ടടുത്ത താളിലേയ്ക്കു് പോകുക" - -#: ../data/ui/devhelp.builder.h:26 -msgid "Decrease the text size" -msgstr "ടെക്സ്റ്റിന്‍റെ വലിപ്പം കുറയ്ക്കുക" - -#: ../data/ui/devhelp.builder.h:27 -msgid "Increase the text size" -msgstr "വാചകത്തിന്‍റെ വലിപ്പം കൂട്ടുക" - -#: ../data/ui/devhelp.builder.h:28 +#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_ഭാഷ വെച്ച് തരംതിരിക്കുക" -#: ../data/ui/devhelp.builder.h:29 +#: ../src/devhelp.ui.h:12 msgid "Enabled" msgstr "പ്രവര്‍ത്തന സജ്ജം" -#: ../data/ui/devhelp.builder.h:30 +#: ../src/devhelp.ui.h:13 msgid "Title" msgstr "ശീര്‍ഷകം" -#: ../data/ui/devhelp.builder.h:31 +#: ../src/devhelp.ui.h:14 msgid "Book Shelf" msgstr "പുസ്തക അറ" -#: ../data/ui/devhelp.builder.h:32 +#: ../src/devhelp.ui.h:15 msgid "_Use system fonts" msgstr "സിസ്റ്റത്തിലുള്ള ലിപികള്‍ ഉപയോഗിക്കുക (_U)" -#: ../data/ui/devhelp.builder.h:33 +#: ../src/devhelp.ui.h:16 msgid "_Variable width: " msgstr "മാറ്റുവാന്‍ സാധ്യമായ വീതി (_V):" -#: ../data/ui/devhelp.builder.h:34 +#: ../src/devhelp.ui.h:17 msgid "_Fixed width:" msgstr "സ്ഥിരമായ വീതി (_F):" -#: ../data/ui/devhelp.builder.h:35 +#: ../src/devhelp.ui.h:18 msgid "Fonts" msgstr "അക്ഷരസഞ്ചയം" -#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 -msgid "Devhelp support" -msgstr "Devhelp സപ്പോറ്‍ട്ട്" - -#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 -msgid "Makes F2 bring up Devhelp for the word at the cursor" -msgstr "കഴ്സറിലുളള വാക്കിനായി F2 Devhelp ലഭ്യമാക്കുന്നു" - -#: ../misc/gedit-plugin/devhelp.py:69 -msgid "Show API Documentation" -msgstr "എപിഐ വിവരണം കാണിക്കുക" - -#: ../misc/gedit-plugin/devhelp.py:71 -msgid "Show API Documentation for the word at the cursor" -msgstr "കഴ്സറിലുളള വാക്കിന്റെ API വിവരണം കാണിക്കുക" - -#: ../src/dh-app.c:162 +#: ../src/dh-app.c:157 msgid "translator_credits" msgstr "" "അനി പീറ്റര്‍\n" "അനീഷ് എ" -#: ../src/dh-app.c:169 +#: ../src/dh-app.c:164 msgid "A developers' help browser for GNOME" msgstr "GNOME -നുളള ഒരു ഡവലപ്പറിന്‍റെ സഹായി" -#: ../src/dh-app.c:177 +#: ../src/dh-app.c:172 msgid "DevHelp Website" msgstr "Devhelp വെബ്സൈറ്റ്" #. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:76 +#: ../src/dh-assistant.c:119 msgid "Devhelp — Assistant" msgstr "Devhelp — സഹായി" -#: ../src/dh-assistant-view.c:395 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "പുസ്തകം:" -#: ../src/dh-book.c:252 +#: ../src/dh-book.c:255 #, c-format msgid "Language: %s" msgstr "ഭാഷ: %s" -#: ../src/dh-book.c:253 +#: ../src/dh-book.c:256 msgid "Language: Undefined" msgstr "ഭാഷ: അറിയില്ല" @@ -403,31 +339,27 @@ msgid "Type" msgstr "തരം" -#: ../src/dh-main.c:48 +#: ../src/dh-main.c:43 msgid "Opens a new Devhelp window" msgstr "പുതിയ ഡെവ്‌ഹെല്‍പ്പ് ജാലകം തുറക്കുക" -#: ../src/dh-main.c:53 -msgid "Focus the Devhelp window with the search field active" -msgstr "" - -#: ../src/dh-main.c:58 +#: ../src/dh-main.c:48 msgid "Search for a keyword" msgstr "ഒരു കീവേര്‍ഡിനായി തിരയുക" -#: ../src/dh-main.c:59 ../src/dh-main.c:64 +#: ../src/dh-main.c:49 ../src/dh-main.c:54 msgid "KEYWORD" msgstr "KEYWORD" -#: ../src/dh-main.c:63 +#: ../src/dh-main.c:53 msgid "Search and display any hit in the assistant window" -msgstr "" +msgstr "വിവരങ്ങള്‍ തിരഞ്ഞ് കണ്ടുപിടിച്ച് സഹായക ജാലകത്തില്‍ കാണിക്കുക" -#: ../src/dh-main.c:68 +#: ../src/dh-main.c:58 msgid "Display the version and exit" msgstr "പതിപ്പ് ഏത് എന്ന് കാണിച്ച് പുറത്ത് കടക്കുക" -#: ../src/dh-main.c:73 +#: ../src/dh-main.c:63 msgid "Quit any running Devhelp" msgstr "പ്രവര്‍ത്തനത്തിലുളള Devhelp-ല്‍ നിന്നും പുറത്ത് കടക്കുക" @@ -463,74 +395,77 @@ msgid "" "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" +"'%s'-നുളളില്‍ %d-ആം വരിയില്‍, %d-ആം നിരയില്‍, \"name\", \"link\" എലമെന്‍റുകള്‍ വേണം" #: ../src/dh-parser.c:311 #, c-format msgid "\"type\" element is required inside on line %d, column %d" msgstr "" +"%d-ആം വരിയില്‍, %d-ആം നിരയില്‍, -നുളളില്‍ \"name\", \"link\" എലമെന്‍റുകള്‍ വേണം" #: ../src/dh-parser.c:514 #, c-format msgid "Cannot uncompress book '%s': %s" msgstr "'%s' എന്ന പുസ്തകം അണ്‍കംപ്റസ്സ് ചെയ്യുവാന്‍ സാധ്യമായില്ല: %s" -#: ../src/dh-search.c:492 -msgid "All books" -msgstr "എല്ലാ പുസ്തകവും" - -#: ../src/dh-search.c:1110 -msgid "Search in:" -msgstr "ഇതില്‍ തിരയുക:" +#. Setup the Current/All Files selector +#: ../src/dh-sidebar.c:478 +msgid "Current" +msgstr "നിലവിലുള്ളതു്" + +#: ../src/dh-sidebar.c:481 +msgid "All Books" +msgstr "എല്ലാ പുസ്തകങ്ങളും" -#: ../src/dh-window.c:100 +#: ../src/dh-window.c:82 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:101 +#: ../src/dh-window.c:83 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:102 +#: ../src/dh-window.c:84 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:103 +#: ../src/dh-window.c:85 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:104 +#: ../src/dh-window.c:86 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:105 +#: ../src/dh-window.c:87 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:106 +#: ../src/dh-window.c:88 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:107 +#: ../src/dh-window.c:89 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:108 +#: ../src/dh-window.c:90 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:1046 -msgid "Contents" -msgstr "ഉള്ളടക്കം" - -#: ../src/dh-window.c:1056 -msgid "Search" -msgstr "തിരയുക" +#: ../src/dh-window.c:669 +msgid "Back" +msgstr "പുറകോട്ട്" + +#: ../src/dh-window.c:676 +msgid "Forward" +msgstr "മുന്നോട്ട്" -#: ../src/dh-window.c:1266 +#: ../src/dh-window.c:896 msgid "Error opening the requested link." msgstr "പറഞ്ഞ കണ്ണി തുറക്കുന്നതില്‍ പിഴവ്." -#: ../src/dh-window.c:1638 ../src/dh-window.c:1885 +#: ../src/dh-window.c:1175 ../src/dh-window.c:1349 msgid "Empty Page" msgstr "കാലിയായ പേജ്" @@ -562,6 +497,60 @@ msgid "Toggle case sensitive search" msgstr "കേസ് സെന്‍സിറ്റീവ് തിരച്ചില്‍ ടൊഗിള്‍ ചെയ്യുക" +#~ msgid "_Window" +#~ msgstr "_ജാലകം" + +#~ msgid "_Close" +#~ msgstr "_അടയ്ക്കുക" + +#~ msgid "_Edit" +#~ msgstr "മാറ്റുക (_E)" + +#~ msgid "_Copy" +#~ msgstr "_പകര്‍ത്തുക" + +#~ msgid "Find _Next" +#~ msgstr "_അടുത്തത് കണ്ടുപിടിക്കുക" + +#~ msgid "Find _Previous" +#~ msgstr "_മുമ്പുളളത് കണ്ടുപിടിക്കുക" + +#~ msgid "_View" +#~ msgstr "_കാഴ്ച" + +#~ msgid "Fullscreen" +#~ msgstr "മുഴുവന്‍ തിരശ്ശീലയും" + +#~ msgid "_Go" +#~ msgstr "പോകുക (_G)" + +#~ msgid "_Search Tab" +#~ msgstr "ടാബ് _തെരയുക" + +#~ msgid "_Contents Tab" +#~ msgstr "_ഉള്ളടക്കം ടാബ്" + +#~ msgid "Go to the previous page" +#~ msgstr "മുമ്പുള്ള താളിലേയ്ക്കു് പോകുക" + +#~ msgid "Go to the next page" +#~ msgstr "തൊട്ടടുത്ത താളിലേയ്ക്കു് പോകുക" + +#~ msgid "Decrease the text size" +#~ msgstr "ടെക്സ്റ്റിന്‍റെ വലിപ്പം കുറയ്ക്കുക" + +#~ msgid "Increase the text size" +#~ msgstr "വാചകത്തിന്‍റെ വലിപ്പം കൂട്ടുക" + +#~ msgid "Search in:" +#~ msgstr "ഇതില്‍ തിരയുക:" + +#~ msgid "Contents" +#~ msgstr "ഉള്ളടക്കം" + +#~ msgid "Search" +#~ msgstr "തിരയുക" + #~ msgid "" #~ "name and link elements are required inside on line %d, column " #~ "%d" diff -Nru devhelp-3.8.2/po/nb.po devhelp-3.10.2/po/nb.po --- devhelp-3.8.2/po/nb.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/nb.po 2013-09-03 07:09:30.000000000 +0000 @@ -5,10 +5,10 @@ # Torstein Adolf Winterseth , 2010. msgid "" msgstr "" -"Project-Id-Version: devhelp 3.7.x\n" +"Project-Id-Version: devhelp 3.9.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-25 17:17+0100\n" -"PO-Revision-Date: 2013-02-25 17:17+0100\n" +"POT-Creation-Date: 2013-08-22 16:01+0200\n" +"PO-Revision-Date: 2013-08-22 16:01+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language:\n" @@ -20,8 +20,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:345 -#: ../src/dh-window.c:647 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -110,58 +110,66 @@ msgstr "Om bøkene skal grupperes etter språk i brukergrensesnittet" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Hvorvidt assistentvinduet skal startes maksimert." + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Hvorvidt assistentvinduet skal startes maksimert." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Bredde på assistentvinduet" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Bredde på assistentvinduet." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Høyde på veiviservinduet" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Høyde på assistentvinduet." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "X-posisjon for assistentvinduet" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "X-posisjon for veiviservinduet." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Vertikal posisjon for hovedvinduet" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Y-posisjon for veiviservinduet." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Bruk systemets skrifter" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Bruk systemets forvalgte skrifter." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Skrift for tekst" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Skrift for tekst med variabel bredde." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Skrift for tekst med fast størrelse" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Skrift for tekst med fast bredde som f.eks kodeeksempler." @@ -181,158 +189,138 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Vis API-dokumentasjon for ordet ved markøren" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nytt vindu" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nytt _vindu" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Brukervalg" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_Om Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "A_vslutt" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Brukervalg" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Om Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Avslutt" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Ny _fane" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "S_kriv ut" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Finn" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "S_tørre tekst" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Mindre tekst" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Normal størrelse" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Grupper etter språk" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Slått på" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Tittel" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Bokhylle" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "Br_uk systemets skrifter" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Variabel bredde: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Fast bredde:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Skrifter" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Kjartan Maraas \n" "Torstein Adolf Winterseth " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "GNOME's hjelpleser for utviklere" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Nettsted for Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp - Assistent" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Bok:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Språk: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Språk: Udefinert" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Bok" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Side" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Nøkkelord" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Funksjon" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Makro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Type" @@ -402,90 +390,86 @@ msgstr "Kan ikke dekomprimere bok «%s»: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Aktiv" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Alle bøker" -#: ../src/dh-window.c:85 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:678 -msgid "Back" -msgstr "Tilbake" - -#: ../src/dh-window.c:683 -msgid "Forward" -msgstr "Fremover" - -#: ../src/dh-window.c:952 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Feil ved åpning av forespurt lenke." -#: ../src/dh-window.c:1302 ../src/dh-window.c:1488 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Tom side" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Finn:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Finn forrige" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Finn forrige oppføring av søkestrengen" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Finn neste" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Finn neste oppføring av søkestrengen" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Skill mellom små/store bokstaver" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Slå av/på skille mellom små/store bokstaver" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Ny _fane" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "S_kriv ut" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Finn" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "S_tørre tekst" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Mindre tekst" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Normal størrelse" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Tilbake" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Fremover" diff -Nru devhelp-3.8.2/po/pl.po devhelp-3.10.2/po/pl.po --- devhelp-3.8.2/po/pl.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/pl.po 2013-09-03 07:09:30.000000000 +0000 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-16 21:32+0100\n" -"PO-Revision-Date: 2013-02-16 21:33+0100\n" +"POT-Creation-Date: 2013-08-31 23:29+0200\n" +"PO-Revision-Date: 2013-08-31 23:30+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -29,8 +29,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:345 -#: ../src/dh-window.c:647 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -44,7 +44,8 @@ #: ../data/devhelp.desktop.in.in.h:4 msgid "documentation;information;manual;developer;api;" -msgstr "dokumentacja;informacje;podręcznik;programista;developer;api;" +msgstr "" +"dokumentacja;informacje;podręcznik;przewodnik;programista;developer;api;" #: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" @@ -121,58 +122,66 @@ "użytkownika" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Określa, czy okno asystenta powinno być zmaksymalizowane" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Określa, czy okno asystenta powinno być zmaksymalizowane." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Szerokość okna asystenta" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Szerokość okna asystenta." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Wysokość okna asystenta" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Wysokość okna asystenta." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Pozycja pozioma okna asystenta" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Pozycja pozioma okna asystenta." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Pozycja pionowa okna asystenta" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Pozycja pionowa okna asystenta." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Użycie czcionek systemowych" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Użycie domyślnych czcionek systemu." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Czcionka tekstu" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Czcionka tekstu o zmiennej szerokości." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Czcionka tekstu o stałej szerokości" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Czcionka tekstu o stałej szerokości, takiego jak przykłady kodu źródłowego." @@ -194,79 +203,59 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Wyświetlanie dokumentacji API dla słowa pod kursorem" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nowe okno" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nowe _okno" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Preferencje" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_O programie Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "Za_kończ" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Preferencje" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "O programie Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Zakończ" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nowa _karta" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "Wy_drukuj" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Znajdź" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Większy tekst" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Mniejszy tekst" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Zwykły rozmiar" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Grupowanie według języka" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Włączona" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Tytuł" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Półka na książki" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Użycie czcionek systemowych" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Zmienna szerokość: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Stała szerokość:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Czcionki" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Zbigniew Chyla , 2001-2003\n" @@ -276,80 +265,80 @@ "Piotr Drąg , 2009-2013\n" "Aviary.pl , 2007-2013" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Przeglądarka pomocy dla programistów GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Witryna programu Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — asystent" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Książka:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Język: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Język: nieokreślony" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Książka" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Strona" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Słowo kluczowe" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Procedura" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Makro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Typ" @@ -424,90 +413,86 @@ msgstr "Nie można dekompresować książki \"%s\": %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Bieżące" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Wszystkie książki" -#: ../src/dh-window.c:85 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:678 -msgid "Back" -msgstr "Wstecz" - -#: ../src/dh-window.c:683 -msgid "Forward" -msgstr "Dalej" - -#: ../src/dh-window.c:952 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Błąd podczas otwierania żądanego odnośnika." -#: ../src/dh-window.c:1302 ../src/dh-window.c:1488 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Pusta strona" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Wyszukiwanie:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Znajdź poprzednie" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Wyszukuje poprzednie wystąpienie ciągu znaków" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Znajdź następne" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Wyszukuje następne wystąpienie ciągu znaków" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Uwzględnianie wielkości liter" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Przełącza tryb wyszukiwania z uwzględnianiem wielkości liter" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nowa _karta" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "Wy_drukuj" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Znajdź" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Większy tekst" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Mniejszy tekst" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Zwykły rozmiar" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Wstecz" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Dalej" diff -Nru devhelp-3.8.2/po/pt_BR.po devhelp-3.10.2/po/pt_BR.po --- devhelp-3.8.2/po/pt_BR.po 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/po/pt_BR.po 2013-09-03 07:09:30.000000000 +0000 @@ -12,14 +12,15 @@ # Leonardo Ferreira Fontenelle , 2009. # Jonh Wendell , 2010. # Rafael Ferreira , 2012. +# Enrico Nicoletto , 2013 # msgid "" msgstr "" "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-02 21:05+0000\n" -"PO-Revision-Date: 2013-03-03 12:07-0300\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-08-21 11:32-0300\n" "Last-Translator: Enrico Nicoletto \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -27,11 +28,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 1.5.4\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:345 -#: ../src/dh-window.c:647 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -45,7 +47,8 @@ #: ../data/devhelp.desktop.in.in.h:4 msgid "documentation;information;manual;developer;api;" -msgstr "documentação;documentações;informações;manual;desenvolvedor;api;" +msgstr "" +"documentação;documentações;informações;manual;desenvolvedor;programador;api;" #: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" @@ -121,58 +124,66 @@ msgstr "Os livros devem ser agrupados por idioma na interface do usuário" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Se a janela do assistente deve ser maximizada ou não" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Se a janela do assistente deve ser maximizada ou não." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Largura da janela do assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "A largura da janela do assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Altura da janela do assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "A altura da janela do assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Posição X da janela do assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "A posição X da janela do assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Posição Y da janela do assistente" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "A posição Y da janela do assistente." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Usar fontes do sistema" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Usa as fontes padrão do sistema." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Fonte para texto" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Fonte para texto com largura variável." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Fonte para texto com largura fixa" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Fonte para texto com largura fixa, assim como os códigos de exemplo." @@ -192,79 +203,59 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Mostrar a documentação da API para a palavra sob o cursor" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Nova Janela" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nova _janela" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Preferências" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "S_obre o Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Sair" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Preferências" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "Sobre o Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Sair" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nova _aba" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "Im_primir" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Localizar" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "Texto m_aior" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "Texto _menor" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "Tamanho _normal" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "A_grupar por idioma" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Habilitado" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Título" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Estante de livros" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Usar fontes do sistema" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Largura _variável: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "Largura _fixa:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Fontes" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Alexandre Folle de Menezes \n" @@ -277,80 +268,80 @@ "Jonh Wendell \n" "Rafael Ferreira " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Um navegador de ajuda para desenvolvedores do GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Site do DevHelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Assistente" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Livro:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Idioma: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Idioma: Indefinido" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Livro" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Página" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Palavra-chave" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Função" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Estrutura" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Macro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Tipo" @@ -427,93 +418,112 @@ msgstr "Não é possível descompactar o livro \"%s\": %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Atual" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Todos os livros" -#: ../src/dh-window.c:85 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:678 +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "Erro ao abrir o link requisitado." + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "Página vazia" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nova _aba" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "Im_primir" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Localizar" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "Texto m_aior" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "Texto _menor" + +# Apesar do "size", a tradução "texto" segue o padrão das outras duas mensagens acima. +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "Texto _normal" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Retroceder" -#: ../src/dh-window.c:683 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Avançar" -#: ../src/dh-window.c:952 -msgid "Error opening the requested link." -msgstr "Erro ao abrir o link requisitado." +#~ msgid "Find:" +#~ msgstr "Localizar:" -#: ../src/dh-window.c:1302 ../src/dh-window.c:1488 -msgid "Empty Page" -msgstr "Página vazia" +#~ msgid "Find Previous" +#~ msgstr "Localizar anterior" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Localiza a ocorrência anterior da palavra ou frase" + +#~ msgid "Find Next" +#~ msgstr "Localizar próxima" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Localizar:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Localizar anterior" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Localiza a ocorrência anterior da palavra ou frase" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Localizar próxima" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Localiza a próxima ocorrência da palavra ou frase" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Diferenciar maiúsculas de minúsculas" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Habilita ou desabilita a diferenciação entre maiúsculas de minúsculas" +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Localiza a próxima ocorrência da palavra ou frase" + +#~ msgid "C_ase Sensitive" +#~ msgstr "_Diferenciar maiúsculas de minúsculas" + +#~ msgid "Toggle case sensitive search" +#~ msgstr "" +#~ "Habilita ou desabilita a diferenciação entre maiúsculas de minúsculas" #~ msgid "_Window" #~ msgstr "_Janela" diff -Nru devhelp-3.8.2/po/ru.po devhelp-3.10.2/po/ru.po --- devhelp-3.8.2/po/ru.po 2013-05-15 11:05:25.000000000 +0000 +++ devhelp-3.10.2/po/ru.po 2013-09-23 16:26:46.000000000 +0000 @@ -10,24 +10,24 @@ msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-04-17 07:37+0000\n" -"PO-Revision-Date: 2013-04-10 10:23+0600\n" -"Last-Translator: Dmitriy S. Seregin \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhelp&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-06 06:25+0000\n" +"PO-Revision-Date: 2013-09-11 21:36+0300\n" +"Last-Translator: Yuri Myasoedov \n" "Language-Team: русский \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 1.5.5\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.5.7\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:347 -#: ../src/dh-window.c:655 +#: ../data/devhelp.desktop.in.in.h:1 +#: ../src/dh-app.c:209 +#: ../src/dh-app.c:395 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" @@ -116,58 +116,66 @@ msgstr "Должны ли книги быть сгруппированы в интерфейсе по языкам" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Разворачивать ли вспомогательное окно" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Разворачивать ли вспомогательное окно." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Ширина окна помощника" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Ширина главного окна." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Высота окна помощника" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Высота окна помощника." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Положение окна помощника по оси X" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Положение окна помощника по оси X." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Положение окна помощника по оси Y" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Положение окна помощника по оси Y." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Использовать системные шрифты" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Использовать системные шрифты по умолчанию." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Шрифт для текста" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Шрифт для текста с переменной шириной." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Шрифт для текста фиксированной ширины" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Шрифт для текста с фиксированной шириной, например, фрагментов кода." @@ -187,158 +195,146 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Показать документацию по API для слова под курсором" +#: ../src/devhelp-menu.ui.h:1 #: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Новое окно" +#: ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "_Создать окно" +#: ../src/devhelp-menu.ui.h:2 #: ../src/devhelp.ui.h:2 -msgid "Preferences" -msgstr "Параметры" +#: ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Параметры" +#: ../src/devhelp-menu.ui.h:3 #: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "О программе Devhelp" +#: ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_О программе" +#: ../src/devhelp-menu.ui.h:4 #: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Закончить" +#: ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Закончить" #: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Новая _вкладка" +msgid "Preferences" +msgstr "Параметры" #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Печать" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Найти" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "У_величить текст" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "У_меньшить текст" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Обычный размер" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Группировать по языкам" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Включено" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Заголовок" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Книжная полка" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Использовать системные шрифты" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Переменная ширина:" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Постоянная ширина:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Шрифты" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Валек Филиппов \n" "Сергей Сафонов " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Программа просмотра справки GNOME для разработчиков" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Веб-сайт Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Помощник" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Книга:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Язык: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Язык: не определён" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Книга" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Страница" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Ключевое слово" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Функция" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Структура" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Макрос" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Перечисление" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Тип" @@ -350,7 +346,8 @@ msgid "Search for a keyword" msgstr "Поиск по ключевому слову" -#: ../src/dh-main.c:49 ../src/dh-main.c:54 +#: ../src/dh-main.c:49 +#: ../src/dh-main.c:54 msgid "KEYWORD" msgstr "КЛЮЧЕВОЕ СЛОВО" @@ -366,7 +363,9 @@ msgid "Quit any running Devhelp" msgstr "Выйти из Devhelp" -#: ../src/dh-parser.c:97 ../src/dh-parser.c:199 ../src/dh-parser.c:263 +#: ../src/dh-parser.c:97 +#: ../src/dh-parser.c:199 +#: ../src/dh-parser.c:263 #: ../src/dh-parser.c:273 #, c-format msgid "Expected '%s', got '%s' at line %d, column %d" @@ -379,21 +378,17 @@ #: ../src/dh-parser.c:143 #, c-format -msgid "" -"\"title\", \"name\" and \"link\" elements are required at line %d, column %d" +msgid "\"title\", \"name\" and \"link\" elements are required at line %d, column %d" msgstr "Элементы «title», «name» и «link» требуются в строке %d, столбец %d" #: ../src/dh-parser.c:218 #, c-format -msgid "" -"\"name\" and \"link\" elements are required inside on line %d, column " -"%d" +msgid "\"name\" and \"link\" elements are required inside on line %d, column %d" msgstr "Элементы «name» и «link» требуются в в строке %d, столбец %d" #: ../src/dh-parser.c:298 #, c-format -msgid "" -"\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" +msgid "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "Элементы «name» и «link» требуются в «%s» в строке %d, столбец %d" #: ../src/dh-parser.c:311 @@ -407,11 +402,11 @@ msgstr "Не удалось распаковать книгу «%s»: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Текущий" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Все книги" @@ -451,103 +446,44 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:688 -msgid "Back" -msgstr "Назад" - -#: ../src/dh-window.c:695 -msgid "Forward" -msgstr "Вперёд" - -#: ../src/dh-window.c:967 +#: ../src/dh-window.c:864 msgid "Error opening the requested link." msgstr "Ошибка при открытии запрошенной ссылки." -#: ../src/dh-window.c:1317 ../src/dh-window.c:1503 +#: ../src/dh-window.c:1148 +#: ../src/dh-window.c:1320 msgid "Empty Page" msgstr "Пустая страница" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Найти:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Найти предыдущее" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Найти предыдущее вхождение строки поиска" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Найти далее" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Найти следующее вхождение строки поиска" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "С у_чётом регистра" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Включить поиск, чувствительный к регистру" - -#~ msgid "_Window" -#~ msgstr "_Окно" - -#~ msgid "_Close" -#~ msgstr "_Закрыть" - -#~ msgid "_Edit" -#~ msgstr "_Правка" - -#~ msgid "_Copy" -#~ msgstr "_Копировать" - -#~ msgid "Find _Next" -#~ msgstr "Найти _следующее" - -#~ msgid "Find _Previous" -#~ msgstr "Найти _предыдущее" - -#~ msgid "_View" -#~ msgstr "_Вид" - -#~ msgid "Fullscreen" -#~ msgstr "На полный экран" - -#~ msgid "_Go" -#~ msgstr "_Перейти" - -#~ msgid "_Search Tab" -#~ msgstr "П_оиск" - -#~ msgid "_Contents Tab" -#~ msgstr "Сод_ержание" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Новая _вкладка" -#~ msgid "Go to the previous page" -#~ msgstr "Перейти на предыдущую страницу" +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Печать" -#~ msgid "Go to the next page" -#~ msgstr "Перейти на следующую страницу" +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Найти" -#~ msgid "Decrease the text size" -#~ msgstr "Уменьшить размер текста" +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "У_величить текст" -#~ msgid "Increase the text size" -#~ msgstr "Увеличить размер текста" +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "У_меньшить текст" -#~ msgid "Focus the Devhelp window with the search field active" -#~ msgstr "Переводить фокус на окно Devhelp и активировать поле поиска" +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "О_бычный размер" -#~ msgid "Search in:" -#~ msgstr "Искать в:" +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Назад" -#~ msgid "Contents" -#~ msgstr "Содержание" +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Вперёд" -#~ msgid "Search" -#~ msgstr "Поиск" diff -Nru devhelp-3.8.2/po/sk.po devhelp-3.10.2/po/sk.po --- devhelp-3.8.2/po/sk.po 2012-10-15 15:16:07.000000000 +0000 +++ devhelp-3.10.2/po/sk.po 2013-09-23 16:26:46.000000000 +0000 @@ -2,15 +2,15 @@ # Copyright (C) 2001-2005, 2010-2012 Free Software Foundation, Inc. # This file is distributed under the same license as the devhelp package. # Marcel Telka , 2001-2005. -# Roman Mátyus , 2010, 2011, 2012. +# Roman Mátyus , 2010-2012. # msgid "" msgstr "" "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-24 21:58+0000\n" -"PO-Revision-Date: 2012-10-09 23:16+0100\n" +"POT-Creation-Date: 2013-09-12 16:36+0000\n" +"PO-Revision-Date: 2013-09-13 10:04+0100\n" "Last-Translator: Roman Mátyus \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -20,8 +20,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:167 ../src/dh-app.c:350 -#: ../src/dh-window.c:958 ../src/dh-window.c:1857 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:648 msgid "Devhelp" msgstr "Devhelp" @@ -33,358 +33,284 @@ msgid "Documentation Browser" msgstr "Prehliadač dokumentácie" -#: ../data/devhelp.schemas.in.h:1 +#: ../data/devhelp.desktop.in.in.h:4 +msgid "documentation;information;manual;developer;api;" +msgstr "dokumentácia;informácie;návod;vývojár;api;rozhranie;" + +#: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" msgstr "Maximalizovaný stav hlavného okna" -#: ../data/devhelp.schemas.in.h:2 +#: ../data/org.gnome.devhelp.gschema.xml.h:2 msgid "Whether the main window should start maximized." -msgstr "Či sa má hlavné okno spustiť maximalizované." +msgstr "Určuje, či sa má hlavné okno spustiť maximalizované." -#: ../data/devhelp.schemas.in.h:3 +#: ../data/org.gnome.devhelp.gschema.xml.h:3 msgid "Width of the main window" msgstr "Šírka hlavného okna" -#: ../data/devhelp.schemas.in.h:4 +#: ../data/org.gnome.devhelp.gschema.xml.h:4 msgid "The width of the main window." msgstr "Šírka hlavného okna." -#: ../data/devhelp.schemas.in.h:5 +#: ../data/org.gnome.devhelp.gschema.xml.h:5 msgid "Height of main window" msgstr "Výška hlavného okna" -#: ../data/devhelp.schemas.in.h:6 +#: ../data/org.gnome.devhelp.gschema.xml.h:6 msgid "The height of the main window." msgstr "Výška hlavného okna." -#: ../data/devhelp.schemas.in.h:7 +#: ../data/org.gnome.devhelp.gschema.xml.h:7 msgid "X position of main window" msgstr "Umiestnenie hlavného okna v smere osi X" -#: ../data/devhelp.schemas.in.h:8 +#: ../data/org.gnome.devhelp.gschema.xml.h:8 msgid "The X position of the main window." msgstr "Umiestnenie hlavného okna v smere osi X." -#: ../data/devhelp.schemas.in.h:9 +#: ../data/org.gnome.devhelp.gschema.xml.h:9 msgid "Y position of main window" msgstr "Umiestnenie hlavného okna v smere osi Y" -#: ../data/devhelp.schemas.in.h:10 +#: ../data/org.gnome.devhelp.gschema.xml.h:10 msgid "The Y position of the main window." msgstr "Umiestnenie hlavného okna v smere osi Y." -#: ../data/devhelp.schemas.in.h:11 +#: ../data/org.gnome.devhelp.gschema.xml.h:11 +msgid "Width of the index and search pane" +msgstr "Šírka indexu a vyhľadávacieho panelu" + +#: ../data/org.gnome.devhelp.gschema.xml.h:12 +msgid "The width of the index and search pane." +msgstr "Šírka indexu a vyhľadávacieho panelu." + +#: ../data/org.gnome.devhelp.gschema.xml.h:13 +msgid "Selected tab: \"content\" or \"search\"" +msgstr "Zvolená karta: „obsah“ (obsah) alebo „search“ (hľadanie)" + +#: ../data/org.gnome.devhelp.gschema.xml.h:14 +msgid "Which of the tabs is selected: \"content\" or \"search\"." +msgstr "" +"Ktorá z týchto kariet je vybraná: „content“ (obsah) alebo " +"„search“ (hľadanie)." + +#: ../data/org.gnome.devhelp.gschema.xml.h:15 +msgid "Books disabled" +msgstr "Zakázané knihy" + +#: ../data/org.gnome.devhelp.gschema.xml.h:16 +msgid "List of books disabled by the user." +msgstr "Zoznam kníh zakázaných používateľom." + +#: ../data/org.gnome.devhelp.gschema.xml.h:17 +msgid "Group by language" +msgstr "Zoskupiť podla jazyka" + +#: ../data/org.gnome.devhelp.gschema.xml.h:18 +msgid "Whether books should be grouped by language in the UI" +msgstr "" +"Určuje, či by sa mali knihy v používateľskom rozhraní zoskupovať podla jazyka" + +#: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Určuje, či má byť okno asistenta maximalizované" + +# nahlasene +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Určuje, či má byť okno asistenta maximalizované." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Šírka okna asistenta" -#: ../data/devhelp.schemas.in.h:12 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Šírka okna asistenta." -#: ../data/devhelp.schemas.in.h:13 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Výška okna asistenta" -#: ../data/devhelp.schemas.in.h:14 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Výška okna asistenta." -#: ../data/devhelp.schemas.in.h:15 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Umiestnenie okna asistenta v smere osi X" -#: ../data/devhelp.schemas.in.h:16 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "Umiestnenie okna asistenta v smere osi X." -#: ../data/devhelp.schemas.in.h:17 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Umiestnenie okna asistenta v smere osi Y" -#: ../data/devhelp.schemas.in.h:18 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Umiestnenie okna asistenta v smere osi Y." -#: ../data/devhelp.schemas.in.h:19 -msgid "Width of the index and search pane" -msgstr "Šírka indexu a vyhľadávacieho panelu" - -#: ../data/devhelp.schemas.in.h:20 -msgid "The width of the index and search pane." -msgstr "Šírka indexu a vyhľadávacieho panelu." - -#: ../data/devhelp.schemas.in.h:21 -msgid "Selected tab: \"content\" or \"search\"" -msgstr "Zvolená karta: „obsah“ (obsah) alebo „search“ (hľadanie)" - -#: ../data/devhelp.schemas.in.h:22 -msgid "Which of the tabs is selected: \"content\" or \"search\"." -msgstr "" -"Ktorá z týchto kariet je vybraná: „content“ (obsah) alebo „search“ " -"(hľadanie)." - -#: ../data/devhelp.schemas.in.h:23 -msgid "Books disabled" -msgstr "Zakázané knihy" - -#: ../data/devhelp.schemas.in.h:24 -msgid "List of books disabled by the user." -msgstr "Zoznam kníh zakázaných používateľom." - -#: ../data/devhelp.schemas.in.h:25 -msgid "Group by language" -msgstr "Zoskupiť podla jazyka" - -#: ../data/devhelp.schemas.in.h:26 -msgid "Whether books should be grouped by language in the UI" -msgstr "Či by sa mali knihy v používateľskom rozhraní zoskupovať podla jazyka" - -#: ../data/devhelp.schemas.in.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Použiť systémové písma" -#: ../data/devhelp.schemas.in.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Použiť predvolené systémové písma." -#: ../data/devhelp.schemas.in.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Písmo pre text" -#: ../data/devhelp.schemas.in.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Písmo pre text s premenlivou šírkou." -#: ../data/devhelp.schemas.in.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Písmo pre pevnú šírku textu" -#: ../data/devhelp.schemas.in.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Písmo pre text s pevnou šírkou, napríklad ukážky kódu." -#: ../data/ui/devhelp.builder.h:1 -msgid "New window" -msgstr "Nové okno" - -#: ../data/ui/devhelp.builder.h:2 -msgid "Preferences" -msgstr "Nastavenia" - -#: ../data/ui/devhelp.builder.h:3 -msgid "About Devhelp" -msgstr "O programe Devhelp" - -#: ../data/ui/devhelp.builder.h:4 -msgid "Quit" -msgstr "Ukončiť" - -#: ../data/ui/devhelp.builder.h:5 -msgid "_Window" -msgstr "_Okno" - -#: ../data/ui/devhelp.builder.h:6 -msgid "New _Tab" -msgstr "Nová _karta" - -#: ../data/ui/devhelp.builder.h:7 -msgid "_Print" -msgstr "_Tlačiť" - -#: ../data/ui/devhelp.builder.h:8 -msgid "_Close" -msgstr "_Zatvoriť" - -#: ../data/ui/devhelp.builder.h:9 -msgid "_Edit" -msgstr "_Upraviť" - -#: ../data/ui/devhelp.builder.h:10 -msgid "_Copy" -msgstr "_Kopírovať" - -#: ../data/ui/devhelp.builder.h:11 -msgid "_Find" -msgstr "_Nájsť" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 +msgid "Devhelp support" +msgstr "Podpora pre Devhelp" -#: ../data/ui/devhelp.builder.h:12 -msgid "Find _Next" -msgstr "Nájsť ď_alšie" - -#: ../data/ui/devhelp.builder.h:13 -msgid "Find _Previous" -msgstr "Nájsť _predchádzajúce" - -#: ../data/ui/devhelp.builder.h:14 -msgid "_View" -msgstr "_Zobraziť" +#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 +msgid "Makes F2 bring up Devhelp for the word at the cursor" +msgstr "Zariadi, že F2 vyvolá Devhelp pre slovo, na ktorom je kurzor" -#: ../data/ui/devhelp.builder.h:15 -msgid "_Larger text" -msgstr "_Väčší text" +#: ../misc/gedit-plugin/devhelp.py:69 +msgid "Show API Documentation" +msgstr "Zobraziť dokumentáciu API" -#: ../data/ui/devhelp.builder.h:16 -msgid "S_maller text" -msgstr "_Menší text" +#: ../misc/gedit-plugin/devhelp.py:71 +msgid "Show API Documentation for the word at the cursor" +msgstr "Zobraziť dokumentáciu API pre slovo, na ktorom je kurzor" -#: ../data/ui/devhelp.builder.h:17 -msgid "_Normal size" -msgstr "_Normálna veľkosť" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Nové _okno" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "Nas_tavenia" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_O programe Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "U_končiť" -#: ../data/ui/devhelp.builder.h:18 -msgid "Fullscreen" -msgstr "Celá obrazovka" - -#: ../data/ui/devhelp.builder.h:19 -msgid "_Go" -msgstr "P_rejsť" - -#: ../data/ui/devhelp.builder.h:20 -msgid "_Back" -msgstr "_Späť" - -#: ../data/ui/devhelp.builder.h:21 -msgid "_Forward" -msgstr "_Dopredu" - -#: ../data/ui/devhelp.builder.h:22 -msgid "_Search Tab" -msgstr "Karta vyhľadáva_nia" - -#: ../data/ui/devhelp.builder.h:23 -msgid "_Contents Tab" -msgstr "Karta _obsahu" - -#: ../data/ui/devhelp.builder.h:24 -msgid "Go to the previous page" -msgstr "Prejsť na predchádzajúcu stranu" - -#: ../data/ui/devhelp.builder.h:25 -msgid "Go to the next page" -msgstr "Prejsť na ďalšiu stranu" - -#: ../data/ui/devhelp.builder.h:26 -msgid "Decrease the text size" -msgstr "Zmenšiť veľkosť textu" - -#: ../data/ui/devhelp.builder.h:27 -msgid "Increase the text size" -msgstr "Zväčšiť veľkosť textu" +#: ../src/devhelp.ui.h:5 +msgid "Preferences" +msgstr "Nastavenia" -#: ../data/ui/devhelp.builder.h:28 +#: ../src/devhelp.ui.h:6 msgid "_Group by language" msgstr "_Zoskupiť podla jazyka" -#: ../data/ui/devhelp.builder.h:29 +#: ../src/devhelp.ui.h:7 msgid "Enabled" -msgstr "Zapnuté" +msgstr "Povolené" -#: ../data/ui/devhelp.builder.h:30 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Titulok" -#: ../data/ui/devhelp.builder.h:31 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Knižnica" -#: ../data/ui/devhelp.builder.h:32 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "Použiť _systémové písma" -#: ../data/ui/devhelp.builder.h:33 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "Premenli_vá šírka: " -#: ../data/ui/devhelp.builder.h:34 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Pevná šírka:" -#: ../data/ui/devhelp.builder.h:35 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Písma" -#: ../misc/gedit-plugin/devhelp.desktop.in.h:1 -msgid "Devhelp support" -msgstr "Podpora pre Devhelp" - -#: ../misc/gedit-plugin/devhelp.desktop.in.h:2 -msgid "Makes F2 bring up Devhelp for the word at the cursor" -msgstr "Zariadi, že F2 vyvolá Devhelp pre slovo, na ktorom je kurzor" - -#: ../misc/gedit-plugin/devhelp.py:69 -msgid "Show API Documentation" -msgstr "Zobraziť dokumentáciu API" - -#: ../misc/gedit-plugin/devhelp.py:71 -msgid "Show API Documentation for the word at the cursor" -msgstr "Zobraziť dokumentáciu API pre slovo, na ktorom je kurzor" - -#: ../src/dh-app.c:162 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Marcel Telka \n" "Roman Mátyus " -#: ../src/dh-app.c:169 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Prehliadač pomocníka pre vývojárov pre GNOME" -#: ../src/dh-app.c:177 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Webová stránka Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:76 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — asistent" -#: ../src/dh-assistant-view.c:395 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Kniha:" -#: ../src/dh-book.c:252 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Jazyk: %s" -#: ../src/dh-book.c:253 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Jazyk: Nedefinovaný" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Kniha" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Strana" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Kľúčové slovo" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Funkcia" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Štruktúra" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Makro" @@ -392,42 +318,38 @@ #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Typ" -#: ../src/dh-main.c:48 +#: ../src/dh-main.c:43 msgid "Opens a new Devhelp window" msgstr "Otvoriť nové okno Devhelp" -#: ../src/dh-main.c:53 -msgid "Focus the Devhelp window with the search field active" -msgstr "Aktivovať okno Devhelp s aktívnym vyhľadávacím poľom" - -#: ../src/dh-main.c:58 +#: ../src/dh-main.c:48 msgid "Search for a keyword" msgstr "Vyhľadať kľúčové slovo" -#: ../src/dh-main.c:59 ../src/dh-main.c:64 +#: ../src/dh-main.c:49 ../src/dh-main.c:54 msgid "KEYWORD" msgstr "KĽÚČOVÉ SLOVO" -#: ../src/dh-main.c:63 +#: ../src/dh-main.c:53 msgid "Search and display any hit in the assistant window" msgstr "Nájsť a zobraziť každý výskyt v okne asistenta" -#: ../src/dh-main.c:68 +#: ../src/dh-main.c:58 msgid "Display the version and exit" msgstr "Zobraziť verziu a ukončiť" -#: ../src/dh-main.c:73 +#: ../src/dh-main.c:63 msgid "Quit any running Devhelp" msgstr "Ukončiť každý bežiaci Devhelp" @@ -457,8 +379,8 @@ "\"name\" and \"link\" elements are required inside on line %d, column " "%d" msgstr "" -"Elementy „name“ a „link“ sú vyžadované vo vnútri na riadku %d, " -"stĺpci %d" +"Elementy „name“ a „link“ sú vyžadované vo vnútri na riadku %d, stĺpci " +"%d" # Sú to názvy elementov, nie je dôvod na ich prekladanie #: ../src/dh-parser.c:298 @@ -466,8 +388,7 @@ msgid "" "\"name\" and \"link\" elements are required inside '%s' on line %d, column %d" msgstr "" -"Elementy „name“ a „link“ sú vyžadované vo vnútri „%s“ na riadku %d, " -"stĺpci %d" +"Elementy „name“ a „link“ sú vyžadované vo vnútri „%s“ na riadku %d, stĺpci %d" # Sú to názvy elementov, nie je dôvod na ich prekladanie #: ../src/dh-parser.c:311 @@ -479,116 +400,89 @@ #: ../src/dh-parser.c:514 #, c-format msgid "Cannot uncompress book '%s': %s" -msgstr "Nepodarilo sa rozbaliť knihu „%s“: %s" +msgstr "Nedá sa rozbaliť knihu „%s“: %s" -#: ../src/dh-search.c:492 -msgid "All books" -msgstr "Všetky knihy" +#. Setup the Current/All Files selector +#: ../src/dh-sidebar.c:531 +msgid "Current" +msgstr "Aktuálne" -#: ../src/dh-search.c:1110 -msgid "Search in:" -msgstr "Hľadať v:" +#: ../src/dh-sidebar.c:534 +msgid "All Books" +msgstr "Všetky knihy" -#: ../src/dh-window.c:100 +#: ../src/dh-window.c:86 msgid "50%" msgstr "50 %" -#: ../src/dh-window.c:101 +#: ../src/dh-window.c:87 msgid "75%" msgstr "75 %" -#: ../src/dh-window.c:102 +#: ../src/dh-window.c:88 msgid "100%" msgstr "100 %" -#: ../src/dh-window.c:103 +#: ../src/dh-window.c:89 msgid "125%" msgstr "125 %" -#: ../src/dh-window.c:104 +#: ../src/dh-window.c:90 msgid "150%" msgstr "150 %" -#: ../src/dh-window.c:105 +#: ../src/dh-window.c:91 msgid "175%" msgstr "175 %" -#: ../src/dh-window.c:106 +#: ../src/dh-window.c:92 msgid "200%" msgstr "200 %" -#: ../src/dh-window.c:107 +#: ../src/dh-window.c:93 msgid "300%" msgstr "300 %" -#: ../src/dh-window.c:108 +#: ../src/dh-window.c:94 msgid "400%" msgstr "400 %" -#: ../src/dh-window.c:1046 -msgid "Contents" -msgstr "Obsah" - -#: ../src/dh-window.c:1056 -msgid "Search" -msgstr "Hľadať" - -#: ../src/dh-window.c:1266 +#: ../src/dh-window.c:864 msgid "Error opening the requested link." msgstr "Chyba pri otváraní požadovaného odkazu." -#: ../src/dh-window.c:1638 ../src/dh-window.c:1885 +#: ../src/dh-window.c:1148 ../src/dh-window.c:1320 msgid "Empty Page" msgstr "Prázdna strana" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Nájsť:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Nájsť predchádzajúce" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Nájsť predchádzajúci výskyt hľadaného reťazca" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Nájsť ďalšie" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Nájsť nasledujúci výskyt hľadaného reťazca" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Citlivé na _veľkosť písmen" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Prepnúť citlivosť na veľkosť písmen vyhľadávanie" - -#~ msgid "_File" -#~ msgstr "_Súbor" - -#~ msgid "_Help" -#~ msgstr "_Pomocník" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nová _karta" -#~ msgid "Use the normal text size" -#~ msgstr "Použiť normálnu veľkosť textu" +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Tlačiť" -#~ msgid "Leave fullscreen mode" -#~ msgstr "Opustiť režim celej obrazovky" +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Nájsť" -#~ msgid "Display in full screen" -#~ msgstr "Zobraziť v režime celej obrazovky" +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Väčší text" -#~ msgid "Larger" -#~ msgstr "Zväčšiť" +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Menší text" -#~ msgid "Smaller" -#~ msgstr "Zmenšiť" +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Normálna veľkosť" -#~ msgid "Preferences…" -#~ msgstr "Nastavenia…" +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Späť" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Dopredu" diff -Nru devhelp-3.8.2/po/sl.po devhelp-3.10.2/po/sl.po --- devhelp-3.8.2/po/sl.po 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/po/sl.po 2013-11-11 08:32:55.000000000 +0000 @@ -2,29 +2,30 @@ # Copyright (C) 2005-2007 Free Software Foundation, Inc. # This file is distributed under the same license as the devhelp package. # -# Matej Urbančič , 2007 - 2013. +# Matej Urbančič , 2007-2013. # msgid "" msgstr "" "Project-Id-Version: devhelp master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-07 11:25+0000\n" -"PO-Revision-Date: 2013-02-07 20:39+0100\n" +"POT-Creation-Date: 2013-08-29 13:43+0000\n" +"PO-Revision-Date: 2013-08-29 18:20+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" "X-Generator: Poedit 1.5.4\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:344 -#: ../src/dh-window.c:633 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -113,58 +114,66 @@ msgstr "Ali naj se knjige združujejo v skupine po jeziku" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "Ali naj bo okno pomočnika razpeto" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "Ali naj bo okno pomočnika razpeto." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Širina okna pomočnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Širina okna pomočnika." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Višina okna pomočnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Višina okna pomočnika." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "X položaj okna pomočnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "X položaj okna pomočnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Y položaj okna pomočnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Y položaj okna pomočnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Uporabi sistemske pisave" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Uporabi privzete sistemske pisave." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Pisava za besedilo" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Pisava za besedilo s spremenljivo širino." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Pisava z določeno širino" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "Pisava za besedilo z določeno širino, kot so vzorci kode." @@ -184,156 +193,136 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Pokaži API dokumentacijo za besedo ob kazalki" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Novo okno" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "Novo _okno" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_Možnosti" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "_O programu" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_Končaj" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Možnosti" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "O programu Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Končaj" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Nov _zavihek" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Natisni" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Najdi" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Večje besedilo" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Manjše besedilo" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Običajna velikost" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Združi po jeziku" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Omogočeno" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Naslov" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Knjižna polica" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Uporabi sistemske pisave" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Spremenljiva širina:" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Določena širina:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Pisave" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "Matej Urbančič, " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Pregledovalnik pomoči razvijalcem za GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Spletišče Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp - pomočnik" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Knjiga:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Jezik: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Jezik: nedoločen" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "Knjiga" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "Stran" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "Ključna beseda" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "Funkcija" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "Makro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "Vrsta" @@ -410,93 +399,110 @@ msgstr "Ni mogoče razširiti knjige '%s': %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Trenutna" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Vse knjige" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:94 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:664 +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "Napaka med odpiranjem zahtevane povezave." + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "Prazna stran" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Nov _zavihek" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Natisni" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Najdi" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "_Večja pisava" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "_Manjša pisava" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "_Običajna pisava" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "Nazaj" -#: ../src/dh-window.c:669 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "Naprej" -#: ../src/dh-window.c:936 -msgid "Error opening the requested link." -msgstr "Napaka med odpiranjem zahtevane povezave." +#~ msgid "Find:" +#~ msgstr "Najdi:" -#: ../src/dh-window.c:1286 ../src/dh-window.c:1472 -msgid "Empty Page" -msgstr "Prazna stran" +#~ msgid "Find Previous" +#~ msgstr "Najdi predhodne" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "Najdi predhodno ponovitev iskanega niza" + +#~ msgid "Find Next" +#~ msgstr "Najdi naslednje" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "Najdi naslednjo ponovitev iskanega niza" + +#~ msgid "C_ase Sensitive" +#~ msgstr "_Razlikovanje velikosti črk" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Najdi:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Najdi predhodne" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Najdi predhodno ponovitev iskanega niza" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Najdi naslednje" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Najdi naslednjo ponovitev iskanega niza" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "_Razlikovanje velikosti črk" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Preklopi iskanje z razlikovanjem velikih in malih črk" +#~ msgid "Toggle case sensitive search" +#~ msgstr "Preklopi iskanje z razlikovanjem velikih in malih črk" #~ msgid "_Window" #~ msgstr "_Okno" diff -Nru devhelp-3.8.2/po/sr.po devhelp-3.10.2/po/sr.po --- devhelp-3.8.2/po/sr.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/sr.po 2013-09-23 16:26:46.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhel" "p&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-02-18 12:03+0200\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-05 06:53+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -25,8 +25,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Девхелп" @@ -117,58 +117,68 @@ msgstr "Да ли књиге треба да буду груписане према језику у корисничком сучељу" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized" +msgstr "Да ли прозор помоћника треба да буде увећан" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized." +msgstr "Да ли прозор помоћника треба да буде увећан." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Ширина прозора помоћника" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Ширина прозора помоћника." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Висина прозора помоћника" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Висина прозора помоћника." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Водоравни положај прозора помоћника" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "X (водораван) положај прозора помоћника." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Усправни положај прозора помоћника" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Y (усправан) положај прозора помоћника." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Користи словни лик са система" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Користи подразумеване словне ликове из окружења." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Словни лик за текст" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Словни лик за текст променљиве ширине." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Словни лик за текст утврђене ширине" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Словни лик за текст утврђене ширине, као што су примери програмског кода." @@ -189,79 +199,63 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Прикажи АПИ документацију за реч под курсором" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Нови прозор" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +#| msgid "New window" +msgid "New _Window" +msgstr "Нови _прозор" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +#| msgid "Preferences" +msgid "_Preferences" +msgstr "_Поставке" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +#| msgid "About Devhelp" +msgid "_About Devhelp" +msgstr "_О Девхелпу" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +#| msgid "Quit" +msgid "_Quit" +msgstr "_Изађи" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Поставке" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "О Девхелпу" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Изађи" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Нови _језичак" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Штампај" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Нађи" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Шири текст" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Мањи текст" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Обична величина" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Групиши према језику" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Укључено" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Наслов" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Полица књига" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Користи словни лик система" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Променљива ширина: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Стална ширина:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Словни ликови" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Бранко Ивановић \n" @@ -272,80 +266,80 @@ "\n" "http://prevod.org — превод на српски језик." -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Прегледник помоћи за програмере у Гном окружењу" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Веб страница Девхелпа" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Девхелп — Помоћник" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Књига:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Језик: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Језик: неодређен" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Књига" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Страна" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Кључна реч" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Функција" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Структура" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Макро" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Врста" @@ -418,12 +412,11 @@ msgstr "Не могу да распакујем књигу „%s“: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Тренутна" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Све књиге" @@ -463,48 +456,45 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -#| msgid "_Back" -msgid "Back" -msgstr "Назад" - -#: ../src/dh-window.c:659 -#| msgid "_Forward" -msgid "Forward" -msgstr "Напред" - -#: ../src/dh-window.c:919 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Грешка отварања захтеване везе." -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Празна страница" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Тражи:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Нађи претходно" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Пронађите претходни израз у низу за претраживање" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Нађи следеће" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Пронађите следећи израз у низу за претраживање" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Разликуј _величину слова" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Укључите претрагу осетљиву на величину слова" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Нови _језичак" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Штампај" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Нађи" + +#: ../src/dh-window.ui.h:4 +#| msgid "_Larger text" +msgid "_Larger Text" +msgstr "_Већи текст" + +#: ../src/dh-window.ui.h:5 +#| msgid "S_maller text" +msgid "S_maller Text" +msgstr "_Мањи текст" + +#: ../src/dh-window.ui.h:6 +#| msgid "_Normal size" +msgid "_Normal Size" +msgstr "_Обична величина" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Назад" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Напред" diff -Nru devhelp-3.8.2/po/sr@latin.po devhelp-3.10.2/po/sr@latin.po --- devhelp-3.8.2/po/sr@latin.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/sr@latin.po 2013-09-23 16:26:46.000000000 +0000 @@ -11,8 +11,8 @@ "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=devhel" "p&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-02-18 12:03+0200\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-05 06:53+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -25,8 +25,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -117,58 +117,68 @@ msgstr "Da li knjige treba da budu grupisane prema jeziku u korisničkom sučelju" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized" +msgstr "Da li prozor pomoćnika treba da bude uvećan" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#| msgid "Whether the main window should start maximized." +msgid "Whether the assistant window should be maximized." +msgstr "Da li prozor pomoćnika treba da bude uvećan." + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "Širina prozora pomoćnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "Širina prozora pomoćnika." -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "Visina prozora pomoćnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "Visina prozora pomoćnika." -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "Vodoravni položaj prozora pomoćnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "X (vodoravan) položaj prozora pomoćnika." -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "Uspravni položaj prozora pomoćnika" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "Y (uspravan) položaj prozora pomoćnika." -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "Koristi slovni lik sa sistema" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "Koristi podrazumevane slovne likove iz okruženja." -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "Slovni lik za tekst" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "Slovni lik za tekst promenljive širine." -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "Slovni lik za tekst utvrđene širine" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "" "Slovni lik za tekst utvrđene širine, kao što su primeri programskog koda." @@ -189,79 +199,63 @@ msgid "Show API Documentation for the word at the cursor" msgstr "Prikaži API dokumentaciju za reč pod kursorom" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "Novi prozor" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +#| msgid "New window" +msgid "New _Window" +msgstr "Novi _prozor" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +#| msgid "Preferences" +msgid "_Preferences" +msgstr "_Postavke" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +#| msgid "About Devhelp" +msgid "_About Devhelp" +msgstr "_O Devhelpu" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +#| msgid "Quit" +msgid "_Quit" +msgstr "_Izađi" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "Postavke" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "O Devhelpu" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "Izađi" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "Novi _jezičak" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_Štampaj" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_Nađi" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "_Širi tekst" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "_Manji tekst" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "_Obična veličina" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "_Grupiši prema jeziku" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "Uključeno" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "Naslov" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "Polica knjiga" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "_Koristi slovni lik sistema" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "_Promenljiva širina: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "_Stalna širina:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "Slovni likovi" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Branko Ivanović \n" @@ -272,80 +266,80 @@ "\n" "http://prevod.org — prevod na srpski jezik." -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "Preglednik pomoći za programere u Gnom okruženju" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "Veb stranica Devhelpa" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — Pomoćnik" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "Knjiga:" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "Jezik: %s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "Jezik: neodređen" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "Knjiga" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "Strana" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "Ključna reč" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "Funkcija" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "Struktura" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "Makro" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "Vrsta" @@ -418,12 +412,11 @@ msgstr "Ne mogu da raspakujem knjigu „%s“: %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "Trenutna" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "Sve knjige" @@ -463,48 +456,45 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -#| msgid "_Back" -msgid "Back" -msgstr "Nazad" - -#: ../src/dh-window.c:659 -#| msgid "_Forward" -msgid "Forward" -msgstr "Napred" - -#: ../src/dh-window.c:919 +#: ../src/dh-window.c:869 msgid "Error opening the requested link." msgstr "Greška otvaranja zahtevane veze." -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 msgid "Empty Page" msgstr "Prazna stranica" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "Traži:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "Nađi prethodno" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "Pronađite prethodni izraz u nizu za pretraživanje" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "Nađi sledeće" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "Pronađite sledeći izraz u nizu za pretraživanje" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "Razlikuj _veličinu slova" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "Uključite pretragu osetljivu na veličinu slova" +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "Novi _jezičak" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_Štampaj" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_Nađi" + +#: ../src/dh-window.ui.h:4 +#| msgid "_Larger text" +msgid "_Larger Text" +msgstr "_Veći tekst" + +#: ../src/dh-window.ui.h:5 +#| msgid "S_maller text" +msgid "S_maller Text" +msgstr "_Manji tekst" + +#: ../src/dh-window.ui.h:6 +#| msgid "_Normal size" +msgid "_Normal Size" +msgstr "_Obična veličina" + +#: ../src/dh-window.ui.h:11 +msgid "Back" +msgstr "Nazad" + +#: ../src/dh-window.ui.h:12 +msgid "Forward" +msgstr "Napred" diff -Nru devhelp-3.8.2/po/th.po devhelp-3.10.2/po/th.po --- devhelp-3.8.2/po/th.po 2013-03-05 15:02:30.000000000 +0000 +++ devhelp-3.10.2/po/th.po 2013-09-23 16:26:46.000000000 +0000 @@ -10,8 +10,8 @@ "Project-Id-Version: devhelp\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-05 20:08+0700\n" -"PO-Revision-Date: 2013-03-05 20:12+0700\n" +"POT-Creation-Date: 2013-08-21 14:28+0000\n" +"PO-Revision-Date: 2013-09-10 13:11+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" "Language: th\n" @@ -21,8 +21,8 @@ #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:345 -#: ../src/dh-window.c:647 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -40,11 +40,11 @@ #: ../data/org.gnome.devhelp.gschema.xml.h:1 msgid "Main window maximized state" -msgstr "สถานะขยายเต็มของหน้าต่างหลัก" +msgstr "สถานะขยายแผ่ของหน้าต่างหลัก" #: ../data/org.gnome.devhelp.gschema.xml.h:2 msgid "Whether the main window should start maximized." -msgstr "กำหนดว่าควรเปิดหน้าต่างหลักแบบขยายเต็มจอหรือไม่" +msgstr "กำหนดว่าควรเปิดหน้าต่างหลักแบบขยายแผ่หรือไม่" #: ../data/org.gnome.devhelp.gschema.xml.h:3 msgid "Width of the main window" @@ -111,58 +111,66 @@ msgstr "หนังสือควรจะจัดกลุ่มตามภาษาใน UI หรือไม่" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "กำหนดว่าควรเปิดหน้าต่างผู้ช่วยแบบขยายแผ่หรือไม่" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "กำหนดว่าควรเปิดหน้าต่างผู้ช่วยแบบขยายแผ่หรือไม่" + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "ความกว้างของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "ความกว้างของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "ความสูงของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "ความสูงของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "ตำแหน่ง X ของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "ตำแหน่ง X ของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "ตำแหน่ง Y ของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "ตำแหน่ง Y ของหน้าต่างผู้ช่วย" -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "ใช้แบบอักษรของระบบ" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "ใช้แบบอักษรปริยายของระบบ" -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "แบบอักษรสำหรับข้อความ" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "แบบอักษรสำหรับข้อความที่ใช้อักษรความกว้างไม่คงที่" -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "แบบอักษรสำหรับอักษรความกว้างคงที่" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "แบบอักษรสำหรับข้อความที่ใช้อักษรความกว้างคงที่ เช่น ตัวอย่างโค้ด" @@ -182,158 +190,138 @@ msgid "Show API Documentation for the word at the cursor" msgstr "แสดงเอกสารของ API สำหรับคำที่ตำแหน่งเคอร์เซอร์" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "หน้าต่างใหม่" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "หน้าต่างใ_หม่" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "_ปรับแต่ง" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "เ_กี่ยวกับ Devhelp" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "_ออก" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "ปรับแต่ง" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "เกี่ยวกับ Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "ออก" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "แ_ท็บใหม่" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "_พิมพ์" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "_หา" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "ตัวอักษรใ_หญ่ขึ้น" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "ตัวอักษรเ_ล็กลง" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "ขนาด_ปกติ" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "จัด_กลุ่มตามภาษา" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "เปิดใช้งาน" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "ชื่อ" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "หิ้งหนังสือ" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "ใ_ช้แบบอักษรของระบบ" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "ความกว้างไ_ม่คงที่: " -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "ความกว้าง_คงที่:" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "แบบอักษร" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "Theppitak Karoonboonyanan \n" "Visal Srivisal " -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "เบราว์เซอร์คู่มือนักพัฒนาสำหรับ GNOME" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "เว็บไซต์ Devhelp" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — ผู้ช่วย" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "หนังสือ:" -#: ../src/dh-book.c:255 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "ภาษา: %s" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "ภาษา: ไม่ระบุ" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:284 msgid "Book" msgstr "หนังสือ" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:287 msgid "Page" msgstr "หน้า" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:291 msgid "Keyword" msgstr "คำหลัก" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:296 msgid "Function" msgstr "ฟังก์ชัน" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:301 msgid "Struct" msgstr "โครงสร้าง" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:306 msgid "Macro" msgstr "แมโคร" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:311 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:316 msgid "Type" msgstr "ชนิด" @@ -402,93 +390,110 @@ msgstr "ไม่สามารถคลายข้อมูลหนังสือ '%s': %s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:478 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "ปัจจุบัน" -#: ../src/dh-sidebar.c:481 +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "ทุกเอกสาร" -#: ../src/dh-window.c:85 +#: ../src/dh-window.c:87 msgid "50%" msgstr "50%" -#: ../src/dh-window.c:86 +#: ../src/dh-window.c:88 msgid "75%" msgstr "75%" -#: ../src/dh-window.c:87 +#: ../src/dh-window.c:89 msgid "100%" msgstr "100%" -#: ../src/dh-window.c:88 +#: ../src/dh-window.c:90 msgid "125%" msgstr "125%" -#: ../src/dh-window.c:89 +#: ../src/dh-window.c:91 msgid "150%" msgstr "150%" -#: ../src/dh-window.c:90 +#: ../src/dh-window.c:92 msgid "175%" msgstr "175%" -#: ../src/dh-window.c:91 +#: ../src/dh-window.c:93 msgid "200%" msgstr "200%" -#: ../src/dh-window.c:92 +#: ../src/dh-window.c:94 msgid "300%" msgstr "300%" -#: ../src/dh-window.c:93 +#: ../src/dh-window.c:95 msgid "400%" msgstr "400%" -#: ../src/dh-window.c:678 +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "เกิดข้อผิดพลาดขณะเปิดลิงก์ที่ร้องขอ" + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "หน้าว่าง" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "แ_ท็บใหม่" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "_พิมพ์" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "_หา" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "ตัวอักษรใ_หญ่ขึ้น" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "ตัวอักษรเ_ล็กลง" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "ขนาด_ปกติ" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "ย้อนกลับ" -#: ../src/dh-window.c:683 +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "ถัดไป" -#: ../src/dh-window.c:952 -msgid "Error opening the requested link." -msgstr "เกิดข้อผิดพลาดขณะเปิดลิงก์ที่ร้องขอ" +#~ msgid "Find:" +#~ msgstr "หา:" -#: ../src/dh-window.c:1302 ../src/dh-window.c:1488 -msgid "Empty Page" -msgstr "หน้าว่าง" +#~ msgid "Find Previous" +#~ msgstr "หาก่อนหน้า" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "หาข้อความค้นที่ปรากฏก่อนหน้านี้" + +#~ msgid "Find Next" +#~ msgstr "หาต่อ" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "หาข้อความค้นที่ปรากฏถัดไป" + +#~ msgid "C_ase Sensitive" +#~ msgstr "ตัวพิมพ์ใหญ่-เ_ล็กตรงกัน" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "หา:" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "หาก่อนหน้า" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "หาข้อความค้นที่ปรากฏก่อนหน้านี้" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "หาต่อ" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "หาข้อความค้นที่ปรากฏถัดไป" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "ตัวพิมพ์ใหญ่-เ_ล็กตรงกัน" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "เปิด-ปิดการค้นหาแบบตัวพิมพ์ใหญ่-เล็กตรงกัน" +#~ msgid "Toggle case sensitive search" +#~ msgstr "เปิด-ปิดการค้นหาแบบตัวพิมพ์ใหญ่-เล็กตรงกัน" #~ msgid "_Window" #~ msgstr "หน้า_ต่าง" diff -Nru devhelp-3.8.2/po/zh_HK.po devhelp-3.10.2/po/zh_HK.po --- devhelp-3.8.2/po/zh_HK.po 2013-02-04 15:31:17.000000000 +0000 +++ devhelp-3.10.2/po/zh_HK.po 2013-09-03 07:09:30.000000000 +0000 @@ -11,21 +11,21 @@ msgid "" msgstr "" "Project-Id-Version: devhelp 2.91.6\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-02-04 19:49+0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-29 21:43+0800\n" +"PO-Revision-Date: 2013-08-29 21:43+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.5\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -114,58 +114,66 @@ msgstr "書本在使用者介面中是否應以語言做為羣組" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "助理視窗應否成為最大化的狀態" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "助理視窗應否成為最大化的狀態。" + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "助理視窗闊度" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "助理視窗的闊度。" -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "助理視窗高度" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "助理視窗的高度。" -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "助理視窗的 X 位置" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "助理視窗的 X 位置。" -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "助理視窗的 Y 位置" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "助理視窗的 Y 位置。" -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "使用系統字型" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "使用系統預設字型。" -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "普通文字字型" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "可變闊度文字所使用的字型。" -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "固定闊度字型" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "固定闊度文字所使用的字型，例如原始碼範例。" @@ -185,79 +193,59 @@ msgid "Show API Documentation for the word at the cursor" msgstr "以游標所在的文字顯示其 API 文件" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "新增視窗" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "新增視窗(_W)" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "偏好設定(_P)" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "關於 Devhelp(_A)" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "結束(_Q)" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "偏好設定" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "關於 Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "結束" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "新增分頁(_T)" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "打印(_P)" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "尋找(_F)" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "放大文字(_L)" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "縮小文字(_M)" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "正常大小(_N)" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "以語言為羣組(_G)" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "已啟用" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "標題" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "書櫃" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "使用系統字型(_U)" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "可變闊度(_V)：" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "固定闊度(_F)：" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "字型" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "如對翻譯有任何意見，請送一封電子郵件給\n" @@ -270,80 +258,80 @@ "Abel Cheung , 2003-04\n" "Joe Man , 2001" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "GNOME 的程式開發者說明文件瀏覽程式" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "DevHelp 網站" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — 助理" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "書本：" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "語言：%s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "語言：未定義" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "書本" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "頁面" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "關鍵字" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "函數" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "巨集" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "類型" @@ -412,12 +400,11 @@ msgstr "無法將說明書‘%s’解壓：%s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "目前的" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "所有書籍" @@ -457,51 +444,66 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -#| msgid "_Back" +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "開啟要求的連結時發生錯誤。" + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "空白頁" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "新增分頁(_T)" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "打印(_P)" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "尋找(_F)" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "較大文字(_L)" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "較小文字(_S)" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "正常大小(_N)" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "上一頁" -#: ../src/dh-window.c:659 -#| msgid "_Forward" +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "下一頁" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "開啟要求的連結時發生錯誤。" +#~ msgid "Find:" +#~ msgstr "搜尋：" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "空白頁" +#~ msgid "Find Previous" +#~ msgstr "尋找上一筆" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "尋找上一個出現的搜尋字串" + +#~ msgid "Find Next" +#~ msgstr "尋找下一筆" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "尋找下一個出現的搜尋字串" + +#~ msgid "C_ase Sensitive" +#~ msgstr "區分大小寫(_A)" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "搜尋：" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "尋找上一筆" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "尋找上一個出現的搜尋字串" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "尋找下一筆" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "尋找下一個出現的搜尋字串" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "區分大小寫(_A)" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "選取後在搜尋時將區分大小寫" +#~ msgid "Toggle case sensitive search" +#~ msgstr "選取後在搜尋時將區分大小寫" #~ msgid "_Window" #~ msgstr "視窗(_W)" diff -Nru devhelp-3.8.2/po/zh_TW.po devhelp-3.10.2/po/zh_TW.po --- devhelp-3.8.2/po/zh_TW.po 2013-02-04 15:31:17.000000000 +0000 +++ devhelp-3.10.2/po/zh_TW.po 2013-09-03 07:09:30.000000000 +0000 @@ -11,21 +11,21 @@ msgid "" msgstr "" "Project-Id-Version: devhelp 2.91.6\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=devhelp&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-02 01:39+0000\n" -"PO-Revision-Date: 2013-02-04 15:11+0800\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-08-29 21:43+0800\n" +"PO-Revision-Date: 2013-08-29 16:58+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.5.5\n" #. i18n: Please don't translate "Devhelp" (it's marked as translatable #. * for transliteration only) -#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:162 ../src/dh-app.c:342 -#: ../src/dh-window.c:623 +#: ../data/devhelp.desktop.in.in.h:1 ../src/dh-app.c:209 ../src/dh-app.c:395 +#: ../src/dh-window.c:650 msgid "Devhelp" msgstr "Devhelp" @@ -114,58 +114,66 @@ msgstr "書本在使用者介面中是否應以語言做為群組" #: ../data/org.gnome.devhelp.gschema.xml.h:19 +msgid "Whether the assistant window should be maximized" +msgstr "助理視窗應否成為最大化的狀態" + +#: ../data/org.gnome.devhelp.gschema.xml.h:20 +msgid "Whether the assistant window should be maximized." +msgstr "助理視窗應否成為最大化的狀態。" + +#: ../data/org.gnome.devhelp.gschema.xml.h:21 msgid "Width of the assistant window" msgstr "助理視窗寬度" -#: ../data/org.gnome.devhelp.gschema.xml.h:20 +#: ../data/org.gnome.devhelp.gschema.xml.h:22 msgid "The width of the assistant window." msgstr "助理視窗的寬度。" -#: ../data/org.gnome.devhelp.gschema.xml.h:21 +#: ../data/org.gnome.devhelp.gschema.xml.h:23 msgid "Height of assistant window" msgstr "助理視窗高度" -#: ../data/org.gnome.devhelp.gschema.xml.h:22 +#: ../data/org.gnome.devhelp.gschema.xml.h:24 msgid "The height of the assistant window." msgstr "助理視窗的高度。" -#: ../data/org.gnome.devhelp.gschema.xml.h:23 +#: ../data/org.gnome.devhelp.gschema.xml.h:25 msgid "X position of assistant window" msgstr "助理視窗的 X 位置" -#: ../data/org.gnome.devhelp.gschema.xml.h:24 +#: ../data/org.gnome.devhelp.gschema.xml.h:26 msgid "The X position of the assistant window." msgstr "助理視窗的 X 位置。" -#: ../data/org.gnome.devhelp.gschema.xml.h:25 +#: ../data/org.gnome.devhelp.gschema.xml.h:27 msgid "Y position of assistant window" msgstr "助理視窗的 Y 位置" -#: ../data/org.gnome.devhelp.gschema.xml.h:26 +#: ../data/org.gnome.devhelp.gschema.xml.h:28 msgid "The Y position of the assistant window." msgstr "助理視窗的 Y 位置。" -#: ../data/org.gnome.devhelp.gschema.xml.h:27 +#: ../data/org.gnome.devhelp.gschema.xml.h:29 msgid "Use system fonts" msgstr "使用系統字型" -#: ../data/org.gnome.devhelp.gschema.xml.h:28 +#: ../data/org.gnome.devhelp.gschema.xml.h:30 msgid "Use the system default fonts." msgstr "使用系統預設字型。" -#: ../data/org.gnome.devhelp.gschema.xml.h:29 +#: ../data/org.gnome.devhelp.gschema.xml.h:31 msgid "Font for text" msgstr "普通文字字型" -#: ../data/org.gnome.devhelp.gschema.xml.h:30 +#: ../data/org.gnome.devhelp.gschema.xml.h:32 msgid "Font for text with variable width." msgstr "可變寬度文字所使用的字型。" -#: ../data/org.gnome.devhelp.gschema.xml.h:31 +#: ../data/org.gnome.devhelp.gschema.xml.h:33 msgid "Font for fixed width text" msgstr "固定寬度字型" -#: ../data/org.gnome.devhelp.gschema.xml.h:32 +#: ../data/org.gnome.devhelp.gschema.xml.h:34 msgid "Font for text with fixed width, such as code examples." msgstr "固定寬度文字所使用的字型，例如原始碼範例。" @@ -185,79 +193,59 @@ msgid "Show API Documentation for the word at the cursor" msgstr "以游標所在的文字顯示其 API 文件" -#: ../src/devhelp.ui.h:1 -msgid "New window" -msgstr "新增視窗" +#: ../src/devhelp-menu.ui.h:1 ../src/devhelp.ui.h:1 ../src/dh-window.ui.h:7 +msgid "New _Window" +msgstr "新增視窗(_W)" + +#: ../src/devhelp-menu.ui.h:2 ../src/devhelp.ui.h:2 ../src/dh-window.ui.h:8 +msgid "_Preferences" +msgstr "偏好設定(_P)" + +#: ../src/devhelp-menu.ui.h:3 ../src/devhelp.ui.h:3 ../src/dh-window.ui.h:9 +msgid "_About Devhelp" +msgstr "關於 Devhelp(_A)" + +#: ../src/devhelp-menu.ui.h:4 ../src/devhelp.ui.h:4 ../src/dh-window.ui.h:10 +msgid "_Quit" +msgstr "結束(_Q)" -#: ../src/devhelp.ui.h:2 +#: ../src/devhelp.ui.h:5 msgid "Preferences" msgstr "偏好設定" -#: ../src/devhelp.ui.h:3 -msgid "About Devhelp" -msgstr "關於 Devhelp" - -#: ../src/devhelp.ui.h:4 -msgid "Quit" -msgstr "結束" - -#: ../src/devhelp.ui.h:5 -msgid "New _Tab" -msgstr "新增分頁(_T)" - #: ../src/devhelp.ui.h:6 -msgid "_Print" -msgstr "列印(_P)" - -#: ../src/devhelp.ui.h:7 -msgid "_Find" -msgstr "尋找(_F)" - -#: ../src/devhelp.ui.h:8 -msgid "_Larger text" -msgstr "放大文字(_L)" - -#: ../src/devhelp.ui.h:9 -msgid "S_maller text" -msgstr "縮小文字(_M)" - -#: ../src/devhelp.ui.h:10 -msgid "_Normal size" -msgstr "正常大小(_N)" - -#: ../src/devhelp.ui.h:11 msgid "_Group by language" msgstr "以語言為群組(_G)" -#: ../src/devhelp.ui.h:12 +#: ../src/devhelp.ui.h:7 msgid "Enabled" msgstr "已啟用" -#: ../src/devhelp.ui.h:13 +#: ../src/devhelp.ui.h:8 msgid "Title" msgstr "標題" -#: ../src/devhelp.ui.h:14 +#: ../src/devhelp.ui.h:9 msgid "Book Shelf" msgstr "書櫃" -#: ../src/devhelp.ui.h:15 +#: ../src/devhelp.ui.h:10 msgid "_Use system fonts" msgstr "使用系統字型(_U)" -#: ../src/devhelp.ui.h:16 +#: ../src/devhelp.ui.h:11 msgid "_Variable width: " msgstr "可變寬度(_V)：" -#: ../src/devhelp.ui.h:17 +#: ../src/devhelp.ui.h:12 msgid "_Fixed width:" msgstr "固定寬度(_F)：" -#: ../src/devhelp.ui.h:18 +#: ../src/devhelp.ui.h:13 msgid "Fonts" msgstr "字型" -#: ../src/dh-app.c:157 +#: ../src/dh-app.c:201 msgid "translator_credits" msgstr "" "如對翻譯有任何意見，請送一封電子郵件給\n" @@ -270,80 +258,80 @@ "Abel Cheung , 2003-04\n" "Joe Man , 2001" -#: ../src/dh-app.c:164 +#: ../src/dh-app.c:211 msgid "A developers' help browser for GNOME" msgstr "GNOME 的程式開發者說明文件瀏覽程式" -#: ../src/dh-app.c:172 +#: ../src/dh-app.c:219 msgid "DevHelp Website" msgstr "DevHelp 網站" -#. i18n: Please don't translate "Devhelp". -#: ../src/dh-assistant.c:121 +#. Please don't translate "Devhelp" +#: ../src/dh-assistant.ui.h:2 msgid "Devhelp — Assistant" msgstr "Devhelp — 助理" -#: ../src/dh-assistant-view.c:403 +#: ../src/dh-assistant-view.c:372 msgid "Book:" msgstr "書本：" -#: ../src/dh-book.c:256 +#: ../src/dh-book.c:250 #, c-format msgid "Language: %s" msgstr "語言：%s" -#: ../src/dh-book.c:257 +#: ../src/dh-book.c:251 msgid "Language: Undefined" msgstr "語言：未定義" #. i18n: a documentation book -#: ../src/dh-link.c:267 +#: ../src/dh-link.c:272 msgid "Book" msgstr "書本" #. i18n: a "page" in a documentation book -#: ../src/dh-link.c:270 +#: ../src/dh-link.c:275 msgid "Page" msgstr "頁面" #. i18n: a search hit in the documentation, could be a #. * function, macro, struct, etc -#: ../src/dh-link.c:274 +#: ../src/dh-link.c:279 msgid "Keyword" msgstr "關鍵字" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:279 +#: ../src/dh-link.c:284 msgid "Function" msgstr "函式" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:284 +#: ../src/dh-link.c:289 msgid "Struct" msgstr "Struct" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:289 +#: ../src/dh-link.c:294 msgid "Macro" msgstr "巨集" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:294 +#: ../src/dh-link.c:299 msgid "Enum" msgstr "Enum" #. i18n: in the programming language context, if you don't #. * have an ESTABLISHED term for it, leave it #. * untranslated. -#: ../src/dh-link.c:299 +#: ../src/dh-link.c:304 msgid "Type" msgstr "類型" @@ -412,12 +400,11 @@ msgstr "無法將說明書‘%s’解壓：%s" #. Setup the Current/All Files selector -#: ../src/dh-sidebar.c:471 +#: ../src/dh-sidebar.c:531 msgid "Current" msgstr "目前的" -#: ../src/dh-sidebar.c:474 -#| msgid "All books" +#: ../src/dh-sidebar.c:534 msgid "All Books" msgstr "所有書籍" @@ -457,51 +444,66 @@ msgid "400%" msgstr "400%" -#: ../src/dh-window.c:654 -#| msgid "_Back" +#: ../src/dh-window.c:869 +msgid "Error opening the requested link." +msgstr "開啟要求的連結時發生錯誤。" + +#: ../src/dh-window.c:1153 ../src/dh-window.c:1325 +msgid "Empty Page" +msgstr "空白頁" + +#: ../src/dh-window.ui.h:1 +msgid "New _Tab" +msgstr "新增分頁(_T)" + +#: ../src/dh-window.ui.h:2 +msgid "_Print" +msgstr "列印(_P)" + +#: ../src/dh-window.ui.h:3 +msgid "_Find" +msgstr "尋找(_F)" + +#: ../src/dh-window.ui.h:4 +msgid "_Larger Text" +msgstr "較大文字(_L)" + +#: ../src/dh-window.ui.h:5 +msgid "S_maller Text" +msgstr "較小文字(_S)" + +#: ../src/dh-window.ui.h:6 +msgid "_Normal Size" +msgstr "正常大小(_N)" + +#: ../src/dh-window.ui.h:11 msgid "Back" msgstr "上一頁" -#: ../src/dh-window.c:659 -#| msgid "_Forward" +#: ../src/dh-window.ui.h:12 msgid "Forward" msgstr "下一頁" -#: ../src/dh-window.c:919 -msgid "Error opening the requested link." -msgstr "開啟要求的連結時發生錯誤。" +#~ msgid "Find:" +#~ msgstr "搜尋：" -#: ../src/dh-window.c:1269 ../src/dh-window.c:1455 -msgid "Empty Page" -msgstr "空白頁" +#~ msgid "Find Previous" +#~ msgstr "尋找上一筆" + +#~ msgid "Find previous occurrence of the search string" +#~ msgstr "尋找上一個出現的搜尋字串" + +#~ msgid "Find Next" +#~ msgstr "尋找下一筆" + +#~ msgid "Find next occurrence of the search string" +#~ msgstr "尋找下一個出現的搜尋字串" + +#~ msgid "C_ase Sensitive" +#~ msgstr "區分大小寫(_A)" -#: ../src/eggfindbar.c:320 -msgid "Find:" -msgstr "搜尋：" - -#: ../src/eggfindbar.c:329 -msgid "Find Previous" -msgstr "尋找上一筆" - -#: ../src/eggfindbar.c:333 ../src/eggfindbar.c:336 -msgid "Find previous occurrence of the search string" -msgstr "尋找上一個出現的搜尋字串" - -#: ../src/eggfindbar.c:342 -msgid "Find Next" -msgstr "尋找下一筆" - -#: ../src/eggfindbar.c:346 ../src/eggfindbar.c:349 -msgid "Find next occurrence of the search string" -msgstr "尋找下一個出現的搜尋字串" - -#: ../src/eggfindbar.c:358 -msgid "C_ase Sensitive" -msgstr "區分大小寫(_A)" - -#: ../src/eggfindbar.c:362 ../src/eggfindbar.c:365 -msgid "Toggle case sensitive search" -msgstr "選取後在搜尋時將區分大小寫" +#~ msgid "Toggle case sensitive search" +#~ msgstr "選取後在搜尋時將區分大小寫" #~ msgid "_Window" #~ msgstr "視窗(_W)" diff -Nru devhelp-3.8.2/src/Makefile.am devhelp-3.10.2/src/Makefile.am --- devhelp-3.8.2/src/Makefile.am 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/Makefile.am 2013-08-20 08:10:58.000000000 +0000 @@ -29,10 +29,6 @@ -DGTK_DISABLE_SINGLE_INCLUDES \ $(WARN_CFLAGS) -if WITH_WEBKIT2 -AM_CPPFLAGS += -DHAVE_WEBKIT2 -endif - bin_PROGRAMS = devhelp devhelp_SOURCES = \ @@ -94,19 +90,17 @@ dh-settings.h \ dh-resources.c \ dh-resources.h \ - eggfindbar.c \ - eggfindbar.h + gedit-close-button.h \ + gedit-close-button.c libdevhelp_3_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(ZLIB_CPPFLAGS) libdevhelp_3_la_CFLAGS = \ - -I$(top_srcdir)/libgd \ $(LIBDEVHELP_CFLAGS) libdevhelp_3_la_LIBADD = \ - $(top_builddir)/libgd/libgd.la \ $(LIBDEVHELP_LIBS) \ $(ZLIB_LIBS) \ $(LIBM) diff -Nru devhelp-3.8.2/src/Makefile.in devhelp-3.10.2/src/Makefile.in --- devhelp-3.8.2/src/Makefile.in 2013-05-15 11:07:36.000000000 +0000 +++ devhelp-3.10.2/src/Makefile.in 2013-11-11 15:03:30.000000000 +0000 @@ -53,21 +53,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@WITH_WEBKIT2_TRUE@am__append_1 = -DHAVE_WEBKIT2 bin_PROGRAMS = devhelp$(EXEEXT) subdir = src DIST_COMMON = $(devhelpinclude_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/libgd/libgd.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -105,9 +100,8 @@ "$(DESTDIR)$(devhelpincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -libdevhelp_3_la_DEPENDENCIES = $(top_builddir)/libgd/libgd.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) +libdevhelp_3_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libdevhelp_3_la_OBJECTS = libdevhelp_3_la-dh-enum-types.lo \ libdevhelp_3_la-dh-app.lo libdevhelp_3_la-dh-assistant.lo \ libdevhelp_3_la-dh-assistant-view.lo \ @@ -119,7 +113,8 @@ libdevhelp_3_la-dh-sidebar.lo libdevhelp_3_la-dh-parser.lo \ libdevhelp_3_la-dh-preferences.lo libdevhelp_3_la-dh-util.lo \ libdevhelp_3_la-dh-window.lo libdevhelp_3_la-dh-settings.lo \ - libdevhelp_3_la-dh-resources.lo libdevhelp_3_la-eggfindbar.lo + libdevhelp_3_la-dh-resources.lo \ + libdevhelp_3_la-gedit-close-button.lo libdevhelp_3_la_OBJECTS = $(am_libdevhelp_3_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -201,12 +196,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ -GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ INSTALL = @INSTALL@ @@ -214,7 +207,6 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INTLLIBS = @INTLLIBS@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ @@ -223,7 +215,6 @@ INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ -INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ LIBDEVHELP_AGE = @LIBDEVHELP_AGE@ @@ -231,27 +222,17 @@ LIBDEVHELP_CURRENT = @LIBDEVHELP_CURRENT@ LIBDEVHELP_LIBS = @LIBDEVHELP_LIBS@ LIBDEVHELP_REVISION = @LIBDEVHELP_REVISION@ -LIBGD_CFLAGS = @LIBGD_CFLAGS@ -LIBGD_GIR_INCLUDES = @LIBGD_GIR_INCLUDES@ -LIBGD_LIBS = @LIBGD_LIBS@ -LIBGD_MODULE_DIR = @LIBGD_MODULE_DIR@ -LIBGD_SOURCES = @LIBGD_SOURCES@ -LIBICONV = @LIBICONV@ -LIBINTL = @LIBINTL@ LIBM = @LIBM@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ -LTLIBICONV = @LTLIBICONV@ -LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MSGFMT = @MSGFMT@ -MSGFMT_015 = @MSGFMT_015@ MSGMERGE = @MSGMERGE@ NM = @NM@ NMEDIT = @NMEDIT@ @@ -270,7 +251,6 @@ PKG_CONFIG = @PKG_CONFIG@ PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -POSUB = @POSUB@ PYTHON = @PYTHON@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ PYTHON_PLATFORM = @PYTHON_PLATFORM@ @@ -284,10 +264,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ -WEBKITGTK_PC_NAME = @WEBKITGTK_PC_NAME@ XGETTEXT = @XGETTEXT@ -XGETTEXT_015 = @XGETTEXT_015@ -XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ ZLIB_CFLAGS = @ZLIB_CFLAGS@ ZLIB_LDFLAGS = @ZLIB_LDFLAGS@ ZLIB_LIBS = @ZLIB_LIBS@ @@ -365,11 +342,16 @@ dh.gresource.xml \ $(NULL) -AM_CPPFLAGS = -I$(top_srcdir) -DLOCALEDIR=\""$(localedir)"\" \ - -DDATADIR=\""$(datadir)"\" -DG_LOG_DOMAIN=\"Devhelp\" \ - -DG_DISABLE_SINGLE_INCLUDES \ - -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \ - -DGTK_DISABLE_SINGLE_INCLUDES $(WARN_CFLAGS) $(am__append_1) +AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -DLOCALEDIR=\""$(localedir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DG_LOG_DOMAIN=\"Devhelp\" \ + -DG_DISABLE_SINGLE_INCLUDES \ + -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \ + -DGTK_DISABLE_SINGLE_INCLUDES \ + $(WARN_CFLAGS) + devhelp_SOURCES = \ dh-main.c @@ -427,19 +409,17 @@ dh-settings.h \ dh-resources.c \ dh-resources.h \ - eggfindbar.c \ - eggfindbar.h + gedit-close-button.h \ + gedit-close-button.c libdevhelp_3_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(ZLIB_CPPFLAGS) libdevhelp_3_la_CFLAGS = \ - -I$(top_srcdir)/libgd \ $(LIBDEVHELP_CFLAGS) libdevhelp_3_la_LIBADD = \ - $(top_builddir)/libgd/libgd.la \ $(LIBDEVHELP_LIBS) \ $(ZLIB_LIBS) \ $(LIBM) @@ -595,7 +575,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_3_la-dh-sidebar.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_3_la-dh-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_3_la-dh-window.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_3_la-eggfindbar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdevhelp_3_la-gedit-close-button.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -751,12 +731,12 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_3_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_3_la_CFLAGS) $(CFLAGS) -c -o libdevhelp_3_la-dh-resources.lo `test -f 'dh-resources.c' || echo '$(srcdir)/'`dh-resources.c -libdevhelp_3_la-eggfindbar.lo: eggfindbar.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_3_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_3_la_CFLAGS) $(CFLAGS) -MT libdevhelp_3_la-eggfindbar.lo -MD -MP -MF $(DEPDIR)/libdevhelp_3_la-eggfindbar.Tpo -c -o libdevhelp_3_la-eggfindbar.lo `test -f 'eggfindbar.c' || echo '$(srcdir)/'`eggfindbar.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdevhelp_3_la-eggfindbar.Tpo $(DEPDIR)/libdevhelp_3_la-eggfindbar.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eggfindbar.c' object='libdevhelp_3_la-eggfindbar.lo' libtool=yes @AMDEPBACKSLASH@ +libdevhelp_3_la-gedit-close-button.lo: gedit-close-button.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_3_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_3_la_CFLAGS) $(CFLAGS) -MT libdevhelp_3_la-gedit-close-button.lo -MD -MP -MF $(DEPDIR)/libdevhelp_3_la-gedit-close-button.Tpo -c -o libdevhelp_3_la-gedit-close-button.lo `test -f 'gedit-close-button.c' || echo '$(srcdir)/'`gedit-close-button.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libdevhelp_3_la-gedit-close-button.Tpo $(DEPDIR)/libdevhelp_3_la-gedit-close-button.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gedit-close-button.c' object='libdevhelp_3_la-gedit-close-button.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_3_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_3_la_CFLAGS) $(CFLAGS) -c -o libdevhelp_3_la-eggfindbar.lo `test -f 'eggfindbar.c' || echo '$(srcdir)/'`eggfindbar.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdevhelp_3_la_CPPFLAGS) $(CPPFLAGS) $(libdevhelp_3_la_CFLAGS) $(CFLAGS) -c -o libdevhelp_3_la-gedit-close-button.lo `test -f 'gedit-close-button.c' || echo '$(srcdir)/'`gedit-close-button.c devhelp-dh-main.o: dh-main.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(devhelp_CPPFLAGS) $(CPPFLAGS) $(devhelp_CFLAGS) $(CFLAGS) -MT devhelp-dh-main.o -MD -MP -MF $(DEPDIR)/devhelp-dh-main.Tpo -c -o devhelp-dh-main.o `test -f 'dh-main.c' || echo '$(srcdir)/'`dh-main.c diff -Nru devhelp-3.8.2/src/devhelp-menu.ui devhelp-3.10.2/src/devhelp-menu.ui --- devhelp-3.8.2/src/devhelp-menu.ui 1970-01-01 00:00:00.000000000 +0000 +++ devhelp-3.10.2/src/devhelp-menu.ui 2013-08-20 08:10:58.000000000 +0000 @@ -0,0 +1,51 @@ + + + + + + + +
+ + New _Window + app.new-window + <Primary>n + +
+
+ + _Preferences + app.preferences + +
+
+ + _About Devhelp + app.about + + + _Quit + app.quit + <Primary>q + +
+ + diff -Nru devhelp-3.8.2/src/devhelp.ui devhelp-3.10.2/src/devhelp.ui --- devhelp-3.8.2/src/devhelp.ui 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/devhelp.ui 1970-01-01 00:00:00.000000000 +0000 @@ -1,395 +0,0 @@ - - - - - - - - -
- - New window - app.new-window - <Primary>n - -
-
- - Preferences - app.preferences - -
-
- - About Devhelp - app.about - - - Quit - app.quit - <Primary>q - -
- - - -
- - New _Tab - win.new-tab - <Primary>t - True - -
-
- - _Print - win.print - <Primary>p - - - _Find - win.find - <Primary>f - -
-
- - _Larger text - win.zoom-in - <Primary>plus - - - S_maller text - win.zoom-out - <Primary>minus - - - _Normal size - win.zoom-default - <Primary>0 - -
- - - - - - - - - - - - - - - - - - - 5 - Preferences - 500 - 400 - dialog - - - True - 2 - - - True - 6 - - - True - True - - - True - - - True - 8 - 8 - 8 - 8 - - - True - 6 - - - _Group by language - True - True - False - True - True - - - False - False - 0 - - - - - True - True - automatic - automatic - in - - - True - True - bookshelf_store - False - 0 - - - 60 - Enabled - True - - - 60 - - - 0 - 4 - - - - - - - Title - True - - - - 1 - 3 - - - - - - - - - 2 - - - - - - - 0 - - - - - - - True - Book Shelf - - - False - - - - - True - - - True - 8 - 8 - 8 - 8 - - - True - 6 - - - _Use system fonts - True - True - False - True - True - True - - - False - False - 0 - - - - - True - False - 2 - 2 - 6 - 6 - - - True - 0 - _Variable width: - True - variable_font_button - - - - - - - - - True - 0 - _Fixed width: - True - fixed_font_button - - - 1 - 2 - GTK_FILL - - - - - - True - True - True - True - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - True - Monospace 12 - True - - - 1 - 2 - 1 - 2 - - - - - - - False - False - 1 - - - - - - - 0 - - - - - 1 - - - - - True - Fonts - - - 1 - False - - - - - - - - - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - - False - end - 0 - - - - - - preferences_close_button - - - - diff -Nru devhelp-3.8.2/src/dh-app.c devhelp-3.10.2/src/dh-app.c --- devhelp-3.8.2/src/dh-app.c 2013-03-25 06:27:18.000000000 +0000 +++ devhelp-3.10.2/src/dh-app.c 2013-09-23 16:26:46.000000000 +0000 @@ -30,26 +30,34 @@ #include "dh-preferences.h" #include "dh-util.h" -struct _DhAppPrivate { +typedef struct { DhBookManager *book_manager; -}; +} DhAppPrivate; -G_DEFINE_TYPE (DhApp, dh_app, GTK_TYPE_APPLICATION); +G_DEFINE_TYPE_WITH_PRIVATE (DhApp, dh_app, GTK_TYPE_APPLICATION); /******************************************************************************/ DhBookManager * -dh_app_peek_book_manager (DhApp *self) +dh_app_peek_book_manager (DhApp *app) { - return self->priv->book_manager; + DhAppPrivate *priv; + + g_return_val_if_fail (DH_IS_APP (app), NULL); + + priv = dh_app_get_instance_private (app); + + return priv->book_manager; } GtkWindow * -dh_app_peek_first_window (DhApp *self) +dh_app_peek_first_window (DhApp *app) { GList *l; - for (l = gtk_application_get_windows (GTK_APPLICATION (self)); + g_return_val_if_fail (DH_IS_APP (app), NULL); + + for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = g_list_next (l)) { if (DH_IS_WINDOW (l->data)) { @@ -58,18 +66,20 @@ } /* Create a new window */ - dh_app_new_window (self); + dh_app_new_window (app); /* And look for the newly created window again */ - return dh_app_peek_first_window (self); + return dh_app_peek_first_window (app); } GtkWindow * -dh_app_peek_assistant (DhApp *self) +dh_app_peek_assistant (DhApp *app) { GList *l; - for (l = gtk_application_get_windows (GTK_APPLICATION (self)); + g_return_val_if_fail (DH_IS_APP (app), NULL); + + for (l = gtk_application_get_windows (GTK_APPLICATION (app)); l; l = g_list_next (l)) { if (DH_IS_ASSISTANT (l->data)) { @@ -80,39 +90,72 @@ return NULL; } +gboolean +_dh_app_has_app_menu (DhApp *app) +{ + GtkSettings *gtk_settings; + gboolean show_app_menu; + gboolean show_menubar; + + g_return_val_if_fail (DH_IS_APP (app), FALSE); + + /* We have three cases: + * - GNOME 3: show-app-menu true, show-menubar false -> use the app menu + * - Unity, OSX: show-app-menu and show-menubar true -> use the normal menu + * - Other WM, Windows: show-app-menu and show-menubar false -> use the normal menu + */ + gtk_settings = gtk_settings_get_default (); + g_object_get (G_OBJECT (gtk_settings), + "gtk-shell-shows-app-menu", &show_app_menu, + "gtk-shell-shows-menubar", &show_menubar, + NULL); + + return show_app_menu && !show_menubar; +} + /******************************************************************************/ /* Application action activators */ void -dh_app_new_window (DhApp *self) +dh_app_new_window (DhApp *app) { - g_action_group_activate_action (G_ACTION_GROUP (self), "new-window", NULL); + g_return_if_fail (DH_IS_APP (app)); + + g_action_group_activate_action (G_ACTION_GROUP (app), "new-window", NULL); } void -dh_app_quit (DhApp *self) +dh_app_quit (DhApp *app) { - g_action_group_activate_action (G_ACTION_GROUP (self), "quit", NULL); + g_return_if_fail (DH_IS_APP (app)); + + g_action_group_activate_action (G_ACTION_GROUP (app), "quit", NULL); } void -dh_app_search (DhApp *self, +dh_app_search (DhApp *app, const gchar *keyword) { - g_action_group_activate_action (G_ACTION_GROUP (self), "search", g_variant_new_string (keyword)); + g_return_if_fail (DH_IS_APP (app)); + + g_action_group_activate_action (G_ACTION_GROUP (app), "search", g_variant_new_string (keyword)); } void -dh_app_search_assistant (DhApp *self, +dh_app_search_assistant (DhApp *app, const gchar *keyword) { - g_action_group_activate_action (G_ACTION_GROUP (self), "search-assistant", g_variant_new_string (keyword)); + g_return_if_fail (DH_IS_APP (app)); + + g_action_group_activate_action (G_ACTION_GROUP (app), "search-assistant", g_variant_new_string (keyword)); } void -dh_app_raise (DhApp *self) +dh_app_raise (DhApp *app) { - g_action_group_activate_action (G_ACTION_GROUP (self), "raise", NULL); + g_return_if_fail (DH_IS_APP (app)); + + g_action_group_activate_action (G_ACTION_GROUP (app), "raise", NULL); } /******************************************************************************/ @@ -123,11 +166,11 @@ GVariant *parameter, gpointer user_data) { - DhApp *self = DH_APP (user_data); + DhApp *app = DH_APP (user_data); GtkWidget *window; - window = dh_window_new (self); - gtk_application_add_window (GTK_APPLICATION (self), GTK_WINDOW (window)); + window = dh_window_new (app); + gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (window)); gtk_widget_show_all (window); } @@ -136,7 +179,12 @@ GVariant *parameter, gpointer user_data) { - dh_preferences_show_dialog (); + DhApp *app = DH_APP (user_data); + GtkWindow *window; + + window = dh_app_peek_first_window (app); + + dh_preferences_show_dialog (window); } static void @@ -144,6 +192,7 @@ GVariant *parameter, gpointer user_data) { + DhApp *app = DH_APP (user_data); const gchar *authors[] = { "Mikael Hallendal ", "Richard Hult ", @@ -155,10 +204,13 @@ }; const gchar **documenters = NULL; const gchar *translator_credits = _("translator_credits"); + GtkWindow *parent; + + parent = dh_app_peek_first_window (app); /* i18n: Please don't translate "Devhelp" (it's marked as translatable * for transliteration only) */ - gtk_show_about_dialog (NULL, + gtk_show_about_dialog (parent, "name", _("Devhelp"), "version", PACKAGE_VERSION, "comments", _("A developers' help browser for GNOME"), @@ -179,12 +231,12 @@ GVariant *parameter, gpointer user_data) { - DhApp *self = DH_APP (user_data); + DhApp *app = DH_APP (user_data); GList *l; /* Remove all windows registered in the application */ - while ((l = gtk_application_get_windows (GTK_APPLICATION (self)))) { - gtk_application_remove_window (GTK_APPLICATION (self), + while ((l = gtk_application_get_windows (GTK_APPLICATION (app)))) { + gtk_application_remove_window (GTK_APPLICATION (app), GTK_WINDOW (l->data)); } } @@ -194,11 +246,11 @@ GVariant *parameter, gpointer user_data) { - DhApp *self = DH_APP (user_data); + DhApp *app = DH_APP (user_data); GtkWindow *window; const gchar *str; - window = dh_app_peek_first_window (self); + window = dh_app_peek_first_window (app); str = g_variant_get_string (parameter, NULL); if (str[0] == '\0') { g_warning ("Cannot search in application window: " @@ -215,7 +267,7 @@ GVariant *parameter, gpointer user_data) { - DhApp *self = DH_APP (user_data); + DhApp *app = DH_APP (user_data); GtkWindow *assistant; const gchar *str; @@ -227,10 +279,10 @@ } /* Look for an already registered assistant */ - assistant = dh_app_peek_assistant (self); + assistant = dh_app_peek_assistant (app); if (!assistant) { - assistant = GTK_WINDOW (dh_assistant_new (self)); - gtk_application_add_window (GTK_APPLICATION (self), assistant); + assistant = GTK_WINDOW (dh_assistant_new (app)); + gtk_application_add_window (GTK_APPLICATION (app), assistant); } dh_assistant_search (DH_ASSISTANT (assistant), str); @@ -241,11 +293,11 @@ GVariant *parameter, gpointer user_data) { - DhApp *self = DH_APP (user_data); + DhApp *app = DH_APP (user_data); GtkWindow *window; /* Look for the first application window available and show it */ - window = dh_app_peek_first_window (self); + window = dh_app_peek_first_window (app); gtk_window_present (window); } @@ -261,76 +313,71 @@ { "raise", raise_cb, NULL, NULL, NULL }, }; -static void -setup_actions (DhApp *self) -{ - g_action_map_add_action_entries (G_ACTION_MAP (self), - app_entries, G_N_ELEMENTS (app_entries), - self); -} - /******************************************************************************/ static void setup_accelerators (DhApp *self) { - gtk_application_add_accelerator (GTK_APPLICATION (self), "0", "win.zoom-default", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "minus", "win.zoom-out", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "plus", "win.zoom-in", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "k", "win.focus-search", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "f", "win.find", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "c", "win.copy", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "p", "win.print", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "t", "win.new-tab", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "w", "win.close", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "F10", "win.gear-menu", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "Right", "win.go-forward", NULL); - gtk_application_add_accelerator (GTK_APPLICATION (self), "Left", "win.go-back", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "0", "win.zoom-default", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "minus", "win.zoom-out", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "plus", "win.zoom-in", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "k", "win.focus-search", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "s", "win.focus-search-alt", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "f", "win.find", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "c", "win.copy", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "p", "win.print", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "t", "win.new-tab", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "w", "win.close", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "F10", "win.gear-menu", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "Right", "win.go-forward", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (self), "Left", "win.go-back", NULL); } /******************************************************************************/ static void -setup_menu (DhApp *self) +dh_app_startup (GApplication *application) { - GtkBuilder *builder; - GMenuModel *model; - GError *error = NULL; - - builder = gtk_builder_new (); - - if (!gtk_builder_add_from_resource (builder, "/org/gnome/devhelp/devhelp.ui", &error)) { - g_error ("%s",error ? error->message : "unknown error"); - g_clear_error (&error); - } - - model = G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")); - gtk_application_set_app_menu (GTK_APPLICATION (self), model); - - g_object_unref (builder); -} - -static void -startup (GApplication *application) -{ - DhApp *self = DH_APP (application); + DhApp *app = DH_APP (application); + DhAppPrivate *priv = dh_app_get_instance_private (app); /* Chain up parent's startup */ G_APPLICATION_CLASS (dh_app_parent_class)->startup (application); /* Setup actions */ - setup_actions (self); + g_action_map_add_action_entries (G_ACTION_MAP (app), + app_entries, G_N_ELEMENTS (app_entries), + app); + + if (_dh_app_has_app_menu (app)) { + GtkBuilder *builder; + GError *error = NULL; + + /* Setup menu */ + builder = gtk_builder_new (); + + if (!gtk_builder_add_from_resource (builder, + "/org/gnome/devhelp/devhelp-menu.ui", + &error)) { + g_warning ("loading menu builder file: %s", error->message); + g_error_free (error); + } else { + GMenuModel *app_menu; + + app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")); + gtk_application_set_app_menu (GTK_APPLICATION (application), + app_menu); + } - /* Setup menu */ - setup_menu (self); + g_object_unref (builder); + } /* Setup accelerators */ - setup_accelerators (self); + setup_accelerators (app); /* Load the book manager */ - g_assert (self->priv->book_manager == NULL); - self->priv->book_manager = dh_book_manager_new (); - dh_book_manager_populate (self->priv->book_manager); + priv->book_manager = dh_book_manager_new (); + dh_book_manager_populate (priv->book_manager); } /******************************************************************************/ @@ -338,36 +385,29 @@ DhApp * dh_app_new (void) { - DhApp *application; - - g_type_init (); + return g_object_new (DH_TYPE_APP, + "application-id", "org.gnome.Devhelp", + "flags", G_APPLICATION_FLAGS_NONE, + "register-session", TRUE, + NULL); +} +static void +dh_app_init (DhApp *app) +{ /* i18n: Please don't translate "Devhelp" (it's marked as translatable * for transliteration only) */ g_set_application_name (_("Devhelp")); gtk_window_set_default_icon_name ("devhelp"); - - application = g_object_new (DH_TYPE_APP, - "application-id", "org.gnome.Devhelp", - "flags", G_APPLICATION_FLAGS_NONE, - "register-session", TRUE, - NULL); - - return application; -} - -static void -dh_app_init (DhApp *self) -{ - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, DH_TYPE_APP, DhAppPrivate); } static void -dispose (GObject *object) +dh_app_dispose (GObject *object) { - DhApp *self = DH_APP (object); + DhApp *app = DH_APP (object); + DhAppPrivate *priv = dh_app_get_instance_private (app); - g_clear_object (&self->priv->book_manager); + g_clear_object (&priv->book_manager); G_OBJECT_CLASS (dh_app_parent_class)->dispose (object); } @@ -378,9 +418,7 @@ GObjectClass *object_class = G_OBJECT_CLASS (klass); GApplicationClass *application_class = G_APPLICATION_CLASS (klass); - g_type_class_add_private (klass, sizeof (DhAppPrivate)); - - application_class->startup = startup; + application_class->startup = dh_app_startup; - object_class->dispose = dispose; + object_class->dispose = dh_app_dispose; } diff -Nru devhelp-3.8.2/src/dh-app.h devhelp-3.10.2/src/dh-app.h --- devhelp-3.8.2/src/dh-app.h 2013-02-01 13:07:04.000000000 +0000 +++ devhelp-3.10.2/src/dh-app.h 2013-08-20 08:10:58.000000000 +0000 @@ -36,11 +36,9 @@ typedef struct _DhApp DhApp; typedef struct _DhAppClass DhAppClass; -typedef struct _DhAppPrivate DhAppPrivate; struct _DhApp { GtkApplication parent_instance; - DhAppPrivate *priv; }; struct _DhAppClass { @@ -63,6 +61,8 @@ const gchar *keyword); void dh_app_raise (DhApp *self); +gboolean _dh_app_has_app_menu (DhApp *app); + G_END_DECLS #endif /* __DH_APP_H__ */ diff -Nru devhelp-3.8.2/src/dh-assistant-view.c devhelp-3.10.2/src/dh-assistant-view.c --- devhelp-3.8.2/src/dh-assistant-view.c 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/dh-assistant-view.c 2013-05-15 11:10:50.000000000 +0000 @@ -64,7 +64,6 @@ G_OBJECT_CLASS (dh_assistant_view_parent_class)->finalize (object); } -#ifdef HAVE_WEBKIT2 static gboolean assistant_decide_policy (WebKitWebView *web_view, WebKitPolicyDecision *decision, @@ -109,32 +108,6 @@ return TRUE; } -#else -static WebKitNavigationResponse -assistant_navigation_requested (WebKitWebView *web_view, - WebKitWebFrame *frame, - WebKitNetworkRequest *request) -{ - DhAssistantViewPriv *priv; - const gchar *uri; - - priv = GET_PRIVATE (web_view); - - uri = webkit_network_request_get_uri (request); - if (strcmp (uri, "about:blank") == 0) { - return WEBKIT_NAVIGATION_RESPONSE_ACCEPT; - } - else if (! priv->snippet_loaded) { - priv->snippet_loaded = TRUE; - return WEBKIT_NAVIGATION_RESPONSE_ACCEPT; - } - else if (g_str_has_prefix (uri, "file://")) { - g_signal_emit (web_view, signals[SIGNAL_OPEN_URI], 0, uri); - } - - return WEBKIT_NAVIGATION_RESPONSE_IGNORE; -} -#endif /* HAVE_WEBKIT2 */ static gboolean assistant_button_press_event (GtkWidget *widget, @@ -158,11 +131,7 @@ object_class->finalize = view_finalize; widget_class->button_press_event = assistant_button_press_event; -#ifdef HAVE_WEBKIT2 web_view_class->decide_policy = assistant_decide_policy; -#else - web_view_class->navigation_requested = assistant_navigation_requested; -#endif g_type_class_add_private (klass, sizeof (DhAssistantViewPriv)); @@ -409,20 +378,10 @@ g_free (javascript_html); priv->snippet_loaded = FALSE; -#ifdef HAVE_WEBKIT2 webkit_web_view_load_html ( WEBKIT_WEB_VIEW (view), html, filename); -#else - webkit_web_view_load_string ( - WEBKIT_WEB_VIEW (view), - html, - "text/html", - NULL, - filename); -#endif - g_free (html); } else { webkit_web_view_load_uri (WEBKIT_WEB_VIEW (view), "about:blank"); diff -Nru devhelp-3.8.2/src/dh-assistant-view.h devhelp-3.10.2/src/dh-assistant-view.h --- devhelp-3.8.2/src/dh-assistant-view.h 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/dh-assistant-view.h 2013-05-15 11:10:50.000000000 +0000 @@ -21,11 +21,7 @@ #ifndef __DH_ASSISTANT_VIEW_H__ #define __DH_ASSISTANT_VIEW_H__ -#ifdef HAVE_WEBKIT2 #include -#else -#include -#endif #include "dh-book-manager.h" #include "dh-link.h" diff -Nru devhelp-3.8.2/src/dh-assistant.c devhelp-3.10.2/src/dh-assistant.c --- devhelp-3.8.2/src/dh-assistant.c 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/dh-assistant.c 2013-08-20 08:10:58.000000000 +0000 @@ -30,68 +30,57 @@ #include "dh-settings.h" typedef struct { - DhApp *application; - GtkWidget *main_box; GtkWidget *view; DhSettings *settings; -} DhAssistantPriv; +} DhAssistantPrivate; -static void dh_assistant_class_init (DhAssistantClass *klass); -static void dh_assistant_init (DhAssistant *assistant); +G_DEFINE_TYPE_WITH_PRIVATE (DhAssistant, dh_assistant, GTK_TYPE_APPLICATION_WINDOW); -G_DEFINE_TYPE (DhAssistant, dh_assistant, GTK_TYPE_APPLICATION_WINDOW); +static void +assistant_view_open_uri_cb (DhAssistantView *view, + const char *uri, + DhAssistant *assistant) +{ + DhApp *app; + GtkWindow *window; + + app = DH_APP (gtk_window_get_application (GTK_WINDOW (assistant))); -#define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \ - (instance, DH_TYPE_ASSISTANT, DhAssistantPriv) + window = dh_app_peek_first_window (app); + _dh_window_display_uri (DH_WINDOW (window), uri); +} static gboolean -assistant_key_press_event_cb (GtkWidget *widget, - GdkEventKey *event, - DhAssistant *assistant) +dh_assistant_key_press_event (GtkWidget *widget, + GdkEventKey *event) { if (event->keyval == GDK_KEY_Escape) { - gtk_widget_destroy (GTK_WIDGET (assistant)); + gtk_widget_destroy (widget); return TRUE; } - return FALSE; + return GTK_WIDGET_CLASS (dh_assistant_parent_class)->key_press_event (widget, event); } -static void -assistant_view_open_uri_cb (DhAssistantView *view, - const char *uri, - DhAssistant *assistant) +static gboolean +dh_assistant_configure_event (GtkWidget *widget, + GdkEventConfigure *event) { - DhAssistantPriv *priv; - GtkWindow* window; + DhAssistant *assistant = DH_ASSISTANT (widget); + DhAssistantPrivate *priv = dh_assistant_get_instance_private (assistant); - priv = GET_PRIVATE (assistant); - window = dh_app_peek_first_window (priv->application); - _dh_window_display_uri (DH_WINDOW (window), uri); -} - -static gboolean -window_configure_event_cb (GtkWidget *window, - GdkEventConfigure *event, - gpointer user_data) -{ - DhAssistant *assistant; - DhAssistantPriv *priv; - - assistant = DH_ASSISTANT (user_data); - priv = GET_PRIVATE (assistant); - dh_util_window_settings_save ( - GTK_WINDOW (assistant), - dh_settings_peek_assistant_settings (priv->settings), FALSE); - return FALSE; + dh_util_window_settings_save (GTK_WINDOW (widget), + dh_settings_peek_assistant_settings (priv->settings), + FALSE); + return GTK_WIDGET_CLASS (dh_assistant_parent_class)->configure_event (widget, event); } static void -dispose (GObject *object) +dh_assistant_dispose (GObject *object) { DhAssistant *assistant = DH_ASSISTANT (object); - DhAssistantPriv *priv = GET_PRIVATE (assistant); - g_clear_object (&priv->application); + DhAssistantPrivate *priv = dh_assistant_get_instance_private (assistant); + g_clear_object (&priv->settings); G_OBJECT_CLASS (dh_assistant_parent_class)->dispose (object); @@ -101,72 +90,46 @@ dh_assistant_class_init (DhAssistantClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (DhAssistantPriv)); - object_class->dispose = dispose; + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + object_class->dispose = dh_assistant_dispose; + + widget_class->key_press_event = dh_assistant_key_press_event; + widget_class->configure_event = dh_assistant_configure_event; + + /* Bind class to template */ + gtk_widget_class_set_template_from_resource (widget_class, + "/org/gnome/devhelp/dh-assistant.ui"); + gtk_widget_class_bind_template_child_private (widget_class, DhAssistant, view); } static void dh_assistant_init (DhAssistant *assistant) { - DhAssistantPriv *priv = GET_PRIVATE (assistant); -#ifndef HAVE_WEBKIT2 - GtkWidget *scrolled_window; -#endif - priv->settings = dh_settings_get (); - priv->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_show (priv->main_box); - gtk_container_add (GTK_CONTAINER (assistant), priv->main_box); - - /* i18n: Please don't translate "Devhelp". */ - gtk_window_set_title (GTK_WINDOW (assistant), _("Devhelp — Assistant")); - gtk_window_set_icon_name (GTK_WINDOW (assistant), "devhelp"); + DhAssistantPrivate *priv = dh_assistant_get_instance_private (assistant); + + gtk_widget_init_template (GTK_WIDGET (assistant)); - priv->view = dh_assistant_view_new (); + priv->settings = dh_settings_get (); g_signal_connect (priv->view, "open-uri", G_CALLBACK (assistant_view_open_uri_cb), assistant); - g_signal_connect (assistant, "key-press-event", - G_CALLBACK (assistant_key_press_event_cb), - assistant); -#ifdef HAVE_WEBKIT2 - gtk_box_pack_start (GTK_BOX (priv->main_box), - priv->view, TRUE, TRUE, 0); - gtk_widget_show (priv->view); -#else - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - gtk_container_add (GTK_CONTAINER (scrolled_window), priv->view); - - gtk_widget_show_all (scrolled_window); - - gtk_box_pack_start (GTK_BOX (priv->main_box), - scrolled_window, TRUE, TRUE, 0); -#endif - - dh_util_window_settings_restore ( - GTK_WINDOW (assistant), - dh_settings_peek_assistant_settings (priv->settings), FALSE); - - g_signal_connect (GTK_WINDOW (assistant), "configure-event", - G_CALLBACK (window_configure_event_cb), - assistant); + dh_util_window_settings_restore (GTK_WINDOW (assistant), + dh_settings_peek_assistant_settings (priv->settings), + FALSE); } GtkWidget * dh_assistant_new (DhApp *application) { - GtkWidget *assistant; - DhAssistantPriv *priv; - - assistant = g_object_new (DH_TYPE_ASSISTANT, NULL); + GtkWidget *assistant; + DhAssistantPrivate *priv; - priv = GET_PRIVATE (assistant); - priv->application = g_object_ref (application); + assistant = g_object_new (DH_TYPE_ASSISTANT, "application", application, NULL); + priv = dh_assistant_get_instance_private (DH_ASSISTANT (assistant)); dh_assistant_view_set_book_manager (DH_ASSISTANT_VIEW (priv->view), dh_app_peek_book_manager (application)); @@ -177,12 +140,12 @@ dh_assistant_search (DhAssistant *assistant, const gchar *str) { - DhAssistantPriv *priv; + DhAssistantPrivate *priv; g_return_val_if_fail (DH_IS_ASSISTANT (assistant), FALSE); g_return_val_if_fail (str != NULL, FALSE); - priv = GET_PRIVATE (assistant); + priv = dh_assistant_get_instance_private (assistant); if (dh_assistant_view_search (DH_ASSISTANT_VIEW (priv->view), str)) { gtk_widget_show (GTK_WIDGET (assistant)); diff -Nru devhelp-3.8.2/src/dh-assistant.ui devhelp-3.10.2/src/dh-assistant.ui --- devhelp-3.8.2/src/dh-assistant.ui 1970-01-01 00:00:00.000000000 +0000 +++ devhelp-3.10.2/src/dh-assistant.ui 2013-08-20 08:10:58.000000000 +0000 @@ -0,0 +1,16 @@ + + + + + diff -Nru devhelp-3.8.2/src/dh-book-manager.c devhelp-3.10.2/src/dh-book-manager.c --- devhelp-3.8.2/src/dh-book-manager.c 2013-02-05 18:18:57.000000000 +0000 +++ devhelp-3.10.2/src/dh-book-manager.c 2013-09-23 16:26:46.000000000 +0000 @@ -50,7 +50,7 @@ /* List of programming languages with at least one book enabled */ GList *languages; DhSettings *settings; -} DhBookManagerPriv; +} DhBookManagerPrivate; enum { BOOK_CREATED, @@ -70,10 +70,7 @@ static gint signals[LAST_SIGNAL] = { 0 }; -G_DEFINE_TYPE (DhBookManager, dh_book_manager, G_TYPE_OBJECT); - -#define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \ - (instance, DH_TYPE_BOOK_MANAGER, DhBookManagerPriv) +G_DEFINE_TYPE_WITH_PRIVATE (DhBookManager, dh_book_manager, G_TYPE_OBJECT); static void dh_book_manager_init (DhBookManager *book_manager); static void dh_book_manager_class_init (DhBookManagerClass *klass); @@ -88,46 +85,31 @@ const gchar *language_name); static void book_manager_dec_language (DhBookManager *book_manager, const gchar *language_name); -static void book_manager_get_property (GObject *object, +static void dh_book_manager_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void book_manager_set_property (GObject *object, +static void dh_book_manager_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void -book_manager_finalize (GObject *object) +dh_book_manager_finalize (GObject *object) { - DhBookManagerPriv *priv; - GList *l; - GSList *sl; - - priv = GET_PRIVATE (object); + DhBookManagerPrivate *priv; - /* Destroy all books */ - for (l = priv->books; l; l = g_list_next (l)) { - g_object_unref (l->data); - } - g_list_free (priv->books); + priv = dh_book_manager_get_instance_private (DH_BOOK_MANAGER (object)); - /* Free all languages */ - g_list_foreach (priv->languages, - (GFunc)dh_language_free, - NULL); - g_list_free (priv->languages); + g_list_free_full (priv->books, g_object_unref); + g_list_free_full (priv->languages, (GDestroyNotify)dh_language_free); /* Destroy the monitors HT */ if (priv->monitors) { g_hash_table_destroy (priv->monitors); } - /* Clean the list of books disabled */ - for (sl = priv->books_disabled; sl; sl = g_slist_next (sl)) { - g_free (sl->data); - } - g_slist_free (priv->books_disabled); + g_slist_free_full (priv->books_disabled, g_free); g_clear_object (&priv->settings); @@ -139,9 +121,9 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = book_manager_finalize; - object_class->set_property = book_manager_set_property; - object_class->get_property = book_manager_get_property; + object_class->finalize = dh_book_manager_finalize; + object_class->set_property = dh_book_manager_set_property; + object_class->get_property = dh_book_manager_get_property; signals[BOOK_CREATED] = g_signal_new ("book-created", @@ -215,14 +197,12 @@ G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB))); - - g_type_class_add_private (klass, sizeof (DhBookManagerPriv)); } static void dh_book_manager_init (DhBookManager *book_manager) { - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); priv->books = NULL; priv->monitors = NULL; @@ -237,10 +217,10 @@ } static void -book_manager_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +dh_book_manager_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { DhBookManager *book_manager = DH_BOOK_MANAGER (object); @@ -257,10 +237,10 @@ } static void -book_manager_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +dh_book_manager_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { DhBookManager *book_manager = DH_BOOK_MANAGER (object); @@ -279,7 +259,7 @@ static void book_manager_load_books_disabled (DhBookManager *book_manager) { - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); gchar **books_disabled_strv = g_settings_get_strv ( dh_settings_peek_contents_settings (priv->settings), @@ -297,7 +277,7 @@ static void book_manager_store_books_disabled (DhBookManager *book_manager) { - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); GVariantBuilder *builder; GVariant *variant; int i; @@ -322,7 +302,7 @@ book_manager_is_book_disabled_in_conf (DhBookManager *book_manager, DhBook *book) { - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); GSList *li; for (li = priv->books_disabled; li; li = g_slist_next (li)) { @@ -459,9 +439,9 @@ { GFileMonitor *file_monitor; GFile *file; - DhBookManagerPriv *priv; + DhBookManagerPrivate *priv; - priv = GET_PRIVATE (book_manager); + priv = dh_book_manager_get_instance_private (book_manager); file = g_file_new_for_path (path); @@ -528,8 +508,7 @@ /* Build the path of the directory where the final * devhelp book resides */ - book_dir_path = g_build_filename (G_DIR_SEPARATOR_S, - dir_path, + book_dir_path = g_build_filename (dir_path, name, NULL); @@ -551,7 +530,7 @@ gpointer user_data) { DhBookManager *book_manager = user_data; - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); GList *li; /* Look for the item we want to remove */ @@ -608,7 +587,7 @@ gpointer user_data) { DhBookManager *book_manager = user_data; - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); GSList *li; li = book_manager_find_book_in_disabled_list (priv->books_disabled, @@ -634,7 +613,7 @@ gpointer user_data) { DhBookManager *book_manager = user_data; - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); GSList *li; li = book_manager_find_book_in_disabled_list (priv->books_disabled, @@ -660,14 +639,14 @@ book_manager_add_from_filepath (DhBookManager *book_manager, const gchar *book_path) { - DhBookManagerPriv *priv; + DhBookManagerPrivate *priv; DhBook *book; gboolean book_disabled; g_return_if_fail (book_manager); g_return_if_fail (book_path); - priv = GET_PRIVATE (book_manager); + priv = dh_book_manager_get_instance_private (book_manager); /* Allocate new book struct */ book = dh_book_new (book_path); @@ -733,28 +712,36 @@ GList * dh_book_manager_get_books (DhBookManager *book_manager) { + DhBookManagerPrivate *priv; + g_return_val_if_fail (book_manager, NULL); - return GET_PRIVATE (book_manager)->books; + priv = dh_book_manager_get_instance_private (book_manager); + + return priv->books; } gboolean dh_book_manager_get_group_by_language (DhBookManager *book_manager) { + DhBookManagerPrivate *priv; + g_return_val_if_fail (book_manager, FALSE); - return GET_PRIVATE (book_manager)->group_by_language; + priv = dh_book_manager_get_instance_private (book_manager); + + return priv->group_by_language; } void dh_book_manager_set_group_by_language (DhBookManager *book_manager, gboolean group_by_language) { - DhBookManagerPriv *priv; + DhBookManagerPrivate *priv; g_return_if_fail (book_manager); - priv = GET_PRIVATE (book_manager); + priv = dh_book_manager_get_instance_private (book_manager); priv->group_by_language = group_by_language; g_object_notify (G_OBJECT (book_manager), "group-by-language"); @@ -766,7 +753,7 @@ { GList *li; DhLanguage *language; - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); li = g_list_find_custom (priv->languages, language_name, @@ -796,7 +783,7 @@ const gchar *language_name) { GList *li; - DhBookManagerPriv *priv = GET_PRIVATE (book_manager); + DhBookManagerPrivate *priv = dh_book_manager_get_instance_private (book_manager); /* Language must exist in list */ li = g_list_find_custom (priv->languages, @@ -820,9 +807,13 @@ GList * dh_book_manager_get_languages (DhBookManager *book_manager) { + DhBookManagerPrivate *priv; + g_return_val_if_fail (book_manager, NULL); - return GET_PRIVATE (book_manager)->languages; + priv = dh_book_manager_get_instance_private (book_manager); + + return priv->languages; } DhBookManager * diff -Nru devhelp-3.8.2/src/dh-book-tree.c devhelp-3.10.2/src/dh-book-tree.c --- devhelp-3.8.2/src/dh-book-tree.c 2013-04-17 07:26:15.000000000 +0000 +++ devhelp-3.10.2/src/dh-book-tree.c 2013-08-20 08:10:58.000000000 +0000 @@ -47,7 +47,7 @@ guint book_enabled_id; guint book_disabled_id; guint group_by_language_id; -} DhBookTreePriv; +} DhBookTreePrivate; static void dh_book_tree_class_init (DhBookTreeClass *klass); static void dh_book_tree_init (DhBookTree *tree); @@ -74,62 +74,100 @@ N_COLUMNS }; -G_DEFINE_TYPE (DhBookTree, dh_book_tree, GTK_TYPE_TREE_VIEW); +enum { + PROP_0, + PROP_BOOK_MANAGER +}; -#define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \ - (instance, DH_TYPE_BOOK_TREE, DhBookTreePriv); +G_DEFINE_TYPE_WITH_PRIVATE (DhBookTree, dh_book_tree, GTK_TYPE_TREE_VIEW); static gint signals[LAST_SIGNAL] = { 0 }; static void -book_tree_finalize (GObject *object) +dh_book_tree_dispose (GObject *object) { - DhBookTreePriv *priv = GET_PRIVATE (object); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (DH_BOOK_TREE (object)); /* Disconnect signals */ - if (g_signal_handler_is_connected (priv->book_manager, priv->book_created_id)) + if (priv->book_created_id != 0 && + g_signal_handler_is_connected (priv->book_manager, priv->book_created_id)) { g_signal_handler_disconnect (priv->book_manager, priv->book_created_id); - if (g_signal_handler_is_connected (priv->book_manager, priv->book_deleted_id)) + priv->book_created_id = 0; + } + + if (priv->book_deleted_id && + g_signal_handler_is_connected (priv->book_manager, priv->book_deleted_id)) { g_signal_handler_disconnect (priv->book_manager, priv->book_deleted_id); - if (g_signal_handler_is_connected (priv->book_manager, priv->book_enabled_id)) + priv->book_deleted_id = 0; + } + + if (priv->book_enabled_id != 0 && + g_signal_handler_is_connected (priv->book_manager, priv->book_enabled_id)) { g_signal_handler_disconnect (priv->book_manager, priv->book_enabled_id); - if (g_signal_handler_is_connected (priv->book_manager, priv->book_disabled_id)) + priv->book_enabled_id = 0; + } + + if (priv->book_disabled_id != 0 && + g_signal_handler_is_connected (priv->book_manager, priv->book_disabled_id)) { g_signal_handler_disconnect (priv->book_manager, priv->book_disabled_id); - if (g_signal_handler_is_connected (priv->book_manager, priv->group_by_language_id)) + priv->book_disabled_id = 0; + } + + if (priv->group_by_language_id != 0 && + g_signal_handler_is_connected (priv->book_manager, priv->group_by_language_id)) { g_signal_handler_disconnect (priv->book_manager, priv->group_by_language_id); + priv->group_by_language_id = 0; + } - g_object_unref (priv->store); - g_object_unref (priv->book_manager); + g_clear_object (&priv->store); + g_clear_object (&priv->book_manager); - G_OBJECT_CLASS (dh_book_tree_parent_class)->finalize (object); + G_OBJECT_CLASS (dh_book_tree_parent_class)->dispose (object); } static void -dh_book_tree_class_init (DhBookTreeClass *klass) +dh_book_tree_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = book_tree_finalize; + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (DH_BOOK_TREE (object)); - signals[LINK_SELECTED] = - g_signal_new ("link-selected", - G_TYPE_FROM_CLASS (klass), - G_SIGNAL_RUN_LAST, - 0, - NULL, NULL, - g_cclosure_marshal_VOID__POINTER, - G_TYPE_NONE, - 1, G_TYPE_POINTER); + switch (prop_id) { + case PROP_BOOK_MANAGER: + g_value_set_object (value, priv->book_manager); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} - g_type_class_add_private (klass, sizeof (DhBookTreePriv)); +static void +dh_book_tree_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (DH_BOOK_TREE (object)); + + switch (prop_id) { + case PROP_BOOK_MANAGER: + g_return_if_fail (priv->book_manager == NULL); + priv->book_manager = g_value_dup_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void dh_book_tree_init (DhBookTree *tree) { - DhBookTreePriv *priv; + DhBookTreePrivate *priv; - priv = GET_PRIVATE (tree); + priv = dh_book_tree_get_instance_private (tree); priv->store = gtk_tree_store_new (N_COLUMNS, G_TYPE_STRING, @@ -197,7 +235,7 @@ GtkTreeIter *next_iter, gboolean *next_found) { - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); GtkTreeIter loop_iter; g_assert ((exact_iter && exact_found) || (next_iter && next_found)); @@ -267,7 +305,7 @@ GtkTreeIter *next_iter, gboolean *next_found) { - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); GtkTreeIter loop_iter; g_assert ((exact_iter && exact_found) || (next_iter && next_found)); @@ -328,7 +366,7 @@ DhBook *book, gboolean group_by_language) { - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); GtkTreeIter book_iter; /* If grouping by language we need to add the language categories */ @@ -453,7 +491,7 @@ static void book_tree_populate_tree (DhBookTree *tree) { - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); GList *l; gboolean group_by_language; @@ -501,7 +539,7 @@ gpointer user_data) { DhBookTree *tree = user_data; - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); DhBook *book = DH_BOOK (book_object); GtkTreeIter exact_iter; gboolean exact_iter_found = FALSE; @@ -565,7 +603,7 @@ DhBook *book) { - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); DhLink *link; PangoWeight weight; GNode *child; @@ -602,7 +640,7 @@ book_tree_selection_changed_cb (GtkTreeSelection *selection, DhBookTree *tree) { - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); GtkTreeIter iter; if (gtk_tree_selection_get_selected (selection, NULL, &iter)) { @@ -633,13 +671,13 @@ static void book_tree_init_selection (DhBookTree *tree) { - DhBookTreePriv *priv; + DhBookTreePrivate *priv; GtkTreeSelection *selection; GtkTreeIter iter; gboolean iter_found = FALSE; DhLink *link; - priv = GET_PRIVATE (tree); + priv = dh_book_tree_get_instance_private (tree); /* Mark the first item as selected, or it would get automatically * selected when the treeview will get focus; but that's not even @@ -682,16 +720,11 @@ tree); } -GtkWidget * -dh_book_tree_new (DhBookManager *book_manager) +static void +dh_book_tree_constructed (GObject *object) { - DhBookTree *tree; - DhBookTreePriv *priv; - - tree = g_object_new (DH_TYPE_BOOK_TREE, NULL); - priv = GET_PRIVATE (tree); - - priv->book_manager = g_object_ref (book_manager); + DhBookTree *tree = DH_BOOK_TREE (object); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); priv->book_created_id = g_signal_connect (priv->book_manager, "book-created", @@ -718,7 +751,43 @@ book_tree_init_selection (tree); - return GTK_WIDGET (tree); + G_OBJECT_CLASS (dh_book_tree_parent_class)->constructed (object); +} + +static void +dh_book_tree_class_init (DhBookTreeClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = dh_book_tree_dispose; + object_class->get_property = dh_book_tree_get_property; + object_class->set_property = dh_book_tree_set_property; + object_class->constructed = dh_book_tree_constructed; + + g_object_class_install_property (object_class, + PROP_BOOK_MANAGER, + g_param_spec_object ("book-manager", + "Book Manager", + "The book maanger", + DH_TYPE_BOOK_MANAGER, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + + signals[LINK_SELECTED] = + g_signal_new ("link-selected", + G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + 0, + NULL, NULL, + g_cclosure_marshal_VOID__POINTER, + G_TYPE_NONE, + 1, G_TYPE_POINTER); +} + +GtkWidget * +dh_book_tree_new (DhBookManager *book_manager) +{ + return GTK_WIDGET (g_object_new (DH_TYPE_BOOK_TREE, "book-manager", book_manager, NULL)); } static gboolean @@ -751,7 +820,7 @@ dh_book_tree_select_uri (DhBookTree *tree, const gchar *uri) { - DhBookTreePriv *priv = GET_PRIVATE (tree); + DhBookTreePrivate *priv = dh_book_tree_get_instance_private (tree); GtkTreeSelection *selection; FindURIData data; diff -Nru devhelp-3.8.2/src/dh-book.c devhelp-3.10.2/src/dh-book.c --- devhelp-3.8.2/src/dh-book.c 2013-02-05 18:18:57.000000000 +0000 +++ devhelp-3.10.2/src/dh-book.c 2013-09-23 16:26:46.000000000 +0000 @@ -75,12 +75,9 @@ DhBookMonitorEvent monitor_event; /* ID of the event source */ guint monitor_event_timeout_id; -} DhBookPriv; +} DhBookPrivate; -G_DEFINE_TYPE (DhBook, dh_book, G_TYPE_OBJECT); - -#define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \ - (instance, DH_TYPE_BOOK, DhBookPriv) +G_DEFINE_TYPE_WITH_PRIVATE (DhBook, dh_book, G_TYPE_OBJECT); static void dh_book_init (DhBook *book); static void dh_book_class_init (DhBookClass *klass); @@ -95,11 +92,11 @@ static guint signals[BOOK_LAST_SIGNAL] = { 0 }; static void -book_finalize (GObject *object) +dh_book_finalize (GObject *object) { - DhBookPriv *priv; + DhBookPrivate *priv; - priv = GET_PRIVATE (object); + priv = dh_book_get_instance_private (DH_BOOK (object)); if (priv->tree) { g_node_traverse (priv->tree, @@ -111,19 +108,11 @@ g_node_destroy (priv->tree); } - if (priv->keywords) { - g_list_foreach (priv->keywords, (GFunc)dh_link_unref, NULL); - g_list_free (priv->keywords); - } + g_list_free_full (priv->keywords, (GDestroyNotify)dh_link_unref); - if (priv->completions) { - g_list_foreach (priv->completions, (GFunc)g_free, NULL); - g_list_free (priv->completions); - } + g_list_free_full (priv->completions, g_free); - if (priv->monitor) { - g_object_unref (priv->monitor); - } + g_clear_object (&priv->monitor); g_free (priv->language); @@ -141,7 +130,7 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = book_finalize; + object_class->finalize = dh_book_finalize; signals[BOOK_ENABLED] = g_signal_new ("enabled", @@ -183,14 +172,12 @@ g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - - g_type_class_add_private (klass, sizeof (DhBookPriv)); } static void dh_book_init (DhBook *book) { - DhBookPriv *priv = GET_PRIVATE (book); + DhBookPrivate *priv = dh_book_get_instance_private (book); priv->name = NULL; priv->path = NULL; @@ -214,7 +201,7 @@ DhBook * dh_book_new (const gchar *book_path) { - DhBookPriv *priv; + DhBookPrivate *priv; DhBook *book; GError *error = NULL; GFile *book_path_file; @@ -223,7 +210,7 @@ g_return_val_if_fail (book_path, NULL); book = g_object_new (DH_TYPE_BOOK, NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); /* Parse file storing contents in the book struct */ if (!dh_parser_read_file (book_path, @@ -281,7 +268,7 @@ book_monitor_event_timeout_cb (gpointer data) { DhBook *book = data; - DhBookPriv *priv = GET_PRIVATE (book); + DhBookPrivate *priv = dh_book_get_instance_private (book); /* We'll get either is_deleted OR is_updated, * not possible to have both or none */ @@ -321,7 +308,7 @@ gpointer user_data) { DhBook *book = user_data; - DhBookPriv *priv = GET_PRIVATE (book); + DhBookPrivate *priv = dh_book_get_instance_private (book); gboolean reset_timer = FALSE; switch (event_type) { @@ -357,11 +344,11 @@ GList * dh_book_get_keywords (DhBook *book) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_val_if_fail (DH_IS_BOOK (book), NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); return priv->enabled ? priv->keywords : NULL; } @@ -369,11 +356,11 @@ GList * dh_book_get_completions (DhBook *book) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_val_if_fail (DH_IS_BOOK (book), NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); if (!priv->enabled) return NULL; @@ -408,11 +395,11 @@ GNode * dh_book_get_tree (DhBook *book) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_val_if_fail (DH_IS_BOOK (book), NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); return priv->enabled ? priv->tree : NULL; } @@ -420,11 +407,11 @@ const gchar * dh_book_get_name (DhBook *book) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_val_if_fail (DH_IS_BOOK (book), NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); return priv->name; } @@ -432,11 +419,11 @@ const gchar * dh_book_get_title (DhBook *book) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_val_if_fail (DH_IS_BOOK (book), NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); return priv->title; } @@ -444,11 +431,11 @@ const gchar * dh_book_get_language (DhBook *book) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_val_if_fail (DH_IS_BOOK (book), NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); return priv->language; } @@ -456,11 +443,11 @@ const gchar * dh_book_get_path (DhBook *book) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_val_if_fail (DH_IS_BOOK (book), NULL); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); return priv->path; } @@ -468,20 +455,24 @@ gboolean dh_book_get_enabled (DhBook *book) { + DhBookPrivate *priv; + g_return_val_if_fail (DH_IS_BOOK (book), FALSE); - return GET_PRIVATE (book)->enabled; + priv = dh_book_get_instance_private (book); + + return priv->enabled; } void dh_book_set_enabled (DhBook *book, gboolean enabled) { - DhBookPriv *priv; + DhBookPrivate *priv; g_return_if_fail (DH_IS_BOOK (book)); - priv = GET_PRIVATE (book); + priv = dh_book_get_instance_private (book); if (priv->enabled != enabled) { priv->enabled = enabled; g_signal_emit (book, @@ -491,46 +482,72 @@ } gint -dh_book_cmp_by_path (const DhBook *a, - const DhBook *b) +dh_book_cmp_by_path (DhBook *a, + DhBook *b) { + DhBookPrivate *priv_a; + DhBookPrivate *priv_b; + + priv_a = dh_book_get_instance_private (a); + priv_b = dh_book_get_instance_private (b); + return ((a && b) ? - g_strcmp0 (GET_PRIVATE (a)->path, GET_PRIVATE (b)->path) : + g_strcmp0 (priv_a->path, priv_b->path) : -1); } gint -dh_book_cmp_by_path_str (const DhBook *a, +dh_book_cmp_by_path_str (DhBook *a, const gchar *b_path) { + DhBookPrivate *priv_a; + + priv_a = dh_book_get_instance_private (a); + return ((a && b_path) ? - g_strcmp0 (GET_PRIVATE (a)->path, b_path) : + g_strcmp0 (priv_a->path, b_path) : -1); } gint -dh_book_cmp_by_name (const DhBook *a, - const DhBook *b) +dh_book_cmp_by_name (DhBook *a, + DhBook *b) { + DhBookPrivate *priv_a; + DhBookPrivate *priv_b; + + priv_a = dh_book_get_instance_private (a); + priv_b = dh_book_get_instance_private (b); + return ((a && b) ? - g_ascii_strcasecmp (GET_PRIVATE (a)->name, GET_PRIVATE (b)->name) : + g_ascii_strcasecmp (priv_a->name, priv_b->name) : -1); } gint -dh_book_cmp_by_name_str (const DhBook *a, +dh_book_cmp_by_name_str (DhBook *a, const gchar *b_name) { + DhBookPrivate *priv_a; + + priv_a = dh_book_get_instance_private (a); + return ((a && b_name) ? - g_ascii_strcasecmp (GET_PRIVATE (a)->name, b_name) : + g_ascii_strcasecmp (priv_a->name, b_name) : -1); } gint -dh_book_cmp_by_title (const DhBook *a, - const DhBook *b) +dh_book_cmp_by_title (DhBook *a, + DhBook *b) { + DhBookPrivate *priv_a; + DhBookPrivate *priv_b; + + priv_a = dh_book_get_instance_private (a); + priv_b = dh_book_get_instance_private (b); + return ((a && b) ? - g_utf8_collate (GET_PRIVATE (a)->title, GET_PRIVATE (b)->title) : + g_utf8_collate (priv_a->title, priv_b->title) : -1); } diff -Nru devhelp-3.8.2/src/dh-book.h devhelp-3.10.2/src/dh-book.h --- devhelp-3.8.2/src/dh-book.h 2011-08-21 10:00:05.000000000 +0000 +++ devhelp-3.10.2/src/dh-book.h 2013-08-20 08:10:58.000000000 +0000 @@ -58,16 +58,16 @@ gboolean dh_book_get_enabled (DhBook *book); void dh_book_set_enabled (DhBook *book, gboolean enabled); -gint dh_book_cmp_by_path (const DhBook *a, - const DhBook *b); -gint dh_book_cmp_by_path_str (const DhBook *a, +gint dh_book_cmp_by_path (DhBook *a, + DhBook *b); +gint dh_book_cmp_by_path_str (DhBook *a, const gchar *b_path); -gint dh_book_cmp_by_name (const DhBook *a, - const DhBook *b); -gint dh_book_cmp_by_name_str (const DhBook *a, +gint dh_book_cmp_by_name (DhBook *a, + DhBook *b); +gint dh_book_cmp_by_name_str (DhBook *a, const gchar *b_name); -gint dh_book_cmp_by_title (const DhBook *a, - const DhBook *b); +gint dh_book_cmp_by_title (DhBook *a, + DhBook *b); G_END_DECLS diff -Nru devhelp-3.8.2/src/dh-keyword-model.c devhelp-3.10.2/src/dh-keyword-model.c --- devhelp-3.8.2/src/dh-keyword-model.c 2012-12-26 16:58:06.000000000 +0000 +++ devhelp-3.10.2/src/dh-keyword-model.c 2013-11-11 08:32:55.000000000 +0000 @@ -29,14 +29,14 @@ #include "dh-book.h" #include "dh-keyword-model.h" -struct _DhKeywordModelPriv { +typedef struct { DhBookManager *book_manager; GList *keyword_words; gint keyword_words_length; gint stamp; -}; +} DhKeywordModelPrivate; /* Store a keyword as well as glob * patterns that match at the start of a word @@ -59,33 +59,27 @@ static void dh_globbed_keywords_free (GList *keyword_globs); G_DEFINE_TYPE_WITH_CODE (DhKeywordModel, dh_keyword_model, G_TYPE_OBJECT, + G_ADD_PRIVATE (DhKeywordModel) G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, dh_keyword_model_tree_model_init)); static void -keyword_model_dispose (GObject *object) +dh_keyword_model_dispose (GObject *object) { - DhKeywordModel *model = DH_KEYWORD_MODEL (object); - DhKeywordModelPriv *priv = model->priv; + DhKeywordModelPrivate *priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (object)); - if (priv->book_manager) { - g_object_unref (priv->book_manager); - priv->book_manager = NULL; - } + g_clear_object (&priv->book_manager); G_OBJECT_CLASS (dh_keyword_model_parent_class)->dispose (object); } static void -keyword_model_finalize (GObject *object) +dh_keyword_model_finalize (GObject *object) { - DhKeywordModel *model = DH_KEYWORD_MODEL (object); - DhKeywordModelPriv *priv = model->priv; + DhKeywordModelPrivate *priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (object)); g_list_free (priv->keyword_words); - g_free (model->priv); - G_OBJECT_CLASS (dh_keyword_model_parent_class)->finalize (object); } @@ -94,17 +88,14 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass);; - object_class->finalize = keyword_model_finalize; - object_class->dispose = keyword_model_dispose; + object_class->finalize = dh_keyword_model_finalize; + object_class->dispose = dh_keyword_model_dispose; } static void dh_keyword_model_init (DhKeywordModel *model) { - DhKeywordModelPriv *priv; - - priv = g_new0 (DhKeywordModelPriv, 1); - model->priv = priv; + DhKeywordModelPrivate *priv = dh_keyword_model_get_instance_private (model); do { priv->stamp = g_random_int (); @@ -143,13 +134,11 @@ GtkTreeIter *iter, GtkTreePath *path) { - DhKeywordModel *model; - DhKeywordModelPriv *priv; - GList *node; - const gint *indices; + DhKeywordModelPrivate *priv; + GList *node; + const gint *indices; - model = DH_KEYWORD_MODEL (tree_model); - priv = model->priv; + priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (tree_model)); indices = gtk_tree_path_get_indices (path); @@ -173,14 +162,13 @@ keyword_model_get_path (GtkTreeModel *tree_model, GtkTreeIter *iter) { - DhKeywordModel *model = DH_KEYWORD_MODEL (tree_model); - DhKeywordModelPriv *priv; - GtkTreePath *path; - gint i = 0; + DhKeywordModelPrivate *priv; + GtkTreePath *path; + gint i = 0; - g_return_val_if_fail (iter->stamp == model->priv->stamp, NULL); + priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (tree_model)); - priv = model->priv; + g_return_val_if_fail (iter->stamp == priv->stamp, NULL); i = g_list_position (priv->keyword_words, iter->user_data); if (i < 0) { @@ -221,9 +209,11 @@ keyword_model_iter_next (GtkTreeModel *tree_model, GtkTreeIter *iter) { - DhKeywordModel *model = DH_KEYWORD_MODEL (tree_model); + DhKeywordModelPrivate *priv; - g_return_val_if_fail (model->priv->stamp == iter->stamp, FALSE); + priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (tree_model)); + + g_return_val_if_fail (priv->stamp == iter->stamp, FALSE); iter->user_data = G_LIST (iter->user_data)->next; @@ -235,9 +225,9 @@ GtkTreeIter *iter, GtkTreeIter *parent) { - DhKeywordModelPriv *priv; + DhKeywordModelPrivate *priv; - priv = DH_KEYWORD_MODEL (tree_model)->priv; + priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (tree_model)); /* This is a list, nodes have no children. */ if (parent) { @@ -267,9 +257,9 @@ keyword_model_iter_n_children (GtkTreeModel *tree_model, GtkTreeIter *iter) { - DhKeywordModelPriv *priv; + DhKeywordModelPrivate *priv; - priv = DH_KEYWORD_MODEL (tree_model)->priv; + priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (tree_model)); if (iter == NULL) { return priv->keyword_words_length; @@ -286,10 +276,10 @@ GtkTreeIter *parent, gint n) { - DhKeywordModelPriv *priv; - GList *child; + DhKeywordModelPrivate *priv; + GList *child; - priv = DH_KEYWORD_MODEL (tree_model)->priv; + priv = dh_keyword_model_get_instance_private (DH_KEYWORD_MODEL (tree_model)); if (parent) { return FALSE; @@ -345,9 +335,13 @@ dh_keyword_model_set_words (DhKeywordModel *model, DhBookManager *book_manager) { + DhKeywordModelPrivate *priv; + g_return_if_fail (DH_IS_KEYWORD_MODEL (model)); - model->priv->book_manager = g_object_ref (book_manager); + priv = dh_keyword_model_get_instance_private (model); + + priv->book_manager = g_object_ref (book_manager); } /* Returns a GList of struct _DhKeywordGlobPattern @@ -441,12 +435,12 @@ guint *n_hits, DhLink **exact_link) { - DhKeywordModelPriv *priv; - GList *new_list = NULL, *b; - gint hits = 0; - gchar *page_filename_prefix = NULL; + DhKeywordModelPrivate *priv; + GList *new_list = NULL, *b; + gint hits = 0; + gchar *page_filename_prefix = NULL; - priv = model->priv; + priv = dh_keyword_model_get_instance_private (model); /* Compile each keyword into a GPatternSpec if necessary */ GList *keyword_globs = dh_globbed_keywords_new (keywords); @@ -767,22 +761,22 @@ const gchar *book_id, const gchar *language) { - DhKeywordModelPriv *priv; - GList *new_list = NULL; - gint old_length; - DhLink *exact_link = NULL; - gint hits; - gint i; - GtkTreePath *path; - GtkTreeIter iter; - gchar *book_id_in_string = NULL; - gchar *page_id_in_string = NULL; - GStrv keywords = NULL; + DhKeywordModelPrivate *priv; + GList *new_list = NULL; + gint old_length; + DhLink *exact_link = NULL; + gint hits; + gint i; + GtkTreePath *path; + GtkTreeIter iter; + gchar *book_id_in_string = NULL; + gchar *page_id_in_string = NULL; + GStrv keywords = NULL; g_return_val_if_fail (DH_IS_KEYWORD_MODEL (model), NULL); g_return_val_if_fail (string != NULL, NULL); - priv = model->priv; + priv = dh_keyword_model_get_instance_private (model); /* Do the minimum amount of work: call update on all rows that are * kept and remove the rest. diff -Nru devhelp-3.8.2/src/dh-keyword-model.h devhelp-3.10.2/src/dh-keyword-model.h --- devhelp-3.8.2/src/dh-keyword-model.h 2011-08-21 10:00:05.000000000 +0000 +++ devhelp-3.10.2/src/dh-keyword-model.h 2013-11-11 08:32:55.000000000 +0000 @@ -37,12 +37,10 @@ typedef struct _DhKeywordModel DhKeywordModel; typedef struct _DhKeywordModelClass DhKeywordModelClass; -typedef struct _DhKeywordModelPriv DhKeywordModelPriv; struct _DhKeywordModel { GObject parent_instance; - DhKeywordModelPriv *priv; }; struct _DhKeywordModelClass diff -Nru devhelp-3.8.2/src/dh-link.c devhelp-3.10.2/src/dh-link.c --- devhelp-3.8.2/src/dh-link.c 2011-08-21 10:00:05.000000000 +0000 +++ devhelp-3.10.2/src/dh-link.c 2013-09-03 07:09:30.000000000 +0000 @@ -45,19 +45,8 @@ DhLinkFlags flags : 8; }; -GType -dh_link_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) { - type = g_boxed_type_register_static ( - "DhLink", - (GBoxedCopyFunc) dh_link_ref, - (GBoxedFreeFunc) dh_link_unref); - } - return type; -} +G_DEFINE_BOXED_TYPE (DhLink, dh_link, + dh_link_ref, dh_link_unref) static void link_free (DhLink *link) @@ -71,26 +60,26 @@ if (link->book) { dh_link_unref (link->book); } - if (link->page) { + if (link->page) { dh_link_unref (link->page); } - g_slice_free (DhLink, link); + g_slice_free (DhLink, link); } DhLink * dh_link_new (DhLinkType type, const gchar *base, - const gchar *id, - const gchar *name, - DhLink *book, - DhLink *page, - const gchar *filename) + const gchar *id, + const gchar *name, + DhLink *book, + DhLink *page, + const gchar *filename) { - DhLink *link; + DhLink *link; - g_return_val_if_fail (name != NULL, NULL); - g_return_val_if_fail (filename != NULL, NULL); + g_return_val_if_fail (name != NULL, NULL); + g_return_val_if_fail (filename != NULL, NULL); if (type == DH_LINK_TYPE_BOOK) { g_return_val_if_fail (base != NULL, NULL); @@ -101,27 +90,27 @@ g_return_val_if_fail (page != NULL, NULL); } - link = g_slice_new0 (DhLink); + link = g_slice_new0 (DhLink); - link->ref_count = 1; - link->type = type; + link->ref_count = 1; + link->type = type; if (type == DH_LINK_TYPE_BOOK) { link->base = g_strdup (base); link->id = g_strdup (id); } - link->name = g_strdup (name); - link->filename = g_strdup (filename); + link->name = g_strdup (name); + link->filename = g_strdup (filename); - if (book) { + if (book) { link->book = dh_link_ref (book); } - if (page) { + if (page) { link->page = dh_link_ref (page); } - return link; + return link; } gint @@ -130,7 +119,7 @@ { DhLink *la = (DhLink *) a; DhLink *lb = (DhLink *) b; - gint flags_diff; + gint flags_diff; /* Sort deprecated hits last. */ flags_diff = (la->flags & DH_LINK_FLAGS_DEPRECATED) - @@ -152,23 +141,22 @@ DhLink * dh_link_ref (DhLink *link) { - g_return_val_if_fail (link != NULL, NULL); + g_return_val_if_fail (link != NULL, NULL); - link->ref_count++; + g_atomic_int_inc (&link->ref_count); - return link; + return link; } void dh_link_unref (DhLink *link) { - g_return_if_fail (link != NULL); - - link->ref_count--; + g_return_if_fail (link != NULL); - if (link->ref_count == 0) { - link_free (link); - } + if (g_atomic_int_dec_and_test (&link->ref_count)) + { + link_free (link); + } } const gchar * @@ -227,16 +215,33 @@ gchar * dh_link_get_uri (DhLink *link) { - gchar *base, *uri; + gchar *base, *filename, *uri, *anchor; if (link->type == DH_LINK_TYPE_BOOK) base = link->base; else base = link->book->base; - uri = g_strconcat ("file://", base, "/", link->filename, NULL, NULL); + filename = g_build_filename (base, link->filename, NULL); + + anchor = strrchr (filename, '#'); + if (anchor) { + *anchor = '\0'; + anchor++; + } + + uri = g_filename_to_uri (filename, NULL, NULL); + + if (anchor) { + gchar *uri_with_anchor; + + uri_with_anchor = g_strconcat (uri, "#", anchor, NULL); + g_free (uri); + uri = uri_with_anchor; + } + g_free (filename); - return uri; + return uri; } DhLinkType @@ -248,7 +253,7 @@ DhLinkFlags dh_link_get_flags (DhLink *link) { - return link->flags; + return link->flags; } void @@ -265,10 +270,10 @@ case DH_LINK_TYPE_BOOK: /* i18n: a documentation book */ return _("Book"); - case DH_LINK_TYPE_PAGE: + case DH_LINK_TYPE_PAGE: /* i18n: a "page" in a documentation book */ return _("Page"); - case DH_LINK_TYPE_KEYWORD: + case DH_LINK_TYPE_KEYWORD: /* i18n: a search hit in the documentation, could be a * function, macro, struct, etc */ return _("Keyword"); @@ -277,22 +282,22 @@ * have an ESTABLISHED term for it, leave it * untranslated. */ return _("Function"); - case DH_LINK_TYPE_STRUCT: + case DH_LINK_TYPE_STRUCT: /* i18n: in the programming language context, if you don't * have an ESTABLISHED term for it, leave it * untranslated. */ return _("Struct"); - case DH_LINK_TYPE_MACRO: + case DH_LINK_TYPE_MACRO: /* i18n: in the programming language context, if you don't * have an ESTABLISHED term for it, leave it * untranslated. */ return _("Macro"); - case DH_LINK_TYPE_ENUM: + case DH_LINK_TYPE_ENUM: /* i18n: in the programming language context, if you don't * have an ESTABLISHED term for it, leave it * untranslated. */ return _("Enum"); - case DH_LINK_TYPE_TYPEDEF: + case DH_LINK_TYPE_TYPEDEF: /* i18n: in the programming language context, if you don't * have an ESTABLISHED term for it, leave it * untranslated. */ diff -Nru devhelp-3.8.2/src/dh-link.h devhelp-3.10.2/src/dh-link.h --- devhelp-3.8.2/src/dh-link.h 2011-08-21 10:00:05.000000000 +0000 +++ devhelp-3.10.2/src/dh-link.h 2013-09-03 07:09:30.000000000 +0000 @@ -48,13 +48,13 @@ DhLink * dh_link_new (DhLinkType type, const gchar *base, const gchar *id, - const gchar *name, + const gchar *name, DhLink *book, DhLink *page, - const gchar *filename); + const gchar *filename); void dh_link_free (DhLink *link); gint dh_link_compare (gconstpointer a, - gconstpointer b); + gconstpointer b); DhLink * dh_link_ref (DhLink *link); void dh_link_unref (DhLink *link); const gchar *dh_link_get_name (DhLink *link); @@ -65,7 +65,7 @@ gchar *dh_link_get_uri (DhLink *link); DhLinkFlags dh_link_get_flags (DhLink *link); void dh_link_set_flags (DhLink *link, - DhLinkFlags flags); + DhLinkFlags flags); DhLinkType dh_link_get_link_type (DhLink *link); const gchar *dh_link_get_type_as_string (DhLink *link); diff -Nru devhelp-3.8.2/src/dh-preferences.c devhelp-3.10.2/src/dh-preferences.c --- devhelp-3.8.2/src/dh-preferences.c 2013-05-15 11:05:25.000000000 +0000 +++ devhelp-3.10.2/src/dh-preferences.c 2013-09-23 16:26:46.000000000 +0000 @@ -28,8 +28,18 @@ #include "dh-app.h" #include "dh-settings.h" +static GtkWidget *prefs_dialog = NULL; + +enum { + COLUMN_ENABLED = 0, + COLUMN_TITLE, + COLUMN_BOOK, + COLUMN_WEIGHT, + COLUMN_INCONSISTENT, + N_COLUMNS +}; + typedef struct { - GtkWidget *dialog; DhBookManager *book_manager; DhSettings *settings; @@ -39,10 +49,10 @@ gulong group_by_language_id; /* Fonts tab */ - GtkWidget *system_fonts_button; - GtkWidget *fonts_table; - GtkWidget *variable_font_button; - GtkWidget *fixed_font_button; + GtkCheckButton *system_fonts_button; + GtkGrid *fonts_grid; + GtkFontButton *variable_font_button; + GtkFontButton *fixed_font_button; guint use_system_fonts_id; guint system_var_id; guint system_fixed_id; @@ -50,293 +60,87 @@ guint fixed_id; /* Book Shelf tab */ + GtkCellRendererToggle *bookshelf_enabled_toggle; GtkListStore *bookshelf_store; - GtkWidget *bookshelf_group_by_language_button; -} DhPreferences; - -/* Bookshelf-tab related */ -static void preferences_bookshelf_tree_selection_toggled_cb (GtkCellRendererToggle *cell_renderer, - gchar *path, - gpointer user_data); -static void preferences_bookshelf_populate_store (void); -static void preferences_bookshelf_clean_store (void); -static void preferences_bookshelf_add_book_to_store (DhBook *book, - gboolean group_by_language); -static void preferences_bookshelf_book_created_cb (DhBookManager *book_manager, - GObject *book_object, - gpointer user_data); -static void preferences_bookshelf_book_deleted_cb (DhBookManager *book_manager, - GObject *book_object, - gpointer user_data); -static void preferences_bookshelf_find_language_group (const gchar *language, - GtkTreeIter *exact_iter, - gboolean *exact_found, - GtkTreeIter *next_iter, - gboolean *next_found); -static void preferences_bookshelf_find_book (DhBook *book, - const GtkTreeIter *first, - GtkTreeIter *exact_iter, - gboolean *exact_found, - GtkTreeIter *next_iter, - gboolean *next_found); -static void preferences_bookshelf_group_by_language_cb (GObject *object, - GParamSpec *pspec, - gpointer user_data); - -/* Book list store columns... */ -#define LTCOLUMN_ENABLED 0 -#define LTCOLUMN_TITLE 1 -#define LTCOLUMN_BOOK 2 -#define LTCOLUMN_WEIGHT 3 -#define LTCOLUMN_INCONSISTENT 4 - -static DhPreferences *prefs; - -static void -preferences_init (void) -{ - GApplication *app; - - if (prefs) { - return; - } - - app = g_application_get_default (); - if (!app) { - g_warning ("Cannot launch Preferences: No default application found"); - return; - } + GtkCheckButton *bookshelf_group_by_language_button; +} DhPreferencesPrivate; - prefs = g_new0 (DhPreferences, 1); - prefs->settings = dh_settings_get (); - prefs->book_manager = g_object_ref (dh_app_peek_book_manager (DH_APP (app))); - prefs->book_created_id = g_signal_connect (prefs->book_manager, - "book-created", - G_CALLBACK (preferences_bookshelf_book_created_cb), - NULL); - prefs->book_deleted_id = g_signal_connect (prefs->book_manager, - "book-deleted", - G_CALLBACK (preferences_bookshelf_book_deleted_cb), - NULL); - prefs->group_by_language_id = g_signal_connect (prefs->book_manager, - "notify::group-by-language", - G_CALLBACK (preferences_bookshelf_group_by_language_cb), - NULL); -} +G_DEFINE_TYPE_WITH_PRIVATE (DhPreferences, dh_preferences, GTK_TYPE_DIALOG) static void -preferences_shutdown (void) +dh_preferences_finalize (GObject *object) { - if (!prefs) { - return; - } - - g_clear_object (&prefs->settings); + DhPreferencesPrivate *priv; - g_signal_handler_disconnect (prefs->book_manager, prefs->book_created_id); - g_signal_handler_disconnect (prefs->book_manager, prefs->book_deleted_id); - g_signal_handler_disconnect (prefs->book_manager, prefs->group_by_language_id); - g_clear_object (&prefs->book_manager); - - gtk_list_store_clear (prefs->bookshelf_store); - gtk_widget_destroy (GTK_WIDGET (prefs->dialog)); - - g_free (prefs); - prefs = NULL; -} + priv = dh_preferences_get_instance_private (DH_PREFERENCES (object)); -static void -preferences_fonts_system_fonts_toggled_cb (GtkToggleButton *button, - gpointer user_data) -{ - DhPreferences *prefs = user_data; - gboolean active; + g_clear_object (&priv->settings); - active = gtk_toggle_button_get_active (button); + g_signal_handler_disconnect (priv->book_manager, priv->book_created_id); + g_signal_handler_disconnect (priv->book_manager, priv->book_deleted_id); + g_signal_handler_disconnect (priv->book_manager, priv->group_by_language_id); + g_clear_object (&priv->book_manager); - gtk_widget_set_sensitive (prefs->fonts_table, !active); + G_OBJECT_CLASS (dh_preferences_parent_class)->finalize (object); } static void -preferences_bookshelf_set_language_inconsistent (const gchar *language) +dh_preferences_response (GtkDialog *dlg, + gint response_id) { - GtkTreeIter loop_iter; - GtkTreeIter language_iter; - gboolean language_iter_found; - gboolean one_book_enabled = FALSE; - gboolean one_book_disabled = FALSE; - - preferences_bookshelf_find_language_group (language, - &language_iter, - &language_iter_found, - NULL, - NULL); - if (!language_iter_found) { - return; - } - - loop_iter = language_iter; - while (gtk_tree_model_iter_next (GTK_TREE_MODEL (prefs->bookshelf_store), - &loop_iter)) { - DhBook *book; - gboolean enabled; - - gtk_tree_model_get (GTK_TREE_MODEL (prefs->bookshelf_store), - &loop_iter, - LTCOLUMN_BOOK, &book, - LTCOLUMN_ENABLED, &enabled, - -1); - if (!book) { - /* Reached next language group */ - break; - } - g_object_unref (book); - - if (enabled) - one_book_enabled = TRUE; - else - one_book_disabled = TRUE; - - if (one_book_enabled == one_book_disabled) - break; - } - - /* If at least one book is enabled AND another book is disabled, - * we need to set inconsistent state */ - if (one_book_enabled == one_book_disabled) { - gtk_list_store_set (prefs->bookshelf_store, &language_iter, - LTCOLUMN_INCONSISTENT, TRUE, - -1); - return; - } - - gtk_list_store_set (prefs->bookshelf_store, &language_iter, - LTCOLUMN_ENABLED, one_book_enabled, - LTCOLUMN_INCONSISTENT, FALSE, - -1); + gtk_widget_destroy (GTK_WIDGET (dlg)); } static void -preferences_bookshelf_tree_selection_toggled_cb (GtkCellRendererToggle *cell_renderer, - gchar *path, - gpointer user_data) +dh_preferences_class_init (DhPreferencesClass *klass) { - GtkTreeIter iter; - - if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (prefs->bookshelf_store), - &iter, - path)) - { - gpointer book = NULL; - gboolean enabled; - - gtk_tree_model_get (GTK_TREE_MODEL (prefs->bookshelf_store), - &iter, - LTCOLUMN_BOOK, &book, - LTCOLUMN_ENABLED, &enabled, - -1); - - if (book) { - /* Update book conf */ - dh_book_set_enabled (book, !enabled); - - gtk_list_store_set (prefs->bookshelf_store, &iter, - LTCOLUMN_ENABLED, !enabled, - -1); - /* Now we need to look for the language group of this item, - * in order to set the inconsistent state if applies */ - if (dh_book_manager_get_group_by_language (prefs->book_manager)) { - preferences_bookshelf_set_language_inconsistent (dh_book_get_language (book)); - } - - } else { - GtkTreeIter loop_iter; - - /* We should only reach this if we are grouping by language */ - g_assert (dh_book_manager_get_group_by_language (prefs->book_manager) == TRUE); - - /* Set new status in the language group item */ - gtk_list_store_set (prefs->bookshelf_store, &iter, - LTCOLUMN_ENABLED, !enabled, - LTCOLUMN_INCONSISTENT, FALSE, - -1); - - /* And set new status in all books of the same language */ - loop_iter = iter; - while (gtk_tree_model_iter_next (GTK_TREE_MODEL (prefs->bookshelf_store), - &loop_iter)) { - gtk_tree_model_get (GTK_TREE_MODEL (prefs->bookshelf_store), - &loop_iter, - LTCOLUMN_BOOK, &book, - -1); - if (!book) { - /* Found next language group, finish */ - return; - } - - /* Update book conf */ - dh_book_set_enabled (book, !enabled); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass); - gtk_list_store_set (prefs->bookshelf_store, - &loop_iter, - LTCOLUMN_ENABLED, !enabled, - -1); - } - } - } -} + object_class->finalize = dh_preferences_finalize; -static void -preferences_bookshelf_group_by_language_cb (GObject *object, - GParamSpec *pspec, - gpointer user_data) -{ - preferences_bookshelf_clean_store (); - preferences_bookshelf_populate_store (); -} + dialog_class->response = dh_preferences_response; -static void -preferences_bookshelf_book_created_cb (DhBookManager *book_manager, - GObject *book_object, - gpointer user_data) -{ - preferences_bookshelf_add_book_to_store (DH_BOOK (book_object), - dh_book_manager_get_group_by_language (prefs->book_manager)); + /* Bind class to template */ + gtk_widget_class_set_template_from_resource (widget_class, + "/org/gnome/devhelp/dh-preferences.ui"); + gtk_widget_class_bind_template_child_private (widget_class, DhPreferences, system_fonts_button); + gtk_widget_class_bind_template_child_private (widget_class, DhPreferences, fonts_grid); + gtk_widget_class_bind_template_child_private (widget_class, DhPreferences, variable_font_button); + gtk_widget_class_bind_template_child_private (widget_class, DhPreferences, fixed_font_button); + gtk_widget_class_bind_template_child_private (widget_class, DhPreferences, bookshelf_store); + gtk_widget_class_bind_template_child_private (widget_class, DhPreferences, bookshelf_group_by_language_button); + gtk_widget_class_bind_template_child_private (widget_class, DhPreferences, bookshelf_enabled_toggle); } static void -preferences_bookshelf_book_deleted_cb (DhBookManager *book_manager, - GObject *book_object, - gpointer user_data) +preferences_bookshelf_clean_store (DhPreferences *prefs) { - DhBook *book = DH_BOOK (book_object); - GtkTreeIter exact_iter; - gboolean exact_iter_found; + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); - preferences_bookshelf_find_book (book, - NULL, - &exact_iter, - &exact_iter_found, - NULL, - NULL); - if (exact_iter_found) { - gtk_list_store_remove (prefs->bookshelf_store, &exact_iter); - preferences_bookshelf_set_language_inconsistent (dh_book_get_language (book)); - } + gtk_list_store_clear (priv->bookshelf_store); } -/* Tries to find: - * - An exact match of the language group - * - The language group which should be just after our given language group. +/* Tries to find, starting at 'first' (if given): + * - An exact match of the book + * - The book which should be just after our given book: + * - If first is set, the next book must be in the same language group + * as the given book. + * - If first is NOT set, we don't care about language groups as we're + * iterating from the beginning of the list. * - Both. */ static void -preferences_bookshelf_find_language_group (const gchar *language, - GtkTreeIter *exact_iter, - gboolean *exact_found, - GtkTreeIter *next_iter, - gboolean *next_found) +preferences_bookshelf_find_book (DhPreferences *prefs, + DhBook *book, + const GtkTreeIter *first, + GtkTreeIter *exact_iter, + gboolean *exact_found, + GtkTreeIter *next_iter, + gboolean *next_found) { + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); GtkTreeIter loop_iter; g_assert ((exact_iter && exact_found) || (next_iter && next_found)); @@ -347,72 +151,71 @@ if (next_found) *next_found = FALSE; - if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (prefs->bookshelf_store), - &loop_iter)) { - /* Store is empty, not found */ - return; + /* Setup iteration start */ + if (!first) { + /* If no first given, start iterating from the start of the model */ + if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->bookshelf_store), &loop_iter)) { + /* Store is empty, not found */ + return; + } + } else { + loop_iter = *first; } do { - DhBook *book = NULL; - gchar *title = NULL; + DhBook *in_list_book = NULL; - /* Look for language titles, which are those where there - * is no book object associated in the row */ - gtk_tree_model_get (GTK_TREE_MODEL (prefs->bookshelf_store), + gtk_tree_model_get (GTK_TREE_MODEL (priv->bookshelf_store), &loop_iter, - LTCOLUMN_TITLE, &title, - LTCOLUMN_BOOK, &book, + COLUMN_BOOK, &in_list_book, -1); - /* If we got a book, it's not a language row */ - if (book) { - g_free (title); - g_object_unref (book); - continue; + /* We may have reached the start of the next language group here */ + if (first && !in_list_book) { + *next_iter = loop_iter; + *next_found = TRUE; + return; } + /* We can compare pointers directly as we're playing with references + * of the same object */ if (exact_iter && - g_ascii_strcasecmp (title, language) == 0) { - /* Exact match found! */ + in_list_book == book) { *exact_iter = loop_iter; *exact_found = TRUE; if (!next_iter) { /* If we were not requested to look for the next one, end here */ - g_free (title); + g_object_unref (in_list_book); return; } } else if (next_iter && - g_ascii_strcasecmp (title, language) > 0) { + dh_book_cmp_by_title (in_list_book, book) > 0) { *next_iter = loop_iter; *next_found = TRUE; - /* There's no way to have an exact match after the next, so end here */ - g_free (title); + g_object_unref (in_list_book); return; } - g_free (title); - } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (prefs->bookshelf_store), + if (in_list_book) + g_object_unref (in_list_book); + } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->bookshelf_store), &loop_iter)); } -/* Tries to find, starting at 'first' (if given): - * - An exact match of the book - * - The book which should be just after our given book: - * - If first is set, the next book must be in the same language group - * as the given book. - * - If first is NOT set, we don't care about language groups as we're - * iterating from the beginning of the list. +/* Tries to find: + * - An exact match of the language group + * - The language group which should be just after our given language group. * - Both. */ static void -preferences_bookshelf_find_book (DhBook *book, - const GtkTreeIter *first, - GtkTreeIter *exact_iter, - gboolean *exact_found, - GtkTreeIter *next_iter, - gboolean *next_found) +preferences_bookshelf_find_language_group (DhPreferences *prefs, + const gchar *language, + GtkTreeIter *exact_iter, + gboolean *exact_found, + GtkTreeIter *next_iter, + gboolean *next_found) { + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); GtkTreeIter loop_iter; g_assert ((exact_iter && exact_found) || (next_iter && next_found)); @@ -423,61 +226,61 @@ if (next_found) *next_found = FALSE; - /* Setup iteration start */ - if (!first) { - /* If no first given, start iterating from the start of the model */ - if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (prefs->bookshelf_store), &loop_iter)) { - /* Store is empty, not found */ - return; - } - } else { - loop_iter = *first; + if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->bookshelf_store), + &loop_iter)) { + /* Store is empty, not found */ + return; } do { - DhBook *in_list_book = NULL; + DhBook *book = NULL; + gchar *title = NULL; - gtk_tree_model_get (GTK_TREE_MODEL (prefs->bookshelf_store), + /* Look for language titles, which are those where there + * is no book object associated in the row */ + gtk_tree_model_get (GTK_TREE_MODEL (priv->bookshelf_store), &loop_iter, - LTCOLUMN_BOOK, &in_list_book, + COLUMN_TITLE, &title, + COLUMN_BOOK, &book, -1); - /* We may have reached the start of the next language group here */ - if (first && !in_list_book) { - *next_iter = loop_iter; - *next_found = TRUE; - return; + /* If we got a book, it's not a language row */ + if (book) { + g_free (title); + g_object_unref (book); + continue; } - /* We can compare pointers directly as we're playing with references - * of the same object */ if (exact_iter && - in_list_book == book) { + g_ascii_strcasecmp (title, language) == 0) { + /* Exact match found! */ *exact_iter = loop_iter; *exact_found = TRUE; if (!next_iter) { /* If we were not requested to look for the next one, end here */ - g_object_unref (in_list_book); + g_free (title); return; } } else if (next_iter && - dh_book_cmp_by_title (in_list_book, book) > 0) { + g_ascii_strcasecmp (title, language) > 0) { *next_iter = loop_iter; *next_found = TRUE; - g_object_unref (in_list_book); + /* There's no way to have an exact match after the next, so end here */ + g_free (title); return; } - if (in_list_book) - g_object_unref (in_list_book); - } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (prefs->bookshelf_store), + g_free (title); + } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->bookshelf_store), &loop_iter)); } static void -preferences_bookshelf_add_book_to_store (DhBook *book, - gboolean group_by_language) +preferences_bookshelf_add_book_to_store (DhPreferences *prefs, + DhBook *book, + gboolean group_by_language) { + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); GtkTreeIter book_iter; /* If grouping by language we need to add the language categories */ @@ -493,7 +296,8 @@ language_title = dh_book_get_language (book); /* Look for the proper language group */ - preferences_bookshelf_find_language_group (language_title, + preferences_bookshelf_find_language_group (prefs, + language_title, &language_iter, &language_iter_found, &next_language_iter, @@ -501,21 +305,21 @@ /* New language group needs to be created? */ if (!language_iter_found) { if (!next_language_iter_found) { - gtk_list_store_append (prefs->bookshelf_store, + gtk_list_store_append (priv->bookshelf_store, &language_iter); } else { - gtk_list_store_insert_before (prefs->bookshelf_store, + gtk_list_store_insert_before (priv->bookshelf_store, &language_iter, &next_language_iter); } - gtk_list_store_set (prefs->bookshelf_store, + gtk_list_store_set (priv->bookshelf_store, &language_iter, - LTCOLUMN_ENABLED, dh_book_get_enabled (book), - LTCOLUMN_TITLE, language_title, - LTCOLUMN_BOOK, NULL, - LTCOLUMN_WEIGHT, PANGO_WEIGHT_BOLD, - LTCOLUMN_INCONSISTENT, FALSE, + COLUMN_ENABLED, dh_book_get_enabled (book), + COLUMN_TITLE, language_title, + COLUMN_BOOK, NULL, + COLUMN_WEIGHT, PANGO_WEIGHT_BOLD, + COLUMN_INCONSISTENT, FALSE, -1); first_in_language = TRUE; @@ -523,7 +327,7 @@ /* If we got to add first book in a given language group, just append it. */ if (first_in_language) { - gtk_list_store_insert_after (prefs->bookshelf_store, + gtk_list_store_insert_after (priv->bookshelf_store, &book_iter, &language_iter); } else { @@ -534,37 +338,38 @@ gboolean language_enabled = FALSE; /* We may need to reset the inconsistent status of the language item */ - gtk_tree_model_get (GTK_TREE_MODEL (prefs->bookshelf_store), + gtk_tree_model_get (GTK_TREE_MODEL (priv->bookshelf_store), &language_iter, - LTCOLUMN_ENABLED, &language_enabled, - LTCOLUMN_INCONSISTENT, &language_inconsistent, + COLUMN_ENABLED, &language_enabled, + COLUMN_INCONSISTENT, &language_inconsistent, -1); /* If inconsistent already, do nothing */ if (!language_inconsistent) { if (language_enabled != dh_book_get_enabled (book)) { - gtk_list_store_set (prefs->bookshelf_store, + gtk_list_store_set (priv->bookshelf_store, &language_iter, - LTCOLUMN_INCONSISTENT, TRUE, + COLUMN_INCONSISTENT, TRUE, -1); } } /* The language will have at least one book, so we move iter to it */ first_book_iter = language_iter; - gtk_tree_model_iter_next (GTK_TREE_MODEL (prefs->bookshelf_store), &first_book_iter); + gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->bookshelf_store), &first_book_iter); /* Find next possible book in language group */ - preferences_bookshelf_find_book (book, + preferences_bookshelf_find_book (prefs, + book, &first_book_iter, NULL, NULL, &next_book_iter, &next_book_iter_found); if (!next_book_iter_found) { - gtk_list_store_append (prefs->bookshelf_store, + gtk_list_store_append (priv->bookshelf_store, &book_iter); } else { - gtk_list_store_insert_before (prefs->bookshelf_store, + gtk_list_store_insert_before (priv->bookshelf_store, &book_iter, &next_book_iter); } @@ -572,13 +377,13 @@ /* Add new item with indented title */ indented_title = g_strdup_printf (" %s", dh_book_get_title (book)); - gtk_list_store_set (prefs->bookshelf_store, + gtk_list_store_set (priv->bookshelf_store, &book_iter, - LTCOLUMN_ENABLED, dh_book_get_enabled (book), - LTCOLUMN_TITLE, indented_title, - LTCOLUMN_BOOK, book, - LTCOLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, - LTCOLUMN_INCONSISTENT, FALSE, + COLUMN_ENABLED, dh_book_get_enabled (book), + COLUMN_TITLE, indented_title, + COLUMN_BOOK, book, + COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, + COLUMN_INCONSISTENT, FALSE, -1); g_free (indented_title); } else { @@ -586,133 +391,302 @@ GtkTreeIter next_book_iter; gboolean next_book_iter_found; - preferences_bookshelf_find_book (book, + preferences_bookshelf_find_book (prefs, + book, NULL, NULL, NULL, &next_book_iter, &next_book_iter_found); if (!next_book_iter_found) { - gtk_list_store_append (prefs->bookshelf_store, + gtk_list_store_append (priv->bookshelf_store, &book_iter); } else { - gtk_list_store_insert_before (prefs->bookshelf_store, + gtk_list_store_insert_before (priv->bookshelf_store, &book_iter, &next_book_iter); } - gtk_list_store_set (prefs->bookshelf_store, + gtk_list_store_set (priv->bookshelf_store, &book_iter, - LTCOLUMN_ENABLED, dh_book_get_enabled (book), - LTCOLUMN_TITLE, dh_book_get_title (book), - LTCOLUMN_BOOK, book, - LTCOLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, + COLUMN_ENABLED, dh_book_get_enabled (book), + COLUMN_TITLE, dh_book_get_title (book), + COLUMN_BOOK, book, + COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, -1); } } static void -preferences_bookshelf_populate_store (void) +preferences_bookshelf_populate_store (DhPreferences *prefs) { + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); GList *l; gboolean group_by_language; - group_by_language = dh_book_manager_get_group_by_language (prefs->book_manager); + group_by_language = dh_book_manager_get_group_by_language (priv->book_manager); /* This list already comes ordered, but we don't care */ - for (l = dh_book_manager_get_books (prefs->book_manager); + for (l = dh_book_manager_get_books (priv->book_manager); l; l = g_list_next (l)) { - preferences_bookshelf_add_book_to_store (DH_BOOK (l->data), + preferences_bookshelf_add_book_to_store (prefs, + DH_BOOK (l->data), group_by_language); } } static void -preferences_dialog_response (GtkDialog *dialog, - gint response_id, - gpointer user_data) +preferences_bookshelf_group_by_language_cb (GObject *object, + GParamSpec *pspec, + DhPreferences *prefs) { - preferences_shutdown (); + preferences_bookshelf_clean_store (prefs); + preferences_bookshelf_populate_store (prefs); } static void -preferences_bookshelf_clean_store (void) +preferences_bookshelf_set_language_inconsistent (DhPreferences *prefs, + const gchar *language) { - gtk_list_store_clear (prefs->bookshelf_store); + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); + GtkTreeIter loop_iter; + GtkTreeIter language_iter; + gboolean language_iter_found; + gboolean one_book_enabled = FALSE; + gboolean one_book_disabled = FALSE; + + preferences_bookshelf_find_language_group (prefs, + language, + &language_iter, + &language_iter_found, + NULL, + NULL); + if (!language_iter_found) { + return; + } + + loop_iter = language_iter; + while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->bookshelf_store), + &loop_iter)) { + DhBook *book; + gboolean enabled; + + gtk_tree_model_get (GTK_TREE_MODEL (priv->bookshelf_store), + &loop_iter, + COLUMN_BOOK, &book, + COLUMN_ENABLED, &enabled, + -1); + if (!book) { + /* Reached next language group */ + break; + } + g_object_unref (book); + + if (enabled) + one_book_enabled = TRUE; + else + one_book_disabled = TRUE; + + if (one_book_enabled == one_book_disabled) + break; + } + + /* If at least one book is enabled AND another book is disabled, + * we need to set inconsistent state */ + if (one_book_enabled == one_book_disabled) { + gtk_list_store_set (priv->bookshelf_store, &language_iter, + COLUMN_INCONSISTENT, TRUE, + -1); + return; + } + + gtk_list_store_set (priv->bookshelf_store, &language_iter, + COLUMN_ENABLED, one_book_enabled, + COLUMN_INCONSISTENT, FALSE, + -1); } -void -dh_preferences_show_dialog (void) +static void +preferences_bookshelf_book_deleted_cb (DhBookManager *book_manager, + GObject *book_object, + DhPreferences *prefs) +{ + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); + DhBook *book = DH_BOOK (book_object); + GtkTreeIter exact_iter; + gboolean exact_iter_found; + + preferences_bookshelf_find_book (prefs, + book, + NULL, + &exact_iter, + &exact_iter_found, + NULL, + NULL); + if (exact_iter_found) { + gtk_list_store_remove (priv->bookshelf_store, &exact_iter); + preferences_bookshelf_set_language_inconsistent (prefs, dh_book_get_language (book)); + } +} + +static void +preferences_bookshelf_book_created_cb (DhBookManager *book_manager, + GObject *book_object, + DhPreferences *prefs) { - gchar *path; - GtkBuilder *builder; - gboolean use_system_fonts; - - preferences_init (); - - if (prefs->dialog != NULL) { - gtk_window_present (GTK_WINDOW (prefs->dialog)); - return; - } - - path = dh_util_build_data_filename ("devhelp", "ui", - "devhelp.builder", - NULL); - builder = dh_util_builder_get_file ( - path, - "preferences_dialog", - NULL, - "preferences_dialog", &prefs->dialog, - "fonts_table", &prefs->fonts_table, - "system_fonts_button", &prefs->system_fonts_button, - "variable_font_button", &prefs->variable_font_button, - "fixed_font_button", &prefs->fixed_font_button, - "bookshelf_store", &prefs->bookshelf_store, - "bookshelf_group_by_language_button", &prefs->bookshelf_group_by_language_button, - NULL); - g_free (path); + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); + + preferences_bookshelf_add_book_to_store (prefs, + DH_BOOK (book_object), + dh_book_manager_get_group_by_language (priv->book_manager)); +} + +static void +preferences_bookshelf_tree_selection_toggled_cb (GtkCellRendererToggle *cell_renderer, + gchar *path, + DhPreferences *prefs) +{ + DhPreferencesPrivate *priv = dh_preferences_get_instance_private (prefs); + GtkTreeIter iter; + + if (gtk_tree_model_get_iter_from_string (GTK_TREE_MODEL (priv->bookshelf_store), + &iter, + path)) { + gpointer book = NULL; + gboolean enabled; + + gtk_tree_model_get (GTK_TREE_MODEL (priv->bookshelf_store), + &iter, + COLUMN_BOOK, &book, + COLUMN_ENABLED, &enabled, + -1); + + if (book) { + /* Update book conf */ + dh_book_set_enabled (book, !enabled); + + gtk_list_store_set (priv->bookshelf_store, &iter, + COLUMN_ENABLED, !enabled, + -1); + /* Now we need to look for the language group of this item, + * in order to set the inconsistent state if applies */ + if (dh_book_manager_get_group_by_language (priv->book_manager)) { + preferences_bookshelf_set_language_inconsistent (prefs, dh_book_get_language (book)); + } + + } else { + GtkTreeIter loop_iter; + + /* We should only reach this if we are grouping by language */ + g_assert (dh_book_manager_get_group_by_language (priv->book_manager) == TRUE); + + /* Set new status in the language group item */ + gtk_list_store_set (priv->bookshelf_store, &iter, + COLUMN_ENABLED, !enabled, + COLUMN_INCONSISTENT, FALSE, + -1); + + /* And set new status in all books of the same language */ + loop_iter = iter; + while (gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->bookshelf_store), + &loop_iter)) { + gtk_tree_model_get (GTK_TREE_MODEL (priv->bookshelf_store), + &loop_iter, + COLUMN_BOOK, &book, + -1); + if (!book) { + /* Found next language group, finish */ + return; + } + + /* Update book conf */ + dh_book_set_enabled (book, !enabled); + + gtk_list_store_set (priv->bookshelf_store, + &loop_iter, + COLUMN_ENABLED, !enabled, + -1); + } + } + } +} + +static void +dh_preferences_init (DhPreferences *prefs) +{ + DhPreferencesPrivate *priv; + GApplication *app; + GSettings *settings_fonts; + GSettings *settings_contents; + + priv = dh_preferences_get_instance_private (prefs); + + gtk_widget_init_template (GTK_WIDGET (prefs)); + + app = g_application_get_default (); + + priv->settings = dh_settings_get (); + priv->book_manager = g_object_ref (dh_app_peek_book_manager (DH_APP (app))); + priv->book_created_id = g_signal_connect (priv->book_manager, + "book-created", + G_CALLBACK (preferences_bookshelf_book_created_cb), + prefs); + priv->book_deleted_id = g_signal_connect (priv->book_manager, + "book-deleted", + G_CALLBACK (preferences_bookshelf_book_deleted_cb), + prefs); + priv->group_by_language_id = g_signal_connect (priv->book_manager, + "notify::group-by-language", + G_CALLBACK (preferences_bookshelf_group_by_language_cb), + prefs); /* setup GSettings bindings */ - GSettings *settings_fonts = dh_settings_peek_fonts_settings (prefs->settings); - GSettings *settings_contents = dh_settings_peek_contents_settings (prefs->settings); + settings_fonts = dh_settings_peek_fonts_settings (priv->settings); + settings_contents = dh_settings_peek_contents_settings (priv->settings); g_settings_bind (settings_fonts, "use-system-fonts", - G_OBJECT (prefs->system_fonts_button), + priv->system_fonts_button, "active", G_SETTINGS_BIND_DEFAULT); + g_settings_bind (settings_fonts, "use-system-fonts", + priv->fonts_grid, + "sensitive", G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN); g_settings_bind (settings_fonts, "fixed-font", - G_OBJECT (prefs->fixed_font_button), + priv->fixed_font_button, "font-name", G_SETTINGS_BIND_DEFAULT); g_settings_bind (settings_fonts, "variable-font", - G_OBJECT (prefs->variable_font_button), + priv->variable_font_button, "font-name", G_SETTINGS_BIND_DEFAULT); g_settings_bind (settings_contents, - "group-books-by-language", G_OBJECT (prefs->bookshelf_group_by_language_button), + "group-books-by-language", + priv->bookshelf_group_by_language_button, "active", G_SETTINGS_BIND_DEFAULT); - dh_util_builder_connect ( - builder, - prefs, - "system_fonts_button", "toggled", preferences_fonts_system_fonts_toggled_cb, - "bookshelf_enabled_toggle", "toggled", preferences_bookshelf_tree_selection_toggled_cb, - NULL); - - /* set initial sensitive */ - use_system_fonts = g_settings_get_boolean (settings_fonts, "use-system-fonts"); - gtk_widget_set_sensitive (prefs->fonts_table, !use_system_fonts); - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs->bookshelf_group_by_language_button), - dh_book_manager_get_group_by_language (prefs->book_manager)); - preferences_bookshelf_populate_store (); - - g_object_unref (builder); - - /* Connect to the response signal to get notified when the dialog is - * closed or deleted */ - g_signal_connect (prefs->dialog, - "response", - G_CALLBACK (preferences_dialog_response), - NULL); + g_signal_connect (priv->bookshelf_enabled_toggle, + "toggled", + G_CALLBACK (preferences_bookshelf_tree_selection_toggled_cb), + prefs); + + preferences_bookshelf_populate_store (prefs); +} + +void +dh_preferences_show_dialog (GtkWindow *parent) +{ + g_return_if_fail (GTK_IS_WINDOW (parent)); + + if (prefs_dialog == NULL) { + prefs_dialog = GTK_WIDGET (g_object_new (DH_TYPE_PREFERENCES, NULL)); + g_signal_connect (prefs_dialog, + "destroy", + G_CALLBACK (gtk_widget_destroyed), + &prefs_dialog); + } + + if (parent != gtk_window_get_transient_for (GTK_WINDOW (prefs_dialog))) { + gtk_window_set_transient_for (GTK_WINDOW (prefs_dialog), + parent); + } - gtk_widget_show_all (prefs->dialog); + gtk_window_present (GTK_WINDOW (prefs_dialog)); } diff -Nru devhelp-3.8.2/src/dh-preferences.h devhelp-3.10.2/src/dh-preferences.h --- devhelp-3.8.2/src/dh-preferences.h 2012-08-07 14:43:10.000000000 +0000 +++ devhelp-3.10.2/src/dh-preferences.h 2013-09-23 16:26:46.000000000 +0000 @@ -26,7 +26,30 @@ G_BEGIN_DECLS -void dh_preferences_show_dialog (void); +#define DH_TYPE_PREFERENCES (dh_preferences_get_type ()) +#define DH_PREFERENCES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DH_TYPE_PREFERENCES, DhPreferences)) +#define DH_PREFERENCES_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DH_TYPE_PREFERENCES, DhPreferences const)) +#define DH_PREFERENCES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DH_TYPE_PREFERENCES, DhPreferencesClass)) +#define DH_IS_PREFERENCES(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DH_TYPE_PREFERENCES)) +#define DH_IS_PREFERENCES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DH_TYPE_PREFERENCES)) +#define DH_PREFERENCES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DH_TYPE_PREFERENCES, DhPreferencesClass)) + +typedef struct _DhPreferences DhPreferences; +typedef struct _DhPreferencesClass DhPreferencesClass; + +struct _DhPreferences +{ + GtkDialog parent; +}; + +struct _DhPreferencesClass +{ + GtkDialogClass parent_class; +}; + +GType dh_preferences_get_type (void) G_GNUC_CONST; + +void dh_preferences_show_dialog (GtkWindow *parent); G_END_DECLS diff -Nru devhelp-3.8.2/src/dh-preferences.ui devhelp-3.10.2/src/dh-preferences.ui --- devhelp-3.8.2/src/dh-preferences.ui 1970-01-01 00:00:00.000000000 +0000 +++ devhelp-3.10.2/src/dh-preferences.ui 2013-09-23 16:26:46.000000000 +0000 @@ -0,0 +1,345 @@ + + + + + + + + + + + + + + + + + + + + + diff -Nru devhelp-3.8.2/src/dh-resources.c devhelp-3.10.2/src/dh-resources.c --- devhelp-3.8.2/src/dh-resources.c 2013-05-15 11:08:05.000000000 +0000 +++ devhelp-3.10.2/src/dh-resources.c 2013-11-11 15:44:07.000000000 +0000 @@ -6,36 +6,1383 @@ # define SECTION #endif -static const SECTION union { const guint8 data[20000]; const double alignment; void * const ptr;} dh_resource_data = { { +static const SECTION union { const guint8 data[21592]; const double alignment; void * const ptr;} dh_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x5b, 0xdf, 0x22, 0x98, - 0x03, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, - 0x0a, 0x00, 0x76, 0x00, 0xb8, 0x00, 0x00, 0x00, - 0xf9, 0x4d, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xf9, 0x4d, 0x00, 0x00, - 0x01, 0x00, 0x4c, 0x00, 0xfc, 0x4d, 0x00, 0x00, - 0x00, 0x4e, 0x00, 0x00, 0x4b, 0x50, 0x90, 0x0b, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x00, 0x00, - 0x04, 0x00, 0x4c, 0x00, 0x04, 0x4e, 0x00, 0x00, - 0x08, 0x4e, 0x00, 0x00, 0xa7, 0x72, 0xbe, 0xe1, - 0x04, 0x00, 0x00, 0x00, 0x08, 0x4e, 0x00, 0x00, - 0x08, 0x00, 0x4c, 0x00, 0x10, 0x4e, 0x00, 0x00, - 0x14, 0x4e, 0x00, 0x00, 0xb0, 0xb7, 0x24, 0x30, - 0x02, 0x00, 0x00, 0x00, 0x14, 0x4e, 0x00, 0x00, - 0x06, 0x00, 0x4c, 0x00, 0x1c, 0x4e, 0x00, 0x00, - 0x20, 0x4e, 0x00, 0x00, 0x64, 0x65, 0x76, 0x68, - 0x65, 0x6c, 0x70, 0x2e, 0x75, 0x69, 0x00, 0x00, - 0x31, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x18, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x28, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0xb0, 0xb7, 0x24, 0x30, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x06, 0x00, 0x4c, 0x00, + 0x08, 0x01, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, + 0x4b, 0x50, 0x90, 0x0b, 0x02, 0x00, 0x00, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x04, 0x00, 0x4c, 0x00, + 0x10, 0x01, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, + 0xd4, 0xb5, 0x02, 0x00, 0xff, 0xff, 0xff, 0xff, + 0x14, 0x01, 0x00, 0x00, 0x01, 0x00, 0x4c, 0x00, + 0x18, 0x01, 0x00, 0x00, 0x1c, 0x01, 0x00, 0x00, + 0x04, 0xca, 0x4b, 0x9c, 0x07, 0x00, 0x00, 0x00, + 0x1c, 0x01, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, + 0x28, 0x01, 0x00, 0x00, 0xb5, 0x21, 0x00, 0x00, + 0xbd, 0xd5, 0xaa, 0xaa, 0x07, 0x00, 0x00, 0x00, + 0xb5, 0x21, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, + 0xc8, 0x21, 0x00, 0x00, 0x14, 0x28, 0x00, 0x00, + 0x86, 0xb9, 0x21, 0x47, 0x07, 0x00, 0x00, 0x00, + 0x14, 0x28, 0x00, 0x00, 0x0f, 0x00, 0x76, 0x00, + 0x28, 0x28, 0x00, 0x00, 0x79, 0x2a, 0x00, 0x00, + 0x5e, 0x5d, 0x29, 0xee, 0x07, 0x00, 0x00, 0x00, + 0x79, 0x2a, 0x00, 0x00, 0x11, 0x00, 0x76, 0x00, + 0x90, 0x2a, 0x00, 0x00, 0x3f, 0x54, 0x00, 0x00, + 0xa7, 0x72, 0xbe, 0xe1, 0x00, 0x00, 0x00, 0x00, + 0x3f, 0x54, 0x00, 0x00, 0x08, 0x00, 0x4c, 0x00, + 0x48, 0x54, 0x00, 0x00, 0x58, 0x54, 0x00, 0x00, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, + 0x00, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x64, 0x68, 0x2d, 0x77, + 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x75, 0x69, + 0x7d, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, - 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x0a, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, + 0x2e, 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x6d, + 0x65, 0x6e, 0x75, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x67, 0x65, 0x61, 0x72, 0x5f, 0x6d, 0x65, 0x6e, + 0x75, 0x22, 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, + 0x20, 0x5f, 0x54, 0x61, 0x62, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x6e, 0x65, + 0x77, 0x2d, 0x74, 0x61, 0x62, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, + 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, + 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, + 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x2d, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, + 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x73, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x50, 0x72, 0x69, 0x6e, 0x74, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x70, + 0x72, 0x69, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, + 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, + 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x70, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x46, 0x69, 0x6e, + 0x64, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x77, 0x69, + 0x6e, 0x2e, 0x66, 0x69, 0x6e, 0x64, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, + 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, + 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, + 0x3b, 0x66, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, + 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, + 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x4c, 0x61, 0x72, 0x67, 0x65, 0x72, + 0x20, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x7a, 0x6f, + 0x6f, 0x6d, 0x2d, 0x69, 0x6e, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, + 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, + 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, + 0x70, 0x6c, 0x75, 0x73, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x53, 0x5f, 0x6d, 0x61, 0x6c, 0x6c, 0x65, 0x72, + 0x20, 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x7a, 0x6f, + 0x6f, 0x6d, 0x2d, 0x6f, 0x75, 0x74, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, + 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, + 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, + 0x3b, 0x6d, 0x69, 0x6e, 0x75, 0x73, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, + 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, + 0x22, 0x3e, 0x5f, 0x4e, 0x6f, 0x72, 0x6d, 0x61, + 0x6c, 0x20, 0x53, 0x69, 0x7a, 0x65, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x7a, + 0x6f, 0x6f, 0x6d, 0x2d, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, + 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, + 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x30, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x2f, 0x6d, 0x65, + 0x6e, 0x75, 0x3e, 0x3c, 0x6d, 0x65, 0x6e, 0x75, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x65, 0x61, + 0x72, 0x5f, 0x61, 0x70, 0x70, 0x5f, 0x6d, 0x65, + 0x6e, 0x75, 0x22, 0x3e, 0x3c, 0x73, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x65, + 0x77, 0x20, 0x5f, 0x57, 0x69, 0x6e, 0x64, 0x6f, + 0x77, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, + 0x70, 0x2e, 0x6e, 0x65, 0x77, 0x2d, 0x77, 0x69, + 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, + 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, + 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x6e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, 0x20, + 0x5f, 0x54, 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x6e, 0x65, 0x77, + 0x2d, 0x74, 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, + 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, + 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x74, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x2d, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x73, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, + 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, + 0x50, 0x72, 0x69, 0x6e, 0x74, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x70, 0x72, + 0x69, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, + 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, + 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x70, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x46, 0x69, 0x6e, 0x64, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x77, 0x69, 0x6e, + 0x2e, 0x66, 0x69, 0x6e, 0x64, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, + 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, + 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, + 0x66, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, + 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x73, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, + 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, + 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, + 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, + 0x5f, 0x4c, 0x61, 0x72, 0x67, 0x65, 0x72, 0x20, + 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x7a, 0x6f, 0x6f, + 0x6d, 0x2d, 0x69, 0x6e, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, + 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, + 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x70, + 0x6c, 0x75, 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, + 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x53, + 0x5f, 0x6d, 0x61, 0x6c, 0x6c, 0x65, 0x72, 0x20, + 0x54, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x7a, 0x6f, 0x6f, + 0x6d, 0x2d, 0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, + 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, + 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, + 0x6d, 0x69, 0x6e, 0x75, 0x73, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, + 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x5f, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, + 0x20, 0x53, 0x69, 0x7a, 0x65, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x7a, 0x6f, + 0x6f, 0x6d, 0x2d, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, + 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, + 0x79, 0x26, 0x67, 0x74, 0x3b, 0x30, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x72, + 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, + 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, + 0x70, 0x2e, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, + 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, + 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x41, 0x62, 0x6f, + 0x75, 0x74, 0x20, 0x44, 0x65, 0x76, 0x68, 0x65, + 0x6c, 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x2e, 0x61, 0x62, 0x6f, 0x75, 0x74, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x51, 0x75, 0x69, + 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, + 0x70, 0x2e, 0x71, 0x75, 0x69, 0x74, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, + 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, + 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, + 0x3b, 0x71, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, + 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, 0x73, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, + 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, 0x74, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x44, + 0x68, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, + 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x41, 0x70, 0x70, 0x6c, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x57, + 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x68, 0x61, 0x73, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x73, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x64, 0x65, 0x76, 0x68, 0x65, 0x6c, + 0x70, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, + 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x62, 0x61, + 0x72, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x68, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, + 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x69, 0x6e, + 0x6b, 0x65, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x61, 0x63, 0x6b, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, + 0x74, 0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x42, 0x61, 0x63, + 0x6b, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x22, + 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x67, 0x6f, 0x2d, + 0x62, 0x61, 0x63, 0x6b, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x2d, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, + 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x61, + 0x63, 0x6b, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, + 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x6f, 0x6c, 0x74, + 0x69, 0x70, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x3e, 0x46, 0x6f, 0x72, 0x77, + 0x61, 0x72, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x67, + 0x6f, 0x2d, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, + 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, + 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x66, 0x6f, 0x72, 0x77, 0x61, + 0x72, 0x64, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x73, + 0x74, 0x61, 0x72, 0x74, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x67, 0x65, 0x61, 0x72, 0x5f, 0x6d, + 0x65, 0x6e, 0x75, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x77, 0x69, 0x6e, + 0x2e, 0x67, 0x65, 0x61, 0x72, 0x2d, 0x6d, 0x65, + 0x6e, 0x75, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x65, 0x6e, + 0x75, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x22, + 0x3e, 0x67, 0x65, 0x61, 0x72, 0x5f, 0x6d, 0x65, + 0x6e, 0x75, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, + 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x2d, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x49, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x67, 0x65, 0x61, 0x72, + 0x5f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, 0x7a, + 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, + 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x3e, 0x65, 0x6d, 0x62, 0x6c, 0x65, 0x6d, + 0x2d, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2d, + 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, 0x63, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, + 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, + 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, + 0x64, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, + 0x73, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x73, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x50, 0x61, 0x6e, 0x65, + 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x68, + 0x70, 0x61, 0x6e, 0x65, 0x64, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x68, 0x61, 0x73, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x73, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x47, + 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x67, 0x72, 0x69, 0x64, 0x5f, 0x73, 0x69, + 0x64, 0x65, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x67, 0x72, 0x69, 0x64, 0x5f, + 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, + 0x73, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x61, 0x72, + 0x63, 0x68, 0x42, 0x61, 0x72, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x5f, 0x62, 0x61, 0x72, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x68, 0x6f, 0x77, 0x2d, 0x63, + 0x6c, 0x6f, 0x73, 0x65, 0x2d, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, + 0x61, 0x72, 0x63, 0x68, 0x5f, 0x62, 0x6f, 0x78, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x68, + 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, 0x6c, 0x65, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, + 0x68, 0x5f, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, + 0x72, 0x22, 0x3e, 0xe2, 0x97, 0x8f, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x5f, + 0x73, 0x65, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x22, 0x3e, 0x33, 0x30, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, + 0x6f, 0x5f, 0x75, 0x70, 0x5f, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x61, 0x69, 0x73, + 0x65, 0x64, 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, + 0x61, 0x67, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x67, 0x6f, 0x5f, 0x75, 0x70, 0x5f, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, 0x75, 0x70, + 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x69, + 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x67, 0x6f, 0x5f, 0x64, 0x6f, + 0x77, 0x6e, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x73, + 0x74, 0x79, 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x72, 0x61, 0x69, 0x73, 0x65, 0x64, + 0x22, 0x2f, 0x3e, 0x3c, 0x2f, 0x73, 0x74, 0x79, + 0x6c, 0x65, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x49, 0x6d, 0x61, 0x67, + 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x67, + 0x6f, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x5f, 0x69, + 0x6d, 0x61, 0x67, 0x65, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x73, 0x69, + 0x7a, 0x65, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, + 0x65, 0x22, 0x3e, 0x67, 0x6f, 0x2d, 0x64, 0x6f, + 0x77, 0x6e, 0x2d, 0x73, 0x79, 0x6d, 0x62, 0x6f, + 0x6c, 0x69, 0x63, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, 0x62, + 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, + 0x6b, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, + 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, + 0x72, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x6f, + 0x77, 0x5f, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, + 0x61, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, + 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, + 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x74, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, + 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, + 0x75, 0x75, 0x61, 0x79, 0x29, 0x64, 0x65, 0x76, + 0x68, 0x65, 0x6c, 0x70, 0x2d, 0x6d, 0x65, 0x6e, + 0x75, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x21, 0x2d, 0x2d, 0x0a, 0x20, 0x20, 0x43, 0x6f, + 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, + 0x28, 0x43, 0x29, 0x20, 0x32, 0x30, 0x31, 0x30, + 0x20, 0x49, 0x6d, 0x65, 0x6e, 0x64, 0x69, 0x6f, + 0x20, 0x41, 0x42, 0x0a, 0x20, 0x20, 0x43, 0x6f, + 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, + 0x28, 0x43, 0x29, 0x20, 0x32, 0x30, 0x31, 0x32, + 0x20, 0x41, 0x6c, 0x65, 0x6b, 0x73, 0x61, 0x6e, + 0x64, 0x65, 0x72, 0x20, 0x4d, 0x6f, 0x72, 0x67, + 0x61, 0x64, 0x6f, 0x20, 0x3c, 0x61, 0x6c, 0x65, + 0x6b, 0x73, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x40, + 0x67, 0x6e, 0x75, 0x2e, 0x6f, 0x72, 0x67, 0x3e, + 0x0a, 0x0a, 0x20, 0x20, 0x54, 0x68, 0x69, 0x73, + 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, + 0x20, 0x69, 0x73, 0x20, 0x66, 0x72, 0x65, 0x65, + 0x20, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, + 0x65, 0x3b, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x63, + 0x61, 0x6e, 0x20, 0x72, 0x65, 0x64, 0x69, 0x73, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x69, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x2f, 0x6f, + 0x72, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, + 0x0a, 0x20, 0x20, 0x69, 0x74, 0x20, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x74, 0x65, 0x72, 0x6d, 0x73, 0x20, 0x6f, 0x66, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, + 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, + 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, + 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, + 0x61, 0x73, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69, + 0x73, 0x68, 0x65, 0x64, 0x20, 0x62, 0x79, 0x0a, + 0x20, 0x20, 0x74, 0x68, 0x65, 0x20, 0x46, 0x72, + 0x65, 0x65, 0x20, 0x53, 0x6f, 0x66, 0x74, 0x77, + 0x61, 0x72, 0x65, 0x20, 0x46, 0x6f, 0x75, 0x6e, + 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x20, + 0x65, 0x69, 0x74, 0x68, 0x65, 0x72, 0x20, 0x76, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x32, + 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x63, 0x65, 0x2c, + 0x20, 0x6f, 0x72, 0x20, 0x28, 0x61, 0x74, 0x0a, + 0x20, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20, 0x6f, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x20, 0x61, + 0x6e, 0x79, 0x20, 0x6c, 0x61, 0x74, 0x65, 0x72, + 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x2e, 0x0a, 0x0a, 0x20, 0x20, 0x54, 0x68, 0x69, + 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, + 0x6d, 0x20, 0x69, 0x73, 0x20, 0x64, 0x69, 0x73, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, + 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x68, 0x6f, 0x70, 0x65, 0x20, 0x74, 0x68, 0x61, + 0x74, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69, 0x6c, + 0x6c, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, + 0x66, 0x75, 0x6c, 0x2c, 0x20, 0x62, 0x75, 0x74, + 0x0a, 0x20, 0x20, 0x57, 0x49, 0x54, 0x48, 0x4f, + 0x55, 0x54, 0x20, 0x41, 0x4e, 0x59, 0x20, 0x57, + 0x41, 0x52, 0x52, 0x41, 0x4e, 0x54, 0x59, 0x3b, + 0x20, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, + 0x20, 0x65, 0x76, 0x65, 0x6e, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x65, + 0x64, 0x20, 0x77, 0x61, 0x72, 0x72, 0x61, 0x6e, + 0x74, 0x79, 0x20, 0x6f, 0x66, 0x0a, 0x20, 0x20, + 0x4d, 0x45, 0x52, 0x43, 0x48, 0x41, 0x4e, 0x54, + 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x20, + 0x6f, 0x72, 0x20, 0x46, 0x49, 0x54, 0x4e, 0x45, + 0x53, 0x53, 0x20, 0x46, 0x4f, 0x52, 0x20, 0x41, + 0x20, 0x50, 0x41, 0x52, 0x54, 0x49, 0x43, 0x55, + 0x4c, 0x41, 0x52, 0x20, 0x50, 0x55, 0x52, 0x50, + 0x4f, 0x53, 0x45, 0x2e, 0x20, 0x20, 0x53, 0x65, + 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, + 0x55, 0x0a, 0x20, 0x20, 0x47, 0x65, 0x6e, 0x65, + 0x72, 0x61, 0x6c, 0x20, 0x50, 0x75, 0x62, 0x6c, + 0x69, 0x63, 0x20, 0x4c, 0x69, 0x63, 0x65, 0x6e, + 0x73, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x6d, + 0x6f, 0x72, 0x65, 0x20, 0x64, 0x65, 0x74, 0x61, + 0x69, 0x6c, 0x73, 0x2e, 0x0a, 0x0a, 0x20, 0x20, + 0x59, 0x6f, 0x75, 0x20, 0x73, 0x68, 0x6f, 0x75, + 0x6c, 0x64, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, + 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, + 0x20, 0x61, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, + 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, + 0x4e, 0x55, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, + 0x61, 0x6c, 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, + 0x63, 0x20, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, + 0x65, 0x0a, 0x20, 0x20, 0x61, 0x6c, 0x6f, 0x6e, + 0x67, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, + 0x68, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x67, + 0x72, 0x61, 0x6d, 0x3b, 0x20, 0x69, 0x66, 0x20, + 0x6e, 0x6f, 0x74, 0x2c, 0x20, 0x77, 0x72, 0x69, + 0x74, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x46, 0x72, 0x65, 0x65, 0x20, 0x53, + 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x0a, + 0x20, 0x20, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x49, 0x6e, + 0x63, 0x2e, 0x2c, 0x20, 0x35, 0x39, 0x20, 0x54, + 0x65, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x50, 0x6c, + 0x61, 0x63, 0x65, 0x2c, 0x20, 0x53, 0x75, 0x69, + 0x74, 0x65, 0x20, 0x33, 0x33, 0x30, 0x2c, 0x20, + 0x42, 0x6f, 0x73, 0x74, 0x6f, 0x6e, 0x2c, 0x20, + 0x4d, 0x41, 0x20, 0x30, 0x32, 0x31, 0x31, 0x30, + 0x2d, 0x31, 0x33, 0x30, 0x31, 0x0a, 0x20, 0x20, + 0x55, 0x53, 0x41, 0x0a, 0x2d, 0x2d, 0x3e, 0x0a, + 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, + 0x69, 0x72, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, + 0x3d, 0x22, 0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, + 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, + 0x22, 0x33, 0x2e, 0x30, 0x22, 0x2f, 0x3e, 0x3c, + 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x61, 0x70, 0x70, 0x2d, 0x6d, 0x65, 0x6e, + 0x75, 0x22, 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, + 0x20, 0x5f, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, + 0x2e, 0x6e, 0x65, 0x77, 0x2d, 0x77, 0x69, 0x6e, + 0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, + 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, + 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x6e, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, + 0x65, 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, + 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, + 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, + 0x65, 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x2e, 0x70, 0x72, 0x65, 0x66, 0x65, + 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, + 0x3e, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x3e, 0x3c, 0x73, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x3e, 0x3c, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x41, 0x62, + 0x6f, 0x75, 0x74, 0x20, 0x44, 0x65, 0x76, 0x68, + 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x61, 0x70, 0x70, 0x2e, 0x61, 0x62, 0x6f, 0x75, + 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, + 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x69, 0x74, 0x65, + 0x6d, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x51, 0x75, + 0x69, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, + 0x70, 0x70, 0x2e, 0x71, 0x75, 0x69, 0x74, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, + 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, + 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, + 0x74, 0x3b, 0x71, 0x3c, 0x2f, 0x61, 0x74, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x3c, + 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x3c, 0x2f, + 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, + 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x3c, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29, 0x64, 0x68, 0x2d, 0x61, + 0x73, 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x74, + 0x2e, 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x41, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, + 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, + 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, + 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, 0x20, 0x33, + 0x2e, 0x38, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x74, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x44, + 0x68, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x61, + 0x6e, 0x74, 0x22, 0x20, 0x70, 0x61, 0x72, 0x65, + 0x6e, 0x74, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, + 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x61, 0x73, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x69, 0x73, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, + 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, + 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, + 0x65, 0x73, 0x22, 0x20, 0x63, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x73, 0x3d, 0x22, 0x50, 0x6c, + 0x65, 0x61, 0x73, 0x65, 0x20, 0x64, 0x6f, 0x6e, + 0x27, 0x74, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, + 0x6c, 0x61, 0x74, 0x65, 0x20, 0x26, 0x71, 0x75, + 0x6f, 0x74, 0x3b, 0x44, 0x65, 0x76, 0x68, 0x65, + 0x6c, 0x70, 0x26, 0x71, 0x75, 0x6f, 0x74, 0x3b, + 0x22, 0x3e, 0x44, 0x65, 0x76, 0x68, 0x65, 0x6c, + 0x70, 0x20, 0xe2, 0x80, 0x94, 0x20, 0x41, 0x73, + 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x69, 0x63, 0x6f, 0x6e, 0x5f, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x64, 0x65, 0x76, + 0x68, 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x44, 0x68, 0x41, + 0x73, 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x74, + 0x56, 0x69, 0x65, 0x77, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x76, 0x69, 0x65, 0x77, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6c, + 0x61, 0x74, 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, + 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, + 0x29, 0x64, 0x68, 0x2d, 0x70, 0x72, 0x65, 0x66, + 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x2e, + 0x75, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x9f, 0x29, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, + 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, + 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, + 0x64, 0x69, 0x6e, 0x67, 0x3d, 0x22, 0x55, 0x54, + 0x46, 0x2d, 0x38, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, + 0x21, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, + 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, + 0x74, 0x68, 0x20, 0x67, 0x6c, 0x61, 0x64, 0x65, + 0x20, 0x33, 0x2e, 0x31, 0x35, 0x2e, 0x32, 0x20, + 0x6f, 0x6e, 0x20, 0x4d, 0x6f, 0x6e, 0x20, 0x53, + 0x65, 0x70, 0x20, 0x32, 0x33, 0x20, 0x30, 0x30, + 0x3a, 0x30, 0x32, 0x3a, 0x32, 0x31, 0x20, 0x32, + 0x30, 0x31, 0x33, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x3c, 0x21, 0x2d, 0x2d, 0x0a, 0x20, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x43, 0x29, 0x20, 0x32, 0x30, 0x31, @@ -136,1644 +1483,921 @@ 0x20, 0x4d, 0x41, 0x20, 0x30, 0x32, 0x31, 0x31, 0x30, 0x2d, 0x31, 0x33, 0x30, 0x31, 0x0a, 0x20, 0x20, 0x55, 0x53, 0x41, 0x0a, 0x2d, 0x2d, 0x3e, - 0x0a, 0x0a, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x20, 0x20, - 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, - 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, 0x22, 0x67, - 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, 0x65, 0x72, - 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x33, 0x2e, - 0x30, 0x22, 0x2f, 0x3e, 0x0a, 0x0a, 0x20, 0x20, - 0x3c, 0x6d, 0x65, 0x6e, 0x75, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x61, 0x70, 0x70, 0x2d, 0x6d, 0x65, - 0x6e, 0x75, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x4e, 0x65, 0x77, 0x20, 0x77, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x6e, - 0x65, 0x77, 0x2d, 0x77, 0x69, 0x6e, 0x64, 0x6f, - 0x77, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, - 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, - 0x79, 0x26, 0x67, 0x74, 0x3b, 0x6e, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x73, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x69, 0x74, 0x65, - 0x6d, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, - 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, - 0x73, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, - 0x70, 0x70, 0x2e, 0x70, 0x72, 0x65, 0x66, 0x65, - 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x73, - 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x69, 0x74, 0x65, - 0x6d, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, - 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, - 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x41, 0x62, - 0x6f, 0x75, 0x74, 0x20, 0x44, 0x65, 0x76, 0x68, - 0x65, 0x6c, 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x61, 0x70, 0x70, 0x2e, 0x61, 0x62, 0x6f, - 0x75, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x69, - 0x74, 0x65, 0x6d, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x69, 0x74, 0x65, 0x6d, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x51, 0x75, 0x69, - 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x61, - 0x70, 0x70, 0x2e, 0x71, 0x75, 0x69, 0x74, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, - 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, - 0x67, 0x74, 0x3b, 0x71, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x73, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x20, - 0x3c, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x0a, - 0x0a, 0x20, 0x20, 0x3c, 0x6d, 0x65, 0x6e, 0x75, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x77, 0x69, 0x6e, - 0x64, 0x6f, 0x77, 0x2d, 0x6d, 0x65, 0x6e, 0x75, - 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x0a, 0x09, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x4e, 0x65, 0x77, 0x20, 0x5f, 0x54, - 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x09, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x6e, 0x65, 0x77, - 0x2d, 0x74, 0x61, 0x62, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x0a, 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, - 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, - 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, - 0x3b, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x09, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x75, 0x73, 0x65, 0x2d, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x73, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x73, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, - 0x0a, 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x50, 0x72, - 0x69, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, - 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x70, 0x72, - 0x69, 0x6e, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, - 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, - 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, - 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, - 0x70, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x69, 0x74, - 0x65, 0x6d, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, - 0x0a, 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, - 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, - 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, - 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x46, 0x69, - 0x6e, 0x64, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x09, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x66, 0x69, 0x6e, - 0x64, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, 0x3e, 0x26, - 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, 0x6d, 0x61, - 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, 0x66, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x73, 0x65, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x69, 0x74, - 0x65, 0x6d, 0x3e, 0x0a, 0x09, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, - 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, - 0x5f, 0x4c, 0x61, 0x72, 0x67, 0x65, 0x72, 0x20, - 0x74, 0x65, 0x78, 0x74, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x0a, 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, 0x7a, - 0x6f, 0x6f, 0x6d, 0x2d, 0x69, 0x6e, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x3e, 0x0a, 0x09, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, - 0x65, 0x6c, 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, - 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, - 0x67, 0x74, 0x3b, 0x70, 0x6c, 0x75, 0x73, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x0a, 0x09, - 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x53, 0x5f, 0x6d, 0x61, 0x6c, - 0x6c, 0x65, 0x72, 0x20, 0x74, 0x65, 0x78, 0x74, - 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x09, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x77, - 0x69, 0x6e, 0x2e, 0x7a, 0x6f, 0x6f, 0x6d, 0x2d, - 0x6f, 0x75, 0x74, 0x3c, 0x2f, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, - 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, 0x22, - 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, 0x69, - 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, 0x3b, - 0x6d, 0x69, 0x6e, 0x75, 0x73, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x69, - 0x74, 0x65, 0x6d, 0x3e, 0x0a, 0x09, 0x3c, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x5f, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, - 0x20, 0x73, 0x69, 0x7a, 0x65, 0x3c, 0x2f, 0x61, - 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, - 0x3e, 0x0a, 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x77, 0x69, 0x6e, 0x2e, - 0x7a, 0x6f, 0x6f, 0x6d, 0x2d, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x0a, 0x09, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x61, 0x63, 0x63, 0x65, 0x6c, - 0x22, 0x3e, 0x26, 0x6c, 0x74, 0x3b, 0x50, 0x72, - 0x69, 0x6d, 0x61, 0x72, 0x79, 0x26, 0x67, 0x74, - 0x3b, 0x30, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x69, - 0x74, 0x65, 0x6d, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x73, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, - 0x6d, 0x65, 0x6e, 0x75, 0x3e, 0x0a, 0x0a, 0x20, - 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, - 0x74, 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x68, - 0x65, 0x6c, 0x66, 0x5f, 0x73, 0x74, 0x6f, 0x72, - 0x65, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x0a, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, + 0x61, 0x63, 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, + 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x2d, 0x72, 0x65, 0x71, 0x75, 0x69, + 0x72, 0x65, 0x73, 0x20, 0x67, 0x74, 0x6b, 0x2b, + 0x20, 0x33, 0x2e, 0x30, 0x20, 0x2d, 0x2d, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x74, + 0x6f, 0x72, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x68, 0x65, + 0x6c, 0x66, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, + 0x22, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x73, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, + 0x61, 0x6d, 0x65, 0x20, 0x65, 0x6e, 0x61, 0x62, + 0x6c, 0x65, 0x64, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, + 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x62, 0x6f, + 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, - 0x20, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, - 0x22, 0x67, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, - 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, - 0x61, 0x6d, 0x65, 0x20, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, - 0x3d, 0x22, 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, - 0x72, 0x72, 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x21, - 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x62, - 0x6f, 0x6f, 0x6b, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, + 0x20, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x20, 0x2d, + 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, + 0x67, 0x63, 0x68, 0x61, 0x72, 0x61, 0x72, 0x72, + 0x61, 0x79, 0x22, 0x2f, 0x3e, 0x3c, 0x21, 0x2d, + 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x62, 0x6f, + 0x6f, 0x6b, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x47, 0x4f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x22, 0x2f, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x21, 0x2d, - 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x77, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 0x2d, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x65, 0x63, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, + 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x77, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2d, 0x2d, + 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, + 0x69, 0x6e, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x21, + 0x2d, 0x2d, 0x20, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x2d, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x69, + 0x6e, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, + 0x65, 0x6e, 0x74, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x20, 0x74, - 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x69, 0x6e, - 0x74, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x21, 0x2d, 0x2d, 0x20, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2d, 0x6e, - 0x61, 0x6d, 0x65, 0x20, 0x69, 0x6e, 0x63, 0x6f, - 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, - 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, - 0x22, 0x67, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, - 0x6e, 0x22, 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, - 0x0a, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, - 0x6e, 0x63, 0x65, 0x73, 0x5f, 0x64, 0x69, 0x61, - 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, - 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, - 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, - 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, - 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, - 0x73, 0x22, 0x3e, 0x50, 0x72, 0x65, 0x66, 0x65, - 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x67, 0x62, 0x6f, + 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x22, 0x2f, 0x3e, + 0x3c, 0x2f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x73, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x74, 0x65, 0x6d, 0x70, + 0x6c, 0x61, 0x74, 0x65, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x44, 0x68, 0x50, 0x72, + 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, + 0x73, 0x22, 0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x44, 0x69, + 0x61, 0x6c, 0x6f, 0x67, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, - 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x77, 0x69, - 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x30, 0x30, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x62, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x50, 0x72, 0x65, + 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, + 0x6c, 0x74, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, + 0x22, 0x3e, 0x35, 0x30, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x34, 0x30, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x79, + 0x70, 0x65, 0x5f, 0x68, 0x69, 0x6e, 0x74, 0x22, + 0x3e, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, + 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, + 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, + 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6f, 0x72, 0x69, 0x65, 0x6e, + 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x79, 0x70, 0x65, 0x5f, - 0x68, 0x69, 0x6e, 0x74, 0x22, 0x3e, 0x64, 0x69, - 0x61, 0x6c, 0x6f, 0x67, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x22, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, 0x69, + 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, + 0x65, 0x61, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, + 0x6c, 0x6f, 0x67, 0x2d, 0x61, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, 0x61, 0x31, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x79, + 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, + 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x64, 0x69, 0x61, 0x6c, - 0x6f, 0x67, 0x2d, 0x76, 0x62, 0x6f, 0x78, 0x31, - 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, + 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, + 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, + 0x74, 0x6b, 0x2d, 0x63, 0x6c, 0x6f, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x32, 0x3c, 0x2f, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, + 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x73, + 0x74, 0x6f, 0x63, 0x6b, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x61, 0x63, 0x6b, + 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x65, + 0x6e, 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x31, 0x22, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, - 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, - 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x4e, 0x6f, 0x74, 0x65, 0x62, - 0x6f, 0x6f, 0x6b, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, - 0x6b, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6f, - 0x75, 0x74, 0x65, 0x72, 0x5f, 0x76, 0x62, 0x6f, - 0x78, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x6c, - 0x69, 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x61, 0x6c, 0x69, - 0x67, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x33, 0x22, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, + 0x74, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x4e, 0x6f, 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6e, 0x6f, + 0x74, 0x65, 0x62, 0x6f, 0x6f, 0x6b, 0x31, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x76, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x41, 0x6c, 0x69, 0x67, + 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x61, 0x6c, 0x69, 0x67, 0x6e, + 0x6d, 0x65, 0x6e, 0x74, 0x33, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x70, 0x61, + 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x38, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x70, - 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x5f, 0x70, 0x61, 0x64, 0x64, + 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, + 0x6d, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, + 0x67, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, + 0x6f, 0x78, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x69, 0x67, - 0x68, 0x74, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x56, 0x42, 0x6f, - 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, - 0x62, 0x6f, 0x78, 0x31, 0x22, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x42, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x6f, 0x6b, 0x73, - 0x68, 0x65, 0x6c, 0x66, 0x5f, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x6c, 0x61, - 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x5f, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x5f, 0x47, 0x72, 0x6f, 0x75, 0x70, - 0x20, 0x62, 0x79, 0x20, 0x6c, 0x61, 0x6e, 0x67, - 0x75, 0x61, 0x67, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x6f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, + 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, + 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, + 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, + 0x6f, 0x6f, 0x6b, 0x73, 0x68, 0x65, 0x6c, 0x66, + 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, + 0x79, 0x5f, 0x6c, 0x61, 0x6e, 0x67, 0x75, 0x61, + 0x67, 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x20, 0x62, 0x79, 0x20, 0x6c, + 0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, - 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x64, 0x72, - 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, 0x69, 0x63, - 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, + 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, + 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, - 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x57, - 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x73, 0x63, 0x72, 0x6f, 0x6c, - 0x6c, 0x65, 0x64, 0x77, 0x69, 0x6e, 0x64, 0x6f, - 0x77, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x53, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x64, + 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x63, 0x72, 0x6f, + 0x6c, 0x6c, 0x65, 0x64, 0x77, 0x69, 0x6e, 0x64, + 0x6f, 0x77, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, - 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, - 0x62, 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x22, 0x3e, 0x61, 0x75, 0x74, 0x6f, - 0x6d, 0x61, 0x74, 0x69, 0x63, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, - 0x62, 0x61, 0x72, 0x5f, 0x70, 0x6f, 0x6c, 0x69, - 0x63, 0x79, 0x22, 0x3e, 0x61, 0x75, 0x74, 0x6f, - 0x6d, 0x61, 0x74, 0x69, 0x63, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x68, 0x61, 0x64, 0x6f, 0x77, 0x2d, - 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x54, 0x72, 0x65, 0x65, 0x56, 0x69, 0x65, 0x77, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, - 0x6f, 0x6b, 0x73, 0x68, 0x65, 0x6c, 0x66, 0x5f, - 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, 0x65, 0x77, - 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x68, 0x61, 0x64, 0x6f, 0x77, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x22, 0x3e, 0x69, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x54, 0x72, 0x65, 0x65, 0x56, 0x69, + 0x65, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x68, 0x65, 0x6c, + 0x66, 0x5f, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, + 0x65, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x6d, 0x6f, 0x64, 0x65, 0x6c, - 0x22, 0x3e, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x68, - 0x65, 0x6c, 0x66, 0x5f, 0x73, 0x74, 0x6f, 0x72, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, - 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x61, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6f, + 0x64, 0x65, 0x6c, 0x22, 0x3e, 0x62, 0x6f, 0x6f, + 0x6b, 0x73, 0x68, 0x65, 0x6c, 0x66, 0x5f, 0x73, + 0x74, 0x6f, 0x72, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x5f, 0x63, + 0x6c, 0x69, 0x63, 0x6b, 0x61, 0x62, 0x6c, 0x65, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, + 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x54, 0x72, 0x65, 0x65, 0x56, 0x69, 0x65, - 0x77, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, - 0x65, 0x76, 0x69, 0x65, 0x77, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x31, 0x22, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x6b, 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x6c, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, 0x65, + 0x76, 0x69, 0x65, 0x77, 0x2d, 0x73, 0x65, 0x6c, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x54, 0x72, 0x65, 0x65, 0x56, 0x69, + 0x65, 0x77, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x72, + 0x65, 0x65, 0x76, 0x69, 0x65, 0x77, 0x63, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x69, 0x6e, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, - 0x64, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, + 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, + 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, + 0x3e, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, + 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, + 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x6f, 0x6b, 0x73, + 0x68, 0x65, 0x6c, 0x66, 0x5f, 0x65, 0x6e, 0x61, + 0x62, 0x6c, 0x65, 0x64, 0x5f, 0x74, 0x6f, 0x67, + 0x67, 0x6c, 0x65, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, 0x65, 0x6e, - 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, 0x6f, 0x67, - 0x67, 0x6c, 0x65, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x68, 0x65, - 0x6c, 0x66, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, - 0x65, 0x64, 0x5f, 0x74, 0x6f, 0x67, 0x67, 0x6c, - 0x65, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x36, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x36, 0x30, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, + 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, 0x30, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x61, 0x63, 0x74, - 0x69, 0x76, 0x65, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x69, 0x6e, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x73, - 0x74, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0x34, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, - 0x65, 0x65, 0x56, 0x69, 0x65, 0x77, 0x43, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, - 0x65, 0x77, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, - 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x69, 0x6e, 0x63, + 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, + 0x74, 0x22, 0x3e, 0x34, 0x3c, 0x2f, 0x61, 0x74, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, + 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x72, 0x65, 0x65, 0x56, 0x69, 0x65, 0x77, 0x43, + 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, 0x65, 0x76, + 0x69, 0x65, 0x77, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, - 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x43, 0x65, 0x6c, 0x6c, 0x52, - 0x65, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x72, 0x54, - 0x65, 0x78, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x62, 0x6f, 0x6f, 0x6b, 0x73, 0x68, 0x65, - 0x6c, 0x66, 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, - 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x2f, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x65, 0x78, - 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x74, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, - 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x33, 0x3c, - 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x65, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x65, + 0x6c, 0x6c, 0x52, 0x65, 0x6e, 0x64, 0x65, 0x72, + 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x6f, 0x6b, + 0x73, 0x68, 0x65, 0x6c, 0x66, 0x5f, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x5f, 0x74, 0x65, 0x78, 0x74, + 0x22, 0x2f, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x65, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, - 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x65, 0x78, 0x74, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x65, 0x3e, 0x3c, 0x61, 0x74, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x65, 0x69, 0x67, + 0x68, 0x74, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x61, + 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, + 0x3e, 0x3c, 0x2f, 0x61, 0x74, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x65, 0x73, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x74, 0x61, 0x62, 0x22, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, 0x6b, 0x73, - 0x68, 0x65, 0x6c, 0x66, 0x22, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, + 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, + 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, + 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x62, 0x6f, 0x6f, + 0x6b, 0x73, 0x68, 0x65, 0x6c, 0x66, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, - 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, - 0x22, 0x3e, 0x42, 0x6f, 0x6f, 0x6b, 0x20, 0x53, - 0x68, 0x65, 0x6c, 0x66, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x42, 0x6f, 0x6f, + 0x6b, 0x20, 0x53, 0x68, 0x65, 0x6c, 0x66, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x6f, 0x75, 0x74, 0x65, 0x72, - 0x5f, 0x76, 0x62, 0x6f, 0x78, 0x32, 0x22, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x41, 0x6c, 0x69, 0x67, 0x6e, 0x6d, - 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, 0x65, - 0x6e, 0x74, 0x32, 0x22, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, + 0x6b, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, + 0x76, 0x62, 0x6f, 0x78, 0x32, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x41, 0x6c, 0x69, 0x67, 0x6e, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x6d, + 0x65, 0x6e, 0x74, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, - 0x6f, 0x70, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, - 0x6e, 0x67, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x5f, - 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, - 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x70, 0x61, 0x64, + 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x38, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x70, - 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x56, 0x42, 0x6f, 0x78, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, 0x78, 0x34, - 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, - 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x70, 0x61, 0x63, - 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, - 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x66, 0x6f, - 0x6e, 0x74, 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, - 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, - 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, - 0x55, 0x73, 0x65, 0x20, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x73, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x70, 0x61, + 0x64, 0x64, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x38, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x62, 0x6f, + 0x78, 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6f, + 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x3e, 0x76, 0x65, 0x72, 0x74, + 0x69, 0x63, 0x61, 0x6c, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, + 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, + 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x43, 0x68, 0x65, + 0x63, 0x6b, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x5f, 0x66, 0x6f, 0x6e, + 0x74, 0x73, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, + 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, + 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x55, 0x73, + 0x65, 0x20, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, + 0x20, 0x66, 0x6f, 0x6e, 0x74, 0x73, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, - 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, + 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, + 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, + 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, + 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, + 0x6e, 0x22, 0x3e, 0x30, 0x2e, 0x35, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x64, 0x72, 0x61, 0x77, 0x5f, 0x69, 0x6e, 0x64, + 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, - 0x47, 0x74, 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, - 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x6f, - 0x6e, 0x74, 0x73, 0x5f, 0x74, 0x61, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, - 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x65, 0x6e, - 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x6e, 0x5f, 0x72, 0x6f, 0x77, 0x73, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x5f, - 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x47, 0x72, 0x69, 0x64, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x66, 0x6f, 0x6e, 0x74, 0x73, 0x5f, + 0x67, 0x72, 0x69, 0x64, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x61, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x72, 0x6f, 0x77, 0x5f, 0x73, - 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x22, 0x3e, - 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x34, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x5f, 0x73, 0x70, 0x61, 0x63, 0x69, 0x6e, 0x67, + 0x22, 0x3e, 0x36, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, + 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x34, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, + 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, + 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, - 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, + 0x74, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, + 0x61, 0x62, 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, + 0x73, 0x22, 0x3e, 0x5f, 0x56, 0x61, 0x72, 0x69, + 0x61, 0x62, 0x6c, 0x65, 0x20, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x3a, 0x20, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x5f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, - 0x6c, 0x65, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x3a, 0x20, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, + 0x73, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x6c, 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x76, 0x61, - 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x66, - 0x6f, 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, - 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x22, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, - 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x66, + 0x6f, 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, + 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, 0x67, 0x68, + 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x35, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, + 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, + 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, @@ -1781,732 +2405,307 @@ 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x5f, 0x46, 0x69, 0x78, 0x65, 0x64, 0x20, 0x77, 0x69, 0x64, 0x74, 0x68, 0x3a, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, + 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, + 0x69, 0x6e, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, 0x65, 0x6d, + 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, 0x69, 0x64, + 0x67, 0x65, 0x74, 0x22, 0x3e, 0x66, 0x69, 0x78, + 0x65, 0x64, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, + 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x6e, - 0x65, 0x6d, 0x6f, 0x6e, 0x69, 0x63, 0x5f, 0x77, - 0x69, 0x64, 0x67, 0x65, 0x74, 0x22, 0x3e, 0x66, - 0x69, 0x78, 0x65, 0x64, 0x5f, 0x66, 0x6f, 0x6e, - 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, 0x74, - 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, 0x6f, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, - 0x47, 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x22, 0x3e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, - 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, - 0x6b, 0x46, 0x6f, 0x6e, 0x74, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, - 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, + 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, + 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x6f, + 0x6e, 0x74, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x76, 0x61, + 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x66, + 0x6f, 0x6e, 0x74, 0x5f, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, - 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, + 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, + 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x6f, 0x6e, 0x74, 0x22, 0x3e, 0x53, 0x61, 0x6e, + 0x73, 0x20, 0x31, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, + 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x5f, 0x74, + 0x65, 0x78, 0x74, 0x22, 0x2f, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, - 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, - 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x47, 0x54, 0x4b, 0x5f, - 0x46, 0x49, 0x4c, 0x4c, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x79, 0x5f, 0x6f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3e, 0x47, - 0x54, 0x4b, 0x5f, 0x46, 0x49, 0x4c, 0x4c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x46, 0x6f, 0x6e, - 0x74, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x66, 0x69, 0x78, - 0x65, 0x64, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, - 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, 0x72, 0x75, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x3d, 0x22, 0x77, 0x69, 0x64, 0x74, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x68, 0x65, 0x69, + 0x67, 0x68, 0x74, 0x22, 0x3e, 0x31, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, + 0x22, 0x47, 0x74, 0x6b, 0x46, 0x6f, 0x6e, 0x74, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x66, 0x69, 0x78, 0x65, + 0x64, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x5f, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, + 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, + 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, + 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x6f, 0x6e, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x3e, 0x4d, 0x6f, 0x6e, 0x6f, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x20, 0x31, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, 0x73, - 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x22, 0x3e, - 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x66, 0x6f, 0x6e, 0x74, 0x22, 0x3e, + 0x53, 0x61, 0x6e, 0x73, 0x20, 0x31, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, + 0x77, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x22, 0x2f, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x75, 0x73, 0x65, 0x5f, 0x66, 0x6f, 0x6e, + 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, 0x3e, - 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x6f, 0x70, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x62, 0x6f, - 0x74, 0x74, 0x6f, 0x6d, 0x5f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x22, 0x3e, 0x32, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x5f, - 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, - 0x3e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x79, 0x5f, 0x6f, 0x70, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x3e, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, 0x6f, 0x70, + 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x22, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x77, 0x69, 0x64, + 0x74, 0x68, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, - 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x70, - 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x66, 0x6f, - 0x6e, 0x74, 0x73, 0x22, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, + 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x73, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, + 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, + 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, + 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, + 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, 0x61, 0x6e, + 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, 0x6c, 0x65, + 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, 0x3e, 0x46, + 0x6f, 0x6e, 0x74, 0x73, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x74, 0x72, - 0x61, 0x6e, 0x73, 0x6c, 0x61, 0x74, 0x61, 0x62, - 0x6c, 0x65, 0x3d, 0x22, 0x79, 0x65, 0x73, 0x22, - 0x3e, 0x46, 0x6f, 0x6e, 0x74, 0x73, 0x3c, 0x2f, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x74, + 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x74, 0x61, 0x62, 0x5f, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x6c, 0x61, - 0x63, 0x65, 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, - 0x2f, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, - 0x22, 0x74, 0x61, 0x62, 0x22, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x68, - 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x74, + 0x79, 0x70, 0x65, 0x3d, 0x22, 0x74, 0x61, 0x62, + 0x22, 0x3e, 0x3c, 0x70, 0x6c, 0x61, 0x63, 0x65, + 0x68, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x2f, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x20, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2d, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3d, 0x22, 0x61, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, 0x65, - 0x61, 0x22, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x48, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x42, - 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, - 0x64, 0x69, 0x61, 0x6c, 0x6f, 0x67, 0x2d, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x61, 0x72, - 0x65, 0x61, 0x31, 0x22, 0x3e, 0x0a, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x79, 0x6f, 0x75, 0x74, 0x5f, 0x73, 0x74, - 0x79, 0x6c, 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x6f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, - 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, - 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x20, - 0x69, 0x64, 0x3d, 0x22, 0x70, 0x72, 0x65, 0x66, - 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x5f, - 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x62, 0x75, - 0x74, 0x74, 0x6f, 0x6e, 0x22, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x3e, 0x67, 0x74, - 0x6b, 0x2d, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, + 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, - 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, - 0x61, 0x6e, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, - 0x6c, 0x74, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, + 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x72, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x73, 0x5f, 0x64, 0x65, 0x66, - 0x61, 0x75, 0x6c, 0x74, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x75, - 0x73, 0x65, 0x5f, 0x73, 0x74, 0x6f, 0x63, 0x6b, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, - 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, - 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, - 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, - 0x65, 0x22, 0x3e, 0x65, 0x6e, 0x64, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, - 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, - 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x3c, 0x61, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, - 0x65, 0x74, 0x73, 0x3e, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x3c, 0x61, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, - 0x74, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x3d, 0x22, 0x2d, 0x37, 0x22, 0x3e, - 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, - 0x63, 0x65, 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, - 0x65, 0x5f, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x3c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x3c, 0x2f, 0x61, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, 0x69, - 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x0a, 0x20, - 0x20, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x3e, 0x0a, 0x0a, 0x3c, 0x2f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, - 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, - 0x29, 0x2f, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x6f, 0x72, 0x67, 0x2f, 0x04, 0x00, 0x00, 0x00, - 0x64, 0x65, 0x76, 0x68, 0x65, 0x6c, 0x70, 0x2f, - 0x00, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, - 0x65, 0x2f, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, + 0x3e, 0x3c, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, + 0x2d, 0x77, 0x69, 0x64, 0x67, 0x65, 0x74, 0x20, + 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x3d, 0x22, 0x2d, 0x37, 0x22, 0x3e, 0x70, 0x72, + 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, + 0x73, 0x5f, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x3c, 0x2f, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x3e, 0x3c, 0x2f, + 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2d, 0x77, + 0x69, 0x64, 0x67, 0x65, 0x74, 0x73, 0x3e, 0x3c, + 0x2f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, + 0x65, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x0a, 0x00, + 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x64, + 0x65, 0x76, 0x68, 0x65, 0x6c, 0x70, 0x2f, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00 } }; static GStaticResource static_resource = { dh_resource_data.data, sizeof (dh_resource_data.data), NULL, NULL, NULL }; diff -Nru devhelp-3.8.2/src/dh-sidebar.c devhelp-3.10.2/src/dh-sidebar.c --- devhelp-3.8.2/src/dh-sidebar.c 2013-02-05 20:50:27.000000000 +0000 +++ devhelp-3.10.2/src/dh-sidebar.c 2013-11-11 08:32:55.000000000 +0000 @@ -36,14 +36,7 @@ #include "dh-book.h" #include "dh-book-tree.h" -G_DEFINE_TYPE (DhSidebar, dh_sidebar, GTK_TYPE_VBOX) - -enum { - LINK_SELECTED, - LAST_SIGNAL -}; - -struct _DhSidebarPrivate { +typedef struct { DhKeywordModel *model; DhBookManager *book_manager; @@ -61,105 +54,125 @@ GCompletion *completion; guint idle_complete; guint idle_filter; +} DhSidebarPrivate; + +enum { + PROP_0, + PROP_BOOK_MANAGER +}; + +enum { + LINK_SELECTED, + LAST_SIGNAL }; static gint signals[LAST_SIGNAL] = { 0 }; +G_DEFINE_TYPE_WITH_PRIVATE (DhSidebar, dh_sidebar, GTK_TYPE_BOX) + /******************************************************************************/ static gboolean -sidebar_filter_idle (DhSidebar *self) +sidebar_filter_idle (DhSidebar *sidebar) { + DhSidebarPrivate *priv; const gchar *str; DhLink *link; DhLink *book_link; - self->priv->idle_filter = 0; + priv = dh_sidebar_get_instance_private (sidebar); - str = gtk_entry_get_text (GTK_ENTRY (self->priv->entry)); + priv->idle_filter = 0; - book_link = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->priv->search_all_button)) ? + str = gtk_entry_get_text (GTK_ENTRY (priv->entry)); + + book_link = (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->search_all_button)) ? NULL : - dh_sidebar_get_selected_book (self)); + dh_sidebar_get_selected_book (sidebar)); - link = dh_keyword_model_filter (self->priv->model, + link = dh_keyword_model_filter (priv->model, str, book_link ? dh_link_get_book_id (book_link) : NULL, NULL); if (link) - g_signal_emit (self, signals[LINK_SELECTED], 0, link); + g_signal_emit (sidebar, signals[LINK_SELECTED], 0, link); return FALSE; } static void -sidebar_search_run_idle (DhSidebar *self) +sidebar_search_run_idle (DhSidebar *sidebar) { - if (!self->priv->idle_filter) - self->priv->idle_filter = - g_idle_add ((GSourceFunc) sidebar_filter_idle, self); + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + + if (!priv->idle_filter) + priv->idle_filter = + g_idle_add ((GSourceFunc) sidebar_filter_idle, sidebar); } /******************************************************************************/ static void -sidebar_completion_add_book (DhSidebar *self, +sidebar_completion_add_book (DhSidebar *sidebar, DhBook *book) { GList *completions; + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); - if (G_UNLIKELY (!self->priv->completion)) - self->priv->completion = g_completion_new (NULL); + if (G_UNLIKELY (!priv->completion)) + priv->completion = g_completion_new (NULL); completions = dh_book_get_completions (book); if (completions) - g_completion_add_items (self->priv->completion, completions); + g_completion_add_items (priv->completion, completions); } static void -sidebar_completion_delete_book (DhSidebar *self, +sidebar_completion_delete_book (DhSidebar *sidebar, DhBook *book) { GList *completions; + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); - if (G_UNLIKELY (!self->priv->completion)) + if (G_UNLIKELY (!priv->completion)) return; completions = dh_book_get_completions (book); if (completions) - g_completion_remove_items (self->priv->completion, completions); + g_completion_remove_items (priv->completion, completions); } static void sidebar_book_created_or_enabled_cb (DhBookManager *book_manager, DhBook *book, - DhSidebar *self) + DhSidebar *sidebar) { - sidebar_completion_add_book (self, book); + sidebar_completion_add_book (sidebar, book); /* Update current search if any */ - sidebar_search_run_idle (self); + sidebar_search_run_idle (sidebar); } static void sidebar_book_deleted_or_disabled_cb (DhBookManager *book_manager, DhBook *book, - DhSidebar *self) + DhSidebar *sidebar) { - sidebar_completion_delete_book (self, book); + sidebar_completion_delete_book (sidebar, book); /* Update current search if any */ - sidebar_search_run_idle (self); + sidebar_search_run_idle (sidebar); } static void -sidebar_completion_populate (DhSidebar *self) +sidebar_completion_populate (DhSidebar *sidebar) { - GList *l; + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + GList *l; - for (l = dh_book_manager_get_books (self->priv->book_manager); + for (l = dh_book_manager_get_books (priv->book_manager); l; l = g_list_next (l)) { - sidebar_completion_add_book (self, DH_BOOK (l->data)); + sidebar_completion_add_book (sidebar, DH_BOOK (l->data)); } } @@ -167,20 +180,21 @@ static void sidebar_selection_changed_cb (GtkTreeSelection *selection, - DhSidebar *self) + DhSidebar *sidebar) { - GtkTreeIter iter; + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + GtkTreeIter iter; if (gtk_tree_selection_get_selected (selection, NULL, &iter)) { DhLink *link; - gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), &iter, + gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, DH_KEYWORD_MODEL_COL_LINK, &link, -1); - if (link != self->priv->selected_link) { - self->priv->selected_link = link; - g_signal_emit (self, signals[LINK_SELECTED], 0, link); + if (link != priv->selected_link) { + priv->selected_link = link; + g_signal_emit (sidebar, signals[LINK_SELECTED], 0, link); } } } @@ -191,8 +205,9 @@ static gboolean sidebar_tree_button_press_cb (GtkTreeView *view, GdkEventButton *event, - DhSidebar *self) + DhSidebar *sidebar) { + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); GtkTreePath *path; GtkTreeIter iter; DhLink *link; @@ -202,17 +217,17 @@ if (!path) return FALSE; - gtk_tree_model_get_iter (GTK_TREE_MODEL (self->priv->model), &iter, path); + gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path); gtk_tree_path_free (path); - gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), + gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, DH_KEYWORD_MODEL_COL_LINK, &link, -1); - self->priv->selected_link = link; + priv->selected_link = link; - g_signal_emit (self, signals[LINK_SELECTED], 0, link); + g_signal_emit (sidebar, signals[LINK_SELECTED], 0, link); /* Always return FALSE so the tree view gets the event and can update * the selection etc. @@ -223,11 +238,13 @@ static gboolean sidebar_entry_key_press_event_cb (GtkEntry *entry, GdkEventKey *event, - DhSidebar *self) + DhSidebar *sidebar) { + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + if (event->keyval == GDK_KEY_Tab) { if (event->state & GDK_CONTROL_MASK) { - gtk_widget_grab_focus (self->priv->hitlist); + gtk_widget_grab_focus (priv->hitlist); } else { gtk_editable_set_position (GTK_EDITABLE (entry), -1); gtk_editable_select_region (GTK_EDITABLE (entry), -1, -1); @@ -242,8 +259,8 @@ gchar *name; /* Get the first entry found. */ - if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->priv->model), &iter)) { - gtk_tree_model_get (GTK_TREE_MODEL (self->priv->model), + if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->model), &iter)) { + gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, DH_KEYWORD_MODEL_COL_LINK, &link, DH_KEYWORD_MODEL_COL_NAME, &name, @@ -255,7 +272,7 @@ gtk_editable_set_position (GTK_EDITABLE (entry), -1); gtk_editable_select_region (GTK_EDITABLE (entry), -1, -1); - g_signal_emit (self, signals[LINK_SELECTED], 0, link); + g_signal_emit (sidebar, signals[LINK_SELECTED], 0, link); return TRUE; } @@ -266,41 +283,44 @@ static void sidebar_entry_changed_cb (GtkEntry *entry, - DhSidebar *self) + DhSidebar *sidebar) { + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + /* If search entry is empty, hide the hitlist */ if (strcmp (gtk_entry_get_text (entry), "") == 0) { - gtk_widget_hide (self->priv->sw_hitlist); - gtk_widget_show (self->priv->sw_book_tree); + gtk_widget_hide (priv->sw_hitlist); + gtk_widget_show (priv->sw_book_tree); return; } - gtk_widget_hide (self->priv->sw_book_tree); - gtk_widget_show (self->priv->sw_hitlist); - sidebar_search_run_idle (self); + gtk_widget_hide (priv->sw_book_tree); + gtk_widget_show (priv->sw_hitlist); + sidebar_search_run_idle (sidebar); } static gboolean -sidebar_complete_idle (DhSidebar *self) +sidebar_complete_idle (DhSidebar *sidebar) { + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); const gchar *str; gchar *completed = NULL; gsize length; - str = gtk_entry_get_text (GTK_ENTRY (self->priv->entry)); + str = gtk_entry_get_text (GTK_ENTRY (priv->entry)); - g_completion_complete (self->priv->completion, str, &completed); + g_completion_complete (priv->completion, str, &completed); if (completed) { length = strlen (str); - gtk_entry_set_text (GTK_ENTRY (self->priv->entry), completed); - gtk_editable_set_position (GTK_EDITABLE (self->priv->entry), length); - gtk_editable_select_region (GTK_EDITABLE (self->priv->entry), + gtk_entry_set_text (GTK_ENTRY (priv->entry), completed); + gtk_editable_set_position (GTK_EDITABLE (priv->entry), length); + gtk_editable_select_region (GTK_EDITABLE (priv->entry), length, -1); g_free (completed); } - self->priv->idle_complete = 0; + priv->idle_complete = 0; return FALSE; } @@ -310,45 +330,53 @@ const gchar *text, gint length, gint *position, - DhSidebar *self) + DhSidebar *sidebar) { - if (!self->priv->idle_complete) - self->priv->idle_complete = - g_idle_add ((GSourceFunc) sidebar_complete_idle, self); + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + + if (!priv->idle_complete) + priv->idle_complete = + g_idle_add ((GSourceFunc) sidebar_complete_idle, sidebar); } /******************************************************************************/ void -dh_sidebar_set_search_string (DhSidebar *self, +dh_sidebar_set_search_string (DhSidebar *sidebar, const gchar *str) { - g_return_if_fail (DH_IS_SIDEBAR (self)); + DhSidebarPrivate *priv; + + g_return_if_fail (DH_IS_SIDEBAR (sidebar)); + + priv = dh_sidebar_get_instance_private (sidebar); /* Mark "All books" as active */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->search_all_button), TRUE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->search_all_button), TRUE); - g_signal_handlers_block_by_func (self->priv->entry, + g_signal_handlers_block_by_func (priv->entry, sidebar_entry_changed_cb, - self); + sidebar); - gtk_entry_set_text (GTK_ENTRY (self->priv->entry), str); - gtk_editable_set_position (GTK_EDITABLE (self->priv->entry), -1); - gtk_editable_select_region (GTK_EDITABLE (self->priv->entry), -1, -1); + gtk_entry_set_text (GTK_ENTRY (priv->entry), str); + gtk_editable_set_position (GTK_EDITABLE (priv->entry), -1); + gtk_editable_select_region (GTK_EDITABLE (priv->entry), -1, -1); - g_signal_handlers_unblock_by_func (self->priv->entry, + g_signal_handlers_unblock_by_func (priv->entry, sidebar_entry_changed_cb, - self); + sidebar); - sidebar_search_run_idle (self); + sidebar_search_run_idle (sidebar); } /******************************************************************************/ void -dh_sidebar_set_search_focus (DhSidebar *self) +dh_sidebar_set_search_focus (DhSidebar *sidebar) { - gtk_widget_grab_focus (self->priv->entry); + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + + gtk_widget_grab_focus (priv->entry); } /******************************************************************************/ @@ -382,9 +410,9 @@ static void search_filter_button_toggled (GtkToggleButton *button, - DhSidebar *self) + DhSidebar *sidebar) { - sidebar_search_run_idle (self); + sidebar_search_run_idle (sidebar); } /******************************************************************************/ @@ -392,25 +420,39 @@ static void sidebar_book_tree_link_selected_cb (GObject *ignored, DhLink *link, - DhSidebar *self) + DhSidebar *sidebar) { - if (link != self->priv->selected_link) { - self->priv->selected_link = link; - g_signal_emit (self, signals[LINK_SELECTED], 0, link); + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + + if (link != priv->selected_link) { + priv->selected_link = link; + g_signal_emit (sidebar, signals[LINK_SELECTED], 0, link); } } DhLink * -dh_sidebar_get_selected_book (DhSidebar *self) +dh_sidebar_get_selected_book (DhSidebar *sidebar) { - return dh_book_tree_get_selected_book (DH_BOOK_TREE (self->priv->book_tree)); + DhSidebarPrivate *priv; + + g_return_val_if_fail (DH_IS_SIDEBAR (sidebar), NULL); + + priv = dh_sidebar_get_instance_private (sidebar); + + return dh_book_tree_get_selected_book (DH_BOOK_TREE (priv->book_tree)); } void -dh_sidebar_select_uri (DhSidebar *self, +dh_sidebar_select_uri (DhSidebar *sidebar, const gchar *uri) { - dh_book_tree_select_uri (DH_BOOK_TREE (self->priv->book_tree), uri); + DhSidebarPrivate *priv; + + g_return_if_fail (DH_IS_SIDEBAR (sidebar)); + + priv = dh_sidebar_get_instance_private (sidebar); + + dh_book_tree_select_uri (DH_BOOK_TREE (priv->book_tree), uri); } /******************************************************************************/ @@ -418,87 +460,98 @@ GtkWidget * dh_sidebar_new (DhBookManager *book_manager) { - DhSidebar *self; + return GTK_WIDGET (g_object_new (DH_TYPE_SIDEBAR, + "orientation", GTK_ORIENTATION_VERTICAL, + "book-manager", book_manager, + NULL)); +} + +static void +dh_sidebar_finalize (GObject *object) +{ + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (DH_SIDEBAR (object)); + + g_completion_free (priv->completion); + + G_OBJECT_CLASS (dh_sidebar_parent_class)->finalize (object); +} + +static void +dh_sidebar_dispose (GObject *object) +{ + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (DH_SIDEBAR (object)); + + g_clear_object (&priv->book_manager); + + G_OBJECT_CLASS (dh_sidebar_parent_class)->dispose (object); +} + +static void +dh_sidebar_init (DhSidebar *sidebar) +{ + DhSidebarPrivate *priv; GtkCellRenderer *cell; GtkWidget *hbox; GtkWidget *button_box; - self = g_object_new (DH_TYPE_SIDEBAR, NULL); - gtk_container_set_border_width (GTK_CONTAINER (self), 2); - gtk_box_set_spacing (GTK_BOX (self), 4); + priv = dh_sidebar_get_instance_private (sidebar); + + gtk_container_set_border_width (GTK_CONTAINER (sidebar), 2); + gtk_box_set_spacing (GTK_BOX (sidebar), 4); /* Setup keyword model */ - self->priv->model = dh_keyword_model_new (); + priv->model = dh_keyword_model_new (); /* Setup hitlist */ - self->priv->hitlist = gtk_tree_view_new (); - gtk_tree_view_set_model (GTK_TREE_VIEW (self->priv->hitlist), GTK_TREE_MODEL (self->priv->model)); - gtk_tree_view_set_enable_search (GTK_TREE_VIEW (self->priv->hitlist), FALSE); - - /* Setup book manager */ - self->priv->book_manager = g_object_ref (book_manager); - g_signal_connect (self->priv->book_manager, - "book-created", - G_CALLBACK (sidebar_book_created_or_enabled_cb), - self); - g_signal_connect (self->priv->book_manager, - "book-deleted", - G_CALLBACK (sidebar_book_deleted_or_disabled_cb), - self); - g_signal_connect (self->priv->book_manager, - "book-enabled", - G_CALLBACK (sidebar_book_created_or_enabled_cb), - self); - g_signal_connect (self->priv->book_manager, - "book-disabled", - G_CALLBACK (sidebar_book_deleted_or_disabled_cb), - self); + priv->hitlist = gtk_tree_view_new (); + gtk_tree_view_set_model (GTK_TREE_VIEW (priv->hitlist), GTK_TREE_MODEL (priv->model)); + gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->hitlist), FALSE); /* Setup the top-level box with entry search and Current|All buttons */ - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_box_pack_start (GTK_BOX (self), hbox, FALSE, FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); + gtk_box_pack_start (GTK_BOX (sidebar), hbox, FALSE, FALSE, 0); /* Setup the search entry */ - self->priv->entry = gtk_search_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), self->priv->entry, TRUE, TRUE, 0); - g_signal_connect (self->priv->entry, "key-press-event", + priv->entry = gtk_search_entry_new (); + gtk_box_pack_start (GTK_BOX (hbox), priv->entry, TRUE, TRUE, 0); + g_signal_connect (priv->entry, "key-press-event", G_CALLBACK (sidebar_entry_key_press_event_cb), - self); - g_signal_connect (self->priv->hitlist, "button-press-event", + sidebar); + g_signal_connect (priv->hitlist, "button-press-event", G_CALLBACK (sidebar_tree_button_press_cb), - self); - g_signal_connect (self->priv->entry, "changed", + sidebar); + g_signal_connect (priv->entry, "changed", G_CALLBACK (sidebar_entry_changed_cb), - self); - g_signal_connect (self->priv->entry, "insert-text", + sidebar); + g_signal_connect (priv->entry, "insert-text", G_CALLBACK (sidebar_entry_text_inserted_cb), - self); + sidebar); - /* Setup the Current/All Files selector */ - self->priv->search_current_button = gtk_radio_button_new_with_label (NULL, _("Current")); - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (self->priv->search_current_button), FALSE); - self->priv->search_all_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (self->priv->search_current_button), + /* Setup the Current/All Files selector */ + priv->search_current_button = gtk_radio_button_new_with_label (NULL, _("Current")); + gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (priv->search_current_button), FALSE); + priv->search_all_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (priv->search_current_button), _("All Books")); - gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (self->priv->search_all_button), FALSE); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->search_all_button), TRUE); - g_signal_connect (self->priv->search_current_button, + gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (priv->search_all_button), FALSE); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->search_all_button), TRUE); + g_signal_connect (priv->search_current_button, "toggled", - G_CALLBACK (search_filter_button_toggled), - self); - button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), button_box, FALSE, FALSE, 0); - gtk_style_context_add_class (gtk_widget_get_style_context (button_box), - GTK_STYLE_CLASS_LINKED); - gtk_style_context_add_class (gtk_widget_get_style_context (button_box), - GTK_STYLE_CLASS_RAISED); - gtk_box_pack_start (GTK_BOX (button_box), self->priv->search_current_button, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (button_box), self->priv->search_all_button, FALSE, FALSE, 0); + G_CALLBACK (search_filter_button_toggled), + sidebar); + button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start (GTK_BOX (hbox), button_box, FALSE, FALSE, 0); + gtk_style_context_add_class (gtk_widget_get_style_context (button_box), + GTK_STYLE_CLASS_LINKED); + gtk_style_context_add_class (gtk_widget_get_style_context (button_box), + GTK_STYLE_CLASS_RAISED); + gtk_box_pack_start (GTK_BOX (button_box), priv->search_current_button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (button_box), priv->search_all_button, FALSE, FALSE, 0); /* Setup the hitlist */ - self->priv->sw_hitlist = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_set_no_show_all (self->priv->sw_hitlist, TRUE); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (self->priv->sw_hitlist), GTK_SHADOW_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->priv->sw_hitlist), + priv->sw_hitlist = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_no_show_all (priv->sw_hitlist, TRUE); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw_hitlist), GTK_SHADOW_IN); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw_hitlist), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); cell = gtk_cell_renderer_text_new (); @@ -506,77 +559,133 @@ "ellipsize", PANGO_ELLIPSIZE_END, NULL); gtk_tree_view_insert_column_with_data_func ( - GTK_TREE_VIEW (self->priv->hitlist), + GTK_TREE_VIEW (priv->hitlist), -1, NULL, cell, search_cell_data_func, - self, + sidebar, NULL); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (self->priv->hitlist), FALSE); - gtk_tree_view_set_search_column (GTK_TREE_VIEW (self->priv->hitlist), DH_KEYWORD_MODEL_COL_NAME); - g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (self->priv->hitlist)), + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->hitlist), FALSE); + gtk_tree_view_set_search_column (GTK_TREE_VIEW (priv->hitlist), DH_KEYWORD_MODEL_COL_NAME); + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->hitlist)), "changed", G_CALLBACK (sidebar_selection_changed_cb), - self); - gtk_widget_show (self->priv->hitlist); - gtk_container_add (GTK_CONTAINER (self->priv->sw_hitlist), self->priv->hitlist); - gtk_box_pack_start (GTK_BOX (self), self->priv->sw_hitlist, TRUE, TRUE, 0); + sidebar); + gtk_widget_show (priv->hitlist); + gtk_container_add (GTK_CONTAINER (priv->sw_hitlist), priv->hitlist); + gtk_box_pack_start (GTK_BOX (sidebar), priv->sw_hitlist, TRUE, TRUE, 0); /* Setup the book tree */ - self->priv->sw_book_tree = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (self->priv->sw_book_tree); - gtk_widget_set_no_show_all (self->priv->sw_book_tree, TRUE); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (self->priv->sw_book_tree), + priv->sw_book_tree = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (priv->sw_book_tree); + gtk_widget_set_no_show_all (priv->sw_book_tree, TRUE); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->sw_book_tree), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (self->priv->sw_book_tree), + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->sw_book_tree), GTK_SHADOW_IN); - gtk_container_set_border_width (GTK_CONTAINER (self->priv->sw_book_tree), 2); - self->priv->book_tree = dh_book_tree_new (self->priv->book_manager); - gtk_widget_show (self->priv->book_tree); - g_signal_connect (self->priv->book_tree, - "link-selected", - G_CALLBACK (sidebar_book_tree_link_selected_cb), - self); - gtk_container_add (GTK_CONTAINER (self->priv->sw_book_tree), self->priv->book_tree); - gtk_box_pack_end (GTK_BOX (self), self->priv->sw_book_tree, TRUE, TRUE, 0); - - sidebar_completion_populate (self); - - dh_keyword_model_set_words (self->priv->model, self->priv->book_manager); - - gtk_widget_show_all (GTK_WIDGET (self)); + gtk_container_set_border_width (GTK_CONTAINER (priv->sw_book_tree), 2); - return GTK_WIDGET (self); + gtk_widget_show_all (GTK_WIDGET (sidebar)); } static void -sidebar_finalize (GObject *object) +dh_sidebar_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { - DhSidebar *self = DH_SIDEBAR (object); + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (DH_SIDEBAR (object)); - g_completion_free (self->priv->completion); - g_object_unref (self->priv->book_manager); + switch (prop_id) { + case PROP_BOOK_MANAGER: + g_value_set_object (value, priv->book_manager); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} - G_OBJECT_CLASS (dh_sidebar_parent_class)->finalize (object); +static void +dh_sidebar_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (DH_SIDEBAR (object)); + + switch (prop_id) { + case PROP_BOOK_MANAGER: + g_return_if_fail (priv->book_manager == NULL); + priv->book_manager = g_value_dup_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void -dh_sidebar_init (DhSidebar *self) +dh_sidebar_constructed (GObject *object) { - self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, - DH_TYPE_SIDEBAR, - DhSidebarPrivate); + DhSidebar *sidebar = DH_SIDEBAR (object); + DhSidebarPrivate *priv = dh_sidebar_get_instance_private (sidebar); + + /* Setup book manager */ + g_signal_connect (priv->book_manager, + "book-created", + G_CALLBACK (sidebar_book_created_or_enabled_cb), + sidebar); + g_signal_connect (priv->book_manager, + "book-deleted", + G_CALLBACK (sidebar_book_deleted_or_disabled_cb), + sidebar); + g_signal_connect (priv->book_manager, + "book-enabled", + G_CALLBACK (sidebar_book_created_or_enabled_cb), + sidebar); + g_signal_connect (priv->book_manager, + "book-disabled", + G_CALLBACK (sidebar_book_deleted_or_disabled_cb), + sidebar); + + priv->book_tree = dh_book_tree_new (priv->book_manager); + gtk_widget_show (priv->book_tree); + g_signal_connect (priv->book_tree, + "link-selected", + G_CALLBACK (sidebar_book_tree_link_selected_cb), + sidebar); + gtk_container_add (GTK_CONTAINER (priv->sw_book_tree), priv->book_tree); + gtk_box_pack_end (GTK_BOX (sidebar), priv->sw_book_tree, TRUE, TRUE, 0); + + sidebar_completion_populate (sidebar); + + dh_keyword_model_set_words (priv->model, priv->book_manager); + + G_OBJECT_CLASS (dh_sidebar_parent_class)->constructed (object); } static void dh_sidebar_class_init (DhSidebarClass *klass) { - GObjectClass *object_class = (GObjectClass *) klass; + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->finalize = sidebar_finalize; - g_type_class_add_private (klass, sizeof (DhSidebarPrivate)); + object_class->finalize = dh_sidebar_finalize; + object_class->dispose = dh_sidebar_dispose; + object_class->get_property = dh_sidebar_get_property; + object_class->set_property = dh_sidebar_set_property; + object_class->constructed = dh_sidebar_constructed; + + g_object_class_install_property (object_class, + PROP_BOOK_MANAGER, + g_param_spec_object ("book-manager", + "Book Manager", + "The book maanger", + DH_TYPE_BOOK_MANAGER, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); signals[LINK_SELECTED] = g_signal_new ("link_selected", diff -Nru devhelp-3.8.2/src/dh-sidebar.h devhelp-3.10.2/src/dh-sidebar.h --- devhelp-3.8.2/src/dh-sidebar.h 2013-02-05 20:50:27.000000000 +0000 +++ devhelp-3.10.2/src/dh-sidebar.h 2013-08-20 08:10:58.000000000 +0000 @@ -37,15 +37,13 @@ typedef struct _DhSidebar DhSidebar; typedef struct _DhSidebarClass DhSidebarClass; -typedef struct _DhSidebarPrivate DhSidebarPrivate; struct _DhSidebar { - GtkVBox parent_instance; - DhSidebarPrivate *priv; + GtkBox parent_instance; }; struct _DhSidebarClass { - GtkVBoxClass parent_class; + GtkBoxClass parent_class; /* Signals */ void (*link_selected) (DhSidebar *search, diff -Nru devhelp-3.8.2/src/dh-util.c devhelp-3.10.2/src/dh-util.c --- devhelp-3.8.2/src/dh-util.c 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/dh-util.c 2013-05-15 11:10:50.000000000 +0000 @@ -240,7 +240,6 @@ return uri; } -#ifdef HAVE_WEBKIT2 static gdouble get_screen_dpi (GdkScreen *screen) { @@ -256,25 +255,20 @@ return dp / di; } -#endif static guint convert_font_size_to_pixels (GtkWidget *widget, gdouble font_size) { -#ifdef HAVE_WEBKIT2 - /* WebKit2 uses font sizes in pixels */ GdkScreen *screen; gdouble dpi; + /* WebKit2 uses font sizes in pixels */ screen = gtk_widget_has_screen (widget) ? gtk_widget_get_screen (widget) : gdk_screen_get_default (); dpi = screen ? get_screen_dpi (screen) : 96; return font_size / 72.0 * dpi; -#else - return font_size; -#endif } /* set the given fonts on the given view */ @@ -294,9 +288,7 @@ /* set the fonts */ g_object_set (webkit_web_view_get_settings (view), -#ifdef HAVE_WEBKIT2 "zoom-text-only", TRUE, -#endif "monospace-font-family", font_name_fixed, "default-monospace-font-size", font_size_fixed_px, "serif-font-family", font_name_variable, diff -Nru devhelp-3.8.2/src/dh-util.h devhelp-3.10.2/src/dh-util.h --- devhelp-3.8.2/src/dh-util.h 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/dh-util.h 2013-05-15 11:10:50.000000000 +0000 @@ -24,11 +24,7 @@ #include #include -#ifdef HAVE_WEBKIT2 #include -#else -#include -#endif #include "dh-link.h" G_BEGIN_DECLS diff -Nru devhelp-3.8.2/src/dh-window.c devhelp-3.10.2/src/dh-window.c --- devhelp-3.8.2/src/dh-window.c 2013-05-15 11:05:20.000000000 +0000 +++ devhelp-3.10.2/src/dh-window.c 2013-11-11 08:32:55.000000000 +0000 @@ -26,13 +26,7 @@ #include #include #include -#ifdef HAVE_WEBKIT2 #include -#else -#include -#endif - -#include #include "dh-book-manager.h" #include "dh-book.h" @@ -41,27 +35,33 @@ #include "dh-util.h" #include "dh-enum-types.h" #include "dh-settings.h" -#include "eggfindbar.h" +#include "gedit-close-button.h" #define TAB_WIDTH_N_CHARS 15 -struct _DhWindowPriv { - GtkWidget *main_box; +typedef struct { + GMenuModel *gear_app_menu; GtkWidget *hpaned; GtkWidget *sidebar; GtkWidget *notebook; GtkWidget *header_bar; - - GtkWidget *vbox; - GtkWidget *findbar; - - GtkBuilder *builder; + GtkWidget *back_button; + GtkImage *back_button_image; + GtkWidget *forward_button; + GtkImage *forward_button_image; + GtkMenuButton *gear_menu_button; + GtkWidget *grid_sidebar; + GtkWidget *grid_documents; + GtkWidget *search_bar; + GtkWidget *search_entry; + GtkWidget *go_up_button; + GtkWidget *go_down_button; DhLink *selected_search_link; guint find_source_id; DhSettings *settings; guint fonts_changed_id; -}; +} DhWindowPrivate; enum { OPEN_LINK, @@ -113,11 +113,7 @@ guint key, GdkModifierType mod, DhWindow *window); -static void window_find_search_changed_cb (GObject *object, - GParamSpec *arg1, - DhWindow *window); -static void window_find_case_changed_cb (GObject *object, - GParamSpec *arg1, +static void window_find_search_changed_cb (GtkEntry *entry, DhWindow *window); static void window_find_next_cb (GtkWidget *widget, DhWindow *window); @@ -125,7 +121,10 @@ static void window_find_previous_cb (GtkWidget *widget, DhWindow *window); static void findbar_find_previous (DhWindow *window); -static void window_findbar_close_cb (GtkWidget *widget, +static void on_search_mode_enabled_changed (GtkSearchBar *search_bar, + GParamSpec *pspec, + DhWindow *window); +static void on_search_entry_activated (GtkEntry *entry, DhWindow *window); static GtkWidget * window_new_tab_label (DhWindow *window, const gchar *label, @@ -145,10 +144,7 @@ gint page_num); static gboolean do_search (DhWindow *window); -G_DEFINE_TYPE (DhWindow, dh_window, GTK_TYPE_APPLICATION_WINDOW); - -#define GET_PRIVATE(instance) G_TYPE_INSTANCE_GET_PRIVATE \ - (instance, DH_TYPE_WINDOW, DhWindowPriv); +G_DEFINE_TYPE_WITH_PRIVATE (DhWindow, dh_window, GTK_TYPE_APPLICATION_WINDOW); static void new_tab_cb (GSimpleAction *action, @@ -167,25 +163,21 @@ { DhWindow *window = user_data; WebKitWebView *web_view = window_get_active_web_view (window); -#ifdef HAVE_WEBKIT2 WebKitPrintOperation *print_operation; print_operation = webkit_print_operation_new (web_view); webkit_print_operation_run_dialog (print_operation, GTK_WINDOW (window)); g_object_unref (print_operation); -#else - webkit_web_view_execute_script (web_view, "print();"); -#endif } static void window_close_tab (DhWindow *window, gint page_num) { - DhWindowPriv *priv; + DhWindowPrivate *priv; gint pages; - priv = window->priv; + priv = dh_window_get_instance_private (window); gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), page_num); @@ -205,9 +197,12 @@ gpointer user_data) { DhWindow *window = user_data; + DhWindowPrivate *priv; gint page_num; - page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (window->priv->notebook)); + priv = dh_window_get_instance_private (window); + + page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); window_close_tab (window, page_num); } @@ -218,9 +213,9 @@ { DhWindow *window = user_data; GtkWidget *widget; - DhWindowPriv *priv; + DhWindowPrivate *priv; - priv = window->priv; + priv = dh_window_get_instance_private (window); widget = gtk_window_get_focus (GTK_WINDOW (window)); @@ -237,11 +232,7 @@ WebKitWebView *web_view; web_view = window_get_active_web_view (window); -#ifdef HAVE_WEBKIT2 webkit_web_view_execute_editing_command (web_view, WEBKIT_EDITING_COMMAND_COPY); -#else - webkit_web_view_copy_clipboard (web_view); -#endif } } @@ -251,24 +242,17 @@ gpointer user_data) { DhWindow *window = user_data; - DhWindowPriv *priv; -#ifndef HAVE_WEBKIT2 - WebKitWebView *web_view; -#endif - priv = window->priv; + DhWindowPrivate *priv; - gtk_widget_show (priv->findbar); - gtk_widget_grab_focus (priv->findbar); + priv = dh_window_get_instance_private (window); + + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), TRUE); + gtk_widget_grab_focus (priv->search_entry); -#ifdef HAVE_WEBKIT2 /* The behaviour for WebKit1 is to re-enable highlighting without starting a new search. WebKit2 API does not allow that without invoking a new search. */ do_search (window); -#else - web_view = window_get_active_web_view (window); - webkit_web_view_set_highlight_text_matches (web_view, TRUE); -#endif /* HAVE_WEBKIT2 */ } static void @@ -391,8 +375,11 @@ gpointer user_data) { DhWindow *window = user_data; + DhWindowPrivate *priv; - dh_sidebar_set_search_focus (DH_SIDEBAR (window->priv->sidebar)); + priv = dh_window_get_instance_private (window); + + dh_sidebar_set_search_focus (DH_SIDEBAR (priv->sidebar)); } static void @@ -401,11 +388,11 @@ gpointer user_data) { DhWindow *window = user_data; - DhWindowPriv *priv; + DhWindowPrivate *priv; WebKitWebView *web_view; GtkWidget *frame; - priv = window->priv; + priv = dh_window_get_instance_private (window); frame = gtk_notebook_get_nth_page ( GTK_NOTEBOOK (priv->notebook), @@ -421,11 +408,11 @@ gpointer user_data) { DhWindow *window = user_data; - DhWindowPriv *priv; + DhWindowPrivate *priv; WebKitWebView *web_view; GtkWidget *frame; - priv = window->priv; + priv = dh_window_get_instance_private (window); frame = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook))); @@ -475,6 +462,7 @@ { "zoom-out", zoom_out_cb, NULL, NULL, NULL }, { "zoom-default", zoom_default_cb, NULL, NULL, NULL }, { "focus-search", focus_search_cb, NULL, NULL, NULL }, + { "focus-search-alt", focus_search_cb, NULL, NULL, NULL }, /* go */ { "go-back", go_back_cb, NULL, "false", NULL }, { "go-forward", go_forward_cb, NULL, "false", NULL }, @@ -489,9 +477,12 @@ gpointer user_data) { DhWindow *window = DH_WINDOW (user_data); - DhWindowPriv *priv = window->priv; + DhWindowPrivate *priv; gint i; WebKitWebView *view; + + priv = dh_window_get_instance_private (window); + /* change font for all pages */ for (i = 0; i < gtk_notebook_get_n_pages (GTK_NOTEBOOK(priv->notebook)); i++) { GtkWidget *page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), i); @@ -506,10 +497,11 @@ gpointer user_data) { DhWindow *dhwindow; - DhWindowPriv *priv; + DhWindowPrivate *priv; dhwindow = DH_WINDOW (user_data); - priv = GET_PRIVATE (dhwindow); + priv = dh_window_get_instance_private (dhwindow); + dh_util_window_settings_save ( GTK_WINDOW (window), dh_settings_peek_window_settings (priv->settings), TRUE); @@ -519,19 +511,20 @@ static void dh_window_init (DhWindow *window) { - DhWindowPriv *priv; + DhWindowPrivate *priv; GtkAccelGroup *accel_group; GClosure *closure; gint i; - GError *error = NULL; - priv = GET_PRIVATE (window); - window->priv = priv; - - gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE); + gtk_widget_init_template (GTK_WIDGET (window)); + priv = dh_window_get_instance_private (window); priv->selected_search_link = NULL; + if (!_dh_app_has_app_menu (DH_APP (g_application_get_default ()))) { + gtk_menu_button_set_menu_model (priv->gear_menu_button, priv->gear_app_menu); + } + /* handle settings */ priv->settings = dh_settings_get (); priv->fonts_changed_id = g_signal_connect (priv->settings, @@ -539,18 +532,6 @@ G_CALLBACK (settings_fonts_changed_cb), window); - /* Setup builder */ - priv->builder = gtk_builder_new (); - if (!gtk_builder_add_from_resource (priv->builder, "/org/gnome/devhelp/devhelp.ui", &error)) { - g_error ("Cannot add resource to builder: %s", error ? error->message : "unknown error"); - g_clear_error (&error); - } - - priv->main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_widget_show (priv->main_box); - - gtk_container_add (GTK_CONTAINER (window), priv->main_box); - g_signal_connect (window, "open-link", G_CALLBACK (window_open_link_cb), @@ -575,18 +556,20 @@ } static void -dispose (GObject *object) +dh_window_dispose (GObject *object) { - DhWindow *self = DH_WINDOW (object); + DhWindow *window = DH_WINDOW (object); + DhWindowPrivate *priv; + + priv = dh_window_get_instance_private (window); - if (self->priv->fonts_changed_id) { - if (self->priv->settings && g_signal_handler_is_connected (self->priv->settings, self->priv->fonts_changed_id)) - g_signal_handler_disconnect (self->priv->settings, self->priv->fonts_changed_id); - self->priv->fonts_changed_id = 0; + if (priv->fonts_changed_id) { + if (priv->settings && g_signal_handler_is_connected (priv->settings, priv->fonts_changed_id)) + g_signal_handler_disconnect (priv->settings, priv->fonts_changed_id); + priv->fonts_changed_id = 0; } - g_clear_object (&self->priv->settings); - g_clear_object (&self->priv->builder); + g_clear_object (&priv->settings); /* Chain up to the parent class */ G_OBJECT_CLASS (dh_window_parent_class)->dispose (object); @@ -596,8 +579,9 @@ dh_window_class_init (DhWindowClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (DhWindowPriv)); - object_class->dispose = dispose; + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + object_class->dispose = dh_window_dispose; signals[OPEN_LINK] = g_signal_new ("open-link", @@ -611,15 +595,24 @@ G_TYPE_STRING, DH_TYPE_OPEN_LINK_FLAGS); - gtk_rc_parse_string ("style \"devhelp-tab-close-button-style\"\n" - "{\n" - "GtkWidget::focus-padding = 0\n" - "GtkWidget::focus-line-width = 0\n" - "xthickness = 0\n" - "ythickness = 0\n" - "}\n" - "widget \"*.devhelp-tab-close-button\" " - "style \"devhelp-tab-close-button-style\""); + /* Bind class to template */ + gtk_widget_class_set_template_from_resource (widget_class, + "/org/gnome/devhelp/dh-window.ui"); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, gear_app_menu); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, header_bar); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, back_button); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, back_button_image); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, forward_button); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, forward_button_image); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, gear_menu_button); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, hpaned); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, grid_sidebar); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, grid_documents); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, notebook); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_bar); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, search_entry); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, go_up_button); + gtk_widget_class_bind_template_child_private (widget_class, DhWindow, go_down_button); } static void @@ -628,10 +621,10 @@ guint new_page_num, DhWindow *window) { - DhWindowPriv *priv; - GtkWidget *new_page; + DhWindowPrivate *priv; + GtkWidget *new_page; - priv = window->priv; + priv = dh_window_get_instance_private (window); new_page = gtk_notebook_get_nth_page (notebook, new_page_num); if (new_page) { @@ -669,76 +662,36 @@ static void window_populate (DhWindow *window) { - DhWindowPriv *priv; + DhWindowPrivate *priv; DhBookManager *book_manager; - GtkWidget *back; - GtkWidget *forward; - GtkWidget *box; - GtkWidget *menu_button; - GObject *menu; + const char *prev_icon, *next_icon; - priv = window->priv; + priv = dh_window_get_instance_private (window); book_manager = dh_app_peek_book_manager (DH_APP (gtk_window_get_application (GTK_WINDOW (window)))); - // TODO: port to GtkHeaderBar in the future - priv->header_bar = gd_header_bar_new (); - - back = gd_header_simple_button_new (); - gd_header_button_set_label (GD_HEADER_BUTTON (back), - _("Back")); - gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (back), - "go-previous-symbolic"); - gtk_actionable_set_action_name (GTK_ACTIONABLE (back), "win.go-back"); - - forward = gd_header_simple_button_new (); - gd_header_button_set_label (GD_HEADER_BUTTON (forward), - _("Forward")); - gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (forward), - "go-next-symbolic"); - gtk_actionable_set_action_name (GTK_ACTIONABLE (forward), "win.go-forward"); - - box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_style_context_add_class (gtk_widget_get_style_context (box), "linked"); - gtk_box_pack_start (GTK_BOX (box), back, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (box), forward, FALSE, FALSE, 0); - gd_header_bar_pack_start (GD_HEADER_BAR (priv->header_bar), box); - - menu_button = gd_header_menu_button_new (); - gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (menu_button), - "emblem-system-symbolic"); - gtk_actionable_set_action_name (GTK_ACTIONABLE (menu_button), "win.gear-menu"); - - gd_header_bar_pack_end (GD_HEADER_BAR (priv->header_bar), menu_button); - - menu = gtk_builder_get_object (priv->builder, "window-menu"); - gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button), G_MENU_MODEL (menu)); - - /* Add toolbar to main box */ - gtk_box_pack_start (GTK_BOX (priv->main_box), priv->header_bar, - FALSE, FALSE, 0); + if (gtk_widget_get_direction (GTK_WIDGET (window)) == GTK_TEXT_DIR_RTL) { + prev_icon = "go-previous-rtl-symbolic"; + next_icon = "go-next-rtl-symbolic"; + } else { + prev_icon = "go-previous-symbolic"; + next_icon = "go-next-symbolic"; + } - priv->hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (priv->main_box), priv->hpaned, TRUE, TRUE, 0); + gtk_image_set_from_icon_name (priv->back_button_image, prev_icon, GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name (priv->forward_button_image, next_icon, GTK_ICON_SIZE_MENU); /* Sidebar */ priv->sidebar = dh_sidebar_new (book_manager); - gtk_paned_add1 (GTK_PANED (priv->hpaned), priv->sidebar); + gtk_widget_set_vexpand (priv->sidebar, TRUE); + gtk_widget_set_hexpand (priv->sidebar, TRUE); + gtk_widget_show (priv->sidebar); + gtk_container_add (GTK_CONTAINER (priv->grid_sidebar), priv->sidebar); g_signal_connect (priv->sidebar, "link-selected", G_CALLBACK (window_search_link_selected_cb), window); - /* Document view */ - priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_paned_add2 (GTK_PANED (priv->hpaned), priv->vbox); - /* HTML tabs notebook. */ - priv->notebook = gtk_notebook_new (); - gtk_container_set_border_width (GTK_CONTAINER (priv->notebook), 0); - gtk_notebook_set_show_border (GTK_NOTEBOOK (priv->notebook), FALSE); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE); - gtk_box_pack_start (GTK_BOX (priv->vbox), priv->notebook, TRUE, TRUE, 0); - g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (window_web_view_switch_page_cb), @@ -749,32 +702,28 @@ window); /* Create findbar */ - priv->findbar = egg_find_bar_new (); - gtk_widget_set_no_show_all (priv->findbar, TRUE); - gtk_box_pack_start (GTK_BOX (priv->vbox), priv->findbar, FALSE, FALSE, 0); - - g_signal_connect (priv->findbar, - "notify::search-string", - G_CALLBACK(window_find_search_changed_cb), + gtk_search_bar_connect_entry (GTK_SEARCH_BAR (priv->search_bar), + GTK_ENTRY (priv->search_entry)); + g_signal_connect (priv->search_bar, + "notify::search-mode-enabled", + G_CALLBACK (on_search_mode_enabled_changed), + window); + g_signal_connect (priv->search_entry, + "changed", + G_CALLBACK (window_find_search_changed_cb), window); - g_signal_connect (priv->findbar, - "notify::case-sensitive", - G_CALLBACK (window_find_case_changed_cb), + g_signal_connect (priv->search_entry, + "activate", + G_CALLBACK (on_search_entry_activated), window); - g_signal_connect (priv->findbar, - "previous", + g_signal_connect (priv->go_up_button, + "clicked", G_CALLBACK (window_find_previous_cb), window); - g_signal_connect (priv->findbar, - "next", + g_signal_connect (priv->go_down_button, + "clicked", G_CALLBACK (window_find_next_cb), window); - g_signal_connect (priv->findbar, - "close", - G_CALLBACK (window_findbar_close_cb), - window); - - gtk_widget_show_all (priv->hpaned); /* Focus search in sidebar by default */ dh_sidebar_set_search_focus (DH_SIDEBAR (priv->sidebar)); @@ -828,48 +777,26 @@ return local_uri; } -#ifdef HAVE_WEBKIT2 static gboolean window_web_view_decide_policy_cb (WebKitWebView *web_view, WebKitPolicyDecision *policy_decision, WebKitPolicyDecisionType type, DhWindow *window) -#else -static gboolean -window_web_view_navigation_policy_decision_requested (WebKitWebView *web_view, - WebKitWebFrame *frame, - WebKitNetworkRequest *request, - WebKitWebNavigationAction *navigation_action, - WebKitWebPolicyDecision *policy_decision, - DhWindow *window) -#endif { const char *uri; -#ifdef HAVE_WEBKIT2 WebKitNavigationPolicyDecision *navigation_decision; -#endif - -#ifdef HAVE_WEBKIT2 if (type != WEBKIT_POLICY_DECISION_TYPE_NAVIGATION_ACTION) return FALSE; navigation_decision = WEBKIT_NAVIGATION_POLICY_DECISION (policy_decision); uri = webkit_uri_request_get_uri (webkit_navigation_policy_decision_get_request (navigation_decision)); -#else - uri = webkit_network_request_get_uri (request); -#endif /* make sure to hide the info bar on page change */ gtk_widget_hide (window_get_active_info_bar (window)); -#ifdef HAVE_WEBKIT2 if (webkit_navigation_policy_decision_get_mouse_button (navigation_decision) == 2) { /* middle click */ webkit_policy_decision_ignore (policy_decision); -#else - if (webkit_web_navigation_action_get_button (navigation_action) == 2) { /* middle click */ - webkit_web_policy_decision_ignore (policy_decision); -#endif g_signal_emit (window, signals[OPEN_LINK], 0, uri, DH_OPEN_LINK_NEW_TAB); return TRUE; } @@ -881,11 +808,7 @@ if (strncmp (uri, "http://library.gnome.org/devel/", 31) == 0) { gchar *local_uri = find_library_equivalent (window, uri); if (local_uri) { -#ifdef HAVE_WEBKIT2 webkit_policy_decision_ignore (policy_decision); -#else - webkit_web_policy_decision_ignore (policy_decision); -#endif _dh_window_display_uri (window, local_uri); g_free (local_uri); return TRUE; @@ -893,39 +816,23 @@ } if (strncmp (uri, "file://", 7) != 0) { -#ifdef HAVE_WEBKIT2 webkit_policy_decision_ignore (policy_decision); -#else - webkit_web_policy_decision_ignore (policy_decision); -#endif gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); return TRUE; } -#ifndef HAVE_WEBKIT2 - /* We already do this in load_changed_cb() for webkit2 */ - if (web_view == window_get_active_web_view (window)) { - DhWindowPriv *priv; - - priv = window->priv; - dh_sidebar_select_uri (DH_SIDEBAR (priv->sidebar), uri); - window_check_history (window, web_view); - } -#endif - return FALSE; } -#ifdef HAVE_WEBKIT2 static void window_web_view_load_changed_cb (WebKitWebView *web_view, WebKitLoadEvent load_event, DhWindow *window) { const gchar *uri; - DhWindowPriv *priv; + DhWindowPrivate *priv; - priv = window->priv; + priv = dh_window_get_instance_private (window); if (load_event != WEBKIT_LOAD_COMMITTED) return; @@ -934,23 +841,13 @@ dh_sidebar_select_uri (DH_SIDEBAR (priv->sidebar), uri); window_check_history (window, web_view); } -#endif -#ifdef HAVE_WEBKIT2 static gboolean window_web_view_load_failed_cb (WebKitWebView *web_view, WebKitLoadEvent load_event, const gchar *uri, GError *web_error, DhWindow *window) -#else -static gboolean -window_web_view_load_error_cb (WebKitWebView *web_view, - WebKitWebFrame *frame, - gchar *uri, - GError *web_error, - DhWindow *window) -#endif { GtkWidget *info_bar; GtkWidget *content_area; @@ -988,12 +885,11 @@ DhLink *link, DhWindow *window) { - DhWindowPriv *priv; + DhWindowPrivate *priv; WebKitWebView *view; gchar *uri; - priv = window->priv; - + priv = dh_window_get_instance_private (window); priv->selected_search_link = link; view = window_get_active_web_view (window); @@ -1050,47 +946,32 @@ static gboolean do_search (DhWindow *window) { - DhWindowPriv *priv = window->priv; -#ifdef HAVE_WEBKIT2 + DhWindowPrivate *priv; WebKitFindController *find_controller; guint find_options = WEBKIT_FIND_OPTIONS_WRAP_AROUND; const gchar *search_text; + priv = dh_window_get_instance_private (window); + find_controller = webkit_web_view_get_find_controller (window_get_active_web_view (window)); - if (!egg_find_bar_get_case_sensitive (EGG_FIND_BAR (priv->findbar))) - find_options |= WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE; + /* FIXME: do we want an option to set this? */ + find_options |= WEBKIT_FIND_OPTIONS_CASE_INSENSITIVE; - search_text = egg_find_bar_get_search_string (EGG_FIND_BAR (priv->findbar)); + search_text = gtk_entry_get_text (GTK_ENTRY (priv->search_entry)); webkit_find_controller_search (find_controller, search_text, find_options, G_MAXUINT); -#else - WebKitWebView *web_view; - - web_view = window_get_active_web_view (window); - - webkit_web_view_unmark_text_matches (web_view); - webkit_web_view_mark_text_matches ( - web_view, - egg_find_bar_get_search_string (EGG_FIND_BAR (priv->findbar)), - egg_find_bar_get_case_sensitive (EGG_FIND_BAR (priv->findbar)), 0); - webkit_web_view_set_highlight_text_matches (web_view, TRUE); - - webkit_web_view_search_text ( - web_view, egg_find_bar_get_search_string (EGG_FIND_BAR (priv->findbar)), - egg_find_bar_get_case_sensitive (EGG_FIND_BAR (priv->findbar)), - TRUE, TRUE); -#endif /* HAVE_WEBKIT2 */ priv->find_source_id = 0; - return FALSE; + return FALSE; } static void -window_find_search_changed_cb (GObject *object, - GParamSpec *pspec, - DhWindow *window) +window_find_search_changed_cb (GtkEntry *entry, + DhWindow *window) { - DhWindowPriv *priv = window->priv; + DhWindowPrivate *priv; + + priv = dh_window_get_instance_private (window); if (priv->find_source_id != 0) { g_source_remove (priv->find_source_id); @@ -1101,51 +982,20 @@ } static void -window_find_case_changed_cb (GObject *object, - GParamSpec *pspec, - DhWindow *window) -{ -#ifdef HAVE_WEBKIT2 - do_search (window); -#else - DhWindowPriv *priv = window->priv;; - WebKitWebView *view; - const gchar *string; - gboolean case_sensitive; - - view = window_get_active_web_view (window); - - string = egg_find_bar_get_search_string (EGG_FIND_BAR (priv->findbar)); - case_sensitive = egg_find_bar_get_case_sensitive (EGG_FIND_BAR (priv->findbar)); - - webkit_web_view_unmark_text_matches (view); - webkit_web_view_mark_text_matches (view, string, case_sensitive, 0); - webkit_web_view_set_highlight_text_matches (view, TRUE); -#endif -} - -static void findbar_find_next (DhWindow *window) { - DhWindowPriv *priv = window->priv; + DhWindowPrivate *priv; WebKitWebView *view; -#ifdef HAVE_WEBKIT2 WebKitFindController *find_controller; -#else - const gchar *string; - gboolean case_sensitive; -#endif + + priv = dh_window_get_instance_private (window); + view = window_get_active_web_view (window); - gtk_widget_show (priv->findbar); -#ifdef HAVE_WEBKIT2 + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), TRUE); + find_controller = webkit_web_view_get_find_controller (view); - webkit_find_controller_search_next(find_controller); -#else - string = egg_find_bar_get_search_string (EGG_FIND_BAR (priv->findbar)); - case_sensitive = egg_find_bar_get_case_sensitive (EGG_FIND_BAR (priv->findbar)); - webkit_web_view_search_text (view, string, case_sensitive, TRUE, TRUE); -#endif + webkit_find_controller_search_next (find_controller); } static void @@ -1158,26 +1008,18 @@ static void findbar_find_previous (DhWindow *window) { - DhWindowPriv *priv = window->priv; + DhWindowPrivate *priv; WebKitWebView *view; -#ifdef HAVE_WEBKIT2 WebKitFindController *find_controller; -#else - const gchar *string; - gboolean case_sensitive; -#endif + + priv = dh_window_get_instance_private (window); + view = window_get_active_web_view (window); - gtk_widget_show (priv->findbar); + gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (priv->search_bar), TRUE); -#ifdef HAVE_WEBKIT2 find_controller = webkit_web_view_get_find_controller (view); - webkit_find_controller_search_previous(find_controller); -#else - string = egg_find_bar_get_search_string (EGG_FIND_BAR (priv->findbar)); - case_sensitive = egg_find_bar_get_case_sensitive (EGG_FIND_BAR (priv->findbar)); - webkit_web_view_search_text (view, string, case_sensitive, FALSE, TRUE); -#endif + webkit_find_controller_search_previous (find_controller); } static void @@ -1188,23 +1030,26 @@ } static void -window_findbar_close_cb (GtkWidget *widget, - DhWindow *window) +on_search_mode_enabled_changed (GtkSearchBar *search_bar, + GParamSpec *pspec, + DhWindow *window) { - DhWindowPriv *priv = window->priv; - WebKitWebView *view; -#ifdef HAVE_WEBKIT2 - WebKitFindController *find_controller; -#endif - view = window_get_active_web_view (window); + if (!gtk_search_bar_get_search_mode (search_bar)) { + WebKitWebView *view; + WebKitFindController *find_controller; - gtk_widget_hide (priv->findbar); -#ifdef HAVE_WEBKIT2 - find_controller = webkit_web_view_get_find_controller (view); - webkit_find_controller_search_finish (find_controller); -#else - webkit_web_view_set_highlight_text_matches (view, FALSE); -#endif + view = window_get_active_web_view (window); + + find_controller = webkit_web_view_get_find_controller (view); + webkit_find_controller_search_finish (find_controller); + } +} + +static void +on_search_entry_activated (GtkEntry *entry, + DhWindow *window) +{ + findbar_find_next (window); } #if 0 @@ -1224,10 +1069,10 @@ GdkModifierType mod, DhWindow *window) { - DhWindowPriv *priv; + DhWindowPrivate *priv; gint i, num; - priv = window->priv; + priv = dh_window_get_instance_private (window); num = -1; for (i = 0; i < G_N_ELEMENTS (tab_accel_keys); i++) { @@ -1248,7 +1093,7 @@ const gchar *location, gboolean switch_focus) { - DhWindowPriv *priv; + DhWindowPrivate *priv; GtkWidget *view; GtkWidget *vbox; GtkWidget *label; @@ -1256,11 +1101,8 @@ GtkWidget *info_bar; gchar *font_fixed = NULL; gchar *font_variable = NULL; -#ifndef HAVE_WEBKIT2 - GtkWidget *scrolled_window; -#endif - priv = window->priv; + priv = dh_window_get_instance_private (window); /* Prepare the web view */ view = webkit_web_view_new (); @@ -1301,18 +1143,7 @@ g_object_set_data (G_OBJECT (vbox), "info_bar", info_bar); gtk_box_pack_start (GTK_BOX(vbox), info_bar, FALSE, TRUE, 0); - -#ifdef HAVE_WEBKIT2 gtk_box_pack_start (GTK_BOX(vbox), view, TRUE, TRUE, 0); -#else - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, - GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (scrolled_window), view); - gtk_widget_show (scrolled_window); - gtk_box_pack_start (GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0); -#endif label = window_new_tab_label (window, _("Empty Page"), vbox); gtk_widget_show_all (label); @@ -1323,32 +1154,21 @@ g_signal_connect (view, "button-press-event", G_CALLBACK (window_web_view_button_press_event_cb), window); -#ifdef HAVE_WEBKIT2 g_signal_connect (view, "decide-policy", G_CALLBACK (window_web_view_decide_policy_cb), window); -#else - g_signal_connect (view, "navigation-policy-decision-requested", - G_CALLBACK (window_web_view_navigation_policy_decision_requested), - window); -#endif -#ifdef HAVE_WEBKIT2 g_signal_connect (view, "load-changed", G_CALLBACK (window_web_view_load_changed_cb), window); g_signal_connect (view, "load-failed", G_CALLBACK (window_web_view_load_failed_cb), window); -#else - g_signal_connect (view, "load-error", - G_CALLBACK (window_web_view_load_error_cb), - window); -#endif num = gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), vbox, NULL); gtk_container_child_set (GTK_CONTAINER (priv->notebook), vbox, "tab-expand", TRUE, + "reorderable", TRUE, NULL); gtk_notebook_set_tab_label (GTK_NOTEBOOK (priv->notebook), vbox, label); @@ -1376,14 +1196,17 @@ close_button_clicked_cb (GtkButton *button, DhWindow *window) { + DhWindowPrivate *priv; GtkWidget *parent_tab; gint pages; gint i; + priv = dh_window_get_instance_private (window); + parent_tab = g_object_get_data (G_OBJECT (button), "parent_tab"); - pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (window->priv->notebook)); + pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); for (i=0; ipriv->notebook), i) == parent_tab) { + if (gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), i) == parent_tab) { window_close_tab (window, i); break; } @@ -1398,7 +1221,6 @@ GtkWidget *label; GtkWidget *hbox; GtkWidget *close_button; - GtkWidget *image; hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); @@ -1407,17 +1229,12 @@ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); - close_button = gtk_button_new (); - gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE); - gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE); - gtk_widget_set_name (close_button, "devhelp-tab-close-button"); + close_button = gedit_close_button_new (); g_object_set_data (G_OBJECT (close_button), "parent_tab", (gpointer) parent); - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); g_signal_connect (close_button, "clicked", G_CALLBACK (close_button_clicked_cb), window); - gtk_container_add (GTK_CONTAINER (close_button), image); gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0); @@ -1430,11 +1247,11 @@ static WebKitWebView * window_get_active_web_view (DhWindow *window) { - DhWindowPriv *priv; + DhWindowPrivate *priv; gint page_num; GtkWidget *page; - priv = window->priv; + priv = dh_window_get_instance_private (window); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); if (page_num == -1) { @@ -1449,11 +1266,11 @@ static GtkWidget * window_get_active_info_bar (DhWindow *window) { - DhWindowPriv *priv; + DhWindowPrivate *priv; gint page_num; GtkWidget *page; - priv = window->priv; + priv = dh_window_get_instance_private (window); page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); if (page_num == -1) { @@ -1470,9 +1287,9 @@ WebKitWebView *web_view, const gchar *web_view_title) { - DhWindowPriv *priv; + DhWindowPrivate *priv; - priv = window->priv; + priv = dh_window_get_instance_private (window); if (!web_view_title) web_view_title = webkit_web_view_get_title (web_view); @@ -1481,7 +1298,7 @@ web_view_title = NULL; } - gd_header_bar_set_title (GD_HEADER_BAR (priv->header_bar), + gtk_header_bar_set_title (GTK_HEADER_BAR (priv->header_bar), web_view_title); } @@ -1490,14 +1307,14 @@ WebKitWebView *web_view, const gchar *title) { - DhWindowPriv *priv; + DhWindowPrivate *priv; gint num_pages, i; GtkWidget *page; GtkWidget *hbox; GtkWidget *label; GtkWidget *page_web_view; - priv = window->priv; + priv = dh_window_get_instance_private (window); if (!title || title[0] == '\0') { title = _("Empty Page"); @@ -1527,17 +1344,13 @@ dh_window_new (DhApp *application) { DhWindow *window; - DhWindowPriv *priv; - - window = g_object_new (DH_TYPE_WINDOW, NULL); - priv = window->priv; + DhWindowPrivate *priv; - gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application)); + window = g_object_new (DH_TYPE_WINDOW, "application", application, NULL); + priv = dh_window_get_instance_private (window); window_populate (window); - gtk_window_set_icon_name (GTK_WINDOW (window), "devhelp"); - g_signal_connect (window, "configure-event", G_CALLBACK (window_configure_event_cb), window); @@ -1557,11 +1370,11 @@ dh_window_search (DhWindow *window, const gchar *str) { - DhWindowPriv *priv; + DhWindowPrivate *priv; g_return_if_fail (DH_IS_WINDOW (window)); - priv = window->priv; + priv = dh_window_get_instance_private (window); dh_sidebar_set_search_string (DH_SIDEBAR (priv->sidebar), str); } @@ -1571,13 +1384,13 @@ _dh_window_display_uri (DhWindow *window, const gchar *uri) { - DhWindowPriv *priv; + DhWindowPrivate *priv; WebKitWebView *web_view; g_return_if_fail (DH_IS_WINDOW (window)); g_return_if_fail (uri != NULL); - priv = window->priv; + priv = dh_window_get_instance_private (window); web_view = window_get_active_web_view (window); webkit_web_view_load_uri (web_view, uri); diff -Nru devhelp-3.8.2/src/dh-window.h devhelp-3.10.2/src/dh-window.h --- devhelp-3.8.2/src/dh-window.h 2013-02-01 13:07:04.000000000 +0000 +++ devhelp-3.10.2/src/dh-window.h 2013-07-29 13:53:23.000000000 +0000 @@ -37,7 +37,6 @@ typedef struct _DhWindow DhWindow; typedef struct _DhWindowClass DhWindowClass; -typedef struct _DhWindowPriv DhWindowPriv; typedef enum { @@ -47,7 +46,6 @@ struct _DhWindow { GtkApplicationWindow parent_instance; - DhWindowPriv *priv; }; struct _DhWindowClass { diff -Nru devhelp-3.8.2/src/dh-window.ui devhelp-3.10.2/src/dh-window.ui --- devhelp-3.8.2/src/dh-window.ui 1970-01-01 00:00:00.000000000 +0000 +++ devhelp-3.10.2/src/dh-window.ui 2013-11-11 08:32:55.000000000 +0000 @@ -0,0 +1,291 @@ + + + + +
+ + New _Tab + win.new-tab + <Primary>t + True + +
+
+ + _Print + win.print + <Primary>p + + + _Find + win.find + <Primary>f + +
+
+ + _Larger Text + win.zoom-in + <Primary>plus + + + S_maller Text + win.zoom-out + <Primary>minus + + + _Normal Size + win.zoom-default + <Primary>0 + +
+ + +
+ + New _Window + app.new-window + <Primary>n + + + New _Tab + win.new-tab + <Primary>t + True + +
+
+ + _Print + win.print + <Primary>p + + + _Find + win.find + <Primary>f + +
+
+ + _Larger Text + win.zoom-in + <Primary>plus + + + S_maller Text + win.zoom-out + <Primary>minus + + + _Normal Size + win.zoom-default + <Primary>0 + +
+
+ + _Preferences + app.preferences + +
+
+ + _About Devhelp + app.about + + + _Quit + app.quit + <Primary>q + +
+ + + diff -Nru devhelp-3.8.2/src/dh.gresource.xml devhelp-3.10.2/src/dh.gresource.xml --- devhelp-3.8.2/src/dh.gresource.xml 2013-02-01 12:33:19.000000000 +0000 +++ devhelp-3.10.2/src/dh.gresource.xml 2013-09-23 16:26:46.000000000 +0000 @@ -1,6 +1,9 @@ - devhelp.ui + devhelp-menu.ui + dh-assistant.ui + dh-window.ui + dh-preferences.ui - \ No newline at end of file + diff -Nru devhelp-3.8.2/src/eggfindbar.c devhelp-3.10.2/src/eggfindbar.c --- devhelp-3.8.2/src/eggfindbar.c 2013-02-01 14:26:02.000000000 +0000 +++ devhelp-3.10.2/src/eggfindbar.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,755 +0,0 @@ -/* Copyright (C) 2004 Red Hat, Inc. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the Gnome Library; see the file COPYING.LIB. If not, -write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. -*/ - -#include "config.h" - -#include - -#include -#include -#include - -#include "eggfindbar.h" - -struct _EggFindBarPrivate -{ - gchar *search_string; - - GtkToolItem *next_button; - GtkToolItem *previous_button; - GtkToolItem *status_separator; - GtkToolItem *status_item; - GtkToolItem *case_button; - - GtkWidget *find_entry; - GtkWidget *status_label; - - gulong set_focus_handler; - guint case_sensitive : 1; -}; - -#define EGG_FIND_BAR_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EGG_TYPE_FIND_BAR, EggFindBarPrivate)) - -enum { - PROP_0, - PROP_SEARCH_STRING, - PROP_CASE_SENSITIVE -}; - -static void egg_find_bar_finalize (GObject *object); -static void egg_find_bar_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void egg_find_bar_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); -static void egg_find_bar_show (GtkWidget *widget); -static void egg_find_bar_hide (GtkWidget *widget); -static void egg_find_bar_grab_focus (GtkWidget *widget); - -G_DEFINE_TYPE (EggFindBar, egg_find_bar, GTK_TYPE_TOOLBAR); - -enum - { - NEXT, - PREVIOUS, - CLOSE, - SCROLL, - LAST_SIGNAL - }; - -static guint find_bar_signals[LAST_SIGNAL] = { 0 }; - -static void -egg_find_bar_class_init (EggFindBarClass *klass) -{ - GObjectClass *object_class; - GtkWidgetClass *widget_class; - GtkBindingSet *binding_set; - - egg_find_bar_parent_class = g_type_class_peek_parent (klass); - - object_class = (GObjectClass *)klass; - widget_class = (GtkWidgetClass *)klass; - - object_class->set_property = egg_find_bar_set_property; - object_class->get_property = egg_find_bar_get_property; - - object_class->finalize = egg_find_bar_finalize; - - widget_class->show = egg_find_bar_show; - widget_class->hide = egg_find_bar_hide; - - widget_class->grab_focus = egg_find_bar_grab_focus; - - find_bar_signals[NEXT] = - g_signal_new ("next", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EggFindBarClass, next), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - find_bar_signals[PREVIOUS] = - g_signal_new ("previous", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (EggFindBarClass, previous), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - find_bar_signals[CLOSE] = - g_signal_new ("close", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EggFindBarClass, close), - NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); - find_bar_signals[SCROLL] = - g_signal_new ("scroll", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (EggFindBarClass, scroll), - NULL, NULL, - g_cclosure_marshal_VOID__ENUM, - G_TYPE_NONE, 1, - GTK_TYPE_SCROLL_TYPE); - - /** - * EggFindBar:search_string: - * - * The current string to search for. NULL or empty string - * both mean no current string. - * - */ - g_object_class_install_property (object_class, - PROP_SEARCH_STRING, - g_param_spec_string ("search_string", - ("Search string"), - ("The name of the string to be found"), - NULL, - G_PARAM_READWRITE)); - - /** - * EggFindBar:case_sensitive: - * - * TRUE for a case sensitive search. - * - */ - g_object_class_install_property (object_class, - PROP_CASE_SENSITIVE, - g_param_spec_boolean ("case_sensitive", - ("Case sensitive"), - ("TRUE for a case sensitive search"), - FALSE, - G_PARAM_READWRITE)); - - /* Style properties */ - gtk_widget_class_install_style_property (widget_class, - g_param_spec_boxed ("all_matches_color", - ("Highlight color"), - ("Color of highlight for all matches"), - GDK_TYPE_COLOR, - G_PARAM_READABLE)); - - gtk_widget_class_install_style_property (widget_class, - g_param_spec_boxed ("current_match_color", - ("Current color"), - ("Color of highlight for the current match"), - GDK_TYPE_COLOR, - G_PARAM_READABLE)); - - g_type_class_add_private (object_class, sizeof (EggFindBarPrivate)); - - binding_set = gtk_binding_set_by_class (klass); - - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Escape, 0, - "close", 0); - - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Up, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Down, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_STEP_FORWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Up, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Up, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_Page_Down, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); - gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Page_Down, 0, - "scroll", 1, - GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_FORWARD); -} - -static void -egg_find_bar_emit_next (EggFindBar *find_bar) -{ - g_signal_emit (find_bar, find_bar_signals[NEXT], 0); -} - -static void -egg_find_bar_emit_previous (EggFindBar *find_bar) -{ - g_signal_emit (find_bar, find_bar_signals[PREVIOUS], 0); -} - -static void -next_clicked_callback (GtkButton *button, - void *data) -{ - EggFindBar *find_bar = EGG_FIND_BAR (data); - - egg_find_bar_emit_next (find_bar); -} - -static void -previous_clicked_callback (GtkButton *button, - void *data) -{ - EggFindBar *find_bar = EGG_FIND_BAR (data); - - egg_find_bar_emit_previous (find_bar); -} - -static void -case_sensitive_toggled_callback (GtkCheckButton *button, - void *data) -{ - EggFindBar *find_bar = EGG_FIND_BAR (data); - - egg_find_bar_set_case_sensitive (find_bar, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))); -} - -static void -entry_activate_callback (GtkEntry *entry, - void *data) -{ - EggFindBar *find_bar = EGG_FIND_BAR (data); - - if (find_bar->priv->search_string != NULL) - egg_find_bar_emit_next (find_bar); -} - -static void -entry_changed_callback (GtkEntry *entry, - void *data) -{ - EggFindBar *find_bar = EGG_FIND_BAR (data); - char *text; - - /* paranoid strdup because set_search_string() sets - * the entry text - */ - text = g_strdup (gtk_entry_get_text (entry)); - - egg_find_bar_set_search_string (find_bar, text); - - g_free (text); -} - -static void -set_focus_cb (GtkWidget *window, - GtkWidget *widget, - EggFindBar *bar) -{ - GtkWidget *wbar = GTK_WIDGET (bar); - - while (widget != NULL && widget != wbar) - { - widget = gtk_widget_get_parent (widget); - } - - /* if widget == bar, the new focus widget is in the bar, so we - * don't deactivate. - */ - if (widget != wbar) - { - g_signal_emit (bar, find_bar_signals[CLOSE], 0); - } -} - -static void -egg_find_bar_init (EggFindBar *find_bar) -{ - EggFindBarPrivate *priv; - GtkWidget *label; - GtkWidget *alignment; - GtkWidget *box; - GtkToolItem *item; - GtkWidget *arrow; - - /* Data */ - priv = EGG_FIND_BAR_GET_PRIVATE (find_bar); - - find_bar->priv = priv; - priv->search_string = NULL; - - gtk_toolbar_set_style (GTK_TOOLBAR (find_bar), GTK_TOOLBAR_BOTH_HORIZ); - - /* Find: |_____| */ - item = gtk_tool_item_new (); - box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - - alignment = gtk_alignment_new (0.0, 0.5, 1.0, 0.0); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 2, 2); - - label = gtk_label_new_with_mnemonic (_("Find:")); - - priv->find_entry = gtk_search_entry_new (); - gtk_entry_set_width_chars (GTK_ENTRY (priv->find_entry), 32); - gtk_entry_set_max_length (GTK_ENTRY (priv->find_entry), 512); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->find_entry); - - /* Prev */ - arrow = gtk_arrow_new (GTK_ARROW_LEFT, GTK_SHADOW_NONE); - priv->previous_button = gtk_tool_button_new (arrow, Q_("Find Previous")); - gtk_tool_item_set_is_important (priv->previous_button, TRUE); -#if GTK_CHECK_VERSION (2, 11, 5) - gtk_widget_set_tooltip_text (GTK_WIDGET (priv->previous_button), - _("Find previous occurrence of the search string")); -#else - gtk_tool_item_set_tooltip (priv->previous_button, GTK_TOOLBAR (find_bar)->tooltips, - _("Find previous occurrence of the search string"), - NULL); -#endif - - /* Next */ - arrow = gtk_arrow_new (GTK_ARROW_RIGHT, GTK_SHADOW_NONE); - priv->next_button = gtk_tool_button_new (arrow, Q_("Find Next")); - gtk_tool_item_set_is_important (priv->next_button, TRUE); -#if GTK_CHECK_VERSION (2, 11, 5) - gtk_widget_set_tooltip_text (GTK_WIDGET (priv->next_button), - _("Find next occurrence of the search string")); -#else - gtk_tool_item_set_tooltip (priv->next_button, GTK_TOOLBAR (find_bar)->tooltips, - _("Find next occurrence of the search string"), - NULL); -#endif - - /* Separator*/ - priv->status_separator = gtk_separator_tool_item_new(); - - /* Case button */ - priv->case_button = gtk_toggle_tool_button_new (); - g_object_set (G_OBJECT (priv->case_button), "label", _("C_ase Sensitive"), NULL); - gtk_tool_item_set_is_important (priv->case_button, TRUE); -#if GTK_CHECK_VERSION (2, 11, 5) - gtk_widget_set_tooltip_text (GTK_WIDGET (priv->case_button), - _("Toggle case sensitive search")); -#else - gtk_tool_item_set_tooltip (priv->case_button, GTK_TOOLBAR (find_bar)->tooltips, - _("Toggle case sensitive search"), - NULL); -#endif - /* Status */ - priv->status_item = gtk_tool_item_new(); - gtk_tool_item_set_expand (priv->status_item, TRUE); - priv->status_label = gtk_label_new (NULL); - gtk_label_set_ellipsize (GTK_LABEL (priv->status_label), - PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (priv->status_label), 0.0, 0.5); - - - g_signal_connect (priv->find_entry, "changed", - G_CALLBACK (entry_changed_callback), - find_bar); - g_signal_connect (priv->find_entry, "activate", - G_CALLBACK (entry_activate_callback), - find_bar); - g_signal_connect (priv->next_button, "clicked", - G_CALLBACK (next_clicked_callback), - find_bar); - g_signal_connect (priv->previous_button, "clicked", - G_CALLBACK (previous_clicked_callback), - find_bar); - g_signal_connect (priv->case_button, "toggled", - G_CALLBACK (case_sensitive_toggled_callback), - find_bar); - - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (box), priv->find_entry, TRUE, TRUE, 0); - gtk_container_add (GTK_CONTAINER (alignment), box); - gtk_container_add (GTK_CONTAINER (item), alignment); - gtk_toolbar_insert (GTK_TOOLBAR (find_bar), item, -1); - gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->previous_button, -1); - gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->next_button, -1); - gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->case_button, -1); - gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->status_separator, -1); - gtk_container_add (GTK_CONTAINER (priv->status_item), priv->status_label); - gtk_toolbar_insert (GTK_TOOLBAR (find_bar), priv->status_item, -1); - - /* don't show status separator/label until they are set */ - - gtk_widget_show_all (GTK_WIDGET (item)); - gtk_widget_show_all (GTK_WIDGET (priv->next_button)); - gtk_widget_show_all (GTK_WIDGET (priv->previous_button)); - gtk_widget_show (priv->status_label); -} - -static void -egg_find_bar_finalize (GObject *object) -{ - EggFindBar *find_bar = EGG_FIND_BAR (object); - EggFindBarPrivate *priv = (EggFindBarPrivate *)find_bar->priv; - - g_free (priv->search_string); - - G_OBJECT_CLASS (egg_find_bar_parent_class)->finalize (object); -} - -static void -egg_find_bar_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - EggFindBar *find_bar = EGG_FIND_BAR (object); - - switch (prop_id) - { - case PROP_SEARCH_STRING: - egg_find_bar_set_search_string (find_bar, g_value_get_string (value)); - break; - case PROP_CASE_SENSITIVE: - egg_find_bar_set_case_sensitive (find_bar, g_value_get_boolean (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -egg_find_bar_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EggFindBar *find_bar = EGG_FIND_BAR (object); - EggFindBarPrivate *priv = (EggFindBarPrivate *)find_bar->priv; - - switch (prop_id) - { - case PROP_SEARCH_STRING: - g_value_set_string (value, priv->search_string); - break; - case PROP_CASE_SENSITIVE: - g_value_set_boolean (value, priv->case_sensitive); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -egg_find_bar_show (GtkWidget *widget) -{ - EggFindBar *bar = EGG_FIND_BAR (widget); - EggFindBarPrivate *priv = bar->priv; - - GTK_WIDGET_CLASS (egg_find_bar_parent_class)->show (widget); - - if (priv->set_focus_handler == 0) - { - GtkWidget *toplevel; - - toplevel = gtk_widget_get_toplevel (widget); - - priv->set_focus_handler = - g_signal_connect (toplevel, "set-focus", - G_CALLBACK (set_focus_cb), bar); - } -} - -static void -egg_find_bar_hide (GtkWidget *widget) -{ - EggFindBar *bar = EGG_FIND_BAR (widget); - EggFindBarPrivate *priv = bar->priv; - - if (priv->set_focus_handler != 0) - { - GtkWidget *toplevel; - - toplevel = gtk_widget_get_toplevel (widget); - - g_signal_handlers_disconnect_by_func - (toplevel, (void (*)) G_CALLBACK (set_focus_cb), bar); - priv->set_focus_handler = 0; - } - - GTK_WIDGET_CLASS (egg_find_bar_parent_class)->hide (widget); -} - -static void -egg_find_bar_grab_focus (GtkWidget *widget) -{ - EggFindBar *find_bar = EGG_FIND_BAR (widget); - EggFindBarPrivate *priv = find_bar->priv; - - gtk_widget_grab_focus (priv->find_entry); -} - -/** - * egg_find_bar_new: - * - * Creates a new #EggFindBar. - * - * Returns: a newly created #EggFindBar - * - * Since: 2.6 - */ -GtkWidget * -egg_find_bar_new (void) -{ - EggFindBar *find_bar; - - find_bar = g_object_new (EGG_TYPE_FIND_BAR, NULL); - - return GTK_WIDGET (find_bar); -} - -/** - * egg_find_bar_set_search_string: - * - * Sets the string that should be found/highlighted in the document. - * Empty string is converted to NULL. - * - * Since: 2.6 - */ -void -egg_find_bar_set_search_string (EggFindBar *find_bar, - const char *search_string) -{ - EggFindBarPrivate *priv; - - g_return_if_fail (EGG_IS_FIND_BAR (find_bar)); - - priv = (EggFindBarPrivate *)find_bar->priv; - - g_object_freeze_notify (G_OBJECT (find_bar)); - - if (priv->search_string != search_string) - { - char *old; - - old = priv->search_string; - - if (search_string && *search_string == '\0') - search_string = NULL; - - /* Only update if the string has changed; setting the entry - * will emit changed on the entry which will re-enter - * this function, but we'll handle that fine with this - * short-circuit. - */ - if ((old && search_string == NULL) || - (old == NULL && search_string) || - (old && search_string && - strcmp (old, search_string) != 0)) - { - gboolean not_empty; - - priv->search_string = g_strdup (search_string); - g_free (old); - - gtk_entry_set_text (GTK_ENTRY (priv->find_entry), - priv->search_string ? - priv->search_string : - ""); - - not_empty = (search_string == NULL) ? FALSE : TRUE; - - gtk_widget_set_sensitive (GTK_WIDGET (find_bar->priv->next_button), not_empty); - gtk_widget_set_sensitive (GTK_WIDGET (find_bar->priv->previous_button), not_empty); - - g_object_notify (G_OBJECT (find_bar), - "search_string"); - } - } - - g_object_thaw_notify (G_OBJECT (find_bar)); -} - - -/** - * egg_find_bar_get_search_string: - * - * Gets the string that should be found/highlighted in the document. - * - * Returns: the string - * - * Since: 2.6 - */ -const char* -egg_find_bar_get_search_string (EggFindBar *find_bar) -{ - EggFindBarPrivate *priv; - - g_return_val_if_fail (EGG_IS_FIND_BAR (find_bar), NULL); - - priv = find_bar->priv; - - return priv->search_string ? priv->search_string : ""; -} - -/** - * egg_find_bar_set_case_sensitive: - * - * Sets whether the search is case sensitive - * - * Since: 2.6 - */ -void -egg_find_bar_set_case_sensitive (EggFindBar *find_bar, - gboolean case_sensitive) -{ - EggFindBarPrivate *priv; - - g_return_if_fail (EGG_IS_FIND_BAR (find_bar)); - - priv = (EggFindBarPrivate *)find_bar->priv; - - g_object_freeze_notify (G_OBJECT (find_bar)); - - case_sensitive = case_sensitive != FALSE; - - if (priv->case_sensitive != case_sensitive) - { - priv->case_sensitive = case_sensitive; - - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->case_button), - priv->case_sensitive); - - g_object_notify (G_OBJECT (find_bar), - "case_sensitive"); - } - - g_object_thaw_notify (G_OBJECT (find_bar)); -} - -/** - * egg_find_bar_get_case_sensitive: - * - * Gets whether the search is case sensitive - * - * Returns: TRUE if it's case sensitive - * - * Since: 2.6 - */ -gboolean -egg_find_bar_get_case_sensitive (EggFindBar *find_bar) -{ - EggFindBarPrivate *priv; - - g_return_val_if_fail (EGG_IS_FIND_BAR (find_bar), FALSE); - - priv = (EggFindBarPrivate *)find_bar->priv; - - return priv->case_sensitive; -} - -static void -get_style_color (EggFindBar *find_bar, - const char *style_prop_name, - GdkColor *color) -{ - GdkColor *style_color; - - gtk_widget_ensure_style (GTK_WIDGET (find_bar)); - gtk_widget_style_get (GTK_WIDGET (find_bar), - "color", &style_color, NULL); - if (style_color) - { - *color = *style_color; - gdk_color_free (style_color); - } -} - -/** - * egg_find_bar_get_all_matches_color: - * - * Gets the color to use to highlight all the - * known matches. - * - * Since: 2.6 - */ -void -egg_find_bar_get_all_matches_color (EggFindBar *find_bar, - GdkColor *color) -{ - GdkColor found_color = { 0, 0, 0, 0x0f0f }; - - get_style_color (find_bar, "all_matches_color", &found_color); - - *color = found_color; -} - -/** - * egg_find_bar_get_current_match_color: - * - * Gets the color to use to highlight the match - * we're currently on. - * - * Since: 2.6 - */ -void -egg_find_bar_get_current_match_color (EggFindBar *find_bar, - GdkColor *color) -{ - GdkColor found_color = { 0, 0, 0, 0xffff }; - - get_style_color (find_bar, "current_match_color", &found_color); - - *color = found_color; -} - -/** - * egg_find_bar_set_status_text: - * - * Sets some text to display if there's space; typical text would - * be something like "5 results on this page" or "No results" - * - * @text: the text to display - * - * Since: 2.6 - */ -void -egg_find_bar_set_status_text (EggFindBar *find_bar, - const char *text) -{ - EggFindBarPrivate *priv; - - g_return_if_fail (EGG_IS_FIND_BAR (find_bar)); - - priv = (EggFindBarPrivate *)find_bar->priv; - - gtk_label_set_text (GTK_LABEL (priv->status_label), text); - g_object_set (priv->status_separator, "visible", text != NULL && *text != '\0', NULL); - g_object_set (priv->status_item, "visible", text != NULL && *text !='\0', NULL); -} diff -Nru devhelp-3.8.2/src/eggfindbar.h devhelp-3.10.2/src/eggfindbar.h --- devhelp-3.8.2/src/eggfindbar.h 2011-08-21 10:00:05.000000000 +0000 +++ devhelp-3.10.2/src/eggfindbar.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/* Copyright (C) 2004 Red Hat, Inc. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the Gnome Library; see the file COPYING.LIB. If not, -write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. -*/ - -#ifndef __EGG_FIND_BAR_H__ -#define __EGG_FIND_BAR_H__ - -#include - -G_BEGIN_DECLS - -#define EGG_TYPE_FIND_BAR (egg_find_bar_get_type ()) -#define EGG_FIND_BAR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), EGG_TYPE_FIND_BAR, EggFindBar)) -#define EGG_FIND_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_FIND_BAR, EggFindBarClass)) -#define EGG_IS_FIND_BAR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), EGG_TYPE_FIND_BAR)) -#define EGG_IS_FIND_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_FIND_BAR)) -#define EGG_FIND_BAR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_FIND_BAR, EggFindBarClass)) - -typedef struct _EggFindBar EggFindBar; -typedef struct _EggFindBarClass EggFindBarClass; -typedef struct _EggFindBarPrivate EggFindBarPrivate; - -struct _EggFindBar -{ - GtkToolbar parent; - - /*< private >*/ - EggFindBarPrivate *priv; -}; - -struct _EggFindBarClass -{ - GtkToolbarClass parent_class; - - void (* next) (EggFindBar *find_bar); - void (* previous) (EggFindBar *find_bar); - void (* close) (EggFindBar *find_bar); - void (* scroll) (EggFindBar *find_bar, GtkScrollType* scroll); - - /* Padding for future expansion */ - void (*_gtk_reserved1) (void); - void (*_gtk_reserved2) (void); - void (*_gtk_reserved3) (void); - void (*_gtk_reserved4) (void); -}; - -GType egg_find_bar_get_type (void) G_GNUC_CONST; -GtkWidget *egg_find_bar_new (void); - -void egg_find_bar_set_search_string (EggFindBar *find_bar, - const char *search_string); -const char* egg_find_bar_get_search_string (EggFindBar *find_bar); -void egg_find_bar_set_case_sensitive (EggFindBar *find_bar, - gboolean case_sensitive); -gboolean egg_find_bar_get_case_sensitive (EggFindBar *find_bar); -void egg_find_bar_get_all_matches_color (EggFindBar *find_bar, - GdkColor *color); -void egg_find_bar_get_current_match_color (EggFindBar *find_bar, - GdkColor *color); -void egg_find_bar_set_status_text (EggFindBar *find_bar, - const char *text); - -G_END_DECLS - -#endif /* __EGG_FIND_BAR_H__ */ - - diff -Nru devhelp-3.8.2/src/gedit-close-button.c devhelp-3.10.2/src/gedit-close-button.c --- devhelp-3.8.2/src/gedit-close-button.c 1970-01-01 00:00:00.000000000 +0000 +++ devhelp-3.10.2/src/gedit-close-button.c 2013-07-29 13:53:23.000000000 +0000 @@ -0,0 +1,82 @@ +/* + * gedit-close-button.c + * This file is part of gedit + * + * Copyright (C) 2010 - Paolo Borelli + * Copyright (C) 2011 - Ignacio Casal Quinteiro + * + * gedit is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * gedit is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "gedit-close-button.h" + +struct _GeditCloseButtonClassPrivate +{ + GtkCssProvider *css; +}; + +G_DEFINE_TYPE_WITH_CODE (GeditCloseButton, gedit_close_button, GTK_TYPE_BUTTON, + g_type_add_class_private (g_define_type_id, sizeof (GeditCloseButtonClassPrivate))) + +static void +gedit_close_button_class_init (GeditCloseButtonClass *klass) +{ + static const gchar button_style[] = + "* {\n" + "-GtkButton-default-border : 0;\n" + "-GtkButton-default-outside-border : 0;\n" + "-GtkButton-inner-border: 0;\n" + "-GtkWidget-focus-line-width : 0;\n" + "-GtkWidget-focus-padding : 0;\n" + "padding: 0;\n" + "}"; + + klass->priv = G_TYPE_CLASS_GET_PRIVATE (klass, GEDIT_TYPE_CLOSE_BUTTON, GeditCloseButtonClassPrivate); + + klass->priv->css = gtk_css_provider_new (); + gtk_css_provider_load_from_data (klass->priv->css, button_style, -1, NULL); +} + +static void +gedit_close_button_init (GeditCloseButton *button) +{ + GtkStyleContext *context; + GtkWidget *image; + GIcon *icon; + + icon = g_themed_icon_new_with_default_fallbacks ("window-close-symbolic"); + image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU); + gtk_widget_show (image); + g_object_unref (icon); + + gtk_container_add (GTK_CONTAINER (button), image); + + /* make it small */ + context = gtk_widget_get_style_context (GTK_WIDGET (button)); + gtk_style_context_add_provider (context, + GTK_STYLE_PROVIDER (GEDIT_CLOSE_BUTTON_GET_CLASS (button)->priv->css), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); +} + +GtkWidget * +gedit_close_button_new () +{ + return GTK_WIDGET (g_object_new (GEDIT_TYPE_CLOSE_BUTTON, + "relief", GTK_RELIEF_NONE, + "focus-on-click", FALSE, + NULL)); +} + +/* ex:set ts=8 noet: */ diff -Nru devhelp-3.8.2/src/gedit-close-button.h devhelp-3.10.2/src/gedit-close-button.h --- devhelp-3.8.2/src/gedit-close-button.h 1970-01-01 00:00:00.000000000 +0000 +++ devhelp-3.10.2/src/gedit-close-button.h 2013-07-29 13:53:23.000000000 +0000 @@ -0,0 +1,60 @@ +/* + * gedit-close-button.h + * This file is part of gedit + * + * Copyright (C) 2010 - Paolo Borelli + * + * gedit is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * gedit is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __GEDIT_CLOSE_BUTTON_H__ +#define __GEDIT_CLOSE_BUTTON_H__ + +#include + +G_BEGIN_DECLS + +#define GEDIT_TYPE_CLOSE_BUTTON (gedit_close_button_get_type ()) +#define GEDIT_CLOSE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_CLOSE_BUTTON, GeditCloseButton)) +#define GEDIT_CLOSE_BUTTON_CONST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GEDIT_TYPE_CLOSE_BUTTON, GeditCloseButton const)) +#define GEDIT_CLOSE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GEDIT_TYPE_CLOSE_BUTTON, GeditCloseButtonClass)) +#define GEDIT_IS_CLOSE_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GEDIT_TYPE_CLOSE_BUTTON)) +#define GEDIT_IS_CLOSE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GEDIT_TYPE_CLOSE_BUTTON)) +#define GEDIT_CLOSE_BUTTON_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GEDIT_TYPE_CLOSE_BUTTON, GeditCloseButtonClass)) + +typedef struct _GeditCloseButton GeditCloseButton; +typedef struct _GeditCloseButtonClass GeditCloseButtonClass; +typedef struct _GeditCloseButtonClassPrivate GeditCloseButtonClassPrivate; + +struct _GeditCloseButton +{ + GtkButton parent; +}; + +struct _GeditCloseButtonClass +{ + GtkButtonClass parent_class; + + GeditCloseButtonClassPrivate *priv; +}; + +GType gedit_close_button_get_type (void) G_GNUC_CONST; + +GtkWidget *gedit_close_button_new (void); + +G_END_DECLS + +#endif /* __GEDIT_CLOSE_BUTTON_H__ */ +/* ex:set ts=8 noet: */