diff -Nru gucharmap-2.31.91/aclocal.m4 gucharmap-2.32.0/aclocal.m4 --- gucharmap-2.31.91/aclocal.m4 2010-08-29 08:04:33.000000000 -0400 +++ gucharmap-2.32.0/aclocal.m4 2010-09-26 14:54:44.000000000 -0400 @@ -19,1414 +19,1146 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH([gconf-source], - AC_HELP_STRING([--with-gconf-source=sourceaddress], - [Config database for installing schema files.]), - [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.11' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) - AC_ARG_WITH([gconf-schema-file-dir], - AC_HELP_STRING([--with-gconf-schema-file-dir=dir], - [Directory for installing schema files.]), - [GCONF_SCHEMA_FILE_DIR="$withval"],) +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.11.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) - AC_ARG_ENABLE(schemas-install, - AC_HELP_STRING([--disable-schemas-install], - [Disable the schemas installation]), - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -]) +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. # -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. # -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir # -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. # -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# AM_CONDITIONAL -*- Autoconf -*- -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 9 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' else - AC_MSG_RESULT(no) + $1_TRUE='#' + $1_FALSE= fi -AC_SUBST($1)dnl -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) - gt_cv_have_gettext=no +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= +# serial 10 - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" - - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi - - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) - - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS - - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) -]) - -dnl -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_in,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl - -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# gnome-common.m4 -# +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl -dnl GNOME_COMMON_INIT +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -AC_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) - AC_SUBST([ACLOCAL_AMFLAGS]) -]) - -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [turn on debugging]),, - [enable_debug=no]) - - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG, 1, - [Enable additional debugging at the expense of performance and size]) - fi -]) - -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) - - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi - - AC_SUBST(DISABLE_DEPRECATED) -]) - -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi fi + done - warning_flags= - realsave_CFLAGS="$CFLAGS" + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) -dnl For C++, do basically the same thing. +# Generate code to set up dependency tracking. -*- Autoconf -*- -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac +#serial 5 - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue fi - fi - AC_MSG_RESULT($warnCXXFLAGS) - - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, -dnl 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]) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) +# Do all the work for Automake. -*- Autoconf -*- -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) +# serial 16 +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +]) -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -$$1_PKG_ERRORS +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST(install_sh)]) -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[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. +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_PKG_TEXT +# serial 2 -To get pkg-config, see .])], - [$4]) +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering + +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -# (This private macro should not be called outside this file.) -AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' -dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to -dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +# serial 5 -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. -# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- +# Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. +# serial 4 -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf ]) -# AM_CONDITIONAL -*- Autoconf -*- - -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 6 -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= +# AM_PROG_CC_C_O +# -------------- +# Like AC_PROG_CC_C_O, but changed for automake. +AC_DEFUN([AM_PROG_CC_C_O], +[AC_REQUIRE([AC_PROG_CC_C_O])dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +# FIXME: we rely on the cache variable name because +# there is no other way. +set dummy $CC +am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +if test "$am_t" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +dnl Make sure AC_PROG_CC is never called again, or it will override our +dnl setting of CC. +m4_define([AC_PROG_CC], + [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 - -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... - - -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl - -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) - -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) +# serial 6 - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - cd .. - rm -rf conftest.dir +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - am_cv_$1_dependencies_compiler_type=none + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) fi ]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) + +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac ]) +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) +# serial 4 +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -# Generate code to set up dependency tracking. -*- Autoconf -*- +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 +# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------------------------- +# Adds support for distributing Python modules and packages. To +# install modules, copy them to $(pythondir), using the python_PYTHON +# automake variable. To install a package with the same name as the +# automake package, install to $(pkgpythondir), or use the +# pkgpython_PYTHON automake variable. +# +# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as +# locations to install python extension modules (shared libraries). +# Another macro is required to find the appropriate flags to compile +# extension modules. +# +# If your package is configured with a different prefix to python, +# users will have to add the install directory to the PYTHONPATH +# environment variable, or create a .pth file (see the python +# documentation for details). +# +# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will +# cause an error if the version of python installed on the system +# doesn't meet the requirement. MINIMUM-VERSION should consist of +# numbers and dots only. +AC_DEFUN([AM_PATH_PYTHON], + [ + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +python2.1 python2.0]) -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` + m4_if([$1],[],[ + dnl No version check is needed. + # Find any Python interpreter. + if test -z "$PYTHON"; then + AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) + fi + am_display_PYTHON=python + ], [ + dnl A version check is needed. + if test -n "$PYTHON"; then + # If the user set $PYTHON, use it and don't search something else. + AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], + [AC_MSG_RESULT(yes)], + [AC_MSG_ERROR(too old)]) + am_display_PYTHON=$PYTHON else - continue + # Otherwise, try each interpreter until we find one that satisfies + # VERSION. + AC_CACHE_CHECK([for a Python interpreter with version >= $1], + [am_cv_pathless_PYTHON],[ + for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do + test "$am_cv_pathless_PYTHON" = none && break + AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) + done]) + # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. + if test "$am_cv_pathless_PYTHON" = none; then + PYTHON=: + else + AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) + fi + am_display_PYTHON=$am_cv_pathless_PYTHON fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS + ]) + + if test "$PYTHON" = :; then + dnl Run any user-specified action, or abort. + m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) + else + + dnl Query Python for its version number. Getting [:3] seems to be + dnl the best way to do this; it's what "site.py" does in the standard + dnl library. + + AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) + AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) + + dnl Use the values of $prefix and $exec_prefix for the corresponding + dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made + dnl distinct variables so they can be overridden if need be. However, + dnl general consensus is that you shouldn't need this ability. + + AC_SUBST([PYTHON_PREFIX], ['${prefix}']) + AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) + + dnl At times (like when building shared libraries) you may want + dnl to know which OS platform Python thinks this is. + + AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) + AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + + + dnl Set up 4 directories: + + dnl pythondir -- where to install python scripts. This is the + dnl site-packages directory, not the python standard library + dnl directory like in previous automake betas. This behavior + dnl is more consistent with lispdir.m4 for example. + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON script directory], + [am_cv_python_pythondir], + [if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) + am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pythondir], [$am_cv_python_pythondir]) + + dnl pkgpythondir -- $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + + AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) + + dnl pyexecdir -- directory for installing python extension modules + dnl (shared libraries) + dnl Query distutils for this directory. distutils does not exist in + dnl Python 1.5, so we fall back to the hardcoded directory if it + dnl doesn't work. + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], + [am_cv_python_pyexecdir], + [if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) + am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages + ;; + esac + ;; + esac + ]) + AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) + dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + + AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + + dnl Run any user-specified action. + $2 + fi -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# --------------------------------------------------------------------------- +# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. +# Run ACTION-IF-FALSE otherwise. +# This test uses sys.hexversion instead of the string equivalent (first +# word of sys.version), in order to cope with versions such as 2.2c1. +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). +AC_DEFUN([AM_PYTHON_CHECK_VERSION], + [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'.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)" + AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. +# Check to make sure that the build environment is sane. -*- Autoconf -*- -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) +# serial 5 -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +# serial 1 -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) fi -AC_SUBST(install_sh)]) +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1434,704 +1166,972 @@ # serial 2 -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 2 -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break -# Check to see how 'make' treats includes. -*- Autoconf -*- + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR -# serial 4 +# gnome-common.m4 +# -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf +dnl GNOME_COMMON_INIT + +AC_DEFUN([GNOME_COMMON_INIT], +[ + dnl this macro should come after AC_CONFIG_MACRO_DIR + AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + + dnl ensure that when the Automake generated makefile calls aclocal, + dnl it honours the $ACLOCAL_FLAGS environment variable + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" + if test -n "$ac_macro_dir"; then + ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" + fi + + AC_SUBST([ACLOCAL_AMFLAGS]) +]) + +AC_DEFUN([GNOME_DEBUG_CHECK], +[ + AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], + [turn on debugging]),, + [enable_debug=no]) + + if test x$enable_debug = xyes ; then + AC_DEFINE(GNOME_ENABLE_DEBUG, 1, + [Enable additional debugging at the expense of performance and size]) + fi ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl GNOME_MAINTAINER_MODE_DEFINES () +dnl define DISABLE_DEPRECATED +dnl +AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +[ + AC_REQUIRE([AM_MAINTAINER_MODE]) -# serial 6 + DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then + DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" + for DOMAIN in $DOMAINS; do + DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" + done + fi -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) + AC_SUBST(DISABLE_DEPRECATED) ]) -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings +dnl For now, only works on GCC +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_ARG_ENABLE(compile-warnings, + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) -# serial 6 + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) + warning_flags= + realsave_CFLAGS="$CFLAGS" + case "$enable_compile_warnings" in + no) + warning_flags= + ;; + minimum) + warning_flags="-Wall" + ;; + yes) + warning_flags="-Wall -Wmissing-prototypes" + ;; + maximum|error) + warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" + CFLAGS="$warning_flags $CFLAGS" + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_RESULT($has_option) + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi + unset has_option + unset SAVE_CFLAGS + done + unset option + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($warning_flags) -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi + AC_ARG_ENABLE(iso-c, + AC_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) + + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) + + WARN_CFLAGS="$warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl For C++, do basically the same thing. -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac +AC_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) + + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac + + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) + + AC_ARG_ENABLE(iso-cxx, + AC_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) + + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac + + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) + + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) ]) -# Helper functions for option handling. -*- Autoconf -*- +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl 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. -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant . # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# serial 4 +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. -# AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# --------------------------------------------------------------------------- -# Adds support for distributing Python modules and packages. To -# install modules, copy them to $(pythondir), using the python_PYTHON -# automake variable. To install a package with the same name as the -# automake package, install to $(pkgpythondir), or use the -# pkgpython_PYTHON automake variable. +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# The variables $(pyexecdir) and $(pkgpyexecdir) are provided as -# locations to install python extension modules (shared libraries). -# Another macro is required to find the appropriate flags to compile -# extension modules. # -# If your package is configured with a different prefix to python, -# users will have to add the install directory to the PYTHONPATH -# environment variable, or create a .pth file (see the python -# documentation for details). +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac # -# If the MINIMUM-VERSION argument is passed, AM_PATH_PYTHON will -# cause an error if the version of python installed on the system -# doesn't meet the requirement. MINIMUM-VERSION should consist of -# numbers and dots only. -AC_DEFUN([AM_PATH_PYTHON], - [ - dnl Find a Python interpreter. Python versions prior to 2.0 are not - dnl supported. (2.0 was released on October 16, 2000). - m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl -python2.1 python2.0]) - - m4_if([$1],[],[ - dnl No version check is needed. - # Find any Python interpreter. - if test -z "$PYTHON"; then - AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST, :) - fi - am_display_PYTHON=python - ], [ - dnl A version check is needed. - if test -n "$PYTHON"; then - # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) - AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) - am_display_PYTHON=$PYTHON - else - # Otherwise, try each interpreter until we find one that satisfies - # VERSION. - AC_CACHE_CHECK([for a Python interpreter with version >= $1], - [am_cv_pathless_PYTHON],[ - for am_cv_pathless_PYTHON in _AM_PYTHON_INTERPRETER_LIST none; do - test "$am_cv_pathless_PYTHON" = none && break - AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break]) - done]) - # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. - if test "$am_cv_pathless_PYTHON" = none; then - PYTHON=: - else - AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON]) - fi - am_display_PYTHON=$am_cv_pathless_PYTHON - fi - ]) - - if test "$PYTHON" = :; then - dnl Run any user-specified action, or abort. - m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) - else +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - dnl Query Python for its version number. Getting [:3] seems to be - dnl the best way to do this; it's what "site.py" does in the standard - dnl library. +pkg_failed=no +AC_MSG_CHECKING([for $1]) - AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], - [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) - AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - dnl Use the values of $prefix and $exec_prefix for the corresponding - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made - dnl distinct variables so they can be overridden if need be. However, - dnl general consensus is that you shouldn't need this ability. +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) - AC_SUBST([PYTHON_PREFIX], ['${prefix}']) - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - dnl At times (like when building shared libraries) you may want - dnl to know which OS platform Python thinks this is. + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: - AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], - [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) - AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) +$$1_PKG_ERRORS +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. - dnl Set up 4 directories: +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[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. - dnl pythondir -- where to install python scripts. This is the - dnl site-packages directory, not the python standard library - dnl directory like in previous automake betas. This behavior - dnl is more consistent with lispdir.m4 for example. - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. - AC_CACHE_CHECK([for $am_display_PYTHON script directory], - [am_cv_python_pythondir], - [if test "x$prefix" = xNONE - then - am_py_prefix=$ac_default_prefix - else - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` - am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` - ;; - *) - case $am_py_prefix in - /usr|/System*) ;; - *) - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - ]) - AC_SUBST([pythondir], [$am_cv_python_pythondir]) +_PKG_TEXT - dnl pkgpythondir -- $PACKAGE directory under pythondir. Was - dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is - dnl more consistent with the rest of automake. +To get pkg-config, see .])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES - AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) +dnl AM_GCONF_SOURCE_2 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +dnl (i.e. pass to gconftool-2 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +dnl you should install foo.schemas files +dnl - dnl pyexecdir -- directory for installing python extension modules - dnl (shared libraries) - dnl Query distutils for this directory. distutils does not exist in - dnl Python 1.5, so we fall back to the hardcoded directory if it - dnl doesn't work. - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], - [am_cv_python_pyexecdir], - [if test "x$exec_prefix" = xNONE - then - am_py_exec_prefix=$am_py_prefix - else - am_py_exec_prefix=$exec_prefix - fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || - echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` - am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` - ;; - *) - case $am_py_exec_prefix in - /usr|/System*) ;; - *) - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; - esac - ]) - AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) +AC_DEFUN([AM_GCONF_SOURCE_2], +[ + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` + else + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi - dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) + AC_ARG_WITH([gconf-source], + AC_HELP_STRING([--with-gconf-source=sourceaddress], + [Config database for installing schema files.]), + [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) - AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - dnl Run any user-specified action. - $2 + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' fi -]) + AC_ARG_WITH([gconf-schema-file-dir], + AC_HELP_STRING([--with-gconf-schema-file-dir=dir], + [Directory for installing schema files.]), + [GCONF_SCHEMA_FILE_DIR="$withval"],) + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -# AM_PYTHON_CHECK_VERSION(PROG, VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -# --------------------------------------------------------------------------- -# Run ACTION-IF-TRUE if the Python interpreter PROG has version >= VERSION. -# Run ACTION-IF-FALSE otherwise. -# This test uses sys.hexversion instead of the string equivalent (first -# word of sys.version), in order to cope with versions such as 2.2c1. -# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). -AC_DEFUN([AM_PYTHON_CHECK_VERSION], - [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'.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)" - AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) + AC_ARG_ENABLE(schemas-install, + AC_HELP_STRING([--disable-schemas-install], + [Disable the schemas installation]), + [case ${enableval} in + yes|no) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. # -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -# AM_RUN_LOG(COMMAND) -# ------------------- -# Run COMMAND, save the exit status in ac_status, and log it. -# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) -AC_DEFUN([AM_RUN_LOG], -[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD - ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - (exit $ac_status); }]) +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) + +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -# serial 5 + gt_cv_have_gettext=no -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) + ]) + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -# Copyright (C) 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi -# serial 1 + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; -esac -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi + + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + # We need to process the po/ directory. + POSUB=po -# serial 2 + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -# Check how to create a tarball. -*- Autoconf -*- +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -# serial 2 + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) + +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl + +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR m4_include([m4/gnome-doc-utils.m4]) m4_include([m4/gtk-doc.m4]) diff -Nru gucharmap-2.31.91/bindings/python/gucharmap.c gucharmap-2.32.0/bindings/python/gucharmap.c --- gucharmap-2.31.91/bindings/python/gucharmap.c 2010-08-10 07:13:31.000000000 -0400 +++ gucharmap-2.32.0/bindings/python/gucharmap.c 2010-09-26 14:55:21.000000000 -0400 @@ -230,7 +230,7 @@ static char *kwlist[] = { "model", NULL }; PyGObject *model; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:GucharmapChaptersView.set_model", kwlist, &PyGucharmapChaptersModel_Type, &model)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:Gucharmap.ChaptersView.set_model", kwlist, &PyGucharmapChaptersModel_Type, &model)) return NULL; gucharmap_chapters_view_set_model(GUCHARMAP_CHAPTERS_VIEW(self->obj), GUCHARMAP_CHAPTERS_MODEL(model->obj)); @@ -258,7 +258,7 @@ int ret; gunichar wc; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:GucharmapChaptersView.select_character", kwlist, pyg_pyobj_to_unichar_conv, &wc)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:Gucharmap.ChaptersView.select_character", kwlist, pyg_pyobj_to_unichar_conv, &wc)) return NULL; ret = gucharmap_chapters_view_select_character(GUCHARMAP_CHAPTERS_VIEW(self->obj), wc); @@ -335,7 +335,7 @@ char *name; int ret; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:GucharmapChaptersView.set_selected", kwlist, &name)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:Gucharmap.ChaptersView.set_selected", kwlist, &name)) return NULL; ret = gucharmap_chapters_view_set_selected(GUCHARMAP_CHAPTERS_VIEW(self->obj), name); @@ -455,7 +455,7 @@ static char *kwlist[] = { "uc", NULL }; gunichar uc; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:GucharmapCharmap.set_active_character", kwlist, pyg_pyobj_to_unichar_conv, &uc)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:Gucharmap.Charmap.set_active_character", kwlist, pyg_pyobj_to_unichar_conv, &uc)) return NULL; gucharmap_charmap_set_active_character(GUCHARMAP_CHARMAP(self->obj), uc); @@ -490,7 +490,7 @@ static char *kwlist[] = { "chapter", NULL }; char *chapter; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:GucharmapCharmap.set_active_chapter", kwlist, &chapter)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:Gucharmap.Charmap.set_active_chapter", kwlist, &chapter)) return NULL; gucharmap_charmap_set_active_chapter(GUCHARMAP_CHARMAP(self->obj), chapter); @@ -554,7 +554,7 @@ static char *kwlist[] = { "model", NULL }; PyGObject *model; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:GucharmapCharmap.set_chapters_model", kwlist, &PyGucharmapChaptersModel_Type, &model)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:Gucharmap.Charmap.set_chapters_model", kwlist, &PyGucharmapChaptersModel_Type, &model)) return NULL; gucharmap_charmap_set_chapters_model(GUCHARMAP_CHARMAP(self->obj), GUCHARMAP_CHAPTERS_MODEL(model->obj)); @@ -605,7 +605,7 @@ static char *kwlist[] = { "visible", NULL }; int visible; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GucharmapCharmap.set_chapters_visible", kwlist, &visible)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:Gucharmap.Charmap.set_chapters_visible", kwlist, &visible)) return NULL; gucharmap_charmap_set_chapters_visible(GUCHARMAP_CHARMAP(self->obj), visible); @@ -632,7 +632,7 @@ static char *kwlist[] = { "page", "visible", NULL }; int page, visible; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:GucharmapCharmap.set_page_visible", kwlist, &page, &visible)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:Gucharmap.Charmap.set_page_visible", kwlist, &page, &visible)) return NULL; gucharmap_charmap_set_page_visible(GUCHARMAP_CHARMAP(self->obj), page, visible); @@ -647,7 +647,7 @@ static char *kwlist[] = { "page", NULL }; int page, ret; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GucharmapCharmap.get_page_visible", kwlist, &page)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:Gucharmap.Charmap.get_page_visible", kwlist, &page)) return NULL; ret = gucharmap_charmap_get_page_visible(GUCHARMAP_CHARMAP(self->obj), page); @@ -662,7 +662,7 @@ static char *kwlist[] = { "page", NULL }; int page; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GucharmapCharmap.set_active_page", kwlist, &page)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:Gucharmap.Charmap.set_active_page", kwlist, &page)) return NULL; gucharmap_charmap_set_active_page(GUCHARMAP_CHARMAP(self->obj), page); @@ -688,7 +688,7 @@ static char *kwlist[] = { "snap", NULL }; int snap; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GucharmapCharmap.set_snap_pow2", kwlist, &snap)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:Gucharmap.Charmap.set_snap_pow2", kwlist, &snap)) return NULL; gucharmap_charmap_set_snap_pow2(GUCHARMAP_CHARMAP(self->obj), snap); @@ -860,7 +860,7 @@ static char *kwlist[] = { "uc", NULL }; gunichar uc; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:GucharmapChartable.set_active_character", kwlist, pyg_pyobj_to_unichar_conv, &uc)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:Gucharmap.Chartable.set_active_character", kwlist, pyg_pyobj_to_unichar_conv, &uc)) return NULL; gucharmap_chartable_set_active_character(GUCHARMAP_CHARTABLE(self->obj), uc); @@ -875,7 +875,7 @@ static char *kwlist[] = { "enabled", NULL }; int enabled; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GucharmapChartable.set_zoom_enabled", kwlist, &enabled)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:Gucharmap.Chartable.set_zoom_enabled", kwlist, &enabled)) return NULL; gucharmap_chartable_set_zoom_enabled(GUCHARMAP_CHARTABLE(self->obj), enabled); @@ -902,7 +902,7 @@ static char *kwlist[] = { "snap", NULL }; int snap; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GucharmapChartable.set_snap_pow2", kwlist, &snap)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:Gucharmap.Chartable.set_snap_pow2", kwlist, &snap)) return NULL; gucharmap_chartable_set_snap_pow2(GUCHARMAP_CHARTABLE(self->obj), snap); @@ -929,7 +929,7 @@ static char *kwlist[] = { "list", NULL }; PyGObject *list; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:GucharmapChartable.set_codepoint_list", kwlist, &PyGucharmapCodepointList_Type, &list)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:Gucharmap.Chartable.set_codepoint_list", kwlist, &PyGucharmapCodepointList_Type, &list)) return NULL; gucharmap_chartable_set_codepoint_list(GUCHARMAP_CHARTABLE(self->obj), GUCHARMAP_CODEPOINT_LIST(list->obj)); @@ -1027,7 +1027,7 @@ gunichar ret; Py_UNICODE py_ret; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:GucharmapCodepointList.get_char", kwlist, &index)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:Gucharmap.CodepointList.get_char", kwlist, &index)) return NULL; ret = gucharmap_codepoint_list_get_char(GUCHARMAP_CODEPOINT_LIST(self->obj), index); @@ -1050,7 +1050,7 @@ int ret; gunichar wc; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:GucharmapCodepointList.get_index", kwlist, pyg_pyobj_to_unichar_conv, &wc)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&:Gucharmap.CodepointList.get_index", kwlist, pyg_pyobj_to_unichar_conv, &wc)) return NULL; ret = gucharmap_codepoint_list_get_index(GUCHARMAP_CODEPOINT_LIST(self->obj), wc); @@ -1134,7 +1134,7 @@ static char *kwlist[] = { "start", "end", NULL }; gunichar start, end; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&O&:GucharmapBlockCodepointList.__init__", kwlist, pyg_pyobj_to_unichar_conv, &start, pyg_pyobj_to_unichar_conv, &end)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O&O&:Gucharmap.BlockCodepointList.__init__", kwlist, pyg_pyobj_to_unichar_conv, &start, pyg_pyobj_to_unichar_conv, &end)) return -1; self->obj = (GObject *)gucharmap_block_codepoint_list_new(start, end); @@ -1291,7 +1291,7 @@ char *script; int ret; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:GucharmapScriptCodepointList.set_script", kwlist, &script)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:Gucharmap.ScriptCodepointList.set_script", kwlist, &script)) return NULL; ret = gucharmap_script_codepoint_list_set_script(GUCHARMAP_SCRIPT_CODEPOINT_LIST(self->obj), script); @@ -1307,7 +1307,7 @@ char *script; int ret; - if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:GucharmapScriptCodepointList.append_script", kwlist, &script)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:Gucharmap.ScriptCodepointList.append_script", kwlist, &script)) return NULL; ret = gucharmap_script_codepoint_list_append_script(GUCHARMAP_SCRIPT_CODEPOINT_LIST(self->obj), script); diff -Nru gucharmap-2.31.91/ChangeLog gucharmap-2.32.0/ChangeLog --- gucharmap-2.31.91/ChangeLog 2010-08-29 08:04:49.000000000 -0400 +++ gucharmap-2.32.0/ChangeLog 2010-09-26 14:55:36.000000000 -0400 @@ -1,3 +1,219 @@ +commit 61f3fb387047022b2f1e7f54765a9c06bfbdb126 +Author: Christian Persch +Date: Sun Sep 26 20:54:33 2010 +0200 + + Distcheck with gtk 2 + + Makefile.am | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit aa93d3418e1649b6623fc4b8910b69e810c50df4 +Author: Christian Persch +Date: Sun Sep 26 20:53:43 2010 +0200 + + Version 2.32.0 + + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 7a6f1c498a2b06ab6e3c541b10bb45ba8d7e6837 +Author: Yaron Shahrabani +Date: Sat Sep 25 02:25:54 2010 +0200 + + Updated Hebrew translation. + + po/he.po | 45 +++++++++++++++++++-------------------------- + 1 files changed, 19 insertions(+), 26 deletions(-) + +commit 162c9db7309d465d886dfe10955a1606ac6d258f +Author: Wouter Bolsterlee +Date: Fri Sep 24 18:32:50 2010 +0200 + + Updated Dutch translation by Wouter Bolsterlee + + po/nl.po | 93 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 47 insertions(+), 46 deletions(-) + +commit 7d5d0a55704aee8e0a5092987d1a234558172ee6 +Author: Yuri Myasoedov +Date: Fri Sep 24 08:09:17 2010 +0400 + + Updated Russian translation + + po/ru.po | 410 +++++++++++++++++++++++++++++++++++--------------------------- + 1 files changed, 231 insertions(+), 179 deletions(-) + +commit ca818b81da58ed965aeccbb4bcb5591fd50d3c83 +Author: Khaled Hosny +Date: Thu Sep 23 15:53:32 2010 +0300 + + Updated Arabic translation + + po/ar.po | 708 +++++++++++++++++++++++++++++++++++-------------------------- + 1 files changed, 406 insertions(+), 302 deletions(-) + +commit 73e54e78810135c748b81034aa059d764b61e19d +Author: Petr Kovar +Date: Thu Sep 23 00:11:05 2010 +0200 + + Update Czech translation + + po/cs.po | 87 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 44 insertions(+), 43 deletions(-) + +commit 1c6cd200367d076900e4bba50bcc35185e91dc05 +Author: Ivar Smolin +Date: Wed Sep 22 14:18:05 2010 +0300 + + [l10n] Updated Estonian translation + + po/et.po | 14 +++++++------- + 1 files changed, 7 insertions(+), 7 deletions(-) + +commit 390d995adc4785566207f0c439ff6f9e8da88a23 +Author: Daniel S. Koda +Date: Tue Sep 21 16:22:32 2010 -0300 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 165 ++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 83 insertions(+), 82 deletions(-) + +commit 0702f6c681ee89a5f45e35de0a0520dee8eaa2e8 +Author: Yaron Shahrabani +Date: Mon Sep 20 18:24:52 2010 +0200 + + Updated Hebrew translation. + + po/he.po | 81 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 41 insertions(+), 40 deletions(-) + +commit 3e0cd97c8d5d88bb813b221c1c4e2af7ece5d97d +Author: Takayuki KUSANO +Date: Mon Sep 20 19:08:58 2010 +0900 + + Updated Japanese translation + + po/ja.po | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 9fabfeb38e273031d3cd37c9609e85a90f940a9c +Author: Kenneth Nielsen +Date: Thu Sep 16 23:50:29 2010 +0200 + + Updated Danish translation + + po/da.po | 160 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 80 insertions(+), 80 deletions(-) + +commit 48a63f85e69676d298a99720282bf4f5b1b04135 +Author: Aron Xu +Date: Tue Sep 14 15:47:35 2010 +0800 + + Update Simplified Chinese translation. + + po/zh_CN.po | 18 +++++++++--------- + 1 files changed, 9 insertions(+), 9 deletions(-) + +commit 453bbea2c10d66fba3d179505f77bbead406f980 +Author: Kjartan Maraas +Date: Sat Sep 11 11:42:20 2010 +0200 + + Updated Norwegian bokmål translation + + po/nb.po | 171 ++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 84 insertions(+), 87 deletions(-) + +commit 9d97e1f7beb77496d74571d946b60bd57a3d56cc +Author: Duarte Loreto +Date: Fri Sep 10 23:35:35 2010 +0100 + + Updated Portuguese translation + + po/pt.po | 88 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 44 insertions(+), 44 deletions(-) + +commit cd4afb19b1ea387dae670f1a577adc91fa4a5ea3 +Author: Takayuki KUSANO +Date: Thu Sep 9 22:16:15 2010 +0900 + + Updated Japanese translation. + + po/ja.po | 172 +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 87 insertions(+), 85 deletions(-) + +commit 94b8e82890480cbe65763298299b43533ae0223e +Author: Piotr Drąg +Date: Tue Sep 7 18:58:52 2010 +0200 + + Updated Polish translation + + po/pl.po | 162 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 81 insertions(+), 81 deletions(-) + +commit cde520744fc6901aa6d06187224c09f13494dab2 +Author: Christian Kirbach +Date: Sat Sep 4 17:03:20 2010 +0200 + + [l10n] Updated German translation + + po/de.po | 171 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 85 insertions(+), 86 deletions(-) + +commit 46137236b5306796978f09ca3339880f0463ad71 +Author: Milo Casagrande +Date: Thu Sep 2 21:35:14 2010 +0200 + + [l10n] Updated Italian translation + + po/it.po | 88 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 44 insertions(+), 44 deletions(-) + +commit bf4bf2ada11be8acfc81d86b93b7129da18936f0 +Author: Bruce Cowan +Date: Tue Aug 31 18:40:51 2010 +0100 + + Updated British English translation + + po/en_GB.po | 174 +++++++++++++++++++++++++++++----------------------------- + 1 files changed, 87 insertions(+), 87 deletions(-) + +commit f88cd7e747507a41f4701500c4c71cb7de9a0607 +Author: Ivar Smolin +Date: Tue Aug 31 08:16:44 2010 +0300 + + [l10n] Updated Estonian translation + + po/et.po | 10 ++-------- + 1 files changed, 2 insertions(+), 8 deletions(-) + +commit f6cbb4ee277a05c98ac84af84be2422600bd9ef5 +Author: Gabor Kelemen +Date: Tue Aug 31 00:58:23 2010 +0200 + + Updated Hungarian translation + + po/hu.po | 160 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 80 insertions(+), 80 deletions(-) + +commit 9dd1916cb065f1f6d11080547dfea86417cbaca7 +Author: Andika Triwidada +Date: Mon Aug 30 15:20:48 2010 +0700 + + Updated Indonesian translation + + po/id.po | 1075 ++++++++++++++++++++++++++++++++++++-------------------------- + 1 files changed, 619 insertions(+), 456 deletions(-) + +commit 8d96468e57b64a7e0658c91c6a19a556907cc61b +Author: Christian Persch +Date: Sun Aug 29 14:06:28 2010 +0200 + + Version 2.31.91 + + configure.ac | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 7c995ddf8de719c96f627d52cc97dd949266281b Author: Ivar Smolin Date: Sun Aug 29 11:48:49 2010 +0300 diff -Nru gucharmap-2.31.91/configure gucharmap-2.32.0/configure --- gucharmap-2.31.91/configure 2010-08-29 08:04:34.000000000 -0400 +++ gucharmap-2.32.0/configure 2010-09-26 14:54:45.000000000 -0400 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for GNOME Character Map 2.31.91. +# Generated by GNU Autoconf 2.65 for GNOME Character Map 2.32.0. # # Report bugs to . # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Character Map' PACKAGE_TARNAME='gucharmap' -PACKAGE_VERSION='2.31.91' -PACKAGE_STRING='GNOME Character Map 2.31.91' +PACKAGE_VERSION='2.32.0' +PACKAGE_STRING='GNOME Character Map 2.32.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gucharmap' PACKAGE_URL='' @@ -1583,7 +1583,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Character Map 2.31.91 to adapt to many kinds of systems. +\`configure' configures GNOME Character Map 2.32.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1653,7 +1653,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Character Map 2.31.91:";; + short | recursive ) echo "Configuration of GNOME Character Map 2.32.0:";; esac cat <<\_ACEOF @@ -1797,7 +1797,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Character Map configure 2.31.91 +GNOME Character Map configure 2.32.0 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2168,7 +2168,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Character Map $as_me 2.31.91, which was +It was created by GNOME Character Map $as_me 2.32.0, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2982,7 +2982,7 @@ # Define the identity of the package. PACKAGE='gucharmap' - VERSION='2.31.91' + VERSION='2.32.0' cat >>confdefs.h <<_ACEOF @@ -13695,9 +13695,9 @@ GUCHARMAP_VERSION_MAJOR=2 -GUCHARMAP_VERSION_MINOR=31 +GUCHARMAP_VERSION_MINOR=32 -GUCHARMAP_VERSION_MICRO=91 +GUCHARMAP_VERSION_MICRO=0 LIBGUCHARMAP_LT_VERSION=7:0:0 @@ -14299,7 +14299,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Character Map $as_me 2.31.91, which was +This file was extended by GNOME Character Map $as_me 2.32.0, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14365,7 +14365,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Character Map config.status 2.31.91 +GNOME Character Map config.status 2.32.0 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff -Nru gucharmap-2.31.91/configure.ac gucharmap-2.32.0/configure.ac --- gucharmap-2.31.91/configure.ac 2010-08-29 08:04:24.000000000 -0400 +++ gucharmap-2.32.0/configure.ac 2010-09-26 14:53:40.000000000 -0400 @@ -16,8 +16,8 @@ # 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA m4_define([gucharmap_version_major],[2]) -m4_define([gucharmap_version_minor],[31]) -m4_define([gucharmap_version_micro],[91]) +m4_define([gucharmap_version_minor],[32]) +m4_define([gucharmap_version_micro],[0]) m4_define([gucharmap_version_extra],[]) m4_define([gucharmap_version],[gucharmap_version_major.gucharmap_version_minor.gucharmap_version_micro()gucharmap_version_extra]) diff -Nru gucharmap-2.31.91/debian/changelog gucharmap-2.32.0/debian/changelog --- gucharmap-2.31.91/debian/changelog 2010-08-29 21:34:35.000000000 -0400 +++ gucharmap-2.32.0/debian/changelog 2010-09-27 09:40:39.000000000 -0400 @@ -1,3 +1,11 @@ +gucharmap (1:2.32.0-0ubuntu1) maverick; urgency=low + + * New upstream release (LP: #648894) + * debian/control*: + - Add shlibs:Depends to python-gucharmap to add missing libc dependency + + -- Michael Terry Mon, 27 Sep 2010 09:39:33 -0400 + gucharmap (1:2.31.91-0ubuntu1) maverick; urgency=low * New upstream release diff -Nru gucharmap-2.31.91/debian/control gucharmap-2.32.0/debian/control --- gucharmap-2.31.91/debian/control 2010-08-29 21:34:36.000000000 -0400 +++ gucharmap-2.32.0/debian/control 2010-09-27 09:41:07.000000000 -0400 @@ -80,7 +80,8 @@ Package: python-gucharmap Section: python Architecture: any -Depends: ${misc:Depends}, +Depends: ${shlibs:Depends}, + ${misc:Depends}, ${python:Depends}, python-gtk2 Suggests: ${python:Suggests} diff -Nru gucharmap-2.31.91/debian/control.in gucharmap-2.32.0/debian/control.in --- gucharmap-2.31.91/debian/control.in 2010-08-29 21:34:35.000000000 -0400 +++ gucharmap-2.32.0/debian/control.in 2010-09-27 09:34:06.000000000 -0400 @@ -75,7 +75,8 @@ Package: python-gucharmap Section: python Architecture: any -Depends: ${misc:Depends}, +Depends: ${shlibs:Depends}, + ${misc:Depends}, ${python:Depends}, python-gtk2 Suggests: ${python:Suggests} diff -Nru gucharmap-2.31.91/docs/reference/html/ch01.html gucharmap-2.32.0/docs/reference/html/ch01.html --- gucharmap-2.31.91/docs/reference/html/ch01.html 2010-08-29 08:04:53.000000000 -0400 +++ gucharmap-2.32.0/docs/reference/html/ch01.html 2010-09-26 14:55:38.000000000 -0400 @@ -21,7 +21,7 @@

-[Insert title here]

+[Insert title here]
GucharmapCodepointList diff -Nru gucharmap-2.31.91/docs/reference/html/gucharmap-gucharmap-chapters-view.html gucharmap-2.32.0/docs/reference/html/gucharmap-gucharmap-chapters-view.html --- gucharmap-2.31.91/docs/reference/html/gucharmap-gucharmap-chapters-view.html 2010-08-29 08:04:53.000000000 -0400 +++ gucharmap-2.32.0/docs/reference/html/gucharmap-gucharmap-chapters-view.html 2010-09-26 14:55:38.000000000 -0400 @@ -82,7 +82,7 @@

Implemented Interfaces

GucharmapChaptersView implements - AtkImplementorIface, GtkBuildable and GtkSizeRequest.

+ AtkImplementorIface and GtkBuildable.

Description

diff -Nru gucharmap-2.31.91/docs/reference/html/gucharmap-gucharmap-charmap.html gucharmap-2.32.0/docs/reference/html/gucharmap-gucharmap-charmap.html --- gucharmap-2.31.91/docs/reference/html/gucharmap-gucharmap-charmap.html 2010-08-29 08:04:53.000000000 -0400 +++ gucharmap-2.32.0/docs/reference/html/gucharmap-gucharmap-charmap.html 2010-09-26 14:55:38.000000000 -0400 @@ -89,7 +89,7 @@

Implemented Interfaces

GucharmapCharmap implements - AtkImplementorIface, GtkBuildable, GtkSizeRequest and GtkOrientable.

+ AtkImplementorIface, GtkBuildable and GtkOrientable.

Properties

diff -Nru gucharmap-2.31.91/docs/reference/html/gucharmap-gucharmap-chartable.html gucharmap-2.32.0/docs/reference/html/gucharmap-gucharmap-chartable.html --- gucharmap-2.31.91/docs/reference/html/gucharmap-gucharmap-chartable.html 2010-08-29 08:04:53.000000000 -0400 +++ gucharmap-2.32.0/docs/reference/html/gucharmap-gucharmap-chartable.html 2010-09-26 14:55:38.000000000 -0400 @@ -84,7 +84,7 @@

Implemented Interfaces

GucharmapChartable implements - AtkImplementorIface, GtkBuildable and GtkSizeRequest.

+ AtkImplementorIface and GtkBuildable.

Properties

diff -Nru gucharmap-2.31.91/gucharmap/gucharmap.h gucharmap-2.32.0/gucharmap/gucharmap.h --- gucharmap-2.31.91/gucharmap/gucharmap.h 2010-08-29 08:04:41.000000000 -0400 +++ gucharmap-2.32.0/gucharmap/gucharmap.h 2010-09-26 14:54:55.000000000 -0400 @@ -23,8 +23,8 @@ #define __GUCHARMAP_GUCHARMAP_H_INSIDE__ #define GUCHARMAP_VERSION_MAJOR (2) -#define GUCHARMAP_VERSION_MINOR (31) -#define GUCHARMAP_VERSION_MICRO (91) +#define GUCHARMAP_VERSION_MINOR (32) +#define GUCHARMAP_VERSION_MICRO (0) #define GUCHARMAP_CHECK_VERSION(major,minor,micro) \ (GUCHARMAP_VERSION_MAJOR > (major) || \ diff -Nru gucharmap-2.31.91/Makefile.am gucharmap-2.32.0/Makefile.am --- gucharmap-2.31.91/Makefile.am 2010-08-18 07:05:06.000000000 -0400 +++ gucharmap-2.32.0/Makefile.am 2010-09-26 14:54:25.000000000 -0400 @@ -44,7 +44,8 @@ --disable-scrollkeeper \ --disable-schemas-install \ --enable-gtk-doc \ - --disable-introspection + --disable-introspection \ + --with-gtk=2.0 CLEANFILES = \ $(desktop_DATA) \ diff -Nru gucharmap-2.31.91/Makefile.in gucharmap-2.32.0/Makefile.in --- gucharmap-2.31.91/Makefile.in 2010-08-29 08:04:36.000000000 -0400 +++ gucharmap-2.32.0/Makefile.in 2010-09-26 14:54:48.000000000 -0400 @@ -169,7 +169,8 @@ --disable-scrollkeeper \ --disable-schemas-install \ --enable-gtk-doc \ - --disable-introspection + --disable-introspection \ + --with-gtk=2.0 DOC_USER_FORMATS = @DOC_USER_FORMATS@ DSYMUTIL = @DSYMUTIL@ diff -Nru gucharmap-2.31.91/po/ar.po gucharmap-2.32.0/po/ar.po --- gucharmap-2.31.91/po/ar.po 2009-04-18 10:24:58.000000000 -0400 +++ gucharmap-2.32.0/po/ar.po 2010-09-26 14:53:09.000000000 -0400 @@ -1,28 +1,28 @@ # translation of gucharmap.HEAD.po to Arabic # This file is distributed under the same license as the gucharmap.HEAD package. # Copyright (C) 2004 THE gucharmap.HEAD'S COPYRIGHT HOLDER, 2003. -# # Arafat Medini , 2004. # Djihed Afifi , 2006. -# Khaled Hosny , 2007, 2008. -# Anas Afif Emad , 2008, 2009. +# Khaled Hosny , 2007, 2008, 2010. +# Anas Afif Emad , 2008. +# Osama Khalid , 2009. msgid "" msgstr "" "Project-Id-Version: gucharmap.HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gucharmap&component=general\n" -"POT-Creation-Date: 2009-03-17 02:27+0000\n" -"PO-Revision-Date: 2009-02-09 14:01+0300\n" -"Last-Translator: Osama Khalid \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-23 15:53+0300\n" +"PO-Revision-Date: 2010-09-23 15:53+0300\n" +"Last-Translator: Khaled Hosny \n" "Language-Team: Arabic \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" +"Language: ar\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Virtaal 0.6.1\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "خريطة المحارف" @@ -35,9 +35,9 @@ msgid "Canonical decomposition:" msgstr "التفكيك المقنن:" -#: ../gucharmap/gucharmap-charmap.c:616 ../gucharmap/gucharmap-chartable.c:568 +#: ../gucharmap/gucharmap-charmap.c:616 ../gucharmap/gucharmap-chartable.c:553 msgid "[not a printable character]" -msgstr "[محرف لا يمكن طباعته]" +msgstr "[محرف لا يطبع]" #: ../gucharmap/gucharmap-charmap.c:630 msgid "General Character Properties" @@ -66,7 +66,7 @@ #: ../gucharmap/gucharmap-charmap.c:678 msgid "C octal escaped UTF-8:" -msgstr "C octal escaped UTF-8:" +msgstr "‏UTF-8 ثماني سي متخلص:" #: ../gucharmap/gucharmap-charmap.c:688 msgid "XML decimal entity:" @@ -98,7 +98,7 @@ #: ../gucharmap/gucharmap-charmap.c:758 msgid "CJK Ideograph Information" -msgstr "معلومات إيديوجرافات ص‌ي‌ك" +msgstr "معلومات إيديوگرافات ص‌ي‌ك" #: ../gucharmap/gucharmap-charmap.c:763 msgid "Definition in English:" @@ -128,40 +128,40 @@ msgid "Korean Pronunciation:" msgstr "الملفوظ الكوري:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "جدول ال_محارف" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "تفا_صيل المحرف" -#: ../gucharmap/gucharmap-chartable.c:1371 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "محرف مجهول و لا يمكن تمييزه." -#: ../gucharmap/gucharmap-chartable.c:1373 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "لم يعثر عليه." -#: ../gucharmap/gucharmap-chartable.c:1376 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "وجد المحرف." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "جدول المحارف" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "الخط" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "عائلة الخطوط" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "حجم الخط" @@ -172,155 +172,155 @@ #. Unicode assigns "Common" as the script name for any character not #. * specifically listed in Scripts.txt #: ../gucharmap/gucharmap-script-codepoint-list.c:463 -#: ../gucharmap/unicode-scripts.h:28 +#: ../gucharmap/unicode-scripts.h:30 msgid "Common" -msgstr "شائع" +msgstr "مشترك" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "<بديل عال غير متاح للاستخام الخاص>" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "<بديل عال للاستخدام الخاص>" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "<بديل منخفض>" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "<استخدام خاص>" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "<مستوى 15 للاستخدام الخاص>" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "<مستوى 16 للاستخدام الخاص>" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "<غير مسند>" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "آخر، تحكم" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "آخر، تهيئة" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "آخر، غير مسند" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" -msgstr "آخر، للاستخدام الخاص" +msgstr "آخر، استخدام خاص" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "آخر، بديل" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "حرف، صغير" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "حرف، مُغير" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "حرف، آخر" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "حرف، عنوان" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "حرف، كبير" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "علامة، تركيبية فاصلة" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "علامة، حاوية" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "علامة، غير فاصلة" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "عدد، رقم عشري" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "عدد، حرف" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "عدد، آخر" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "ترقيم، رابط" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "ترقيم، شرطة" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "ترقيم، مغلق" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "ترقيم، اقتباس أخير" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "ترقيم، اقتباس أول" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "ترقيم، آخر" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "ترقيم، فاتح" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "رمز، عملة" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "رمز، مُغير" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "رمز، رياضيات" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "رمز، آخر" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "فاصل، سطر" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "فاصل، فقرة" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "فاصل، فراغ" @@ -332,11 +332,11 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" -"خريطة المحارف برنمجية حرة؛ يمكنك توزيعها و/أو تعديلها حسب بنود رخصة جنو " -"العمومية كما نشرتها مؤسسة البرامج الحرة، الإصدار الثاني أو أي إصدار أحدث " +"خريطة المحارف برمجية حرة؛ يمكنك توزيعها و/أو تعديلها حسب بنود رخصة جنو " +"العمومية كما نشرتها مؤسسة البرامج الحرة، الإصدار الثالث أو أي إصدار أحدث " "(حسب رغبتك)." #: ../gucharmap/gucharmap-window.c:497 @@ -386,8 +386,8 @@ msgstr "خريطة محارف جنوم" #: ../gucharmap/gucharmap-window.c:523 -msgid "Based on the Unicode Character Database 5.1" -msgstr "مبنية على قاعدة بيانات محارف يونيكود 5.1" +msgid "Based on the Unicode Character Database 5.2" +msgstr "مبنية على قاعدة بيانات محارف يونيكود 5.2" #: ../gucharmap/gucharmap-window.c:532 msgid "translator-credits" @@ -398,11 +398,11 @@ "خالد حسني\t\n" "أنس عفيف عماد\t" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "نظام الكتابة التالي" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "نظام الكتابة السابق" @@ -414,71 +414,71 @@ msgid "Previous Block" msgstr "القالب السابق" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_ملف" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_عرض" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_بحث" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "ا_ذهب" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_مساعدة" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "إ_عداد الصفحة" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "ابحث عن ال_تالي" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "ابحث عن ال_سابق" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "المحرف ال_تالي" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "المحرف ال_سابق" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "ال_محتويات" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_عنْ" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "ب_نظام الكتابة" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "بقالب _يونيكود" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "الصق الأعمدة لمضاعفات اثنين" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_نص لينسخ:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "انسخ للحافظة." @@ -496,7 +496,7 @@ #: ../gucharmap/unicode-blocks.h:15 msgid "Latin-1 Supplement" -msgstr "تكميليات لاتيني-1" +msgstr "تكميليات لاتينية-1" #: ../gucharmap/unicode-blocks.h:16 msgid "Latin Extended-A" @@ -522,9 +522,9 @@ msgid "Greek and Coptic" msgstr "يوناني وقبطي" -#: ../gucharmap/unicode-blocks.h:22 ../gucharmap/unicode-scripts.h:32 +#: ../gucharmap/unicode-blocks.h:22 ../gucharmap/unicode-scripts.h:34 msgid "Cyrillic" -msgstr "سريالي" +msgstr "سريلي" #: ../gucharmap/unicode-blocks.h:23 msgid "Cyrillic Supplement" @@ -534,7 +534,7 @@ msgid "Armenian" msgstr "أرمني" -#: ../gucharmap/unicode-blocks.h:25 ../gucharmap/unicode-scripts.h:45 +#: ../gucharmap/unicode-blocks.h:25 ../gucharmap/unicode-scripts.h:48 msgid "Hebrew" msgstr "عبري" @@ -542,7 +542,7 @@ msgid "Arabic" msgstr "عربي" -#: ../gucharmap/unicode-blocks.h:27 ../gucharmap/unicode-scripts.h:80 +#: ../gucharmap/unicode-blocks.h:27 ../gucharmap/unicode-scripts.h:93 msgid "Syriac" msgstr "سرياني" @@ -550,680 +550,784 @@ msgid "Arabic Supplement" msgstr "تكميليات عربية" -#: ../gucharmap/unicode-blocks.h:29 ../gucharmap/unicode-scripts.h:86 +#: ../gucharmap/unicode-blocks.h:29 ../gucharmap/unicode-scripts.h:101 msgid "Thaana" msgstr "تاأنا" -#: ../gucharmap/unicode-blocks.h:30 ../gucharmap/unicode-scripts.h:63 +#: ../gucharmap/unicode-blocks.h:30 ../gucharmap/unicode-scripts.h:73 msgid "N'Ko" msgstr "نكو" -#: ../gucharmap/unicode-blocks.h:31 ../gucharmap/unicode-scripts.h:34 +#: ../gucharmap/unicode-blocks.h:31 ../gucharmap/unicode-scripts.h:87 +msgid "Samaritan" +msgstr "سامري" + +#: ../gucharmap/unicode-blocks.h:32 ../gucharmap/unicode-scripts.h:36 msgid "Devanagari" msgstr "دفنيجري" -#: ../gucharmap/unicode-blocks.h:32 ../gucharmap/unicode-scripts.h:19 +#: ../gucharmap/unicode-blocks.h:33 ../gucharmap/unicode-scripts.h:21 msgid "Bengali" -msgstr "بنغالي" +msgstr "بنگالي" -#: ../gucharmap/unicode-blocks.h:33 ../gucharmap/unicode-scripts.h:41 +#: ../gucharmap/unicode-blocks.h:34 ../gucharmap/unicode-scripts.h:44 msgid "Gurmukhi" -msgstr "غرموخي" +msgstr "گرموخي" -#: ../gucharmap/unicode-blocks.h:34 ../gucharmap/unicode-scripts.h:40 +#: ../gucharmap/unicode-blocks.h:35 ../gucharmap/unicode-scripts.h:43 msgid "Gujarati" -msgstr "قوجراتي" +msgstr "گوجراتي" -#: ../gucharmap/unicode-blocks.h:35 ../gucharmap/unicode-scripts.h:69 +#: ../gucharmap/unicode-blocks.h:36 ../gucharmap/unicode-scripts.h:81 msgid "Oriya" msgstr "أوريا" -#: ../gucharmap/unicode-blocks.h:36 ../gucharmap/unicode-scripts.h:84 +#: ../gucharmap/unicode-blocks.h:37 ../gucharmap/unicode-scripts.h:99 msgid "Tamil" msgstr "تاميلي" -#: ../gucharmap/unicode-blocks.h:37 ../gucharmap/unicode-scripts.h:85 +#: ../gucharmap/unicode-blocks.h:38 ../gucharmap/unicode-scripts.h:100 msgid "Telugu" -msgstr "تلوغو" +msgstr "تلوگو" -#: ../gucharmap/unicode-blocks.h:38 ../gucharmap/unicode-scripts.h:48 +#: ../gucharmap/unicode-blocks.h:39 ../gucharmap/unicode-scripts.h:56 msgid "Kannada" msgstr "كنادا" -#: ../gucharmap/unicode-blocks.h:39 ../gucharmap/unicode-scripts.h:60 +#: ../gucharmap/unicode-blocks.h:40 ../gucharmap/unicode-scripts.h:69 msgid "Malayalam" msgstr "ملايلام" -#: ../gucharmap/unicode-blocks.h:40 ../gucharmap/unicode-scripts.h:77 +#: ../gucharmap/unicode-blocks.h:41 ../gucharmap/unicode-scripts.h:90 msgid "Sinhala" -msgstr "صنهالا" +msgstr "سنهالا" -#: ../gucharmap/unicode-blocks.h:41 ../gucharmap/unicode-scripts.h:87 +#: ../gucharmap/unicode-blocks.h:42 ../gucharmap/unicode-scripts.h:102 msgid "Thai" msgstr "تايلاندي" -#: ../gucharmap/unicode-blocks.h:42 ../gucharmap/unicode-scripts.h:53 +#: ../gucharmap/unicode-blocks.h:43 ../gucharmap/unicode-scripts.h:61 msgid "Lao" msgstr "لاو" -#: ../gucharmap/unicode-blocks.h:43 ../gucharmap/unicode-scripts.h:88 +#: ../gucharmap/unicode-blocks.h:44 ../gucharmap/unicode-scripts.h:103 msgid "Tibetan" msgstr "تبيتي" -#: ../gucharmap/unicode-blocks.h:44 ../gucharmap/unicode-scripts.h:62 +#: ../gucharmap/unicode-blocks.h:45 ../gucharmap/unicode-scripts.h:72 msgid "Myanmar" msgstr "مينماري" -#: ../gucharmap/unicode-blocks.h:45 ../gucharmap/unicode-scripts.h:36 +#: ../gucharmap/unicode-blocks.h:46 ../gucharmap/unicode-scripts.h:39 msgid "Georgian" msgstr "جورجي" -#: ../gucharmap/unicode-blocks.h:46 +#: ../gucharmap/unicode-blocks.h:47 msgid "Hangul Jamo" -msgstr "هنغول جامو" +msgstr "هنگول جامو" -#: ../gucharmap/unicode-blocks.h:47 ../gucharmap/unicode-scripts.h:35 +#: ../gucharmap/unicode-blocks.h:48 ../gucharmap/unicode-scripts.h:38 msgid "Ethiopic" -msgstr "اثيوبي" +msgstr "إثيوبي" -#: ../gucharmap/unicode-blocks.h:48 +#: ../gucharmap/unicode-blocks.h:49 msgid "Ethiopic Supplement" msgstr "تكميليات إثيوبية" -#: ../gucharmap/unicode-blocks.h:49 ../gucharmap/unicode-scripts.h:27 +#: ../gucharmap/unicode-blocks.h:50 ../gucharmap/unicode-scripts.h:29 msgid "Cherokee" msgstr "شيروكي" -#: ../gucharmap/unicode-blocks.h:50 +#: ../gucharmap/unicode-blocks.h:51 msgid "Unified Canadian Aboriginal Syllabics" msgstr "المقاطع الموحدة لسكان كندا الأصليين" -#: ../gucharmap/unicode-blocks.h:51 ../gucharmap/unicode-scripts.h:65 +#: ../gucharmap/unicode-blocks.h:52 ../gucharmap/unicode-scripts.h:75 msgid "Ogham" msgstr "أوغام" -#: ../gucharmap/unicode-blocks.h:52 ../gucharmap/unicode-scripts.h:74 +#: ../gucharmap/unicode-blocks.h:53 ../gucharmap/unicode-scripts.h:86 msgid "Runic" msgstr "روني" -#: ../gucharmap/unicode-blocks.h:53 ../gucharmap/unicode-scripts.h:81 +#: ../gucharmap/unicode-blocks.h:54 ../gucharmap/unicode-scripts.h:94 msgid "Tagalog" -msgstr "التغالوق" +msgstr "تگالوگ" -#: ../gucharmap/unicode-blocks.h:54 ../gucharmap/unicode-scripts.h:44 +#: ../gucharmap/unicode-blocks.h:55 ../gucharmap/unicode-scripts.h:47 msgid "Hanunoo" -msgstr "الهنونو" +msgstr "هنونو" -#: ../gucharmap/unicode-blocks.h:55 ../gucharmap/unicode-scripts.h:23 +#: ../gucharmap/unicode-blocks.h:56 ../gucharmap/unicode-scripts.h:25 msgid "Buhid" -msgstr "البوهيدية" +msgstr "بوهيدية" -#: ../gucharmap/unicode-blocks.h:56 ../gucharmap/unicode-scripts.h:82 +#: ../gucharmap/unicode-blocks.h:57 ../gucharmap/unicode-scripts.h:95 msgid "Tagbanwa" msgstr "تاغبنوا" -#: ../gucharmap/unicode-blocks.h:57 ../gucharmap/unicode-scripts.h:52 +#: ../gucharmap/unicode-blocks.h:58 ../gucharmap/unicode-scripts.h:60 msgid "Khmer" -msgstr "الخميرية" +msgstr "خميرية" -#: ../gucharmap/unicode-blocks.h:58 ../gucharmap/unicode-scripts.h:61 +#: ../gucharmap/unicode-blocks.h:59 ../gucharmap/unicode-scripts.h:71 msgid "Mongolian" -msgstr "الماغولية" +msgstr "منغولية" + +#: ../gucharmap/unicode-blocks.h:60 +msgid "Unified Canadian Aboriginal Syllabics Extended" +msgstr "المقاطع الموحدة لسكان كندا الأصليين (ممتد)" -#: ../gucharmap/unicode-blocks.h:59 ../gucharmap/unicode-scripts.h:56 +#: ../gucharmap/unicode-blocks.h:61 ../gucharmap/unicode-scripts.h:64 msgid "Limbu" msgstr "لمبو" -#: ../gucharmap/unicode-blocks.h:60 ../gucharmap/unicode-scripts.h:83 +#: ../gucharmap/unicode-blocks.h:62 ../gucharmap/unicode-scripts.h:96 msgid "Tai Le" msgstr "تاي لي" -#: ../gucharmap/unicode-blocks.h:61 ../gucharmap/unicode-scripts.h:64 +#: ../gucharmap/unicode-blocks.h:63 ../gucharmap/unicode-scripts.h:74 msgid "New Tai Lue" msgstr "تاي لو الجديد" -#: ../gucharmap/unicode-blocks.h:62 +#: ../gucharmap/unicode-blocks.h:64 msgid "Khmer Symbols" msgstr "رموز الخميرية" -#: ../gucharmap/unicode-blocks.h:63 ../gucharmap/unicode-scripts.h:22 +#: ../gucharmap/unicode-blocks.h:65 ../gucharmap/unicode-scripts.h:24 msgid "Buginese" msgstr "بوجينية" -#: ../gucharmap/unicode-blocks.h:64 ../gucharmap/unicode-scripts.h:18 +#: ../gucharmap/unicode-blocks.h:66 ../gucharmap/unicode-scripts.h:97 +msgid "Tai Tham" +msgstr "تام تايلندي" + +#: ../gucharmap/unicode-blocks.h:67 ../gucharmap/unicode-scripts.h:19 msgid "Balinese" msgstr "بالينية" -#: ../gucharmap/unicode-blocks.h:65 ../gucharmap/unicode-scripts.h:78 +#: ../gucharmap/unicode-blocks.h:68 ../gucharmap/unicode-scripts.h:91 msgid "Sundanese" msgstr "سوداني" -#: ../gucharmap/unicode-blocks.h:66 ../gucharmap/unicode-scripts.h:55 +#: ../gucharmap/unicode-blocks.h:69 ../gucharmap/unicode-scripts.h:63 msgid "Lepcha" msgstr "ليبشا" -#: ../gucharmap/unicode-blocks.h:67 ../gucharmap/unicode-scripts.h:66 +#: ../gucharmap/unicode-blocks.h:70 ../gucharmap/unicode-scripts.h:76 msgid "Ol Chiki" msgstr "أول تشيكي" -#: ../gucharmap/unicode-blocks.h:68 +#: ../gucharmap/unicode-blocks.h:71 +msgid "Vedic Extensions" +msgstr "امتدادات ڤيدية" + +#: ../gucharmap/unicode-blocks.h:72 msgid "Phonetic Extensions" msgstr "امتدادات صوتية" -#: ../gucharmap/unicode-blocks.h:69 +#: ../gucharmap/unicode-blocks.h:73 msgid "Phonetic Extensions Supplement" msgstr "تكميليات الامتدادات الصوتية" -#: ../gucharmap/unicode-blocks.h:70 +#: ../gucharmap/unicode-blocks.h:74 msgid "Combining Diacritical Marks Supplement" msgstr "تكميلي علامات التشكيل التركيبية" -#: ../gucharmap/unicode-blocks.h:71 +#: ../gucharmap/unicode-blocks.h:75 msgid "Latin Extended Additional" msgstr "لاتيني ممتد إضافي" -#: ../gucharmap/unicode-blocks.h:72 +#: ../gucharmap/unicode-blocks.h:76 msgid "Greek Extended" msgstr "يوناني ممتد" -#: ../gucharmap/unicode-blocks.h:73 +#: ../gucharmap/unicode-blocks.h:77 msgid "General Punctuation" msgstr "ترقيم عام" -#: ../gucharmap/unicode-blocks.h:74 +#: ../gucharmap/unicode-blocks.h:78 msgid "Superscripts and Subscripts" msgstr "حروف فوقية و حروف تحتية" -#: ../gucharmap/unicode-blocks.h:75 +#: ../gucharmap/unicode-blocks.h:79 msgid "Currency Symbols" msgstr "رموز العملات" -#: ../gucharmap/unicode-blocks.h:76 +#: ../gucharmap/unicode-blocks.h:80 msgid "Combining Diacritical Marks for Symbols" msgstr "علامات تشكيل تركيبية للرموز" -#: ../gucharmap/unicode-blocks.h:77 +#: ../gucharmap/unicode-blocks.h:81 msgid "Letterlike Symbols" msgstr "رموز مشابهة للحروف" -#: ../gucharmap/unicode-blocks.h:78 +#: ../gucharmap/unicode-blocks.h:82 msgid "Number Forms" msgstr "أشكال الأعداد" -#: ../gucharmap/unicode-blocks.h:79 +#: ../gucharmap/unicode-blocks.h:83 msgid "Arrows" msgstr "سهام" -#: ../gucharmap/unicode-blocks.h:80 +#: ../gucharmap/unicode-blocks.h:84 msgid "Mathematical Operators" msgstr "دوال رياضية" -#: ../gucharmap/unicode-blocks.h:81 +#: ../gucharmap/unicode-blocks.h:85 msgid "Miscellaneous Technical" msgstr "تقني متنوع" -#: ../gucharmap/unicode-blocks.h:82 +#: ../gucharmap/unicode-blocks.h:86 msgid "Control Pictures" msgstr "صور تحكم" -#: ../gucharmap/unicode-blocks.h:83 +#: ../gucharmap/unicode-blocks.h:87 msgid "Optical Character Recognition" msgstr "تعرف بصري على المحارف" -#: ../gucharmap/unicode-blocks.h:84 +#: ../gucharmap/unicode-blocks.h:88 msgid "Enclosed Alphanumerics" -msgstr "أبجدي رقمي مضمن" +msgstr "أبجدي رقمي محاط" -#: ../gucharmap/unicode-blocks.h:85 +#: ../gucharmap/unicode-blocks.h:89 msgid "Box Drawing" msgstr "رسم الصناديق" -#: ../gucharmap/unicode-blocks.h:86 +#: ../gucharmap/unicode-blocks.h:90 msgid "Block Elements" msgstr "عناصر مقولبة" -#: ../gucharmap/unicode-blocks.h:87 +#: ../gucharmap/unicode-blocks.h:91 msgid "Geometric Shapes" msgstr "أشكال هندسية" -#: ../gucharmap/unicode-blocks.h:88 +#: ../gucharmap/unicode-blocks.h:92 msgid "Miscellaneous Symbols" msgstr "رموز متنوعة" -#: ../gucharmap/unicode-blocks.h:89 +#: ../gucharmap/unicode-blocks.h:93 msgid "Dingbats" msgstr "رموز رسومية" -#: ../gucharmap/unicode-blocks.h:90 +#: ../gucharmap/unicode-blocks.h:94 msgid "Miscellaneous Mathematical Symbols-A" msgstr "رموز رياضية متنوعة-أ" -#: ../gucharmap/unicode-blocks.h:91 +#: ../gucharmap/unicode-blocks.h:95 msgid "Supplemental Arrows-A" msgstr "أسهم إضافية-أ" -#: ../gucharmap/unicode-blocks.h:92 +#: ../gucharmap/unicode-blocks.h:96 msgid "Braille Patterns" msgstr "أنماط برايل" -#: ../gucharmap/unicode-blocks.h:93 +#: ../gucharmap/unicode-blocks.h:97 msgid "Supplemental Arrows-B" msgstr "أسهم إضافية-ب" -#: ../gucharmap/unicode-blocks.h:94 +#: ../gucharmap/unicode-blocks.h:98 msgid "Miscellaneous Mathematical Symbols-B" msgstr "رموز رياضية متنوعة-ب" -#: ../gucharmap/unicode-blocks.h:95 +#: ../gucharmap/unicode-blocks.h:99 msgid "Supplemental Mathematical Operators" msgstr "علامات رياضية إضافية" -#: ../gucharmap/unicode-blocks.h:96 +#: ../gucharmap/unicode-blocks.h:100 msgid "Miscellaneous Symbols and Arrows" msgstr "رموز و أسهم متنوعة" -#: ../gucharmap/unicode-blocks.h:97 ../gucharmap/unicode-scripts.h:37 +#: ../gucharmap/unicode-blocks.h:101 ../gucharmap/unicode-scripts.h:40 msgid "Glagolitic" -msgstr "جلاجولي" +msgstr "گلاگولي" -#: ../gucharmap/unicode-blocks.h:98 +#: ../gucharmap/unicode-blocks.h:102 msgid "Latin Extended-C" msgstr "لا تيني ممتد-أ" -#: ../gucharmap/unicode-blocks.h:99 ../gucharmap/unicode-scripts.h:29 +#: ../gucharmap/unicode-blocks.h:103 ../gucharmap/unicode-scripts.h:31 msgid "Coptic" msgstr "قبطي" -#: ../gucharmap/unicode-blocks.h:100 +#: ../gucharmap/unicode-blocks.h:104 msgid "Georgian Supplement" msgstr "تكميليات جورجية" -#: ../gucharmap/unicode-blocks.h:101 ../gucharmap/unicode-scripts.h:89 +#: ../gucharmap/unicode-blocks.h:105 ../gucharmap/unicode-scripts.h:104 msgid "Tifinagh" -msgstr "تفناغ" +msgstr "تفيناغ" -#: ../gucharmap/unicode-blocks.h:102 +#: ../gucharmap/unicode-blocks.h:106 msgid "Ethiopic Extended" msgstr "إثيوبي ممتد" -#: ../gucharmap/unicode-blocks.h:103 +#: ../gucharmap/unicode-blocks.h:107 msgid "Cyrillic Extended-A" msgstr "سريلي ممتد-أ" -#: ../gucharmap/unicode-blocks.h:104 +#: ../gucharmap/unicode-blocks.h:108 msgid "Supplemental Punctuation" msgstr "تكميليات ترقيم" -#: ../gucharmap/unicode-blocks.h:105 +#: ../gucharmap/unicode-blocks.h:109 msgid "CJK Radicals Supplement" msgstr "تكميليات جذور ص‌ي‌ك" -#: ../gucharmap/unicode-blocks.h:106 +#: ../gucharmap/unicode-blocks.h:110 msgid "Kangxi Radicals" msgstr "جذور كان هي" -#: ../gucharmap/unicode-blocks.h:107 +#: ../gucharmap/unicode-blocks.h:111 msgid "Ideographic Description Characters" -msgstr "رموز وصف الإديوغرافات" +msgstr "رموز وصف الإديوگرافات" -#: ../gucharmap/unicode-blocks.h:108 +#: ../gucharmap/unicode-blocks.h:112 msgid "CJK Symbols and Punctuation" msgstr "رموز و ترقيمات ص‌ي‌ك" -#: ../gucharmap/unicode-blocks.h:109 ../gucharmap/unicode-scripts.h:46 +#: ../gucharmap/unicode-blocks.h:113 ../gucharmap/unicode-scripts.h:49 msgid "Hiragana" msgstr "هيراغنا" -#: ../gucharmap/unicode-blocks.h:110 ../gucharmap/unicode-scripts.h:49 +#: ../gucharmap/unicode-blocks.h:114 ../gucharmap/unicode-scripts.h:57 msgid "Katakana" msgstr "كتاكنا" -#: ../gucharmap/unicode-blocks.h:111 ../gucharmap/unicode-scripts.h:20 +#: ../gucharmap/unicode-blocks.h:115 ../gucharmap/unicode-scripts.h:22 msgid "Bopomofo" msgstr "بوبوموفو" -#: ../gucharmap/unicode-blocks.h:112 +#: ../gucharmap/unicode-blocks.h:116 msgid "Hangul Compatibility Jamo" -msgstr "جامو الموافق للهنغولية" +msgstr "توافقية هانگول جامو" -#: ../gucharmap/unicode-blocks.h:113 +#: ../gucharmap/unicode-blocks.h:117 msgid "Kanbun" msgstr "كنبون" -#: ../gucharmap/unicode-blocks.h:114 +#: ../gucharmap/unicode-blocks.h:118 msgid "Bopomofo Extended" msgstr "بوبوموفو ممدد" -#: ../gucharmap/unicode-blocks.h:115 +#: ../gucharmap/unicode-blocks.h:119 msgid "CJK Strokes" -msgstr "نظام ص‌ي‌ك " +msgstr "تركيبات ص‌ي‌ك" -#: ../gucharmap/unicode-blocks.h:116 +#: ../gucharmap/unicode-blocks.h:120 msgid "Katakana Phonetic Extensions" msgstr "الامتدادات الصوتية للكتاكنا" -#: ../gucharmap/unicode-blocks.h:117 +#: ../gucharmap/unicode-blocks.h:121 msgid "Enclosed CJK Letters and Months" -msgstr "حروف و شهور ص‌ي‌ك مضمنة" +msgstr "حروف و شهور ص‌ي‌ك محاطة" -#: ../gucharmap/unicode-blocks.h:118 +#: ../gucharmap/unicode-blocks.h:122 msgid "CJK Compatibility" -msgstr "توافق مع ص‌ي‌ك " +msgstr "توافق مع ص‌ي‌ك" -#: ../gucharmap/unicode-blocks.h:119 +#: ../gucharmap/unicode-blocks.h:123 msgid "CJK Unified Ideographs Extension A" -msgstr "امتدادات أ لإديوغرافات ص‌ي‌ك الموحدة" +msgstr "امتدادات أ لإديوگرافات ص‌ي‌ك الموحدة" -#: ../gucharmap/unicode-blocks.h:120 +#: ../gucharmap/unicode-blocks.h:124 msgid "Yijing Hexagram Symbols" msgstr "رموز يي جِن السداسية" -#: ../gucharmap/unicode-blocks.h:121 +#: ../gucharmap/unicode-blocks.h:125 msgid "CJK Unified Ideographs" -msgstr "إديوغرافات ص‌ي‌ك الموحدة" +msgstr "إديوگرافات ص‌ي‌ك الموحدة" -#: ../gucharmap/unicode-blocks.h:122 +#: ../gucharmap/unicode-blocks.h:126 msgid "Yi Syllables" msgstr "مقاطع يي" -#: ../gucharmap/unicode-blocks.h:123 +#: ../gucharmap/unicode-blocks.h:127 msgid "Yi Radicals" msgstr "جذور يي" -#: ../gucharmap/unicode-blocks.h:124 ../gucharmap/unicode-scripts.h:91 +#: ../gucharmap/unicode-blocks.h:128 ../gucharmap/unicode-scripts.h:66 +msgid "Lisu" +msgstr "ليسو" + +#: ../gucharmap/unicode-blocks.h:129 ../gucharmap/unicode-scripts.h:106 msgid "Vai" -msgstr "فاي" +msgstr "ڤاي" -#: ../gucharmap/unicode-blocks.h:125 +#: ../gucharmap/unicode-blocks.h:130 msgid "Cyrillic Extended-B" msgstr "سريلي ممتد-ب" -#: ../gucharmap/unicode-blocks.h:126 +#: ../gucharmap/unicode-blocks.h:131 ../gucharmap/unicode-scripts.h:20 +msgid "Bamum" +msgstr "باموم" + +#: ../gucharmap/unicode-blocks.h:132 msgid "Modifier Tone Letters" msgstr "حروف مغيرة للنغمة" -#: ../gucharmap/unicode-blocks.h:127 +#: ../gucharmap/unicode-blocks.h:133 msgid "Latin Extended-D" msgstr "لا تيني ممتد-ت" -#: ../gucharmap/unicode-blocks.h:128 ../gucharmap/unicode-scripts.h:79 +#: ../gucharmap/unicode-blocks.h:134 ../gucharmap/unicode-scripts.h:92 msgid "Syloti Nagri" -msgstr "سيولتي ناغري" +msgstr "سيولتي ناگري" -#: ../gucharmap/unicode-blocks.h:129 +#: ../gucharmap/unicode-blocks.h:135 +msgid "Common Indic Number Forms" +msgstr "أشكال الأعداد الهندية المشتركة" + +#: ../gucharmap/unicode-blocks.h:136 msgid "Phags-pa" -msgstr "فاغس-با" +msgstr "فاگس-با" -#: ../gucharmap/unicode-blocks.h:130 ../gucharmap/unicode-scripts.h:75 +#: ../gucharmap/unicode-blocks.h:137 ../gucharmap/unicode-scripts.h:88 msgid "Saurashtra" msgstr "سوراشترا" -#: ../gucharmap/unicode-blocks.h:131 ../gucharmap/unicode-scripts.h:50 +#: ../gucharmap/unicode-blocks.h:138 +msgid "Devanagari Extended" +msgstr "دفنيجري ممتد" + +#: ../gucharmap/unicode-blocks.h:139 ../gucharmap/unicode-scripts.h:58 msgid "Kayah Li" msgstr "كاياه لي" -#: ../gucharmap/unicode-blocks.h:132 ../gucharmap/unicode-scripts.h:73 +#: ../gucharmap/unicode-blocks.h:140 ../gucharmap/unicode-scripts.h:85 msgid "Rejang" -msgstr "ريجانغ" +msgstr "ريجانگ" + +#: ../gucharmap/unicode-blocks.h:141 +msgid "Hangul Jamo Extended-A" +msgstr "هانگول جامو ممتد-أ" -#: ../gucharmap/unicode-blocks.h:133 ../gucharmap/unicode-scripts.h:26 +#: ../gucharmap/unicode-blocks.h:142 ../gucharmap/unicode-scripts.h:54 +msgid "Javanese" +msgstr "جاوية" + +#: ../gucharmap/unicode-blocks.h:143 ../gucharmap/unicode-scripts.h:28 msgid "Cham" msgstr "تشام" -#: ../gucharmap/unicode-blocks.h:134 +#: ../gucharmap/unicode-blocks.h:144 +msgid "Myanmar Extended-A" +msgstr "ميانمار ممتد-أ" + +#: ../gucharmap/unicode-blocks.h:145 ../gucharmap/unicode-scripts.h:98 +msgid "Tai Viet" +msgstr "ڤيت تايلندي" + +#: ../gucharmap/unicode-blocks.h:146 ../gucharmap/unicode-scripts.h:70 +msgid "Meetei Mayek" +msgstr "ميتي مايك" + +#: ../gucharmap/unicode-blocks.h:147 msgid "Hangul Syllables" -msgstr "مقاطع الهنغولية" +msgstr "مقاطع الهنگولية" -#: ../gucharmap/unicode-blocks.h:135 +#: ../gucharmap/unicode-blocks.h:148 +msgid "Hangul Jamo Extended-B" +msgstr "هانگول جامو ممتد-ب" + +#: ../gucharmap/unicode-blocks.h:149 msgid "High Surrogates" msgstr "بدائل عالية" -#: ../gucharmap/unicode-blocks.h:136 +#: ../gucharmap/unicode-blocks.h:150 msgid "High Private Use Surrogates" msgstr "بدائل عالية للاستخدام الخاص" -#: ../gucharmap/unicode-blocks.h:137 +#: ../gucharmap/unicode-blocks.h:151 msgid "Low Surrogates" msgstr "بدائل منخفضة" -#: ../gucharmap/unicode-blocks.h:138 +#: ../gucharmap/unicode-blocks.h:152 msgid "Private Use Area" msgstr "منطقة الاستخدام الخاص" -#: ../gucharmap/unicode-blocks.h:139 +#: ../gucharmap/unicode-blocks.h:153 msgid "CJK Compatibility Ideographs" -msgstr "إديوغرافات التوافق مع ص‌ي‌ك" +msgstr "إديوگرافات التوافق مع ص‌ي‌ك" -#: ../gucharmap/unicode-blocks.h:140 +#: ../gucharmap/unicode-blocks.h:154 msgid "Alphabetic Presentation Forms" msgstr "أشكال العرض الألفبائية" -#: ../gucharmap/unicode-blocks.h:141 +#: ../gucharmap/unicode-blocks.h:155 msgid "Arabic Presentation Forms-A" msgstr "أشكال العرض العربية-أ" -#: ../gucharmap/unicode-blocks.h:142 +#: ../gucharmap/unicode-blocks.h:156 msgid "Variation Selectors" msgstr "منتقيات التنويعات" -#: ../gucharmap/unicode-blocks.h:143 +#: ../gucharmap/unicode-blocks.h:157 msgid "Vertical Forms" msgstr "الأشكال العمودية" -#: ../gucharmap/unicode-blocks.h:144 +#: ../gucharmap/unicode-blocks.h:158 msgid "Combining Half Marks" msgstr "علامة تركيبية نصفية" -#: ../gucharmap/unicode-blocks.h:145 +#: ../gucharmap/unicode-blocks.h:159 msgid "CJK Compatibility Forms" msgstr "أشكال التوافق مع ص‌ي‌ك" -#: ../gucharmap/unicode-blocks.h:146 +#: ../gucharmap/unicode-blocks.h:160 msgid "Small Form Variants" msgstr "تنويعات صغرى" -#: ../gucharmap/unicode-blocks.h:147 +#: ../gucharmap/unicode-blocks.h:161 msgid "Arabic Presentation Forms-B" msgstr "أشكال عرض العربية-ب" -#: ../gucharmap/unicode-blocks.h:148 +#: ../gucharmap/unicode-blocks.h:162 msgid "Halfwidth and Fullwidth Forms" msgstr "أشكال كاملة ونصفية العرض" -#: ../gucharmap/unicode-blocks.h:149 +#: ../gucharmap/unicode-blocks.h:163 msgid "Specials" msgstr "خاصة" -#: ../gucharmap/unicode-blocks.h:150 +#: ../gucharmap/unicode-blocks.h:164 msgid "Linear B Syllabary" msgstr "مقاطع خطية ب" -#: ../gucharmap/unicode-blocks.h:151 +#: ../gucharmap/unicode-blocks.h:165 msgid "Linear B Ideograms" msgstr "صور معنوية خطية ب" -#: ../gucharmap/unicode-blocks.h:152 +#: ../gucharmap/unicode-blocks.h:166 msgid "Aegean Numbers" -msgstr "الأرقام الإيجية" +msgstr "أرقام إيجية" -#: ../gucharmap/unicode-blocks.h:153 +#: ../gucharmap/unicode-blocks.h:167 msgid "Ancient Greek Numbers" msgstr "أرقام يونانية قديمة" -#: ../gucharmap/unicode-blocks.h:154 +#: ../gucharmap/unicode-blocks.h:168 msgid "Ancient Symbols" msgstr "رموز أثرية" -#: ../gucharmap/unicode-blocks.h:155 +#: ../gucharmap/unicode-blocks.h:169 msgid "Phaistos Disc" msgstr "قرص فستوس" -#: ../gucharmap/unicode-blocks.h:156 ../gucharmap/unicode-scripts.h:58 +#: ../gucharmap/unicode-blocks.h:170 ../gucharmap/unicode-scripts.h:67 msgid "Lycian" msgstr "ليشياني" -#: ../gucharmap/unicode-blocks.h:157 ../gucharmap/unicode-scripts.h:25 +#: ../gucharmap/unicode-blocks.h:171 ../gucharmap/unicode-scripts.h:27 msgid "Carian" msgstr "كاريان" -#: ../gucharmap/unicode-blocks.h:158 ../gucharmap/unicode-scripts.h:67 +#: ../gucharmap/unicode-blocks.h:172 ../gucharmap/unicode-scripts.h:77 msgid "Old Italic" msgstr "إيطالي قديم" -#: ../gucharmap/unicode-blocks.h:159 ../gucharmap/unicode-scripts.h:38 +#: ../gucharmap/unicode-blocks.h:173 ../gucharmap/unicode-scripts.h:41 msgid "Gothic" msgstr "قوطي" -#: ../gucharmap/unicode-blocks.h:160 ../gucharmap/unicode-scripts.h:90 +#: ../gucharmap/unicode-blocks.h:174 ../gucharmap/unicode-scripts.h:105 msgid "Ugaritic" msgstr "أوغاريتي" -#: ../gucharmap/unicode-blocks.h:161 ../gucharmap/unicode-scripts.h:68 +#: ../gucharmap/unicode-blocks.h:175 ../gucharmap/unicode-scripts.h:78 msgid "Old Persian" msgstr "فارسية قديمة" -#: ../gucharmap/unicode-blocks.h:162 ../gucharmap/unicode-scripts.h:33 +#: ../gucharmap/unicode-blocks.h:176 ../gucharmap/unicode-scripts.h:35 msgid "Deseret" msgstr "ديزرت" -#: ../gucharmap/unicode-blocks.h:163 ../gucharmap/unicode-scripts.h:76 +#: ../gucharmap/unicode-blocks.h:177 ../gucharmap/unicode-scripts.h:89 msgid "Shavian" msgstr "شافيان" -#: ../gucharmap/unicode-blocks.h:164 ../gucharmap/unicode-scripts.h:70 +#: ../gucharmap/unicode-blocks.h:178 ../gucharmap/unicode-scripts.h:82 msgid "Osmanya" msgstr "عثمانيا" -#: ../gucharmap/unicode-blocks.h:165 +#: ../gucharmap/unicode-blocks.h:179 msgid "Cypriot Syllabary" msgstr "مقاطع القبرصية" -#: ../gucharmap/unicode-blocks.h:166 ../gucharmap/unicode-scripts.h:72 +#: ../gucharmap/unicode-blocks.h:180 ../gucharmap/unicode-scripts.h:50 +msgid "Imperial Aramaic" +msgstr "آرامي ملكي" + +#: ../gucharmap/unicode-blocks.h:181 ../gucharmap/unicode-scripts.h:84 msgid "Phoenician" msgstr "فينيقية" -#: ../gucharmap/unicode-blocks.h:167 ../gucharmap/unicode-scripts.h:59 +#: ../gucharmap/unicode-blocks.h:182 ../gucharmap/unicode-scripts.h:68 msgid "Lydian" msgstr "ليديان" -#: ../gucharmap/unicode-blocks.h:168 ../gucharmap/unicode-scripts.h:51 +#: ../gucharmap/unicode-blocks.h:183 ../gucharmap/unicode-scripts.h:59 msgid "Kharoshthi" msgstr "خاروشذي" -#: ../gucharmap/unicode-blocks.h:169 ../gucharmap/unicode-scripts.h:30 +#: ../gucharmap/unicode-blocks.h:184 ../gucharmap/unicode-scripts.h:79 +msgid "Old South Arabian" +msgstr "جنوب عربي قديم" + +#: ../gucharmap/unicode-blocks.h:185 ../gucharmap/unicode-scripts.h:18 +msgid "Avestan" +msgstr "أڤستانية" + +#: ../gucharmap/unicode-blocks.h:186 ../gucharmap/unicode-scripts.h:53 +msgid "Inscriptional Parthian" +msgstr "بارثيان نحتي" + +#: ../gucharmap/unicode-blocks.h:187 ../gucharmap/unicode-scripts.h:52 +msgid "Inscriptional Pahlavi" +msgstr "بهلوي نحتي" + +#: ../gucharmap/unicode-blocks.h:188 ../gucharmap/unicode-scripts.h:80 +msgid "Old Turkic" +msgstr "تركي قديم" + +#: ../gucharmap/unicode-blocks.h:189 +msgid "Rumi Numeral Symbols" +msgstr "رموز أرقام رومية" + +#: ../gucharmap/unicode-blocks.h:190 ../gucharmap/unicode-scripts.h:55 +msgid "Kaithi" +msgstr "كياثي" + +#: ../gucharmap/unicode-blocks.h:191 ../gucharmap/unicode-scripts.h:32 msgid "Cuneiform" msgstr "مسماري" -#: ../gucharmap/unicode-blocks.h:170 +#: ../gucharmap/unicode-blocks.h:192 msgid "Cuneiform Numbers and Punctuation" msgstr "أعداد وترقيم مسماري" -#: ../gucharmap/unicode-blocks.h:171 +#: ../gucharmap/unicode-blocks.h:193 ../gucharmap/unicode-scripts.h:37 +msgid "Egyptian Hieroglyphs" +msgstr "هيروغليفي مصري" + +#: ../gucharmap/unicode-blocks.h:194 msgid "Byzantine Musical Symbols" msgstr "رموز موسيقية بيزنطية" -#: ../gucharmap/unicode-blocks.h:172 +#: ../gucharmap/unicode-blocks.h:195 msgid "Musical Symbols" msgstr "رموز موسيقية" -#: ../gucharmap/unicode-blocks.h:173 +#: ../gucharmap/unicode-blocks.h:196 msgid "Ancient Greek Musical Notation" msgstr "رموز موسيقية يونانية قديمة" -#: ../gucharmap/unicode-blocks.h:174 +#: ../gucharmap/unicode-blocks.h:197 msgid "Tai Xuan Jing Symbols" msgstr "رموز تاي زوان دجن" -#: ../gucharmap/unicode-blocks.h:175 +#: ../gucharmap/unicode-blocks.h:198 msgid "Counting Rod Numerals" msgstr "تعداد أرقام رود" -#: ../gucharmap/unicode-blocks.h:176 +#: ../gucharmap/unicode-blocks.h:199 msgid "Mathematical Alphanumeric Symbols" msgstr "رموز رياضية أبجدي عددية" -#: ../gucharmap/unicode-blocks.h:177 +#: ../gucharmap/unicode-blocks.h:200 msgid "Mahjong Tiles" msgstr "مربعات ماهجونغ" -#: ../gucharmap/unicode-blocks.h:178 +#: ../gucharmap/unicode-blocks.h:201 msgid "Domino Tiles" msgstr "مربعات دومينو" -#: ../gucharmap/unicode-blocks.h:179 +#: ../gucharmap/unicode-blocks.h:202 +msgid "Enclosed Alphanumeric Supplement" +msgstr "أبجدي رقمي محاط إضافي" + +#: ../gucharmap/unicode-blocks.h:203 +msgid "Enclosed Ideographic Supplement" +msgstr "إديوگرافات محاطة إضافية" + +#: ../gucharmap/unicode-blocks.h:204 msgid "CJK Unified Ideographs Extension B" -msgstr "امتدادات ب لإديوغرافات ص‌ي‌ك الموحدة " +msgstr "امتدادات ب لإديوگرافات ص‌ي‌ك الموحدة ب" -#: ../gucharmap/unicode-blocks.h:180 +#: ../gucharmap/unicode-blocks.h:205 +msgid "CJK Unified Ideographs Extension C" +msgstr "امتدادات أ لإديوگرافات ص‌ي‌ك الموحدة ج" + +#: ../gucharmap/unicode-blocks.h:206 msgid "CJK Compatibility Ideographs Supplement" -msgstr "الإديوغرافات التكميلية المتوافقة مع ص‌ي‌ك" +msgstr "الإديوگرافات التكميلية المتوافقة مع ص‌ي‌ك" -#: ../gucharmap/unicode-blocks.h:181 +#: ../gucharmap/unicode-blocks.h:207 msgid "Tags" msgstr "وسوم" -#: ../gucharmap/unicode-blocks.h:182 +#: ../gucharmap/unicode-blocks.h:208 msgid "Variation Selectors Supplement" msgstr "تكميليات منتقيات التنويعات" -#: ../gucharmap/unicode-blocks.h:183 +#: ../gucharmap/unicode-blocks.h:209 msgid "Supplementary Private Use Area-A" msgstr "مساحة تكميلية للاستعمال الخاص-أ" -#: ../gucharmap/unicode-blocks.h:184 +#: ../gucharmap/unicode-blocks.h:210 msgid "Supplementary Private Use Area-B" msgstr "مساحة تكميلية للاستعمال الخاص-ب" -#: ../gucharmap/unicode-scripts.h:21 +#: ../gucharmap/unicode-scripts.h:23 msgid "Braille" msgstr "بريل" -#: ../gucharmap/unicode-scripts.h:24 +#: ../gucharmap/unicode-scripts.h:26 msgid "Canadian Aboriginal" msgstr "سكان كندا الأصليين" -#: ../gucharmap/unicode-scripts.h:31 +#: ../gucharmap/unicode-scripts.h:33 msgid "Cypriot" msgstr "قبرصي" -#: ../gucharmap/unicode-scripts.h:39 +#: ../gucharmap/unicode-scripts.h:42 msgid "Greek" msgstr "يوناني" -#: ../gucharmap/unicode-scripts.h:42 +#: ../gucharmap/unicode-scripts.h:45 msgid "Han" msgstr "هان" -#: ../gucharmap/unicode-scripts.h:43 +#: ../gucharmap/unicode-scripts.h:46 msgid "Hangul" -msgstr "هانغول" +msgstr "هانگول" -#: ../gucharmap/unicode-scripts.h:47 +#: ../gucharmap/unicode-scripts.h:51 msgid "Inherited" msgstr "موروث" -#: ../gucharmap/unicode-scripts.h:54 +#: ../gucharmap/unicode-scripts.h:62 msgid "Latin" msgstr "لاتيني" -#: ../gucharmap/unicode-scripts.h:57 +#: ../gucharmap/unicode-scripts.h:65 msgid "Linear B" msgstr "خطي ب" -#: ../gucharmap/unicode-scripts.h:71 +#: ../gucharmap/unicode-scripts.h:83 msgid "Phags Pa" msgstr "فاغس با" -#: ../gucharmap/unicode-scripts.h:92 +#: ../gucharmap/unicode-scripts.h:107 msgid "Yi" msgstr "يي" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "معلومات" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:739 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "ابحث" @@ -1231,31 +1335,31 @@ msgid "_Previous" msgstr "ال_سابق" -#: ../gucharmap/gucharmap-search-dialog.c:760 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "ال_تالي" -#: ../gucharmap/gucharmap-search-dialog.c:770 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "ا_بحث:" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "طابق ك_امل الكلمة" -#: ../gucharmap/gucharmap-search-dialog.c:785 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "ابحث في ت_فاصيل المحارف" -#: ../gucharmap/gucharmap-block-chapters-model.c:53 +#: ../gucharmap/gucharmap-block-chapters-model.c:84 msgid "All" msgstr "الكل" -#: ../gucharmap/gucharmap-block-chapters-model.c:138 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "قالب يونيكود" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "نظام كتابة" diff -Nru gucharmap-2.31.91/po/cs.po gucharmap-2.32.0/po/cs.po --- gucharmap-2.31.91/po/cs.po 2010-03-29 09:29:45.000000000 -0400 +++ gucharmap-2.32.0/po/cs.po 2010-09-26 14:53:09.000000000 -0400 @@ -11,17 +11,18 @@ msgstr "" "Project-Id-Version: gucharmap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-20 02:01+0100\n" -"PO-Revision-Date: 2010-03-20 02:01+0100\n" +"POT-Creation-Date: 2010-09-23 00:10+0200\n" +"PO-Revision-Date: 2010-09-23 00:10+0200\n" "Last-Translator: Petr Kovar \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.0\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Mapa znaků" @@ -127,40 +128,40 @@ msgid "Korean Pronunciation:" msgstr "Korejská výslovnost:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Tabulka z_naků" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "_Detaily znaku" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Neznámý znak, nelze jej identifikovat." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Nenalezeno." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Znak nalezen." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tabulka znaků" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Písmo" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Rodina písma" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Velikost písma" @@ -331,12 +332,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap je svobodný software; můžete jej šířit a modifikovat podle " "ustanovení GNU General Public License, vydávané Free Software Foundation; a " -"to buď verze 2 této licence anebo (podle vlastního uvážení) kterékoliv " +"to buď verze 3 této licence anebo (podle vlastního uvážení) kterékoliv " "pozdější verze." #: ../gucharmap/gucharmap-window.c:497 @@ -398,11 +399,11 @@ "Jakub Friedl \n" "Petr Kovář " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Následující písmo" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Předchozí písmo" @@ -414,71 +415,71 @@ msgid "Previous Block" msgstr "Předchozí blok" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Soubor" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Zobrazit" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Hledat" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "Pře_jít" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Nápověda" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Vzhled _stránky" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Hledat _následující" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Hledat _předchozí" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "_Následující znak" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "_Předchozí znak" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Obsah" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "O _aplikaci" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Podle pí_sma" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Podle _bloku Unicode" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Přich_ytit sloupce k mocninám dvojky" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Text ke zkopírování:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Zkopírovat do schránky." @@ -1322,32 +1323,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informace" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Hledat" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Předchozí" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Následující" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Hledat:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Hledat _celé slovo" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Hledat v _detailech znaku" @@ -1355,10 +1356,10 @@ msgid "All" msgstr "Vše" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Blok Unicode" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Písmo" diff -Nru gucharmap-2.31.91/po/da.po gucharmap-2.32.0/po/da.po --- gucharmap-2.31.91/po/da.po 2010-03-02 08:05:20.000000000 -0500 +++ gucharmap-2.32.0/po/da.po 2010-09-26 14:53:09.000000000 -0400 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: gucharmap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-14 17:24+0100\n" -"PO-Revision-Date: 2010-02-13 16:42+0100\n" +"POT-Creation-Date: 2010-09-16 23:50+0200\n" +"PO-Revision-Date: 2010-09-15 20:58+0200\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Tegnoversigt" @@ -133,40 +133,40 @@ msgid "Korean Pronunciation:" msgstr "Koreansk udtale:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Tegn_oversigt" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Tegn_detaljer" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Ukendt tegn, kan ikke identificeres." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Ikke fundet." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Tegn fundet." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tegnoversigt" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Skrifttype" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Familie" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Størrelse" @@ -181,151 +181,151 @@ msgid "Common" msgstr "Almen" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "Anden, kontrol" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "Anden, formatering" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "Anden, ikke tildelt" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "Anden, privat brug" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Anden, surrogat" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "Bogstav, lille" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Bogstav, ændring" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "Bogstav, andet" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "Bogstav, titel" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "Bogstav, stort" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "Tegn, mellemrumskombinerende" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "Tegn, indrammende" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "Tegn, ikke-mellemrum" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "Tal, decimalt tal" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "Tal, bogstav" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "Tal, andet" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "Punktuering, forbinder" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "Punktuering, tankestreg" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "Punktuering, lukning" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "Punktuering, afsluttende anførselstegn" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "Punktuering, begyndende anførselstegn" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "Punktuering, anden" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "Punktuering, åbning" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "Symbol, valuta" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "Symbol, ændring" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "Symbol, matematik" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "Symbol, andet" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "Adskiller, linje" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "Adskiller, afsnit" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "Adskiller, mellemrum" @@ -337,12 +337,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap er frit programmel; det kan distribueres og/eller modificeres som " "betinget af GNU General Public License, udarbejdet af Free Software " -"Foundation; enten version 2 af licensen eller, efter eget valg, enhver nyere " +"Foundation; enten version 3 af licensen eller, efter eget valg, enhver nyere " "version." #: ../gucharmap/gucharmap-window.c:497 @@ -407,11 +407,11 @@ "Dansk-gruppen \n" "Mere info: http://dansk-gruppen.dk/" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Næste skrift" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Forrige skrift" @@ -423,71 +423,71 @@ msgid "Previous Block" msgstr "Forrige blok" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Fil" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Vis" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Find" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Gå til" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Hjælp" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Side_opsætning" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Find _næste" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Find _forrige" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "_Næste tegn" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "_Forrige tegn" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Indhold" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_Om" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Efter _skrift" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Efter _Unicodeblokke" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Lås _kolonner til potenser af to" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Tekst at kopiere:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Kopiér til udklipsholderen." @@ -1340,32 +1340,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Information" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Find" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Forrige" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Næste" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Find:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Træf på _hele ordet" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Søg i tegn_detaljer" @@ -1373,11 +1373,11 @@ msgid "All" msgstr "Alle" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Unicodeblok" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Skrift" diff -Nru gucharmap-2.31.91/po/de.po gucharmap-2.32.0/po/de.po --- gucharmap-2.31.91/po/de.po 2010-03-02 08:05:20.000000000 -0500 +++ gucharmap-2.32.0/po/de.po 2010-09-26 14:53:09.000000000 -0400 @@ -4,7 +4,6 @@ # Christian Neumair , 2003, 2004. # Hendrik Richter , 2005, 2006. # Andre Klapper , 2008, 2009. -# Christian Kirbach , 2009. # Mario Blättermann , 2010. # # #Fachbegriffe (Unicode terminology): @@ -20,24 +19,24 @@ # combining - kombiniert # Cuneiform - Keilschrift # modifier - Zusatzzeichen +# Christian Kirbach , 2009, 2010. # msgid "" msgstr "" "Project-Id-Version: gucharmap 1.3.0\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=gucharmap&component=general\n" -"POT-Creation-Date: 2010-02-06 17:58+0000\n" -"PO-Revision-Date: 2010-02-14 15:27+0100\n" -"Last-Translator: Mario Blättermann \n" -"Language-Team: German \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-04 17:02+0200\n" +"PO-Revision-Date: 2010-09-04 17:03+0200\n" +"Last-Translator: Christian Kirbach \n" +"Language-Team: Deutsch \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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Zeichentabelle" @@ -143,40 +142,40 @@ msgid "Korean Pronunciation:" msgstr "Koreanische Aussprache:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Zeichen_tabelle" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Zeichen_details" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Unbekanntes Zeichen, Identifikation nicht möglich." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Nicht gefunden." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Zeichen gefunden." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Zeichentabelle" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Schrift" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Schriftfamilie" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Schriftgröße" @@ -191,152 +190,152 @@ msgid "Common" msgstr "Allgemein" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "Sonstige, Steuerung" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "Sonstige, Formatierung" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "Sonstige, Nicht zugewiesen" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "Sonstige, Privater Gebrauch" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Sonstige, Ersatzkode" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "Kleinbuchstabe" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Buchstabe, Zusatzzeichen" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "Buchstabe, Sonstige" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "Großbuchstabe am Wortanfang" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "Großbuchstabe" # CHECK -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "Zusatzzeichen, kombinierende Anfügung" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "Zusatzzeichen, einschließend" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "Zusatzzeichen, kombinierend" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "Zahl, Dezimalziffer" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "Zahl, Buchstabe" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "Zahl, Sonstige" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "Interpunktion, Verbinder" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "Interpunktion, Bindestrich" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "Interpunktion, Schließend" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "Interpunktion, Schließendes Anführungszeichen" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "Interpunktion, Öffnendes Anführungszeichen" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "Interpunktion, Sonstige" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "Interpunktion, Öffnend" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "Symbol, Währung" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "Symbol, Zusatzzeichen" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "Symbol, Mathematik" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "Symbol, Sonstige" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "Trenner, Zeile" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "Trenner, Absatz" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "Trenner, Leerzeichen" @@ -348,12 +347,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap ist freie Software. Sie können es unter den Bedingungen der GNU " "General Public License, wie von der Free Software Foundation veröffentlicht, " -"weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder " +"weitergeben und/oder modifizieren, entweder gemäß Version 3 der Lizenz oder " "(nach Ihrer Option) jeder späteren Version." #: ../gucharmap/gucharmap-window.c:497 @@ -416,11 +415,11 @@ "Hendrik Richter \n" "Andre Klapper " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Nächstes Schriftsystem" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Vorheriges Schriftsystem" @@ -432,71 +431,71 @@ msgid "Previous Block" msgstr "Vorheriger Block" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Datei" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Ansicht" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Suchen" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Gehe zu" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Hilfe" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Sei_teneinstellungen" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "_Weitersuchen" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "_Rückwärts suchen" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "_Nächstem Zeichen" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "_Vorherigem Zeichen" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Inhalt" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_Info" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Nach _Schriftsystem" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Nach _Unicode-Block" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Spalten auf doppelte Breite erweitern" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "Zu kopierender _Text:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "In die Zwischenablage kopieren" @@ -1351,32 +1350,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informationen" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Suchen" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Rückwärts suchen" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Weitersuchen" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "Such_begriff:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Nur _vollständige Wörter berücksichtigen" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Suchen in Zeichen_details" @@ -1384,11 +1383,11 @@ msgid "All" msgstr "Alle" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Unicode-Block" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Schriftsystem" diff -Nru gucharmap-2.31.91/po/en_GB.po gucharmap-2.32.0/po/en_GB.po --- gucharmap-2.31.91/po/en_GB.po 2010-03-02 08:05:20.000000000 -0500 +++ gucharmap-2.32.0/po/en_GB.po 2010-09-26 14:53:09.000000000 -0400 @@ -1,24 +1,24 @@ # English (British) translation. -# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the gucharmap package. +# Copyright (C) 2004 gucharmap'S COPYRIGHT HOLDER +# This file is distributed under the same licence as the gucharmap package. # Gareth Owen , 2004. -# Bruce Cowan , 2010. +# Bruce Cowan , 2010. msgid "" msgstr "" "Project-Id-Version: gucharmap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-24 15:11+0000\n" -"PO-Revision-Date: 2010-01-27 21:46+0100\n" -"Last-Translator: Bruce Cowan \n" +"POT-Creation-Date: 2010-08-31 18:38+0100\n" +"PO-Revision-Date: 2010-08-31 18:42+0100\n" +"Last-Translator: Bruce Cowan \n" "Language-Team: British English \n" +"Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.5.1\n" +"X-Generator: Virtaal 0.6.1\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Character Map" @@ -124,40 +124,40 @@ msgid "Korean Pronunciation:" msgstr "Korean Pronunciation:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Characte_r Table" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Character _Details" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Unknown character, unable to identify." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Not found." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Character found." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Character Table" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Font" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Font Family" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Font Size" @@ -172,151 +172,151 @@ msgid "Common" msgstr "Common" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "Other, Control" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "Other, Format" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "Other, Not Assigned" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "Other, Private Use" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Other, Surrogate" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "Letter, Lowercase" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Letter, Modifier" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "Letter, Other" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "Letter, Titlecase" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "Letter, Uppercase" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "Mark, Spacing Combining" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "Mark, Enclosing" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "Mark, Non-Spacing" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "Number, Decimal Digit" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "Number, Letter" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "Number, Other" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "Punctuation, Connector" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "Punctuation, Dash" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "Punctuation, Close" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "Punctuation, Final Quote" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "Punctuation, Initial Quote" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "Punctuation, Other" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "Punctuation, Open" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "Symbol, Currency" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "Symbol, Modifier" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "Symbol, Math" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "Symbol, Other" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "Separator, Line" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "Separator, Paragraph" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "Separator, Space" @@ -328,12 +328,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public Licence as published by the Free " -"Software Foundation; either version 2 of the Licence, or (at your option) " +"Software Foundation; either version 3 of the Licence, or (at your option) " "any later version." #: ../gucharmap/gucharmap-window.c:497 @@ -395,13 +395,13 @@ "Bastien Nocera \n" "Gareth Owen \n" "Philip Withnall \n" -"Bruce Cowan " +"Bruce Cowan " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Next Script" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Previous Script" @@ -413,71 +413,71 @@ msgid "Previous Block" msgstr "Previous Block" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_File" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_View" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Search" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Go" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Help" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Page _Setup" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Find _Next" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Find _Previous" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "_Next Character" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "_Previous Character" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Contents" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_About" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "By _Script" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "By _Unicode Block" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Snap _Columns to Power of Two" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Text to copy:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Copy to the clipboard." @@ -1321,32 +1321,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Information" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Find" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Previous" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Next" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Search:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Match _whole word" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Search in character _details" @@ -1354,11 +1354,11 @@ msgid "All" msgstr "All" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Unicode Block" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Script" diff -Nru gucharmap-2.31.91/po/et.po gucharmap-2.32.0/po/et.po --- gucharmap-2.31.91/po/et.po 2010-08-29 08:04:17.000000000 -0400 +++ gucharmap-2.32.0/po/et.po 2010-09-26 14:53:09.000000000 -0400 @@ -1,12 +1,12 @@ # Gucharmap'i eesti keele tõlge. # Estonian translation of Gucharmap. - +# # Copyright (C) 2005–2010 The Gnome Project. # This file is distributed under the same license as the gucharmap package. - +# # Priit Laes , 2005. # Ivar Smolin , 2005–2010. - +# # Käesolevas tõlkes on kasutatud järgnevaid materjale EKI kodulehelt: # * standard EVS8: # http://www.eki.ee/itstandard/2000/EVS8_rakendusjuhend.pdf @@ -18,14 +18,14 @@ # http://www.eki.ee/knab/linguae.htm # * lokaatide andmed # http://www.eki.ee/itstandard/2006/1.5.script.html - +# msgid "" msgstr "" "Project-Id-Version: Gucharmap 2.32\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gucharmap&component=general\n" "POT-Creation-Date: 2010-08-19 15:10+0000\n" -"PO-Revision-Date: 2010-08-27 11:37+0300\n" +"PO-Revision-Date: 2010-09-18 17:52+0300\n" "Last-Translator: Ivar Smolin \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" @@ -261,12 +261,6 @@ msgid "Searching…" msgstr "Otsimine…" -#, fuzzy -#| msgid "" -#| "Gucharmap is free software; you can redistribute it and/or modify it " -#| "under the terms of the GNU General Public License as published by the " -#| "Free Software Foundation; either version 2 of the License, or (at your " -#| "option) any later version." msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " @@ -275,7 +269,7 @@ msgstr "" "Gucharmap on vaba tarkvara. Te võite seda edasi levitada ja/või muuta " "vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need on Vaba " -"Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number 2 või " +"Tarkvara Fondi poolt avaldatud; kas Litsentsi versioon number 3 või " "(vastavalt Teie valikule) ükskõik milline hilisem versioon." msgid "" @@ -762,7 +756,7 @@ msgstr "Silotinagri" msgid "Common Indic Number Forms" -msgstr "" +msgstr "Üldised India numbrivormid" msgid "Phags-pa" msgstr "Phags-pa" @@ -924,7 +918,7 @@ msgstr "Muinastürgi" msgid "Rumi Numeral Symbols" -msgstr "" +msgstr "Rumi numbrid" msgid "Kaithi" msgstr "Kaithi" diff -Nru gucharmap-2.31.91/po/he.po gucharmap-2.32.0/po/he.po --- gucharmap-2.31.91/po/he.po 2010-08-18 07:05:06.000000000 -0400 +++ gucharmap-2.32.0/po/he.po 2010-09-26 14:53:09.000000000 -0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gucharmap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-11 02:13+0300\n" -"PO-Revision-Date: 2010-08-11 08:43+0200\n" +"POT-Creation-Date: 2010-09-21 09:05+0200\n" +"PO-Revision-Date: 2010-09-25 02:25+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -406,11 +406,11 @@ #: ../gucharmap/gucharmap-window.c:612 msgid "Next Block" -msgstr "" +msgstr "המקטע הבא" #: ../gucharmap/gucharmap-window.c:612 msgid "Previous Block" -msgstr "" +msgstr "המקטע הקודם" #: ../gucharmap/gucharmap-window.c:847 msgid "_File" @@ -466,7 +466,7 @@ #: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" -msgstr "" +msgstr "לפי מ_קטע יוניקוד" #: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" @@ -494,7 +494,7 @@ #: ../gucharmap/unicode-blocks.h:15 msgid "Latin-1 Supplement" -msgstr "לטיני-1 תוספות" +msgstr "השלמה של לטיני-1" #: ../gucharmap/unicode-blocks.h:16 msgid "Latin Extended-A" @@ -622,7 +622,7 @@ #: ../gucharmap/unicode-blocks.h:47 msgid "Hangul Jamo" -msgstr "ג׳אמו של הנגול" +msgstr "האנגול ג׳מו" #: ../gucharmap/unicode-blocks.h:48 ../gucharmap/unicode-scripts.h:38 msgid "Ethiopic" @@ -673,9 +673,8 @@ msgstr "מונגולית" #: ../gucharmap/unicode-blocks.h:60 -#, fuzzy msgid "Unified Canadian Aboriginal Syllabics Extended" -msgstr "תנועות קנדיות אבוריג'יניות מאוחדות" +msgstr "השלמה של סימניות קנדיות ילידות מאוחדות" #: ../gucharmap/unicode-blocks.h:61 ../gucharmap/unicode-scripts.h:64 msgid "Limbu" @@ -727,11 +726,11 @@ #: ../gucharmap/unicode-blocks.h:73 msgid "Phonetic Extensions Supplement" -msgstr "הרחבות פונטיות תוספות" +msgstr "השלמת תוספות פונטיות" #: ../gucharmap/unicode-blocks.h:74 msgid "Combining Diacritical Marks Supplement" -msgstr "תוספות לסימנים דיאקריטיים מורכבים" +msgstr "השלמות לסימנים דיאקריטיים מורכבים" #: ../gucharmap/unicode-blocks.h:75 msgid "Latin Extended Additional" @@ -811,11 +810,11 @@ #: ../gucharmap/unicode-blocks.h:94 msgid "Miscellaneous Mathematical Symbols-A" -msgstr "סמלים מתמטיים שונות-A" +msgstr "סמלים מתמטיים שונות-א׳" #: ../gucharmap/unicode-blocks.h:95 msgid "Supplemental Arrows-A" -msgstr "חצים תוספות-A" +msgstr "חצים השלמות-א׳" #: ../gucharmap/unicode-blocks.h:96 msgid "Braille Patterns" @@ -823,15 +822,15 @@ #: ../gucharmap/unicode-blocks.h:97 msgid "Supplemental Arrows-B" -msgstr "חצים תוספות-B" +msgstr "חצים השלמות-ב׳" #: ../gucharmap/unicode-blocks.h:98 msgid "Miscellaneous Mathematical Symbols-B" -msgstr "סמלים מתמטיים שונות-B" +msgstr "סמלים מתמטיים שונות-ב׳" #: ../gucharmap/unicode-blocks.h:99 msgid "Supplemental Mathematical Operators" -msgstr "" +msgstr "השלמה של פעולות מתמטיות" #: ../gucharmap/unicode-blocks.h:100 msgid "Miscellaneous Symbols and Arrows" @@ -843,7 +842,7 @@ #: ../gucharmap/unicode-blocks.h:102 msgid "Latin Extended-C" -msgstr "" +msgstr "לטינית מורחבת-ג׳" #: ../gucharmap/unicode-blocks.h:103 ../gucharmap/unicode-scripts.h:31 msgid "Coptic" @@ -851,7 +850,7 @@ #: ../gucharmap/unicode-blocks.h:104 msgid "Georgian Supplement" -msgstr "גרוזיני תוספות" +msgstr "גרוזיני השלמות" #: ../gucharmap/unicode-blocks.h:105 ../gucharmap/unicode-scripts.h:104 msgid "Tifinagh" @@ -863,11 +862,11 @@ #: ../gucharmap/unicode-blocks.h:107 msgid "Cyrillic Extended-A" -msgstr "קירילי הרחבה-A" +msgstr "קירילי הרחבה-א׳" #: ../gucharmap/unicode-blocks.h:108 msgid "Supplemental Punctuation" -msgstr "פיסוק תוספות" +msgstr "השלמות פיסוק" #: ../gucharmap/unicode-blocks.h:109 msgid "CJK Radicals Supplement" @@ -879,11 +878,11 @@ #: ../gucharmap/unicode-blocks.h:111 msgid "Ideographic Description Characters" -msgstr "" +msgstr "תווי תיאור אידיאוגרפי" #: ../gucharmap/unicode-blocks.h:112 msgid "CJK Symbols and Punctuation" -msgstr "" +msgstr "סמלים וסימני פיסוק סיניים, יפניים וקוריאניים" #: ../gucharmap/unicode-blocks.h:113 ../gucharmap/unicode-scripts.h:49 msgid "Hiragana" @@ -899,7 +898,7 @@ #: ../gucharmap/unicode-blocks.h:116 msgid "Hangul Compatibility Jamo" -msgstr "ג׳אמו של הנגול לתאימות" +msgstr "ג׳מו של האנגול לתאימות" #: ../gucharmap/unicode-blocks.h:117 msgid "Kanbun" @@ -911,7 +910,7 @@ #: ../gucharmap/unicode-blocks.h:119 msgid "CJK Strokes" -msgstr "" +msgstr "קווים להרכבת אותיות בסינית, יפנית וקוריאנית" #: ../gucharmap/unicode-blocks.h:120 msgid "Katakana Phonetic Extensions" @@ -955,7 +954,7 @@ #: ../gucharmap/unicode-blocks.h:130 msgid "Cyrillic Extended-B" -msgstr "קירילי הרחבה-B" +msgstr "קירילי הרחבה-ב׳" #: ../gucharmap/unicode-blocks.h:131 ../gucharmap/unicode-scripts.h:20 msgid "Bamum" @@ -963,24 +962,23 @@ #: ../gucharmap/unicode-blocks.h:132 msgid "Modifier Tone Letters" -msgstr "" +msgstr "אותיות להחלפת טון" #: ../gucharmap/unicode-blocks.h:133 msgid "Latin Extended-D" -msgstr "לטיני הרחבה-D" +msgstr "לטיני הרחבה-ד׳" #: ../gucharmap/unicode-blocks.h:134 ../gucharmap/unicode-scripts.h:92 msgid "Syloti Nagri" msgstr "" #: ../gucharmap/unicode-blocks.h:135 -#, fuzzy msgid "Common Indic Number Forms" -msgstr "צורות מספר" +msgstr "" #: ../gucharmap/unicode-blocks.h:136 msgid "Phags-pa" -msgstr "" +msgstr "פאגס-פה" #: ../gucharmap/unicode-blocks.h:137 ../gucharmap/unicode-scripts.h:88 msgid "Saurashtra" @@ -992,34 +990,31 @@ #: ../gucharmap/unicode-blocks.h:139 ../gucharmap/unicode-scripts.h:58 msgid "Kayah Li" -msgstr "" +msgstr "קאיה לי" #: ../gucharmap/unicode-blocks.h:140 ../gucharmap/unicode-scripts.h:85 msgid "Rejang" msgstr "רג'אנג" #: ../gucharmap/unicode-blocks.h:141 -#, fuzzy msgid "Hangul Jamo Extended-A" -msgstr "לטיני הרחבה-A" +msgstr "האנגול ג׳מו הרחבה א׳" #: ../gucharmap/unicode-blocks.h:142 ../gucharmap/unicode-scripts.h:54 msgid "Javanese" msgstr "ג'אוואנית" #: ../gucharmap/unicode-blocks.h:143 ../gucharmap/unicode-scripts.h:28 -#, fuzzy msgid "Cham" -msgstr "אוחמי" +msgstr "צ׳אם" #: ../gucharmap/unicode-blocks.h:144 -#, fuzzy msgid "Myanmar Extended-A" -msgstr "לטיני הרחבה-A" +msgstr "מיאנמר (בורמזית) הרחבה-א׳" #: ../gucharmap/unicode-blocks.h:145 ../gucharmap/unicode-scripts.h:98 msgid "Tai Viet" -msgstr "" +msgstr "תאי וייט" #: ../gucharmap/unicode-blocks.h:146 ../gucharmap/unicode-scripts.h:70 msgid "Meetei Mayek" @@ -1027,12 +1022,11 @@ #: ../gucharmap/unicode-blocks.h:147 msgid "Hangul Syllables" -msgstr "הברות הנגול" +msgstr "סימניות האנגול" #: ../gucharmap/unicode-blocks.h:148 -#, fuzzy msgid "Hangul Jamo Extended-B" -msgstr "לטיני הרחבה-B" +msgstr "האנגול ג׳מו הרחבה ב׳" #: ../gucharmap/unicode-blocks.h:149 msgid "High Surrogates" @@ -1068,7 +1062,7 @@ #: ../gucharmap/unicode-blocks.h:157 msgid "Vertical Forms" -msgstr "" +msgstr "צורות אנכיות" #: ../gucharmap/unicode-blocks.h:158 msgid "Combining Half Marks" @@ -1096,11 +1090,11 @@ #: ../gucharmap/unicode-blocks.h:164 msgid "Linear B Syllabary" -msgstr "הברות של כתב לינארי B" +msgstr "הברות של כתב לינארי ב׳" #: ../gucharmap/unicode-blocks.h:165 msgid "Linear B Ideograms" -msgstr "אידיאוגרמות של כתב לינארי B" +msgstr "אידיאוגרמות של כתב לינארי ב׳" #: ../gucharmap/unicode-blocks.h:166 msgid "Aegean Numbers" @@ -1120,7 +1114,7 @@ #: ../gucharmap/unicode-blocks.h:170 ../gucharmap/unicode-scripts.h:67 msgid "Lycian" -msgstr "" +msgstr "ליסיאנית" #: ../gucharmap/unicode-blocks.h:171 ../gucharmap/unicode-scripts.h:27 msgid "Carian" @@ -1176,7 +1170,7 @@ #: ../gucharmap/unicode-blocks.h:184 ../gucharmap/unicode-scripts.h:79 msgid "Old South Arabian" -msgstr "" +msgstr "דרום-ערבית עתיקה" #: ../gucharmap/unicode-blocks.h:185 ../gucharmap/unicode-scripts.h:18 msgid "Avestan" @@ -1195,9 +1189,8 @@ msgstr "" #: ../gucharmap/unicode-blocks.h:189 -#, fuzzy msgid "Rumi Numeral Symbols" -msgstr "סמלים מוזיקליים" +msgstr "" #: ../gucharmap/unicode-blocks.h:190 ../gucharmap/unicode-scripts.h:55 msgid "Kaithi" @@ -1209,7 +1202,7 @@ #: ../gucharmap/unicode-blocks.h:192 msgid "Cuneiform Numbers and Punctuation" -msgstr "" +msgstr "פיסוק ומספרים בכתב יתדות" #: ../gucharmap/unicode-blocks.h:193 ../gucharmap/unicode-scripts.h:37 msgid "Egyptian Hieroglyphs" @@ -1248,26 +1241,24 @@ msgstr "אריחי דומינו" #: ../gucharmap/unicode-blocks.h:202 -#, fuzzy msgid "Enclosed Alphanumeric Supplement" -msgstr "אתיופי תוספות" +msgstr "" #: ../gucharmap/unicode-blocks.h:203 -#, fuzzy msgid "Enclosed Ideographic Supplement" -msgstr "אתיופי תוספות" +msgstr "" #: ../gucharmap/unicode-blocks.h:204 msgid "CJK Unified Ideographs Extension B" -msgstr "" +msgstr "אידאוגרפיים מאוחדים לסינית, ליפנית ולקוריאנית הרחבה ב׳" #: ../gucharmap/unicode-blocks.h:205 msgid "CJK Unified Ideographs Extension C" -msgstr "" +msgstr "אידאוגרפיים מאוחדים לסינית, ליפנית ולקוריאנית הרחבה ג׳" #: ../gucharmap/unicode-blocks.h:206 msgid "CJK Compatibility Ideographs Supplement" -msgstr "" +msgstr "השלמת אידיאוגרמות תאימות לסינית, יפנית וקוריאנית" #: ../gucharmap/unicode-blocks.h:207 msgid "Tags" @@ -1303,15 +1294,15 @@ #: ../gucharmap/unicode-scripts.h:45 msgid "Han" -msgstr "" +msgstr "חאן" #: ../gucharmap/unicode-scripts.h:46 msgid "Hangul" -msgstr "הנגול" +msgstr "האנגול" #: ../gucharmap/unicode-scripts.h:51 msgid "Inherited" -msgstr "" +msgstr "ירושה" #: ../gucharmap/unicode-scripts.h:62 msgid "Latin" @@ -1319,11 +1310,11 @@ #: ../gucharmap/unicode-scripts.h:65 msgid "Linear B" -msgstr "" +msgstr "כתב לינארי ב׳" #: ../gucharmap/unicode-scripts.h:83 msgid "Phags Pa" -msgstr "" +msgstr "פאגס פה" #: ../gucharmap/unicode-scripts.h:107 msgid "Yi" @@ -1340,11 +1331,11 @@ #: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" -msgstr "_הקודם" +msgstr "ה_קודם" #: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" -msgstr "_הבא" +msgstr "ה_בא" #: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" @@ -1364,12 +1355,15 @@ #: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" -msgstr "" +msgstr "מקטע יוניקוד" #: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "כתב" +#~ msgid "Sho_w only glyphs from this font" +#~ msgstr "הצגת _גליפים מגופן זה בלבד" + #~ msgid "Gucharmap" #~ msgstr "Gucharmap" diff -Nru gucharmap-2.31.91/po/hu.po gucharmap-2.32.0/po/hu.po --- gucharmap-2.31.91/po/hu.po 2010-03-07 15:50:57.000000000 -0500 +++ gucharmap-2.32.0/po/hu.po 2010-09-26 14:53:09.000000000 -0400 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: gucharmap master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-06 17:41+0100\n" -"PO-Revision-Date: 2010-03-06 17:41+0100\n" +"POT-Creation-Date: 2010-08-31 00:58+0200\n" +"PO-Revision-Date: 2010-08-31 00:56+0200\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Karaktertábla" @@ -126,40 +126,40 @@ msgid "Korean Pronunciation:" msgstr "Koreai kiejtés:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Karakte_rtábla" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Karakter _adatai" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Ismeretlen karakter, nem azonosítható." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Nem található." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Karakter megtalálva." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Karaktertábla" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Betűkészlet" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Betűcsalád" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Betűméret" @@ -174,151 +174,151 @@ msgid "Common" msgstr "Közös" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "<15. sík személyes felhasználásra>" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "<16. sík személyes felhasználásra>" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "Egyéb, vezérlő" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "Egyéb, formátum" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "Egyéb, nem hozzárendelt" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "Egyéb, személyes felhasználásra" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Egyéb, pótlás" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "Betű, kisbetű" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Betű, módosító" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "Betű, egyéb" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "Betű, nagy kezdőbetű" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "Betű, nagybetű" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "Jel, kombinált elválasztó" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "Jel, lezárt" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "Jel, nem-elválasztó" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "Szám, decimális számjegy" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "Szám, betű" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "Szám, egyéb" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "Központozás, összekötő" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "Központozás, kötőjel" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "Központozás, lezáró" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "Központozás, záró idézőjel" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "Központozás, nyitó idézőjel" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "Központozás, egyéb" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "Központozás, nyitó" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "Szimbólum, pénznem" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "Szimbólum, módosító" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "Szimbólum, matematikai" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "Szimbólum, egyéb" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "Elválasztó, sor" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "Elválasztó, bekezdés" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "Elválasztó, szóköz" @@ -330,11 +330,11 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "A Gucharmap szabad szoftver, terjesztheti és/vagy módosíthatja a Free " -"Software Foundation által kiadott GNU General Public License második (vagy " +"Software Foundation által kiadott GNU General Public License harmadik (vagy " "bármely későbbi) változatában foglaltak alapján" #: ../gucharmap/gucharmap-window.c:497 @@ -398,11 +398,11 @@ "Tímár András \n" "Őry Máté " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Következő írásrendszer" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Előző írásrendszer" @@ -414,71 +414,71 @@ msgid "Previous Block" msgstr "Előző blokk" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "Fáj_l" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Nézet" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Keresés" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Ugrás" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Súgó" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Oldal_beállítás" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Kö_vetkező találat" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "_Előző találat" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "_Következő karakter" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "_Előző karakter" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Tartalom" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_Névjegy" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Írá_srendszer szerint" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "_Unicode-blokk szerint" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "_Oszlopok összecsukása kettő hatványára" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "Másolan_dó szöveg:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Másolás a vágólapra." @@ -1322,32 +1322,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Információ" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Keresés" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Előző" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "Kö_vetkező" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Keresés:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "_Teljes szó" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Keresés a karakter _adatai közt" @@ -1355,10 +1355,10 @@ msgid "All" msgstr "Összes" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Unicode-blokk" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Írásrendszer" diff -Nru gucharmap-2.31.91/po/id.po gucharmap-2.32.0/po/id.po --- gucharmap-2.31.91/po/id.po 2009-04-18 10:24:58.000000000 -0400 +++ gucharmap-2.32.0/po/id.po 2010-09-26 14:53:09.000000000 -0400 @@ -2,329 +2,348 @@ # Copyright (C) 2003 THE gucharmap'S COPYRIGHT HOLDER # This file is distributed under the same license as the gucharmap package. # Ahmad Riza H Nst 02082006 -# +# msgid "" msgstr "" -"Project-Id-Version: gucharmap HEAD\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-08-02 10:09+0700\n" -"PO-Revision-Date: 2006-08-02 10:08+0700\n" -"Last-Translator: Ahmad Riza H Nst \n" -"Language-Team: Indonesian \n" +"Project-Id-Version: gucharmap gnome-2-32\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gucharmap&component=general\n" +"POT-Creation-Date: 2010-08-19 15:10+0000\n" +"PO-Revision-Date: 2010-08-30 15:20+0700\n" +"Last-Translator: Andika Triwidada \n" +"Language-Team: GNOME Indonesian Translation Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Indonesian\n" +"X-Poedit-Country: Indonesia\n" -#: ../gucharmap.desktop.in.h:1 ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 +#: ../gucharmap/main.c:80 msgid "Character Map" -msgstr "Tabel karakter" +msgstr "Tabel Karakter" -#: ../gucharmap.desktop.in.h:2 +#: ../gucharmap.desktop.in.in.h:2 msgid "Insert special characters into documents" msgstr "Masukkan karakter istimewa ke dalam dokumen" -#: ../gucharmap/gucharmap-charmap.c:268 +#: ../gucharmap/gucharmap-charmap.c:573 msgid "Canonical decomposition:" msgstr "Dekomposisi kanonik:" -#: ../gucharmap/gucharmap-charmap.c:309 ../gucharmap/gucharmap-table.c:294 +#: ../gucharmap/gucharmap-charmap.c:616 ../gucharmap/gucharmap-chartable.c:553 msgid "[not a printable character]" msgstr "[karakter ini tidak dapat dicetak]" -#: ../gucharmap/gucharmap-charmap.c:323 +#: ../gucharmap/gucharmap-charmap.c:630 msgid "General Character Properties" -msgstr "Informasi karakter secara umum" +msgstr "Properti Umum Karakter" + +#: ../gucharmap/gucharmap-charmap.c:636 +#| msgid "Unicode category:" +msgid "In Unicode since:" +msgstr "Dalam Unicode sejak:" #. character category -#: ../gucharmap/gucharmap-charmap.c:326 +#: ../gucharmap/gucharmap-charmap.c:640 msgid "Unicode category:" msgstr "Kategori Unicode:" -#: ../gucharmap/gucharmap-charmap.c:335 +#: ../gucharmap/gucharmap-charmap.c:649 msgid "Various Useful Representations" -msgstr "Berbagai representasi yang berguna" +msgstr "Berbagai Representasi yang Berguna" -#: ../gucharmap/gucharmap-charmap.c:345 +#: ../gucharmap/gucharmap-charmap.c:659 msgid "UTF-8:" msgstr "UTF-8:" -#: ../gucharmap/gucharmap-charmap.c:353 +#: ../gucharmap/gucharmap-charmap.c:667 msgid "UTF-16:" msgstr "UTF-16:" -#: ../gucharmap/gucharmap-charmap.c:364 +#: ../gucharmap/gucharmap-charmap.c:678 msgid "C octal escaped UTF-8:" msgstr "C octal escaped UTF-8:" -#: ../gucharmap/gucharmap-charmap.c:374 +#: ../gucharmap/gucharmap-charmap.c:688 msgid "XML decimal entity:" msgstr "Entiti desimal XML:" -#: ../gucharmap/gucharmap-charmap.c:385 +#: ../gucharmap/gucharmap-charmap.c:699 msgid "Annotations and Cross References" -msgstr "Anotasi dan referensi silang" +msgstr "Anotasi dan Rujukan Silang" -#: ../gucharmap/gucharmap-charmap.c:392 +#: ../gucharmap/gucharmap-charmap.c:706 msgid "Alias names:" msgstr "Nama alias:" -#: ../gucharmap/gucharmap-charmap.c:401 +#: ../gucharmap/gucharmap-charmap.c:715 msgid "Notes:" msgstr "Catatan:" -#: ../gucharmap/gucharmap-charmap.c:410 +#: ../gucharmap/gucharmap-charmap.c:724 msgid "See also:" msgstr "Lihat juga:" -#: ../gucharmap/gucharmap-charmap.c:419 +#: ../gucharmap/gucharmap-charmap.c:733 msgid "Approximate equivalents:" msgstr "Hampir mendekati:" -#: ../gucharmap/gucharmap-charmap.c:428 +#: ../gucharmap/gucharmap-charmap.c:742 msgid "Equivalents:" msgstr "Sama dengan:" -#: ../gucharmap/gucharmap-charmap.c:444 +#: ../gucharmap/gucharmap-charmap.c:758 msgid "CJK Ideograph Information" -msgstr "Informasi CJK Ideograph" +msgstr "Informasi Ideograf CJK" -#: ../gucharmap/gucharmap-charmap.c:449 +#: ../gucharmap/gucharmap-charmap.c:763 msgid "Definition in English:" msgstr "Definisi dalam Bahasa Inggris:" -#: ../gucharmap/gucharmap-charmap.c:454 +#: ../gucharmap/gucharmap-charmap.c:768 msgid "Mandarin Pronunciation:" msgstr "Pengucapan Mandarin:" -#: ../gucharmap/gucharmap-charmap.c:459 +#: ../gucharmap/gucharmap-charmap.c:773 msgid "Cantonese Pronunciation:" -msgstr "Pengucapan pada Kanton:" +msgstr "Pengucapan Kanton:" -#: ../gucharmap/gucharmap-charmap.c:464 +#: ../gucharmap/gucharmap-charmap.c:778 msgid "Japanese On Pronunciation:" -msgstr "Pengucapan pada Bahasa Jepang:" +msgstr "Pengucapan Bahasa Jepang On:" -#: ../gucharmap/gucharmap-charmap.c:469 +#: ../gucharmap/gucharmap-charmap.c:783 msgid "Japanese Kun Pronunciation:" msgstr "Pengucapan Bahasa Jepang Kun:" -#: ../gucharmap/gucharmap-charmap.c:474 +#: ../gucharmap/gucharmap-charmap.c:788 msgid "Tang Pronunciation:" msgstr "Pengucapan Tang:" -#: ../gucharmap/gucharmap-charmap.c:479 +#: ../gucharmap/gucharmap-charmap.c:793 msgid "Korean Pronunciation:" -msgstr "Pengucapan Korea" +msgstr "Pengucapan Korea:" -#: ../gucharmap/gucharmap-charmap.c:780 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" -msgstr "Tabel karakte_r" +msgstr "Tabel Karakte_r" -#: ../gucharmap/gucharmap-charmap.c:783 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "_Detil Karakter" -#: ../gucharmap/gucharmap-mini-fontsel.c:205 -msgid "Font" -msgstr "Huruf" - -#: ../gucharmap/gucharmap-mini-fontsel.c:212 -msgid "Font Family" -msgstr "Keluarga huruf" - -#: ../gucharmap/gucharmap-mini-fontsel.c:232 -msgid "Font Size" -msgstr "Ukuran huruf" - -#. Unicode assigns "Common" as the script name for any character not -#. * specifically listed in Scripts.txt -#: ../gucharmap/gucharmap-script-codepoint-list.c:458 -#: ../gucharmap/unicode-scripts.h:26 -msgid "Common" -msgstr "Umum" - -#: ../gucharmap/gucharmap-table.c:1513 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Karakter tidak dikenal, tidak bisa mengenali." -#: ../gucharmap/gucharmap-table.c:1515 -#: ../gucharmap/gucharmap-search-dialog.c:595 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Tidak ditemukan." -#: ../gucharmap/gucharmap-table.c:1518 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Karakter ditemukan." -#: ../gucharmap/gucharmap-table.c:1582 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" -msgstr "Tabel karakter" +msgstr "Tabel Karakter" + +#: ../gucharmap/gucharmap-mini-fontsel.c:282 +msgid "Font" +msgstr "Fonta" + +#: ../gucharmap/gucharmap-mini-fontsel.c:295 +msgid "Font Family" +msgstr "Keluarga Fonta" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 +msgid "Font Size" +msgstr "Ukuran Fonta" + +#: ../gucharmap/gucharmap-settings.c:71 +msgid "GConf could not be initialized." +msgstr "GConf tak dapat diinisialisasi." + +#. Unicode assigns "Common" as the script name for any character not +#. * specifically listed in Scripts.txt +#: ../gucharmap/gucharmap-script-codepoint-list.c:463 +#: ../gucharmap/unicode-scripts.h:30 +msgid "Common" +msgstr "Umum" + +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" -msgstr "" +msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" -msgstr "" +msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" -msgstr "" +msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:106 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:111 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" -msgstr "Yang lain, kuasa" +msgstr "Yang lain, Kendali" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" -msgstr "Yang lain, susun" +msgstr "Yang lain, Format" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" -msgstr "Yang lain, belum ditentukan" +msgstr "Yang lain, Belum Ditentukan" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" -msgstr "Yang lain, penggunaan private" +msgstr "Yang lain, Penggunaan Privat" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Yang lain, Surrogate" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" -msgstr "Huruf, huruf kecil" +msgstr "Huruf, Huruf Kecil" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Huruf, Perubah" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" -msgstr "Huruf, yang lain" +msgstr "Huruf, Lainnya" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" -msgstr "Huruf, Huruf judul" +msgstr "Huruf, Huruf Judul" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" -msgstr "Huruf, HURUF BESAR" +msgstr "Huruf, Huruf Besar" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" -msgstr "tanda, kombinasi spasi" +msgstr "Tanda, Kombinasi Spasi" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" -msgstr "tanda, enclosing" +msgstr "Tanda, Enclosing" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" -msgstr "tanda, bukan spasi" +msgstr "Tanda, Bukan Spasi" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" -msgstr "Nomor, digit desimal" +msgstr "Nomor, Digit Desimal" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" -msgstr "Nomor, huruf" +msgstr "Nomor, Huruf" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" -msgstr "Nomor, yang lain" +msgstr "Nomor, Lainnya" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" -msgstr "Puntuasi, penghubung" +msgstr "Puntuasi, Penghubung" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" -msgstr "Puntuasi, tanda kurang" +msgstr "Puntuasi, Tanda Kurang" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" -msgstr "Puntuasi, tutup" +msgstr "Puntuasi, Tutup" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" -msgstr "Puntuasi, tanda kutip akhir" +msgstr "Puntuasi, Tanda Kutip Tutup" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" -msgstr "Puntuasi, tanda kutip buka" +msgstr "Puntuasi, Tanda Kutip Buka" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" -msgstr "Puntuasi, yang lain" +msgstr "Puntuasi, Lainnya" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" -msgstr "Puntuasi, buka" +msgstr "Puntuasi, Buka" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" -msgstr "Simbol, keuangan" +msgstr "Simbol, Keuangan" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" -msgstr "Simbol, pengubah" +msgstr "Simbol, Pengubah" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" -msgstr "Simbol, matematika" +msgstr "Simbol, Matematika" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" -msgstr "Simbol, Yang lain" +msgstr "Simbol, Lainnya" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" -msgstr "Pemisah, garis" +msgstr "Pemisah, Garis" -#: ../gucharmap/gucharmap-unicode-info.c:152 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" -msgstr "Pemisah, paragraf" +msgstr "Pemisah, Paragraf" -#: ../gucharmap/gucharmap-unicode-info.c:153 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" -msgstr "Pemisah, spasi" +msgstr "Pemisah, Spasi" -#: ../gucharmap/gucharmap-window.c:188 -msgid "Searching..." -msgstr "Mencari..." - -#: ../gucharmap/gucharmap-window.c:337 +#: ../gucharmap/gucharmap-window.c:246 +#| msgid "Searching..." +msgid "Searching…" +msgstr "Mencari…" + +#: ../gucharmap/gucharmap-window.c:493 +#| msgid "" +#| "Gucharmap is free software; you can redistribute it and/or modify it " +#| "under the terms of the GNU General Public License as published by the " +#| "Free Software Foundation; either version 2 of the License, or (at your " +#| "option) any later version." msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" -"Gucharmap adalah perangkat lunak bebas, anda dapat menyebarkan dan/atau " -"merubahnya di bawah lisensi Lisensi Publik Umum GNU sebagaimana diterbirkan " -"oleh Free Software Foundation, apakah versi 2 atau (sesuai pilihan anda) " -"versi selanjutnya." +"Gucharmap adalah perangkat lunak bebas, Anda dapat menyebarluaskannya dan/" +"atau mengubahnya di bawah syarat GNU General Public License sebagaimana " +"dipublikasikan oleh Free Software Foundation; baik versi 3 dari Lisensi atau " +"(terserah pilihan Anda) versi setelahnya." -#: ../gucharmap/gucharmap-window.c:341 +#: ../gucharmap/gucharmap-window.c:497 msgid "" "Permission is hereby granted, free of charge, to any person obtaining a copy " "of the Unicode data files to deal in them without restriction, including " @@ -336,7 +355,7 @@ "untuk menggunakan, menyalin, merubah, menggabungkan, menerbitkan, " "menyebarkan, dan atau menjual salinan." -#: ../gucharmap/gucharmap-window.c:345 +#: ../gucharmap/gucharmap-window.c:501 msgid "" "Gucharmap and the Unicode data files are distributed in the hope that they " "will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty " @@ -348,889 +367,1033 @@ "BEKERJA DENGAN BAIK. Lihat Lisensi Publik Umum GNU dan Hak cipta Unicode " "untuk lebih jelasnya." -#: ../gucharmap/gucharmap-window.c:349 +#: ../gucharmap/gucharmap-window.c:505 +#| msgid "" +#| "You should have received a copy of the GNU General Public License along " +#| "with Gucharmap; if not, write to the Free Software Foundation, Inc., 59 " +#| "Temple Place, Suite 330, Boston, MA 02111-1307 USA" msgid "" "You should have received a copy of the GNU General Public License along with " "Gucharmap; if not, write to the Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02111-1307 USA" +"Place, Suite 330, Boston, MA 02110-1301 USA" msgstr "" -"Anda seharusnya menerima salinan Lisensi Publik Umum GNU bersamaa dengan " -"Gucharmap, jika tidak, minta kepada Free Software Foundation, Inc., 59 " -"Temple Place, Suite 330, Boston, MA 02111-1307 USA" +"Anda seharusnya menerima salinan GNU General Public License bersama dengan " +"Gucharmap; jika tidak, kirimkan surat Anda ke Free Software Foundation, " +"Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA" -#: ../gucharmap/gucharmap-window.c:352 +#: ../gucharmap/gucharmap-window.c:508 msgid "" "Also you should have received a copy of the Unicode Copyright along with " "Gucharmap; you can always find it at Unicode's website: http://www.unicode." "org/copyright.html" msgstr "" -"Anda juga harus mendapat salinan Hak Cipta Unicode bersamaan demgan " -"Gucharmap, anda selalu dapat menemukannya di website Unicode: http://www." +"Anda juga harus mendapat salinan Hak Cipta Unicode bersamaan dengan " +"Gucharmap, Anda selalu dapat menemukannya di website Unicode: http://www." "unicode.org/copyright.html" -#: ../gucharmap/gucharmap-window.c:363 -msgid "" -"GNOME Character Map\n" -"based on the Unicode Character Database" -msgstr "" -"Peta Karakter GNOME\n" -"berdasarkan pada Basisdata Karakter Unicode" - -#: ../gucharmap/gucharmap-window.c:369 ../gucharmap/main.c:76 -msgid "Gucharmap" -msgstr "Gucharmap" +#: ../gucharmap/gucharmap-window.c:521 ../gucharmap/main.c:37 +#| msgid "Character Map" +msgid "GNOME Character Map" +msgstr "Tabel Karakter GNOME" + +#: ../gucharmap/gucharmap-window.c:523 +#| msgid "" +#| "GNOME Character Map\n" +#| "based on the Unicode Character Database" +msgid "Based on the Unicode Character Database 5.2" +msgstr "Berdasar pada Basis Data Karakter Unicode 5.2" -#: ../gucharmap/gucharmap-window.c:371 +#: ../gucharmap/gucharmap-window.c:532 msgid "translator-credits" msgstr "" "Ahmad Riza H Nst \n" -"http://id.gnome.org/" +"Andika Triwidada , 2010." -#: ../gucharmap/gucharmap-window.c:486 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 +msgid "Next Script" +msgstr "Skrip selanjutnya" + +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 +msgid "Previous Script" +msgstr "Skrip sebelumnya" + +#: ../gucharmap/gucharmap-window.c:612 +msgid "Next Block" +msgstr "Blok selanjutnya" + +#: ../gucharmap/gucharmap-window.c:612 +msgid "Previous Block" +msgstr "Blok Sebelumnya" + +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_File" -#: ../gucharmap/gucharmap-window.c:487 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Lihat" -#: ../gucharmap/gucharmap-window.c:488 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Cari" -#: ../gucharmap/gucharmap-window.c:489 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Jalan" -#: ../gucharmap/gucharmap-window.c:490 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Bantuan" -#: ../gucharmap/gucharmap-window.c:492 -msgid "_Quit" -msgstr "_Keluar" - -#: ../gucharmap/gucharmap-window.c:495 -msgid "Zoom _In" -msgstr "Zoom _Perbesar" - -#: ../gucharmap/gucharmap-window.c:497 -msgid "Zoom _Out" -msgstr "Z_oom perkecil" - -#: ../gucharmap/gucharmap-window.c:499 -msgid "_Normal Size" -msgstr "Ukuran _Normal" - -#: ../gucharmap/gucharmap-window.c:502 -msgid "_Find..." -msgstr "_Cari..." +#: ../gucharmap/gucharmap-window.c:854 +msgid "Page _Setup" +msgstr "_Penyiapan Halaman" -#: ../gucharmap/gucharmap-window.c:504 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Temukan sela_njutnya" -#: ../gucharmap/gucharmap-window.c:506 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Temukan _sebelumnya" -#: ../gucharmap/gucharmap-window.c:509 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "Karakter sela_njutnya" -#: ../gucharmap/gucharmap-window.c:511 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "Karakter _sebelumnya" -#: ../gucharmap/gucharmap-window.c:513 -msgid "Next Script" -msgstr "Skrip selanjutnya" - -#: ../gucharmap/gucharmap-window.c:515 -msgid "Previous Script" -msgstr "Skrip sebelumnya" - -#: ../gucharmap/gucharmap-window.c:519 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Isi" -#: ../gucharmap/gucharmap-window.c:522 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "Tent_ang" -#: ../gucharmap/gucharmap-window.c:528 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Oleh _Skrip" -#: ../gucharmap/gucharmap-window.c:530 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Ole Blok Unicode" -#: ../gucharmap/gucharmap-window.c:594 -msgid "Snap Columns to Power of Two" -msgstr "Snap Columns to Power of Two" +#: ../gucharmap/gucharmap-window.c:908 +#| msgid "Snap Columns to Power of Two" +msgid "Snap _Columns to Power of Two" +msgstr "Jadikan _Cacah Kolom Pangkat dari Dua" -#: ../gucharmap/gucharmap-window.c:727 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Teks yang hendak disalin:" -#: ../gucharmap/gucharmap-window.c:748 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Salin ke klipbord" -#: ../gucharmap/main.c:36 +#: ../gucharmap/main.c:55 msgid "Font to start with; ex: 'Serif 27'" msgstr "Huruf yang ingin dimulai dengan; mis: 'Serif 27'" -#: ../gucharmap/unicode-blocks.h:20 +#: ../gucharmap/main.c:55 +msgid "FONT" +msgstr "FONTA" + +#: ../gucharmap/unicode-blocks.h:14 msgid "Basic Latin" msgstr "Latin dasar" -#: ../gucharmap/unicode-blocks.h:21 +#: ../gucharmap/unicode-blocks.h:15 msgid "Latin-1 Supplement" msgstr "Tambahan latin-1" -#: ../gucharmap/unicode-blocks.h:22 +#: ../gucharmap/unicode-blocks.h:16 msgid "Latin Extended-A" msgstr "Ekstended-A Latin" -#: ../gucharmap/unicode-blocks.h:23 +#: ../gucharmap/unicode-blocks.h:17 msgid "Latin Extended-B" msgstr "Ekstended-B Latin" -#: ../gucharmap/unicode-blocks.h:24 +#: ../gucharmap/unicode-blocks.h:18 msgid "IPA Extensions" msgstr "Ekstensi IPA" -#: ../gucharmap/unicode-blocks.h:25 +#: ../gucharmap/unicode-blocks.h:19 msgid "Spacing Modifier Letters" msgstr "Spacing Modifier Letters" -#: ../gucharmap/unicode-blocks.h:26 +#: ../gucharmap/unicode-blocks.h:20 msgid "Combining Diacritical Marks" msgstr "Kombinasikan tanda diacritical" -#: ../gucharmap/unicode-blocks.h:27 +#: ../gucharmap/unicode-blocks.h:21 msgid "Greek and Coptic" msgstr "Yunani dan Coptic" -#: ../gucharmap/unicode-blocks.h:28 ../gucharmap/unicode-scripts.h:30 +#: ../gucharmap/unicode-blocks.h:22 ../gucharmap/unicode-scripts.h:34 msgid "Cyrillic" msgstr "Cyrillic" -#: ../gucharmap/unicode-blocks.h:29 +#: ../gucharmap/unicode-blocks.h:23 msgid "Cyrillic Supplement" msgstr "Penambahan Cyrillic" -#: ../gucharmap/unicode-blocks.h:30 ../gucharmap/unicode-scripts.h:17 +#: ../gucharmap/unicode-blocks.h:24 ../gucharmap/unicode-scripts.h:17 msgid "Armenian" msgstr "Armenia" -#: ../gucharmap/unicode-blocks.h:31 ../gucharmap/unicode-scripts.h:43 +#: ../gucharmap/unicode-blocks.h:25 ../gucharmap/unicode-scripts.h:48 msgid "Hebrew" msgstr "Ibrani" -#: ../gucharmap/unicode-blocks.h:32 ../gucharmap/unicode-scripts.h:16 +#: ../gucharmap/unicode-blocks.h:26 ../gucharmap/unicode-scripts.h:16 msgid "Arabic" msgstr "Arab" -#: ../gucharmap/unicode-blocks.h:33 ../gucharmap/unicode-scripts.h:70 +#: ../gucharmap/unicode-blocks.h:27 ../gucharmap/unicode-scripts.h:93 msgid "Syriac" msgstr "Syria" -#: ../gucharmap/unicode-blocks.h:34 +#: ../gucharmap/unicode-blocks.h:28 msgid "Arabic Supplement" msgstr "Tambahan Arab" -#: ../gucharmap/unicode-blocks.h:35 ../gucharmap/unicode-scripts.h:76 +#: ../gucharmap/unicode-blocks.h:29 ../gucharmap/unicode-scripts.h:101 msgid "Thaana" msgstr "Thaana" -#: ../gucharmap/unicode-blocks.h:36 -msgid "NKo" -msgstr "NKo" +#: ../gucharmap/unicode-blocks.h:30 ../gucharmap/unicode-scripts.h:73 +#| msgid "NKo" +msgid "N'Ko" +msgstr "N'Ko" + +#: ../gucharmap/unicode-blocks.h:31 ../gucharmap/unicode-scripts.h:87 +#| msgid "Shavian" +msgid "Samaritan" +msgstr "Samarita" -#: ../gucharmap/unicode-blocks.h:37 ../gucharmap/unicode-scripts.h:32 +#: ../gucharmap/unicode-blocks.h:32 ../gucharmap/unicode-scripts.h:36 msgid "Devanagari" msgstr "Devanagari" -#: ../gucharmap/unicode-blocks.h:38 ../gucharmap/unicode-scripts.h:19 +#: ../gucharmap/unicode-blocks.h:33 ../gucharmap/unicode-scripts.h:21 msgid "Bengali" msgstr "Bengal" -#: ../gucharmap/unicode-blocks.h:39 ../gucharmap/unicode-scripts.h:39 +#: ../gucharmap/unicode-blocks.h:34 ../gucharmap/unicode-scripts.h:44 msgid "Gurmukhi" msgstr "Gurmukhi" -#: ../gucharmap/unicode-blocks.h:40 ../gucharmap/unicode-scripts.h:38 +#: ../gucharmap/unicode-blocks.h:35 ../gucharmap/unicode-scripts.h:43 msgid "Gujarati" msgstr "Gujarat" -#: ../gucharmap/unicode-blocks.h:41 ../gucharmap/unicode-scripts.h:62 +#: ../gucharmap/unicode-blocks.h:36 ../gucharmap/unicode-scripts.h:81 msgid "Oriya" msgstr "Oriya" -#: ../gucharmap/unicode-blocks.h:42 ../gucharmap/unicode-scripts.h:74 +#: ../gucharmap/unicode-blocks.h:37 ../gucharmap/unicode-scripts.h:99 msgid "Tamil" msgstr "Tamil" -#: ../gucharmap/unicode-blocks.h:43 ../gucharmap/unicode-scripts.h:75 +#: ../gucharmap/unicode-blocks.h:38 ../gucharmap/unicode-scripts.h:100 msgid "Telugu" msgstr "Telugu" -#: ../gucharmap/unicode-blocks.h:44 ../gucharmap/unicode-scripts.h:46 +#: ../gucharmap/unicode-blocks.h:39 ../gucharmap/unicode-scripts.h:56 msgid "Kannada" msgstr "Kannada" -#: ../gucharmap/unicode-blocks.h:45 ../gucharmap/unicode-scripts.h:54 +#: ../gucharmap/unicode-blocks.h:40 ../gucharmap/unicode-scripts.h:69 msgid "Malayalam" msgstr "Malayalam" -#: ../gucharmap/unicode-blocks.h:46 ../gucharmap/unicode-scripts.h:68 +#: ../gucharmap/unicode-blocks.h:41 ../gucharmap/unicode-scripts.h:90 msgid "Sinhala" msgstr "Sinhala" -#: ../gucharmap/unicode-blocks.h:47 ../gucharmap/unicode-scripts.h:77 +#: ../gucharmap/unicode-blocks.h:42 ../gucharmap/unicode-scripts.h:102 msgid "Thai" msgstr "Thailand" -#: ../gucharmap/unicode-blocks.h:48 ../gucharmap/unicode-scripts.h:50 +#: ../gucharmap/unicode-blocks.h:43 ../gucharmap/unicode-scripts.h:61 msgid "Lao" msgstr "Lao" -#: ../gucharmap/unicode-blocks.h:49 ../gucharmap/unicode-scripts.h:78 +#: ../gucharmap/unicode-blocks.h:44 ../gucharmap/unicode-scripts.h:103 msgid "Tibetan" msgstr "Tibet" -#: ../gucharmap/unicode-blocks.h:50 ../gucharmap/unicode-scripts.h:56 +#: ../gucharmap/unicode-blocks.h:45 ../gucharmap/unicode-scripts.h:72 msgid "Myanmar" msgstr "Mianmar" -#: ../gucharmap/unicode-blocks.h:51 ../gucharmap/unicode-scripts.h:34 +#: ../gucharmap/unicode-blocks.h:46 ../gucharmap/unicode-scripts.h:39 msgid "Georgian" msgstr "Georgia" -#: ../gucharmap/unicode-blocks.h:52 +#: ../gucharmap/unicode-blocks.h:47 msgid "Hangul Jamo" msgstr "Hangul Jamo" -#: ../gucharmap/unicode-blocks.h:53 ../gucharmap/unicode-scripts.h:33 +#: ../gucharmap/unicode-blocks.h:48 ../gucharmap/unicode-scripts.h:38 msgid "Ethiopic" msgstr "Etiopia" -#: ../gucharmap/unicode-blocks.h:54 +#: ../gucharmap/unicode-blocks.h:49 msgid "Ethiopic Supplement" msgstr "Tambahan Etopia" -#: ../gucharmap/unicode-blocks.h:55 ../gucharmap/unicode-scripts.h:25 +#: ../gucharmap/unicode-blocks.h:50 ../gucharmap/unicode-scripts.h:29 msgid "Cherokee" msgstr "Cherokee" -#: ../gucharmap/unicode-blocks.h:56 +#: ../gucharmap/unicode-blocks.h:51 msgid "Unified Canadian Aboriginal Syllabics" msgstr "Unified Canadian Aboriginal Syllabics" -#: ../gucharmap/unicode-blocks.h:57 ../gucharmap/unicode-scripts.h:59 +#: ../gucharmap/unicode-blocks.h:52 ../gucharmap/unicode-scripts.h:75 msgid "Ogham" msgstr "Ogham" -#: ../gucharmap/unicode-blocks.h:58 ../gucharmap/unicode-scripts.h:66 +#: ../gucharmap/unicode-blocks.h:53 ../gucharmap/unicode-scripts.h:86 msgid "Runic" msgstr "Runic" -#: ../gucharmap/unicode-blocks.h:59 ../gucharmap/unicode-scripts.h:71 +#: ../gucharmap/unicode-blocks.h:54 ../gucharmap/unicode-scripts.h:94 msgid "Tagalog" msgstr "Tagalog" -#: ../gucharmap/unicode-blocks.h:60 ../gucharmap/unicode-scripts.h:42 +#: ../gucharmap/unicode-blocks.h:55 ../gucharmap/unicode-scripts.h:47 msgid "Hanunoo" msgstr "Hanunoo" -#: ../gucharmap/unicode-blocks.h:61 ../gucharmap/unicode-scripts.h:23 +#: ../gucharmap/unicode-blocks.h:56 ../gucharmap/unicode-scripts.h:25 msgid "Buhid" msgstr "Buhid" -#: ../gucharmap/unicode-blocks.h:62 ../gucharmap/unicode-scripts.h:72 +#: ../gucharmap/unicode-blocks.h:57 ../gucharmap/unicode-scripts.h:95 msgid "Tagbanwa" msgstr "Tagbanwa" -#: ../gucharmap/unicode-blocks.h:63 ../gucharmap/unicode-scripts.h:49 +#: ../gucharmap/unicode-blocks.h:58 ../gucharmap/unicode-scripts.h:60 msgid "Khmer" msgstr "Khmer" -#: ../gucharmap/unicode-blocks.h:64 ../gucharmap/unicode-scripts.h:55 +#: ../gucharmap/unicode-blocks.h:59 ../gucharmap/unicode-scripts.h:71 msgid "Mongolian" msgstr "Mongolia" -#: ../gucharmap/unicode-blocks.h:65 ../gucharmap/unicode-scripts.h:52 +#: ../gucharmap/unicode-blocks.h:60 +#| msgid "Unified Canadian Aboriginal Syllabics" +msgid "Unified Canadian Aboriginal Syllabics Extended" +msgstr "Unified Canadian Aboriginal Syllabics Extended" + +#: ../gucharmap/unicode-blocks.h:61 ../gucharmap/unicode-scripts.h:64 msgid "Limbu" msgstr "Limbu" -#: ../gucharmap/unicode-blocks.h:66 ../gucharmap/unicode-scripts.h:73 +#: ../gucharmap/unicode-blocks.h:62 ../gucharmap/unicode-scripts.h:96 msgid "Tai Le" msgstr "Tai Le" -#: ../gucharmap/unicode-blocks.h:67 ../gucharmap/unicode-scripts.h:57 +#: ../gucharmap/unicode-blocks.h:63 ../gucharmap/unicode-scripts.h:74 msgid "New Tai Lue" msgstr "Tai Lue Baru" -#: ../gucharmap/unicode-blocks.h:68 +#: ../gucharmap/unicode-blocks.h:64 msgid "Khmer Symbols" msgstr "Symbol Khmer" -#: ../gucharmap/unicode-blocks.h:69 ../gucharmap/unicode-scripts.h:22 +#: ../gucharmap/unicode-blocks.h:65 ../gucharmap/unicode-scripts.h:24 msgid "Buginese" msgstr "Bugis" -#: ../gucharmap/unicode-blocks.h:70 ../gucharmap/unicode-scripts.h:18 +#: ../gucharmap/unicode-blocks.h:66 ../gucharmap/unicode-scripts.h:97 +msgid "Tai Tham" +msgstr "Tai Tham" + +#: ../gucharmap/unicode-blocks.h:67 ../gucharmap/unicode-scripts.h:19 msgid "Balinese" msgstr "Bali" +#: ../gucharmap/unicode-blocks.h:68 ../gucharmap/unicode-scripts.h:91 +msgid "Sundanese" +msgstr "Sunda" + +#: ../gucharmap/unicode-blocks.h:69 ../gucharmap/unicode-scripts.h:63 +msgid "Lepcha" +msgstr "Lepcha" + +#: ../gucharmap/unicode-blocks.h:70 ../gucharmap/unicode-scripts.h:76 +msgid "Ol Chiki" +msgstr "Ol Chiki" + #: ../gucharmap/unicode-blocks.h:71 +#| msgid "Phonetic Extensions" +msgid "Vedic Extensions" +msgstr "Ekstensi Vedik" + +#: ../gucharmap/unicode-blocks.h:72 msgid "Phonetic Extensions" msgstr "Ekstensi fonetik" -#: ../gucharmap/unicode-blocks.h:72 +#: ../gucharmap/unicode-blocks.h:73 msgid "Phonetic Extensions Supplement" msgstr "Tambahan Ekstensi Fonetik" -#: ../gucharmap/unicode-blocks.h:73 +#: ../gucharmap/unicode-blocks.h:74 msgid "Combining Diacritical Marks Supplement" msgstr "Tambahan Kombinasi tanda diacritical" -#: ../gucharmap/unicode-blocks.h:74 +#: ../gucharmap/unicode-blocks.h:75 msgid "Latin Extended Additional" msgstr "Penambahan Latin secara luas" -#: ../gucharmap/unicode-blocks.h:75 +#: ../gucharmap/unicode-blocks.h:76 msgid "Greek Extended" msgstr "Perluasan Yunani" -#: ../gucharmap/unicode-blocks.h:76 +#: ../gucharmap/unicode-blocks.h:77 msgid "General Punctuation" msgstr "Pengucapan umum" -#: ../gucharmap/unicode-blocks.h:77 +#: ../gucharmap/unicode-blocks.h:78 msgid "Superscripts and Subscripts" msgstr "Superskrip dan subskrip" -#: ../gucharmap/unicode-blocks.h:78 +#: ../gucharmap/unicode-blocks.h:79 msgid "Currency Symbols" msgstr "Symbol keuangan" -#: ../gucharmap/unicode-blocks.h:79 +#: ../gucharmap/unicode-blocks.h:80 msgid "Combining Diacritical Marks for Symbols" msgstr "Kombinasi tanda diactrical untuk simbol" -#: ../gucharmap/unicode-blocks.h:80 +#: ../gucharmap/unicode-blocks.h:81 msgid "Letterlike Symbols" msgstr "Simbol seperti huruf" -#: ../gucharmap/unicode-blocks.h:81 +#: ../gucharmap/unicode-blocks.h:82 msgid "Number Forms" msgstr "Bentuk angka" -#: ../gucharmap/unicode-blocks.h:82 +#: ../gucharmap/unicode-blocks.h:83 msgid "Arrows" msgstr "Panah" -#: ../gucharmap/unicode-blocks.h:83 +#: ../gucharmap/unicode-blocks.h:84 msgid "Mathematical Operators" msgstr "Operator matematika" -#: ../gucharmap/unicode-blocks.h:84 +#: ../gucharmap/unicode-blocks.h:85 msgid "Miscellaneous Technical" msgstr "Teknis lain lain" -#: ../gucharmap/unicode-blocks.h:85 +#: ../gucharmap/unicode-blocks.h:86 msgid "Control Pictures" msgstr "Penguasaan gambar" -#: ../gucharmap/unicode-blocks.h:86 +#: ../gucharmap/unicode-blocks.h:87 msgid "Optical Character Recognition" msgstr "Pengenalan karakter secara optik" -#: ../gucharmap/unicode-blocks.h:87 +#: ../gucharmap/unicode-blocks.h:88 msgid "Enclosed Alphanumerics" msgstr "Huruf dan angka terlampir" -#: ../gucharmap/unicode-blocks.h:88 +#: ../gucharmap/unicode-blocks.h:89 msgid "Box Drawing" msgstr "Kotak gambar" -#: ../gucharmap/unicode-blocks.h:89 +#: ../gucharmap/unicode-blocks.h:90 msgid "Block Elements" msgstr "Bagian blok" -#: ../gucharmap/unicode-blocks.h:90 +#: ../gucharmap/unicode-blocks.h:91 msgid "Geometric Shapes" msgstr "Bentuk geometri" -#: ../gucharmap/unicode-blocks.h:91 +#: ../gucharmap/unicode-blocks.h:92 msgid "Miscellaneous Symbols" msgstr "Simbol lain lain" -#: ../gucharmap/unicode-blocks.h:92 +#: ../gucharmap/unicode-blocks.h:93 msgid "Dingbats" msgstr "Dingbats" -#: ../gucharmap/unicode-blocks.h:93 +#: ../gucharmap/unicode-blocks.h:94 msgid "Miscellaneous Mathematical Symbols-A" msgstr "Miscellaneous Mathematical Symbols-A" -#: ../gucharmap/unicode-blocks.h:94 +#: ../gucharmap/unicode-blocks.h:95 msgid "Supplemental Arrows-A" msgstr "Penambahan panah-A" -#: ../gucharmap/unicode-blocks.h:95 +#: ../gucharmap/unicode-blocks.h:96 msgid "Braille Patterns" msgstr "Pola Braille" -#: ../gucharmap/unicode-blocks.h:96 +#: ../gucharmap/unicode-blocks.h:97 msgid "Supplemental Arrows-B" msgstr "Penambahan panah-B" -#: ../gucharmap/unicode-blocks.h:97 +#: ../gucharmap/unicode-blocks.h:98 msgid "Miscellaneous Mathematical Symbols-B" msgstr "Miscellaneous Mathematical Symbols-B" -#: ../gucharmap/unicode-blocks.h:98 +#: ../gucharmap/unicode-blocks.h:99 msgid "Supplemental Mathematical Operators" msgstr "Operator matematika tambahan" -#: ../gucharmap/unicode-blocks.h:99 +#: ../gucharmap/unicode-blocks.h:100 msgid "Miscellaneous Symbols and Arrows" msgstr "Simbol dan panah lain lain" -#: ../gucharmap/unicode-blocks.h:100 ../gucharmap/unicode-scripts.h:35 +#: ../gucharmap/unicode-blocks.h:101 ../gucharmap/unicode-scripts.h:40 msgid "Glagolitic" msgstr "Glagolitic" -#: ../gucharmap/unicode-blocks.h:101 +#: ../gucharmap/unicode-blocks.h:102 msgid "Latin Extended-C" msgstr "Ekstended-C Latin" -#: ../gucharmap/unicode-blocks.h:102 ../gucharmap/unicode-scripts.h:27 +#: ../gucharmap/unicode-blocks.h:103 ../gucharmap/unicode-scripts.h:31 msgid "Coptic" msgstr "Coptic" -#: ../gucharmap/unicode-blocks.h:103 +#: ../gucharmap/unicode-blocks.h:104 msgid "Georgian Supplement" msgstr "Tambahan Georgia" -#: ../gucharmap/unicode-blocks.h:104 ../gucharmap/unicode-scripts.h:79 +#: ../gucharmap/unicode-blocks.h:105 ../gucharmap/unicode-scripts.h:104 msgid "Tifinagh" msgstr "Tifinagh" -#: ../gucharmap/unicode-blocks.h:105 +#: ../gucharmap/unicode-blocks.h:106 msgid "Ethiopic Extended" msgstr "Perluasan Etopia" -#: ../gucharmap/unicode-blocks.h:106 +#: ../gucharmap/unicode-blocks.h:107 +#| msgid "Latin Extended-A" +msgid "Cyrillic Extended-A" +msgstr "Cyrillic Extended-A" + +#: ../gucharmap/unicode-blocks.h:108 msgid "Supplemental Punctuation" msgstr "Tambahan Pengucapan" -#: ../gucharmap/unicode-blocks.h:107 +#: ../gucharmap/unicode-blocks.h:109 msgid "CJK Radicals Supplement" msgstr "Penambahan CJK Radical" -#: ../gucharmap/unicode-blocks.h:108 +#: ../gucharmap/unicode-blocks.h:110 msgid "Kangxi Radicals" msgstr "Kangxi Radicals" -#: ../gucharmap/unicode-blocks.h:109 +#: ../gucharmap/unicode-blocks.h:111 msgid "Ideographic Description Characters" msgstr "Karakter keterangan ideographic" -#: ../gucharmap/unicode-blocks.h:110 +#: ../gucharmap/unicode-blocks.h:112 msgid "CJK Symbols and Punctuation" msgstr "Pengucapan dan simbol CJK" -#: ../gucharmap/unicode-blocks.h:111 ../gucharmap/unicode-scripts.h:44 +#: ../gucharmap/unicode-blocks.h:113 ../gucharmap/unicode-scripts.h:49 msgid "Hiragana" msgstr "Hiragana" -#: ../gucharmap/unicode-blocks.h:112 ../gucharmap/unicode-scripts.h:47 +#: ../gucharmap/unicode-blocks.h:114 ../gucharmap/unicode-scripts.h:57 msgid "Katakana" msgstr "Katakana" -#: ../gucharmap/unicode-blocks.h:113 ../gucharmap/unicode-scripts.h:20 +#: ../gucharmap/unicode-blocks.h:115 ../gucharmap/unicode-scripts.h:22 msgid "Bopomofo" msgstr "Bopomofo" -#: ../gucharmap/unicode-blocks.h:114 +#: ../gucharmap/unicode-blocks.h:116 msgid "Hangul Compatibility Jamo" msgstr "Hangul Compatibility Jamo" -#: ../gucharmap/unicode-blocks.h:115 +#: ../gucharmap/unicode-blocks.h:117 msgid "Kanbun" msgstr "Kanbun" -#: ../gucharmap/unicode-blocks.h:116 +#: ../gucharmap/unicode-blocks.h:118 msgid "Bopomofo Extended" -msgstr "Perluasan Bopomofo" +msgstr "Bopomofo Diperluas" -#: ../gucharmap/unicode-blocks.h:117 +#: ../gucharmap/unicode-blocks.h:119 msgid "CJK Strokes" msgstr "CJK Strokes" -#: ../gucharmap/unicode-blocks.h:118 +#: ../gucharmap/unicode-blocks.h:120 msgid "Katakana Phonetic Extensions" -msgstr "Ekstensi phonetik Katakana " +msgstr "Ekstensi Fonetik Katakana " -#: ../gucharmap/unicode-blocks.h:119 +#: ../gucharmap/unicode-blocks.h:121 msgid "Enclosed CJK Letters and Months" msgstr "Menyertakan huruf dan bulan CJK" -#: ../gucharmap/unicode-blocks.h:120 +#: ../gucharmap/unicode-blocks.h:122 msgid "CJK Compatibility" msgstr "Kompatibilitas CJK" -#: ../gucharmap/unicode-blocks.h:121 +#: ../gucharmap/unicode-blocks.h:123 msgid "CJK Unified Ideographs Extension A" msgstr "CJK Unified Ideograpik Ekstensi A" -#: ../gucharmap/unicode-blocks.h:122 +#: ../gucharmap/unicode-blocks.h:124 msgid "Yijing Hexagram Symbols" msgstr "Simbol Heksagram Yijing" -#: ../gucharmap/unicode-blocks.h:123 +#: ../gucharmap/unicode-blocks.h:125 msgid "CJK Unified Ideographs" msgstr "Ideograpik CJK Unified" -#: ../gucharmap/unicode-blocks.h:124 +#: ../gucharmap/unicode-blocks.h:126 msgid "Yi Syllables" msgstr "Yi Syllables" -#: ../gucharmap/unicode-blocks.h:125 +#: ../gucharmap/unicode-blocks.h:127 msgid "Yi Radicals" msgstr "Yi Radikal" -#: ../gucharmap/unicode-blocks.h:126 +#: ../gucharmap/unicode-blocks.h:128 ../gucharmap/unicode-scripts.h:66 +#| msgid "Limbu" +msgid "Lisu" +msgstr "Lisu" + +#: ../gucharmap/unicode-blocks.h:129 ../gucharmap/unicode-scripts.h:106 +msgid "Vai" +msgstr "Vai" + +#: ../gucharmap/unicode-blocks.h:130 +#| msgid "Latin Extended-B" +msgid "Cyrillic Extended-B" +msgstr "Cyrillic Extended-B" + +#: ../gucharmap/unicode-blocks.h:131 ../gucharmap/unicode-scripts.h:20 +msgid "Bamum" +msgstr "Bamum" + +#: ../gucharmap/unicode-blocks.h:132 msgid "Modifier Tone Letters" msgstr "Pengubah Huruf Nada" -#: ../gucharmap/unicode-blocks.h:127 +#: ../gucharmap/unicode-blocks.h:133 msgid "Latin Extended-D" msgstr "Ekstended-D Latin" -#: ../gucharmap/unicode-blocks.h:128 ../gucharmap/unicode-scripts.h:69 +#: ../gucharmap/unicode-blocks.h:134 ../gucharmap/unicode-scripts.h:92 msgid "Syloti Nagri" msgstr "Syloti Nagri" -#: ../gucharmap/unicode-blocks.h:129 +#: ../gucharmap/unicode-blocks.h:135 +#| msgid "Number Forms" +msgid "Common Indic Number Forms" +msgstr "Common Indic Number Forms" + +#: ../gucharmap/unicode-blocks.h:136 msgid "Phags-pa" msgstr "Phags-pa" -#: ../gucharmap/unicode-blocks.h:130 +#: ../gucharmap/unicode-blocks.h:137 ../gucharmap/unicode-scripts.h:88 +msgid "Saurashtra" +msgstr "Saurashtra" + +#: ../gucharmap/unicode-blocks.h:138 +#| msgid "Devanagari" +msgid "Devanagari Extended" +msgstr "Devanagari Diperluas" + +#: ../gucharmap/unicode-blocks.h:139 ../gucharmap/unicode-scripts.h:58 +msgid "Kayah Li" +msgstr "Kayah Li" + +#: ../gucharmap/unicode-blocks.h:140 ../gucharmap/unicode-scripts.h:85 +msgid "Rejang" +msgstr "Rejang" + +#: ../gucharmap/unicode-blocks.h:141 +#| msgid "Latin Extended-A" +msgid "Hangul Jamo Extended-A" +msgstr "Hangul Jamo Extended-A" + +#: ../gucharmap/unicode-blocks.h:142 ../gucharmap/unicode-scripts.h:54 +#| msgid "Balinese" +msgid "Javanese" +msgstr "Jawa" + +#: ../gucharmap/unicode-blocks.h:143 ../gucharmap/unicode-scripts.h:28 +#| msgid "Ogham" +msgid "Cham" +msgstr "Cham" + +#: ../gucharmap/unicode-blocks.h:144 +#| msgid "Latin Extended-A" +msgid "Myanmar Extended-A" +msgstr "Myanmar Extended-A" + +#: ../gucharmap/unicode-blocks.h:145 ../gucharmap/unicode-scripts.h:98 +#| msgid "Tai Le" +msgid "Tai Viet" +msgstr "Tai Viet" + +#: ../gucharmap/unicode-blocks.h:146 ../gucharmap/unicode-scripts.h:70 +msgid "Meetei Mayek" +msgstr "Meetei Mayek" + +#: ../gucharmap/unicode-blocks.h:147 msgid "Hangul Syllables" msgstr "Hangul Syllables" -#: ../gucharmap/unicode-blocks.h:131 +#: ../gucharmap/unicode-blocks.h:148 +#| msgid "Latin Extended-B" +msgid "Hangul Jamo Extended-B" +msgstr "Hangul Jamo Extended-B" + +#: ../gucharmap/unicode-blocks.h:149 msgid "High Surrogates" msgstr "Surrogate tinggi" -#: ../gucharmap/unicode-blocks.h:132 +#: ../gucharmap/unicode-blocks.h:150 msgid "High Private Use Surrogates" msgstr "Penggunaan Surrogate secara private" -#: ../gucharmap/unicode-blocks.h:133 +#: ../gucharmap/unicode-blocks.h:151 msgid "Low Surrogates" msgstr "Surrogates rendah" -#: ../gucharmap/unicode-blocks.h:134 +#: ../gucharmap/unicode-blocks.h:152 msgid "Private Use Area" msgstr "Daerah penggunaan privat" -#: ../gucharmap/unicode-blocks.h:135 +#: ../gucharmap/unicode-blocks.h:153 msgid "CJK Compatibility Ideographs" msgstr "Kompatibilitas CJK terhadap ideograpik" -#: ../gucharmap/unicode-blocks.h:136 +#: ../gucharmap/unicode-blocks.h:154 msgid "Alphabetic Presentation Forms" msgstr "Alphabetic Presentation Forms" -#: ../gucharmap/unicode-blocks.h:137 +#: ../gucharmap/unicode-blocks.h:155 msgid "Arabic Presentation Forms-A" msgstr "Arabic Presentation Forms-A" -#: ../gucharmap/unicode-blocks.h:138 +#: ../gucharmap/unicode-blocks.h:156 msgid "Variation Selectors" msgstr "Variation selectors" -#: ../gucharmap/unicode-blocks.h:139 +#: ../gucharmap/unicode-blocks.h:157 msgid "Vertical Forms" msgstr "Bentuk Tegak" -#: ../gucharmap/unicode-blocks.h:140 +#: ../gucharmap/unicode-blocks.h:158 msgid "Combining Half Marks" msgstr "Kombinasi half marks" -#: ../gucharmap/unicode-blocks.h:141 +#: ../gucharmap/unicode-blocks.h:159 msgid "CJK Compatibility Forms" msgstr "CJK Compatibility Forms" -#: ../gucharmap/unicode-blocks.h:142 +#: ../gucharmap/unicode-blocks.h:160 msgid "Small Form Variants" msgstr "Small Form Variants" -#: ../gucharmap/unicode-blocks.h:143 +#: ../gucharmap/unicode-blocks.h:161 msgid "Arabic Presentation Forms-B" msgstr "Arabic Presentation Forms-B" -#: ../gucharmap/unicode-blocks.h:144 +#: ../gucharmap/unicode-blocks.h:162 msgid "Halfwidth and Fullwidth Forms" msgstr "Halfwidth and Fullwidth Forms" -#: ../gucharmap/unicode-blocks.h:145 +#: ../gucharmap/unicode-blocks.h:163 msgid "Specials" msgstr "Spesial" -#: ../gucharmap/unicode-blocks.h:146 +#: ../gucharmap/unicode-blocks.h:164 msgid "Linear B Syllabary" msgstr "Linear B Syllabary" -#: ../gucharmap/unicode-blocks.h:147 +#: ../gucharmap/unicode-blocks.h:165 msgid "Linear B Ideograms" msgstr "Linear B Ideograms" -#: ../gucharmap/unicode-blocks.h:148 +#: ../gucharmap/unicode-blocks.h:166 msgid "Aegean Numbers" msgstr "Angka Aegean" -#: ../gucharmap/unicode-blocks.h:149 +#: ../gucharmap/unicode-blocks.h:167 msgid "Ancient Greek Numbers" msgstr "Angka Yunani Kuno" -#: ../gucharmap/unicode-blocks.h:150 ../gucharmap/unicode-scripts.h:60 +#: ../gucharmap/unicode-blocks.h:168 +#| msgid "Currency Symbols" +msgid "Ancient Symbols" +msgstr "Simbol Kuno" + +#: ../gucharmap/unicode-blocks.h:169 +msgid "Phaistos Disc" +msgstr "Phaistos Disc" + +#: ../gucharmap/unicode-blocks.h:170 ../gucharmap/unicode-scripts.h:67 +msgid "Lycian" +msgstr "Lycia" + +#: ../gucharmap/unicode-blocks.h:171 ../gucharmap/unicode-scripts.h:27 +#| msgid "Shavian" +msgid "Carian" +msgstr "Caria" + +#: ../gucharmap/unicode-blocks.h:172 ../gucharmap/unicode-scripts.h:77 msgid "Old Italic" -msgstr "Old Italic" +msgstr "Italic Tua" -#: ../gucharmap/unicode-blocks.h:151 ../gucharmap/unicode-scripts.h:36 +#: ../gucharmap/unicode-blocks.h:173 ../gucharmap/unicode-scripts.h:41 msgid "Gothic" msgstr "Gothic" -#: ../gucharmap/unicode-blocks.h:152 ../gucharmap/unicode-scripts.h:80 +#: ../gucharmap/unicode-blocks.h:174 ../gucharmap/unicode-scripts.h:105 msgid "Ugaritic" msgstr "Ugaritic" -#: ../gucharmap/unicode-blocks.h:153 ../gucharmap/unicode-scripts.h:61 +#: ../gucharmap/unicode-blocks.h:175 ../gucharmap/unicode-scripts.h:78 msgid "Old Persian" -msgstr "Persia Lama" +msgstr "Persia Tua" -#: ../gucharmap/unicode-blocks.h:154 ../gucharmap/unicode-scripts.h:31 +#: ../gucharmap/unicode-blocks.h:176 ../gucharmap/unicode-scripts.h:35 msgid "Deseret" msgstr "Deseret" -#: ../gucharmap/unicode-blocks.h:155 ../gucharmap/unicode-scripts.h:67 +#: ../gucharmap/unicode-blocks.h:177 ../gucharmap/unicode-scripts.h:89 msgid "Shavian" msgstr "Shavian" -#: ../gucharmap/unicode-blocks.h:156 ../gucharmap/unicode-scripts.h:63 +#: ../gucharmap/unicode-blocks.h:178 ../gucharmap/unicode-scripts.h:82 msgid "Osmanya" msgstr "Osmanya" -#: ../gucharmap/unicode-blocks.h:157 +#: ../gucharmap/unicode-blocks.h:179 msgid "Cypriot Syllabary" msgstr "Cypriot Syllabary" -#: ../gucharmap/unicode-blocks.h:158 ../gucharmap/unicode-scripts.h:65 +#: ../gucharmap/unicode-blocks.h:180 ../gucharmap/unicode-scripts.h:50 +msgid "Imperial Aramaic" +msgstr "Imperial Aramaic" + +#: ../gucharmap/unicode-blocks.h:181 ../gucharmap/unicode-scripts.h:84 msgid "Phoenician" msgstr "Phoenician" -#: ../gucharmap/unicode-blocks.h:159 ../gucharmap/unicode-scripts.h:48 +#: ../gucharmap/unicode-blocks.h:182 ../gucharmap/unicode-scripts.h:68 +msgid "Lydian" +msgstr "Lydia" + +#: ../gucharmap/unicode-blocks.h:183 ../gucharmap/unicode-scripts.h:59 msgid "Kharoshthi" msgstr "Kharoshthi" -#: ../gucharmap/unicode-blocks.h:160 ../gucharmap/unicode-scripts.h:28 +#: ../gucharmap/unicode-blocks.h:184 ../gucharmap/unicode-scripts.h:79 +msgid "Old South Arabian" +msgstr "Arab Selatan Tua" + +#: ../gucharmap/unicode-blocks.h:185 ../gucharmap/unicode-scripts.h:18 +msgid "Avestan" +msgstr "Avesta" + +#: ../gucharmap/unicode-blocks.h:186 ../gucharmap/unicode-scripts.h:53 +msgid "Inscriptional Parthian" +msgstr "Inscriptional Parthian" + +#: ../gucharmap/unicode-blocks.h:187 ../gucharmap/unicode-scripts.h:52 +msgid "Inscriptional Pahlavi" +msgstr "Inscriptional Pahlavi" + +#: ../gucharmap/unicode-blocks.h:188 ../gucharmap/unicode-scripts.h:80 +#| msgid "Old Italic" +msgid "Old Turkic" +msgstr "Turkic Lama" + +#: ../gucharmap/unicode-blocks.h:189 +#| msgid "Musical Symbols" +msgid "Rumi Numeral Symbols" +msgstr "Simbol Numeral Rumi" + +#: ../gucharmap/unicode-blocks.h:190 ../gucharmap/unicode-scripts.h:55 +#| msgid "Kharoshthi" +msgid "Kaithi" +msgstr "Kaithi" + +#: ../gucharmap/unicode-blocks.h:191 ../gucharmap/unicode-scripts.h:32 msgid "Cuneiform" msgstr "Cuneiform" -#: ../gucharmap/unicode-blocks.h:161 +#: ../gucharmap/unicode-blocks.h:192 msgid "Cuneiform Numbers and Punctuation" msgstr "Pengucapan dan Angka Cuneiform" -#: ../gucharmap/unicode-blocks.h:162 +#: ../gucharmap/unicode-blocks.h:193 ../gucharmap/unicode-scripts.h:37 +msgid "Egyptian Hieroglyphs" +msgstr "Hieroglif Mesir" + +#: ../gucharmap/unicode-blocks.h:194 msgid "Byzantine Musical Symbols" -msgstr "Simbol musik Byzantium" +msgstr "Simbol Musik Byzantium" -#: ../gucharmap/unicode-blocks.h:163 +#: ../gucharmap/unicode-blocks.h:195 msgid "Musical Symbols" msgstr "Symbol Musik" -#: ../gucharmap/unicode-blocks.h:164 +#: ../gucharmap/unicode-blocks.h:196 msgid "Ancient Greek Musical Notation" msgstr "Notasi Music Yunani Kuno" -#: ../gucharmap/unicode-blocks.h:165 +#: ../gucharmap/unicode-blocks.h:197 msgid "Tai Xuan Jing Symbols" msgstr "Symbol Tai Xuan Jing" -#: ../gucharmap/unicode-blocks.h:166 +#: ../gucharmap/unicode-blocks.h:198 msgid "Counting Rod Numerals" msgstr "Angka Counting·Rod" -#: ../gucharmap/unicode-blocks.h:167 +#: ../gucharmap/unicode-blocks.h:199 msgid "Mathematical Alphanumeric Symbols" msgstr "Simbol matematika alpanumeric" -#: ../gucharmap/unicode-blocks.h:168 +#: ../gucharmap/unicode-blocks.h:200 +msgid "Mahjong Tiles" +msgstr "kartu Mahjong" + +#: ../gucharmap/unicode-blocks.h:201 +msgid "Domino Tiles" +msgstr "Kartu Domino" + +#: ../gucharmap/unicode-blocks.h:202 +#| msgid "Enclosed Alphanumerics" +msgid "Enclosed Alphanumeric Supplement" +msgstr "Enclosed Alphanumeric Supplement" + +#: ../gucharmap/unicode-blocks.h:203 +#| msgid "Ethiopic Supplement" +msgid "Enclosed Ideographic Supplement" +msgstr "Enclosed Ideographic Supplement" + +#: ../gucharmap/unicode-blocks.h:204 msgid "CJK Unified Ideographs Extension B" msgstr "CJK Unified Ideographs Extension B" -#: ../gucharmap/unicode-blocks.h:169 +#: ../gucharmap/unicode-blocks.h:205 +#| msgid "CJK Unified Ideographs Extension A" +msgid "CJK Unified Ideographs Extension C" +msgstr "CJK Unified Ideographs Extension C" + +#: ../gucharmap/unicode-blocks.h:206 msgid "CJK Compatibility Ideographs Supplement" msgstr "CJK Compatibility Ideographs Supplement" -#: ../gucharmap/unicode-blocks.h:170 +#: ../gucharmap/unicode-blocks.h:207 msgid "Tags" -msgstr "Tags" +msgstr "Tag" -#: ../gucharmap/unicode-blocks.h:171 +#: ../gucharmap/unicode-blocks.h:208 msgid "Variation Selectors Supplement" -msgstr "Penambahan variasi pemilih" +msgstr "Variation Selectors Supplement" -#: ../gucharmap/unicode-blocks.h:172 +#: ../gucharmap/unicode-blocks.h:209 msgid "Supplementary Private Use Area-A" msgstr "Supplementary Private Use Area-A" -#: ../gucharmap/unicode-blocks.h:173 +#: ../gucharmap/unicode-blocks.h:210 msgid "Supplementary Private Use Area-B" msgstr "Supplementary Private Use Area-B" -#: ../gucharmap/unicode-scripts.h:21 +#: ../gucharmap/unicode-scripts.h:23 msgid "Braille" msgstr "Braille" -#: ../gucharmap/unicode-scripts.h:24 +#: ../gucharmap/unicode-scripts.h:26 msgid "Canadian Aboriginal" msgstr "Penduduk Asli Kanada" -#: ../gucharmap/unicode-scripts.h:29 +#: ../gucharmap/unicode-scripts.h:33 msgid "Cypriot" msgstr "Cypriot" -#: ../gucharmap/unicode-scripts.h:37 +#: ../gucharmap/unicode-scripts.h:42 msgid "Greek" msgstr "Yunani" -#: ../gucharmap/unicode-scripts.h:40 +#: ../gucharmap/unicode-scripts.h:45 msgid "Han" msgstr "Han" -#: ../gucharmap/unicode-scripts.h:41 +#: ../gucharmap/unicode-scripts.h:46 msgid "Hangul" msgstr "Hangul" -#: ../gucharmap/unicode-scripts.h:45 +#: ../gucharmap/unicode-scripts.h:51 msgid "Inherited" msgstr "Turunan" -#: ../gucharmap/unicode-scripts.h:51 +#: ../gucharmap/unicode-scripts.h:62 msgid "Latin" msgstr "Latin" -#: ../gucharmap/unicode-scripts.h:53 +#: ../gucharmap/unicode-scripts.h:65 msgid "Linear B" msgstr "Linear B" -#: ../gucharmap/unicode-scripts.h:58 -msgid "Nko" -msgstr "NKo" - -#: ../gucharmap/unicode-scripts.h:64 +#: ../gucharmap/unicode-scripts.h:83 msgid "Phags Pa" msgstr "Phags Pa" -#: ../gucharmap/unicode-scripts.h:81 +#: ../gucharmap/unicode-scripts.h:107 msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-block-chapters.c:61 -msgid "All" -msgstr "Semua" - -#: ../gucharmap/gucharmap-block-chapters.c:79 -msgid "Unicode Block" -msgstr "Blok Unicode" - -#: ../gucharmap/gucharmap-script-chapters.c:76 -msgid "Script" -msgstr "Skrip" - -#: ../gucharmap/gucharmap-search-dialog.c:549 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informasi" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:753 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Temukan" -#: ../gucharmap/gucharmap-search-dialog.c:767 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Sebelumnya" -#: ../gucharmap/gucharmap-search-dialog.c:774 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "Sela_njutnya" -#: ../gucharmap/gucharmap-search-dialog.c:784 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Cari:" -#: ../gucharmap/gucharmap-search-dialog.c:794 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Cocok seluruh kata" -#: ../gucharmap/gucharmap-search-dialog.c:799 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Cari dalam _Detil Karakter" -#~ msgid "Next Block" -#~ msgstr "Blok selanjutnya" - -#~ msgid "Previous Block" -#~ msgstr "Blok Sebelumnya" - -#~ msgid "Unicode Character Map" -#~ msgstr "Peta karakter Unicode" - -#~ msgid "_Bold" -#~ msgstr "_Tebal" - -#~ msgid "_Italic" -#~ msgstr "M_iring" - -#~ msgid "Clipboard is empty." -#~ msgstr "Klipbord kosong." - -#~ msgid "There is no selected text." -#~ msgstr "Tidak ada teks terpilih." - -#~ msgid "Unknown character in clipboard, unable to identify." -#~ msgstr "Karakter tidak dikenal dalam klipbord, tidak bisa mengenali." - -#~ msgid "First character in clipboard not found." -#~ msgstr "Karakter pertama dalam klipbord tidak ditemukan" - -#~ msgid "Nothing to search for." -#~ msgstr "Tidak ada yang hendak dicari." - -#~ msgid "Character in _Clipboard" -#~ msgstr "Karakter dalam _Klipbord" - -#~ msgid "HANGUL SYLLABLE %s%s%s" -#~ msgstr "HANGUL SYLLABLE %s%s%s" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "" -#~ msgstr "" +#: ../gucharmap/gucharmap-block-chapters-model.c:84 +msgid "All" +msgstr "Semua" -#~ msgid "" -#~ msgstr "" +#: ../gucharmap/gucharmap-block-chapters-model.c:187 +msgid "Unicode Block" +msgstr "Blok Unicode" -#~ msgid "" -#~ msgstr "" +#: ../gucharmap/gucharmap-script-chapters-model.c:130 +msgid "Script" +msgstr "Skrip" diff -Nru gucharmap-2.31.91/po/it.po gucharmap-2.32.0/po/it.po --- gucharmap-2.31.91/po/it.po 2010-03-29 09:29:45.000000000 -0400 +++ gucharmap-2.32.0/po/it.po 2010-09-26 14:53:09.000000000 -0400 @@ -10,15 +10,15 @@ msgstr "" "Project-Id-Version: gucharmap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-13 18:10+0100\n" -"PO-Revision-Date: 2010-03-13 18:19+0100\n" +"POT-Creation-Date: 2010-09-02 21:33+0200\n" +"PO-Revision-Date: 2010-09-02 21:34+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Tabella caratteri" @@ -124,40 +124,40 @@ msgid "Korean Pronunciation:" msgstr "Pronuncia coreana:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Tabella ca_ratteri" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Dettagli _carattere" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Carattere sconosciuto, impossibile da identificare." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Non trovato." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Carattere trovato." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tabella caratteri" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Tipo carattere" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Famiglia carattere" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Dimensione carattere" @@ -328,12 +328,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap è software libero; è lecito redistribuirlo o modificarlo secondo i " -"termini della Licenza Pubblica Generica GNU come è pubblicata dalla Free " -"Software Foundation; o la versione 2 della licenza o (a propria scelta) una " +"termini della GNU General Public License come è pubblicata dalla Free " +"Software Foundation; o la versione 3 della licenza o (a propria scelta) una " "versione successiva." #: ../gucharmap/gucharmap-window.c:497 @@ -396,11 +396,11 @@ "Alessio Frusciante \n" "Luigi Maselli " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Scrittura successiva" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Scrittura precedente" @@ -412,71 +412,71 @@ msgid "Previous Block" msgstr "Blocco precedente" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_File" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Visualizza" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Cerca" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "V_ai" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "A_iuto" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "_Impostazione pagina" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Trova successi_vo" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Trova pr_ecedente" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "Carattere su_ccessivo" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "Carattere pr_ecedente" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Sommario" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_Informazioni" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Per _scrittura" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Per blocco _Unicode" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Spezza _colonne in potenze di due" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Testo da copiare:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Copia negli appunti." @@ -1321,32 +1321,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informazioni" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Trova" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Precedente" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Successivo" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Cerca:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "_Parola intera" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Cerca nei _dettagli del carattere" @@ -1354,10 +1354,10 @@ msgid "All" msgstr "Tutti" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Blocchi Unicode" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Scrittura" diff -Nru gucharmap-2.31.91/po/ja.po gucharmap-2.32.0/po/ja.po --- gucharmap-2.31.91/po/ja.po 2010-03-02 08:05:20.000000000 -0500 +++ gucharmap-2.32.0/po/ja.po 2010-09-26 14:53:09.000000000 -0400 @@ -5,6 +5,7 @@ # Satoru SATOH , 2006. # Takeshi AIHANA , 2003-2006,2008,2009. # Hideki Yamane (Debian-JP) , 2009-2010. +# Takayuki KUSANO , 2010. # # About Unicode terminology, see :http://unicode.org/terminology/term_en_ja.html # @@ -13,15 +14,15 @@ "Project-Id-Version: gucharmap master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gucharmap&component=general\n" -"POT-Creation-Date: 2010-02-06 18:08+0900\n" -"PO-Revision-Date: 2010-02-07 02:49+0900\n" -"Last-Translator: Hideki Yamane (Debian-JP) \n" +"POT-Creation-Date: 2010-09-16 21:50+0000\n" +"PO-Revision-Date: 2010-09-09 00:37+0900\n" +"Last-Translator: Takayuki KUSANO \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "文字マップ" @@ -127,40 +128,40 @@ msgid "Korean Pronunciation:" msgstr "韓国語の発音:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "文字テーブル(_R)" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "文字の詳細(_D)" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "不明な文字のため判別できません" -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "見つかりませんでした" -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "文字が見つかりました" -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "文字テーブル" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "フォント" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "フォント・ファミリ" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "フォント・サイズ" @@ -175,151 +176,151 @@ msgid "Common" msgstr "Common" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "<私用ではない上位サロゲート>" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "<私用の上位サロゲート>" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "<下位サロゲート>" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "<私用>" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "<15面 私用>" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "<16面 私用>" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "<未割り当て>" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "その他、制御文字" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "その他、書式文字" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "その他、未割り当て" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "その他、私用" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "その他、サロゲート" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "文字、小文字" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "文字、修飾文字" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "文字、その他" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "文字、タイトル文字" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "文字、大文字" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "符号、空白結合文字" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "符号、囲み文字" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "符号、非空白文字" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "数字、10進数" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "数字、文字" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "数字、その他" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "句読点、コネクタ" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "句読点、ダッシュ" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "句読点、閉じ" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "句読点、末尾引用符" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "句読点、開始引用符" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "句読点、その他" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "句読点、開き" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "記号、通貨" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "記号、修飾文字" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "記号、数学" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "記号、その他" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "区切り、行" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "区切り、段落" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "区切り、空白" @@ -331,12 +332,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap はフリーソフトウェアです; フリーソフトウェア財団が発行する GNU 一般" -"公有使用許諾契約書の第２版、またはそれ以降の版の下で改変・修正・再配布が認め" -"られています。" +"公有使用許諾契約書の第3版、またはそれ以降の版の下で改変・修正・再配布が認めら" +"れています。" #: ../gucharmap/gucharmap-window.c:497 msgid "" @@ -359,7 +360,7 @@ msgstr "" "Gucharmap とその Unicode データは有用とは思いますが、頒布にあたっては、市場性" "及び特定目的、適合性についての暗黙の保証を含めて、いかなる保証も行ないませ" -"ん。詳細は GNU 一般公有使用許諾契約書をご覧下さい。" +"ん。詳細は GNU 一般公有使用許諾契約書をご覧ください。" #: ../gucharmap/gucharmap-window.c:505 msgid "" @@ -369,7 +370,7 @@ msgstr "" "あなたは、本プログラムと一緒に GNU 一般公有使用許諾契約書の写しを受け取ってい" "るはずです。そうでない場合は、Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02110-1301 USA まで手紙を書いて下さい。" +"Place, Suite 330, Boston, MA 02110-1301 USA まで手紙を書いてください。" #: ../gucharmap/gucharmap-window.c:508 msgid "" @@ -396,13 +397,14 @@ "佐藤 暁 \n" "KAMAGASAKO Masatoshi \n" "やまねひでき \n" -"日本GNOMEユーザー会 http://www.gnome.gr.jp/" +"草野 貴之 \n" +"日本GNOMEユーザー会 " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "次のスクリプト" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "前のスクリプト" @@ -414,71 +416,71 @@ msgid "Previous Block" msgstr "前のブロック" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "ファイル(_F)" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "表示(_V)" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "検索(_S)" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "ジャンプ(_G)" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "ヘルプ(_H)" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "ページの設定(_S)" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "次を検索(_N)" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "前を検索(_P)" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "次の文字(_N)" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "前の文字(_P)" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "目次(_C)" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "情報(_A)" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Unicode スクリプト順(_S)" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Unicode ブロック順(_U)" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" -msgstr "表示枠を２のべき乗単位にする(_C)" +msgstr "表示枠を2のべき乗単位にする(_C)" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "コピーする文字列(_T):" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "クリップボードへコピーします" @@ -1324,43 +1326,43 @@ msgid "Yi" msgstr "イ文字" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "情報" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "検索" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "前を検索(_P)" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "次を検索(_N)" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "検索(_S):" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "単語全体に一致するものだけ(_W)" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "\"文字の詳細\" も検索する(_D)" #: ../gucharmap/gucharmap-block-chapters-model.c:84 msgid "All" -msgstr "全て" +msgstr "すべて" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Unicode ブロック" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "スクリプト" diff -Nru gucharmap-2.31.91/po/nb.po gucharmap-2.32.0/po/nb.po --- gucharmap-2.31.91/po/nb.po 2010-08-29 08:04:17.000000000 -0400 +++ gucharmap-2.32.0/po/nb.po 2010-09-26 14:53:09.000000000 -0400 @@ -5,17 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: gucharmap 2.29.x\n" -"Report-Msgid-Bugs-To:\n" -"POT-Creation-Date: 2009-11-15 13:39+0100\n" -"PO-Revision-Date: 2009-11-15 13:43+0100\n" +"Project-Id-Version: gucharmap 2.31.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-09-11 11:41+0200\n" +"PO-Revision-Date: 2010-09-11 11:42+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian Bokmal \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Tegnkart" @@ -121,40 +122,40 @@ msgid "Korean Pronunciation:" msgstr "Koreansk uttale:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "_Tegntabell" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "_Detaljer om tegn" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Ukjent tegn. Kan ikke identifiseres." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Ikke funnet." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Tegn funnet." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tegntabell" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Skrift" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Skriftfamilie" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Skriftstørrelse" @@ -169,151 +170,151 @@ msgid "Common" msgstr "Vanlig" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "Annet, kontroll" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "Annet, format" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "Annet, ikke tildelt" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "Annet, privat bruk" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Annet, erstatning" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "Bokstav, liten" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Bokstav, endringstast" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "Bokstav, annet" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "Bokstav, titteltype" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "Bokstav, stor" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "Merke, plasstagende sammensatt" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "Merke, omsluttende" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "Merke, Ikke-plasstagende" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "Tall, desimaltall" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "Tall, bokstav" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "Tall, annet" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "Skilletegn, kobling" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "Skilletegn, bindestrek" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "Skilletegn, lukk" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "Skilletegn, avsluttende sitattegn" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "Skilletegn, åpnende sitattegn" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "Skilletegn, annet" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "Skilletegn, åpne" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "Symbol, valuta" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "Symbol, endringstegn" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "Symbol, matematisk" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "Symbol, annet" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "Skilletegn, linje" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "Skilletegn, avsnitt" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "Skilletegn, mellomrom" @@ -325,13 +326,9 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." -msgstr "" -"Gucharmap er fri programvare. Du kan redistribuere og/eller endre programmet " -"under betingelsene gitt i GNU General Public License som utgitt av Free " -"Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) " -"enhver senere versjon." +msgstr "Gucharmap er fri programvare. Du kan redistribuere og/eller endre programmet under betingelsene gitt i GNU General Public License som utgitt av Free Software Foundation; enten versjon 3 av lisensen, eller (hvis du ønsker det) enhver senere versjon." #: ../gucharmap/gucharmap-window.c:497 msgid "" @@ -388,11 +385,11 @@ msgid "translator-credits" msgstr "Kjartan Maraas " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Neste skript" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Forrige skript" @@ -404,71 +401,71 @@ msgid "Previous Block" msgstr "Forrige blokk" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Fil" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Vis" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Søk" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Gå til" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Hjelp" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "_Sideoppsett" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Finn _neste" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Finn _forrige" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "_Neste tegn" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "_Forrige tegn" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Innhold" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_Om" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Etter _skript" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Etter Unicode-blokk" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Fest _kolonner i jevnt antall" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Tekst som skal kopieres:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Kopier til utklippstavlen." @@ -1312,43 +1309,43 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informasjon" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Finn" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Forrige" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Neste" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Søk:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Treff på _hele ord" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Søk i _detaljer om tegn" -#: ../gucharmap/gucharmap-block-chapters-model.c:53 +#: ../gucharmap/gucharmap-block-chapters-model.c:84 msgid "All" msgstr "Alle" -#: ../gucharmap/gucharmap-block-chapters-model.c:138 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Unicode-blokk" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Skript" diff -Nru gucharmap-2.31.91/po/nl.po gucharmap-2.32.0/po/nl.po --- gucharmap-2.31.91/po/nl.po 2010-08-18 07:05:06.000000000 -0400 +++ gucharmap-2.32.0/po/nl.po 2010-09-26 14:53:09.000000000 -0400 @@ -25,10 +25,11 @@ msgstr "" "Project-Id-Version: gucharmap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-30 23:32+0200\n" -"PO-Revision-Date: 2010-03-30 23:32+0200\n" +"POT-Creation-Date: 2010-09-24 18:31+0200\n" +"PO-Revision-Date: 2010-09-24 18:32+0200\n" "Last-Translator: Wouter Bolsterlee \n" "Language-Team: Dutch \n" +"Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -36,7 +37,7 @@ # Dit komt in het gnome menu Hulpmiddelen # # speciale tekens/lettertekens/tekentabel/tekens en symbolen -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Tekens en symbolen" @@ -148,42 +149,42 @@ msgid "Korean Pronunciation:" msgstr "Koreaanse uitspraak:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "_Tekentabel" # de _d wordt gebruikt in Beel_d -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Teke_ndetails" # thuisbrengen/identificeren -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Onbekend teken, kon het niet identificeren." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Niet gevonden." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Teken gevonden." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tekentabel" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Lettertype" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Lettertypefamilie" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Lettergrootte" @@ -354,12 +355,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap is vrije software; u mag het herdistribueren en/of aanpassen onder " "de voorwaarden van de GNU General Public License zoals die gepubliceerd is " -"door de Free Software Foundation; ofwel versie 2 van de licentie of (zo u " +"door de Free Software Foundation; ofwel versie 3 van de licentie of (zo u " "wilt) een latere versie." #: ../gucharmap/gucharmap-window.c:497 @@ -383,10 +384,10 @@ "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " "Public License and Unicode Copyright for more details." msgstr "" -"Gucharmap en de Unicode databestanden worden gedistribueerd in de hoop dat " -"ze nuttig zullen zijn, maar ZONDER ENIGE GARANTIE; zelfs zonder de " +"Gucharmap en de Unicode-databestanden worden gedistribueerd in de hoop dat " +"deze nuttig zullen zijn, maar ZONDER ENIGE GARANTIE; zelfs zonder de " "impliciete garantie van VERKOOPBAARHEID of GESCHIKHEID VOOR EEN BEPAALD " -"DOEL. Zie de GNU General Public License en het Unicode auteursrecht voor " +"DOEL. Zie de GNU General Public License en het Unicode-auteursrecht voor " "meer informatie." #: ../gucharmap/gucharmap-window.c:505 @@ -426,11 +427,11 @@ "\n" "Kijk voor meer informatie op http://nl.gnome.org/" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Volgend schrift" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Vorig schrift" @@ -442,73 +443,73 @@ msgid "Previous Block" msgstr "Vorig blok" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Bestand" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "Beel_d" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Zoeken" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Ga naar" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Hulp" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Pagina-i_nstellingen" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "V_olgende zoeken" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Vo_rige zoeken" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "V_olgend teken" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "Vo_rig teken" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "In_houd" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "I_nfo" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Per _schrift" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Per _Unicode-blok" # eenvoudiger maar niet helemaal juist: even aantallen kolommen. -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Aantal _kolommen is macht van 2" # de _k wordt gebruikt voor de knop _kopieren en de T voor Tekentabel -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "Te _kopiëren tekst:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Kopiëren naar het klembord." @@ -1391,32 +1392,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informatie" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Zoeken" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "Vo_rige" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "V_olgende" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Zoeken:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Volledig _woord moet overeenstemmen" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Zoeken in teken_details" @@ -1424,10 +1425,10 @@ msgid "All" msgstr "Alles" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Unicode-blok" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Schrift" diff -Nru gucharmap-2.31.91/po/pl.po gucharmap-2.32.0/po/pl.po --- gucharmap-2.31.91/po/pl.po 2010-03-02 08:05:20.000000000 -0500 +++ gucharmap-2.32.0/po/pl.po 2010-09-26 14:53:09.000000000 -0400 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: gucharmap\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-26 20:38+0100\n" -"PO-Revision-Date: 2010-02-26 20:07+0100\n" +"POT-Creation-Date: 2010-09-07 18:58+0200\n" +"PO-Revision-Date: 2010-09-07 17:25+0200\n" "Last-Translator: Piotr Drąg \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,7 +20,7 @@ "X-Poedit-Language: Polish\n" "X-Poedit-Country: Poland\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Mapa znaków" @@ -126,40 +126,40 @@ msgid "Korean Pronunciation:" msgstr "Wymowa koreańska:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Tablica z_naków" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Szczegóły _znaku" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Nieznany znak, nie można go zidentyfikować." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Nie odnaleziono." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Odnaleziono znak." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tablica znaków" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Czcionka" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Rodzina czcionek" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Rozmiar czcionki" @@ -175,151 +175,151 @@ msgstr "Wspólne" # Idiotyczne -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "Inne, kontrola" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "Inne, formatowanie" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "Inne, nieprzypisany" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "Inne, prywatny użytek" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Inne, surogat" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "Litera, mała" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Litera, modyfikator" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "Litera, inna" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "Litera, tytułowa" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "Litera, wielka" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "Znak, łączenie odstępów" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "Znak, otaczanie" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "Znak, nie będący odstępem" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "Liczba, cyfra dziesiętna" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "Liczba, litera" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "Liczba, inna" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "Interpunkcja, łącznik" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "Interpunkcja, myślnik" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "Interpunkcja, zamknięcie" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "Interpunkcja, cudzysłów zamykający" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "Interpunkcja, cudzysłów otwierający" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "Interpunkcja, inny" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "Interpunkcja, otwarcie" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "Symbol, waluta" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "Symbol, modyfikator" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "Symbol, matematyczny" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "Symbol, inny" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "Separator, wiersz" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "Separator, akapit" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "Separator, spacja" @@ -331,13 +331,13 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Program Gucharmap jest wolnym oprogramowaniem; można go rozprowadzać dalej i/" "lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej " "przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według " -"wersji drugiej tej Licencji lub którejś z późniejszych wersji." +"wersji trzeciej tej Licencji lub którejś z późniejszych wersji." #: ../gucharmap/gucharmap-window.c:497 msgid "" @@ -397,11 +397,11 @@ msgid "translator-credits" msgstr "Aviary.pl , 2008, 2009, 2010" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Następne pismo" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Poprzednie pismo" @@ -413,71 +413,71 @@ msgid "Previous Block" msgstr "Poprzedni blok" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Plik" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Widok" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "Wy_szukaj" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Przejdź" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Pomoc" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Usta_wienia strony" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Znajdź _następne" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Znajdź pop_rzednie" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "_Następny znak" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "_Poprzedni znak" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Spis treści" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_O programie" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Według pi_sma" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Według bloku _Unicode" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Łamanie _kolumn na potęgach dwójki" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Tekst do skopiowania:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Kopiuje do schowka." @@ -1322,32 +1322,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informacje" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Znajdź" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Poprzedni" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Następny" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "Wy_szukaj:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Dopasowanie _całego słowa" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Wyszukiwanie w _szczegółach znaku" @@ -1355,10 +1355,10 @@ msgid "All" msgstr "Wszystkie" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Blok Unicode" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Pismo" diff -Nru gucharmap-2.31.91/po/pt_BR.po gucharmap-2.32.0/po/pt_BR.po --- gucharmap-2.31.91/po/pt_BR.po 2010-03-02 08:05:20.000000000 -0500 +++ gucharmap-2.32.0/po/pt_BR.po 2010-09-26 14:53:09.000000000 -0400 @@ -13,16 +13,17 @@ msgid "" msgstr "" "Project-Id-Version: gucharmap\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-20 09:45-0500\n" -"PO-Revision-Date: 2010-02-20 10:00-0500\n" -"Last-Translator: Og Maciel \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=gucharmap&component=general\n" +"POT-Creation-Date: 2010-09-16 21:50+0000\n" +"PO-Revision-Date: 2010-09-19 19:41-0300\n" +"Last-Translator: Daniel S. Koda \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Mapa de caracteres" @@ -128,40 +129,40 @@ msgid "Korean Pronunciation:" msgstr "Pronúncia em Coreano:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Tabel_a de caracteres" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "Detalhes do _caractere" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Caractere desconhecido, não foi possível identificá-lo." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Não localizado." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Caractere localizado." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tabela de caracteres" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Fonte" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Família da fonte" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Tamanho da fonte" @@ -176,151 +177,151 @@ msgid "Common" msgstr "Comum" -#: ../gucharmap/gucharmap-unicode-info.c:94 +#: ../gucharmap/gucharmap-unicode-info.c:99 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:96 +#: ../gucharmap/gucharmap-unicode-info.c:101 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:98 +#: ../gucharmap/gucharmap-unicode-info.c:103 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:100 +#: ../gucharmap/gucharmap-unicode-info.c:105 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:102 +#: ../gucharmap/gucharmap-unicode-info.c:107 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:104 +#: ../gucharmap/gucharmap-unicode-info.c:109 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:109 +#: ../gucharmap/gucharmap-unicode-info.c:114 msgid "" msgstr "" -#: ../gucharmap/gucharmap-unicode-info.c:122 +#: ../gucharmap/gucharmap-unicode-info.c:127 msgid "Other, Control" msgstr "Outro, Controle" -#: ../gucharmap/gucharmap-unicode-info.c:123 +#: ../gucharmap/gucharmap-unicode-info.c:128 msgid "Other, Format" msgstr "Outro, Formato" -#: ../gucharmap/gucharmap-unicode-info.c:124 +#: ../gucharmap/gucharmap-unicode-info.c:129 msgid "Other, Not Assigned" msgstr "Outro, Não designado" -#: ../gucharmap/gucharmap-unicode-info.c:125 +#: ../gucharmap/gucharmap-unicode-info.c:130 msgid "Other, Private Use" msgstr "Outro, Uso privado" -#: ../gucharmap/gucharmap-unicode-info.c:126 +#: ../gucharmap/gucharmap-unicode-info.c:131 msgid "Other, Surrogate" msgstr "Outro, Substituto" -#: ../gucharmap/gucharmap-unicode-info.c:127 +#: ../gucharmap/gucharmap-unicode-info.c:132 msgid "Letter, Lowercase" msgstr "Letra, Minúscula" -#: ../gucharmap/gucharmap-unicode-info.c:128 +#: ../gucharmap/gucharmap-unicode-info.c:133 msgid "Letter, Modifier" msgstr "Letra, Modificador" -#: ../gucharmap/gucharmap-unicode-info.c:129 +#: ../gucharmap/gucharmap-unicode-info.c:134 msgid "Letter, Other" msgstr "Letra, Outro" -#: ../gucharmap/gucharmap-unicode-info.c:130 +#: ../gucharmap/gucharmap-unicode-info.c:135 msgid "Letter, Titlecase" msgstr "Letra, Iniciais maiúsculas" -#: ../gucharmap/gucharmap-unicode-info.c:131 +#: ../gucharmap/gucharmap-unicode-info.c:136 msgid "Letter, Uppercase" msgstr "Letra, Maiúscula" -#: ../gucharmap/gucharmap-unicode-info.c:132 +#: ../gucharmap/gucharmap-unicode-info.c:137 msgid "Mark, Spacing Combining" msgstr "Marca, Combinação de espaçamento" -#: ../gucharmap/gucharmap-unicode-info.c:133 +#: ../gucharmap/gucharmap-unicode-info.c:138 msgid "Mark, Enclosing" msgstr "Marca, Contenção" -#: ../gucharmap/gucharmap-unicode-info.c:134 +#: ../gucharmap/gucharmap-unicode-info.c:139 msgid "Mark, Non-Spacing" msgstr "Marca, Não espaçamento" -#: ../gucharmap/gucharmap-unicode-info.c:135 +#: ../gucharmap/gucharmap-unicode-info.c:140 msgid "Number, Decimal Digit" msgstr "Número, Dígito decimal" -#: ../gucharmap/gucharmap-unicode-info.c:136 +#: ../gucharmap/gucharmap-unicode-info.c:141 msgid "Number, Letter" msgstr "Número, Letra" -#: ../gucharmap/gucharmap-unicode-info.c:137 +#: ../gucharmap/gucharmap-unicode-info.c:142 msgid "Number, Other" msgstr "Número, Outro" -#: ../gucharmap/gucharmap-unicode-info.c:138 +#: ../gucharmap/gucharmap-unicode-info.c:143 msgid "Punctuation, Connector" msgstr "Pontuação, Conectivo" -#: ../gucharmap/gucharmap-unicode-info.c:139 +#: ../gucharmap/gucharmap-unicode-info.c:144 msgid "Punctuation, Dash" msgstr "Pontuação, Traço" -#: ../gucharmap/gucharmap-unicode-info.c:140 +#: ../gucharmap/gucharmap-unicode-info.c:145 msgid "Punctuation, Close" msgstr "Pontuação, Fechar" -#: ../gucharmap/gucharmap-unicode-info.c:141 +#: ../gucharmap/gucharmap-unicode-info.c:146 msgid "Punctuation, Final Quote" msgstr "Pontuação, Aspa final" -#: ../gucharmap/gucharmap-unicode-info.c:142 +#: ../gucharmap/gucharmap-unicode-info.c:147 msgid "Punctuation, Initial Quote" msgstr "Pontuação, Aspa inicial" -#: ../gucharmap/gucharmap-unicode-info.c:143 +#: ../gucharmap/gucharmap-unicode-info.c:148 msgid "Punctuation, Other" msgstr "Pontuação, Outro" -#: ../gucharmap/gucharmap-unicode-info.c:144 +#: ../gucharmap/gucharmap-unicode-info.c:149 msgid "Punctuation, Open" msgstr "Pontuação, Abrir" -#: ../gucharmap/gucharmap-unicode-info.c:145 +#: ../gucharmap/gucharmap-unicode-info.c:150 msgid "Symbol, Currency" msgstr "Símbolo, Moeda" -#: ../gucharmap/gucharmap-unicode-info.c:146 +#: ../gucharmap/gucharmap-unicode-info.c:151 msgid "Symbol, Modifier" msgstr "Símbolo, Modificador" -#: ../gucharmap/gucharmap-unicode-info.c:147 +#: ../gucharmap/gucharmap-unicode-info.c:152 msgid "Symbol, Math" msgstr "Símbolo, Matemático" -#: ../gucharmap/gucharmap-unicode-info.c:148 +#: ../gucharmap/gucharmap-unicode-info.c:153 msgid "Symbol, Other" msgstr "Símbolo, Outro" -#: ../gucharmap/gucharmap-unicode-info.c:149 +#: ../gucharmap/gucharmap-unicode-info.c:154 msgid "Separator, Line" msgstr "Separador, Linha" -#: ../gucharmap/gucharmap-unicode-info.c:150 +#: ../gucharmap/gucharmap-unicode-info.c:155 msgid "Separator, Paragraph" msgstr "Separador, Parágrafo" -#: ../gucharmap/gucharmap-unicode-info.c:151 +#: ../gucharmap/gucharmap-unicode-info.c:156 msgid "Separator, Space" msgstr "Separador, Espaço" @@ -332,12 +333,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap é software livre; você pode redistribuí-lo e/ou modificá-lo sob os " "termos da Licença Pública Geral GNU (GNU General Public License), conforme " -"publicada pela Free Software Foundation; tanto a versão 2 da Licença como (a " +"publicada pela Free Software Foundation; tanto a versão 3 da Licença como (a " "seu critério) qualquer versão mais nova." #: ../gucharmap/gucharmap-window.c:497 @@ -404,11 +405,11 @@ "Og Maciel \n" "André Gondim " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Próximo sistema de escrita" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Sistema de escrita anterior" @@ -420,71 +421,71 @@ msgid "Previous Block" msgstr "Bloco anterior" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Arquivo" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Ver" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Pesquisar" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Ir" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "Aj_uda" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Configurar _página" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Localizar pró_xima" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Localizar a_nterior" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "Pró_ximo caractere" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "Caractere a_nterior" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "S_umário" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_Sobre" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Por _sistema de escrita" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Por bloco _Unicode" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Ajustar _colunas para potência de dois" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Texto para copiar:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Copiar para área de transferência." @@ -1328,32 +1329,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informação" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Localizar" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "A_nterior" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "Pró_xima" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Pesquisar:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Palavra _inteira" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Pesquisar nos _detalhes dos caracteres" @@ -1361,11 +1362,11 @@ msgid "All" msgstr "Todos" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Bloco Unicode" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Sistema de escrita" diff -Nru gucharmap-2.31.91/po/pt.po gucharmap-2.32.0/po/pt.po --- gucharmap-2.31.91/po/pt.po 2010-03-29 09:29:45.000000000 -0400 +++ gucharmap-2.32.0/po/pt.po 2010-09-26 14:53:09.000000000 -0400 @@ -5,17 +5,17 @@ # msgid "" msgstr "" -"Project-Id-Version: 2.30\n" +"Project-Id-Version: 2.32\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-11 23:02+0000\n" -"PO-Revision-Date: 2010-03-11 23:10+0000\n" +"POT-Creation-Date: 2010-09-10 23:34+0100\n" +"PO-Revision-Date: 2010-09-10 23:35+0000\n" "Last-Translator: Duarte Loreto \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Mapa de Caracteres" @@ -121,40 +121,40 @@ msgid "Korean Pronunciation:" msgstr "Pronunciação Coreana:" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Tabela de Caracte_res" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "_Detalhes de Caracter" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Caracter desconhecido, incapaz de identificar." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Não encontrado." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Caracter encontrado." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Tabela de Caracteres" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Fonte" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Família de Fonte" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Tamanho de Fonte" @@ -325,12 +325,12 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap é uma aplicação livre; pode redistribuí-la e/ou alterá-la sob os " "termos da Licença Pública Genérica GNU tal como publicada pela Free Software " -"Foundation; a versão 2 da Licença ou (à sua discrição) qualquer versão " +"Foundation; a versão 3 da Licença ou (à sua discrição) qualquer versão " "posterior." #: ../gucharmap/gucharmap-window.c:497 @@ -390,11 +390,11 @@ msgid "translator-credits" msgstr "Duarte Loreto " -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "Script Seguinte" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "Script Anterior" @@ -406,71 +406,71 @@ msgid "Previous Block" msgstr "Bloco Anterior" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Ficheiro" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Ver" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Procurar" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "_Ir Para" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Ajuda" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Confi_guração de Página" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Procurar _Seguinte" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Procurar _Anterior" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "Caracter Segui_nte" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "Caracter _Anterior" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Conteúdo" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_Sobre" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "Por _Script" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "Por Bloco _Unicode" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "Ajustar as _Colunas à Potência de Dois" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Texto a copiar:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Copiar para a área de transferência." @@ -1314,32 +1314,32 @@ msgid "Yi" msgstr "Yi" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Informação" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Procurar" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "_Anterior" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "_Seguinte" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Procurar:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Coincidir a palavra _inteira" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Procurar nos _detalhes de caracter" @@ -1347,11 +1347,11 @@ msgid "All" msgstr "Tudo" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Bloco Unicode" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Script" diff -Nru gucharmap-2.31.91/po/ru.po gucharmap-2.32.0/po/ru.po --- gucharmap-2.31.91/po/ru.po 2010-03-29 09:29:45.000000000 -0400 +++ gucharmap-2.32.0/po/ru.po 2010-09-26 14:53:09.000000000 -0400 @@ -19,19 +19,19 @@ msgid "" msgstr "" "Project-Id-Version: gucharmap trunk\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-03-20 11:56+0200\n" -"PO-Revision-Date: 2010-03-17 20:35+0300\n" -"Last-Translator: Yuri Kozlov \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gucharmap&component=general\n" +"POT-Creation-Date: 2010-08-19 15:10+0000\n" +"PO-Revision-Date: 2010-09-24 08:08+0300\n" +"Last-Translator: Yuri Myasoedov \n" "Language-Team: Russian \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" +"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: KBabel 1.11.4\n" -#: ../gucharmap.desktop.in.in.h:1 ../gucharmap/gucharmap-window.c:905 +#: ../gucharmap.desktop.in.in.h:1 +#: ../gucharmap/gucharmap-window.c:915 #: ../gucharmap/main.c:80 msgid "Character Map" msgstr "Таблица символов" @@ -44,7 +44,8 @@ msgid "Canonical decomposition:" msgstr "Каноническое разложение:" -#: ../gucharmap/gucharmap-charmap.c:616 ../gucharmap/gucharmap-chartable.c:553 +#: ../gucharmap/gucharmap-charmap.c:616 +#: ../gucharmap/gucharmap-chartable.c:553 msgid "[not a printable character]" msgstr "[непечатный символ]" @@ -54,7 +55,7 @@ #: ../gucharmap/gucharmap-charmap.c:636 msgid "In Unicode since:" -msgstr "В стандарте с версии" +msgstr "В Юникоде с версии:" #. character category #: ../gucharmap/gucharmap-charmap.c:640 @@ -123,54 +124,54 @@ #: ../gucharmap/gucharmap-charmap.c:778 msgid "Japanese On Pronunciation:" -msgstr "Японское произношение \"On\":" +msgstr "Японское произношение «On»:" #: ../gucharmap/gucharmap-charmap.c:783 msgid "Japanese Kun Pronunciation:" -msgstr "Японское произношение \"Kun\":" +msgstr "Японское произношение «Kun»:" #: ../gucharmap/gucharmap-charmap.c:788 msgid "Tang Pronunciation:" -msgstr "Произношение \"Tang\":" +msgstr "Произношение «Tang»:" #: ../gucharmap/gucharmap-charmap.c:793 msgid "Korean Pronunciation:" msgstr "Корейское произношение" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "Та_блица символов" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "По_дробности о символе" -#: ../gucharmap/gucharmap-chartable.c:1399 +#: ../gucharmap/gucharmap-chartable.c:1452 msgid "Unknown character, unable to identify." msgstr "Неизвестный символ, не удалось идентифицировать." -#: ../gucharmap/gucharmap-chartable.c:1401 -#: ../gucharmap/gucharmap-search-dialog.c:585 +#: ../gucharmap/gucharmap-chartable.c:1454 +#: ../gucharmap/gucharmap-search-dialog.c:589 msgid "Not found." msgstr "Не найден." -#: ../gucharmap/gucharmap-chartable.c:1404 +#: ../gucharmap/gucharmap-chartable.c:1457 msgid "Character found." msgstr "Символ найден." -#: ../gucharmap/gucharmap-chartable-accessible.c:771 +#: ../gucharmap/gucharmap-chartable-accessible.c:829 msgid "Character Table" msgstr "Таблица символов" -#: ../gucharmap/gucharmap-mini-fontsel.c:280 +#: ../gucharmap/gucharmap-mini-fontsel.c:282 msgid "Font" msgstr "Шрифт" -#: ../gucharmap/gucharmap-mini-fontsel.c:293 +#: ../gucharmap/gucharmap-mini-fontsel.c:295 msgid "Font Family" msgstr "Семейство шрифта" -#: ../gucharmap/gucharmap-mini-fontsel.c:311 +#: ../gucharmap/gucharmap-mini-fontsel.c:313 msgid "Font Size" msgstr "Размер шрифта" @@ -338,64 +339,32 @@ msgstr "Идёт поиск…" #: ../gucharmap/gucharmap-window.c:493 -msgid "" -"Gucharmap is free software; you can redistribute it and/or modify it under " -"the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " -"any later version." -msgstr "" -"Gucharmap — свободное программное обеспечение, вы можете распространять и/" -"или изменять его на условиях Универсальной Общественной Лицензии GNU, " -"опубликованной Фондом свободного программного обеспечения, либо версии 2 " -"Лицензии, либо (на ваше усмотрение) любой более поздней версии." +#| msgid "" +#| "Gucharmap is free software; you can redistribute it and/or modify it " +#| "under the terms of the GNU General Public License as published by the " +#| "Free Software Foundation; either version 2 of the License, or (at your " +#| "option) any later version." +msgid "Gucharmap is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version." +msgstr "Gucharmap — свободное программное обеспечение, вы можете распространять и/или изменять его на условиях Универсальной Общественной Лицензии GNU, опубликованной Фондом свободного программного обеспечения, либо версии 3 Лицензии, либо (на ваше усмотрение) любой более поздней версии." #: ../gucharmap/gucharmap-window.c:497 -msgid "" -"Permission is hereby granted, free of charge, to any person obtaining a copy " -"of the Unicode data files to deal in them without restriction, including " -"without limitation the rights to use, copy, modify, merge, publish, " -"distribute, and/or sell copies." -msgstr "" -"Тем самым любому лицу предоставляется право бесплатно получить копию файлов " -"данных Юникода и обращаться с ними без ограничения, включая право " -"использования, копирования, объединения, публикации, распространения и/или " -"продажи копий." +msgid "Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files to deal in them without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies." +msgstr "Тем самым любому лицу предоставляется право бесплатно получить копию файлов данных Юникода и обращаться с ними без ограничения, включая право использования, копирования, объединения, публикации, распространения и/или продажи копий." #: ../gucharmap/gucharmap-window.c:501 -msgid "" -"Gucharmap and the Unicode data files are distributed in the hope that they " -"will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty " -"of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " -"Public License and Unicode Copyright for more details." -msgstr "" -"Gucharmap и файлы данных Юникода распространяются в надежде, что они могут " -"быть полезны, но БЕЗ ВСЯКИХ ГАРАНТИЙ. Не предоставляется ни малейшей " -"гарантии КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ КОНКРЕТНЫМ ЦЕЛЯМ. Для " -"получения дополнительных сведений обратитесь к Универсальной Общественной " -"Лицензии GNU." +msgid "Gucharmap and the Unicode data files are distributed in the hope that they will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License and Unicode Copyright for more details." +msgstr "Gucharmap и файлы данных Юникода распространяются в надежде, что они могут быть полезны, но БЕЗ ВСЯКИХ ГАРАНТИЙ. Не предоставляется ни малейшей гарантии КОММЕРЧЕСКОЙ ЦЕННОСТИ или ПРИГОДНОСТИ КОНКРЕТНЫМ ЦЕЛЯМ. Для получения дополнительных сведений обратитесь к Универсальной Общественной Лицензии GNU." #: ../gucharmap/gucharmap-window.c:505 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"Gucharmap; if not, write to the Free Software Foundation, Inc., 59 Temple " -"Place, Suite 330, Boston, MA 02110-1301 USA" -msgstr "" -"Вы должны были получить копию Универсальной Общественной Лицензии GNU вместе " -"с программой Gucharmap. Если копия не была получена, напишите в Фонд " -"свободного программного обеспечения по адресу Free Software Foundation, " -"Inc.,59 Temple Place, Suite 330, Boston, MA 02110-1301 USA" +msgid "You should have received a copy of the GNU General Public License along with Gucharmap; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 USA" +msgstr "Вы должны были получить копию Универсальной Общественной Лицензии GNU вместе с программой Gucharmap. Если копия не была получена, напишите в Фонд свободного программного обеспечения по адресу Free Software Foundation, Inc.,59 Temple Place, Suite 330, Boston, MA 02110-1301 USA" #: ../gucharmap/gucharmap-window.c:508 -msgid "" -"Also you should have received a copy of the Unicode Copyright along with " -"Gucharmap; you can always find it at Unicode's website: http://www.unicode." -"org/copyright.html" -msgstr "" -"Также вы должны были получить копию Unicode Copyright с программой " -"Gucharmap, вы всегда можете найти копию этого документа на веб-сайте http://" -"www.unicode.org/copyright.html" +msgid "Also you should have received a copy of the Unicode Copyright along with Gucharmap; you can always find it at Unicode's website: http://www.unicode.org/copyright.html" +msgstr "Также вы должны были получить копию Unicode Copyright с программой Gucharmap, вы всегда можете найти копию этого документа на веб-сайте http://www.unicode.org/copyright.html" -#: ../gucharmap/gucharmap-window.c:521 ../gucharmap/main.c:37 +#: ../gucharmap/gucharmap-window.c:521 +#: ../gucharmap/main.c:37 msgid "GNOME Character Map" msgstr "Таблица символов GNOME" @@ -410,11 +379,13 @@ "Дмитрий Мастрюков , 2004\n" "Леонид Кантер , 2006" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:874 +#: ../gucharmap/gucharmap-window.c:607 +#: ../gucharmap/gucharmap-window.c:884 msgid "Next Script" msgstr "К следующему алфавиту" -#: ../gucharmap/gucharmap-window.c:607 ../gucharmap/gucharmap-window.c:876 +#: ../gucharmap/gucharmap-window.c:607 +#: ../gucharmap/gucharmap-window.c:886 msgid "Previous Script" msgstr "К предыдущему алфавиту" @@ -426,71 +397,71 @@ msgid "Previous Block" msgstr "Предыдущий блок" -#: ../gucharmap/gucharmap-window.c:837 +#: ../gucharmap/gucharmap-window.c:847 msgid "_File" msgstr "_Файл" -#: ../gucharmap/gucharmap-window.c:838 +#: ../gucharmap/gucharmap-window.c:848 msgid "_View" msgstr "_Вид" -#: ../gucharmap/gucharmap-window.c:839 +#: ../gucharmap/gucharmap-window.c:849 msgid "_Search" msgstr "_Поиск" -#: ../gucharmap/gucharmap-window.c:840 +#: ../gucharmap/gucharmap-window.c:850 msgid "_Go" msgstr "Пере_ход" -#: ../gucharmap/gucharmap-window.c:841 +#: ../gucharmap/gucharmap-window.c:851 msgid "_Help" msgstr "_Справка" -#: ../gucharmap/gucharmap-window.c:844 +#: ../gucharmap/gucharmap-window.c:854 msgid "Page _Setup" msgstr "Пара_метры страницы" -#: ../gucharmap/gucharmap-window.c:865 +#: ../gucharmap/gucharmap-window.c:875 msgid "Find _Next" msgstr "Найти _следующее" -#: ../gucharmap/gucharmap-window.c:867 +#: ../gucharmap/gucharmap-window.c:877 msgid "Find _Previous" msgstr "Найти _предыдущее" -#: ../gucharmap/gucharmap-window.c:870 +#: ../gucharmap/gucharmap-window.c:880 msgid "_Next Character" msgstr "К следующему символу" -#: ../gucharmap/gucharmap-window.c:872 +#: ../gucharmap/gucharmap-window.c:882 msgid "_Previous Character" msgstr "К предыдущему символу" -#: ../gucharmap/gucharmap-window.c:879 +#: ../gucharmap/gucharmap-window.c:889 msgid "_Contents" msgstr "_Содержание" -#: ../gucharmap/gucharmap-window.c:881 +#: ../gucharmap/gucharmap-window.c:891 msgid "_About" msgstr "_О программе" -#: ../gucharmap/gucharmap-window.c:891 +#: ../gucharmap/gucharmap-window.c:901 msgid "By _Script" msgstr "По _алфавитам" -#: ../gucharmap/gucharmap-window.c:893 +#: ../gucharmap/gucharmap-window.c:903 msgid "By _Unicode Block" msgstr "По блокам _Юникода" -#: ../gucharmap/gucharmap-window.c:898 +#: ../gucharmap/gucharmap-window.c:908 msgid "Snap _Columns to Power of Two" msgstr "_Число столбцов кратно двум" -#: ../gucharmap/gucharmap-window.c:967 +#: ../gucharmap/gucharmap-window.c:977 msgid "_Text to copy:" msgstr "_Текст для копирования:" -#: ../gucharmap/gucharmap-window.c:974 +#: ../gucharmap/gucharmap-window.c:984 msgid "Copy to the clipboard." msgstr "Скопировать в буфер обмена." @@ -534,7 +505,8 @@ msgid "Greek and Coptic" msgstr "Греческий и коптский" -#: ../gucharmap/unicode-blocks.h:22 ../gucharmap/unicode-scripts.h:34 +#: ../gucharmap/unicode-blocks.h:22 +#: ../gucharmap/unicode-scripts.h:34 msgid "Cyrillic" msgstr "Кириллица" @@ -542,19 +514,23 @@ msgid "Cyrillic Supplement" msgstr "Кириллица дополнительные" -#: ../gucharmap/unicode-blocks.h:24 ../gucharmap/unicode-scripts.h:17 +#: ../gucharmap/unicode-blocks.h:24 +#: ../gucharmap/unicode-scripts.h:17 msgid "Armenian" msgstr "Армянский" -#: ../gucharmap/unicode-blocks.h:25 ../gucharmap/unicode-scripts.h:48 +#: ../gucharmap/unicode-blocks.h:25 +#: ../gucharmap/unicode-scripts.h:48 msgid "Hebrew" msgstr "Иврит" -#: ../gucharmap/unicode-blocks.h:26 ../gucharmap/unicode-scripts.h:16 +#: ../gucharmap/unicode-blocks.h:26 +#: ../gucharmap/unicode-scripts.h:16 msgid "Arabic" msgstr "Арабский" -#: ../gucharmap/unicode-blocks.h:27 ../gucharmap/unicode-scripts.h:93 +#: ../gucharmap/unicode-blocks.h:27 +#: ../gucharmap/unicode-scripts.h:93 msgid "Syriac" msgstr "Сирийский" @@ -562,75 +538,93 @@ msgid "Arabic Supplement" msgstr "Арабский дополнительный" -#: ../gucharmap/unicode-blocks.h:29 ../gucharmap/unicode-scripts.h:101 +#: ../gucharmap/unicode-blocks.h:29 +#: ../gucharmap/unicode-scripts.h:101 msgid "Thaana" msgstr "Таана" -#: ../gucharmap/unicode-blocks.h:30 ../gucharmap/unicode-scripts.h:73 +#: ../gucharmap/unicode-blocks.h:30 +#: ../gucharmap/unicode-scripts.h:73 msgid "N'Ko" msgstr "Нко" -#: ../gucharmap/unicode-blocks.h:31 ../gucharmap/unicode-scripts.h:87 +#: ../gucharmap/unicode-blocks.h:31 +#: ../gucharmap/unicode-scripts.h:87 msgid "Samaritan" msgstr "Самаритянский" -#: ../gucharmap/unicode-blocks.h:32 ../gucharmap/unicode-scripts.h:36 +#: ../gucharmap/unicode-blocks.h:32 +#: ../gucharmap/unicode-scripts.h:36 msgid "Devanagari" msgstr "Деванагари" -#: ../gucharmap/unicode-blocks.h:33 ../gucharmap/unicode-scripts.h:21 +#: ../gucharmap/unicode-blocks.h:33 +#: ../gucharmap/unicode-scripts.h:21 msgid "Bengali" msgstr "Бенгали" -#: ../gucharmap/unicode-blocks.h:34 ../gucharmap/unicode-scripts.h:44 +#: ../gucharmap/unicode-blocks.h:34 +#: ../gucharmap/unicode-scripts.h:44 msgid "Gurmukhi" msgstr "Гурмукхи" -#: ../gucharmap/unicode-blocks.h:35 ../gucharmap/unicode-scripts.h:43 +#: ../gucharmap/unicode-blocks.h:35 +#: ../gucharmap/unicode-scripts.h:43 msgid "Gujarati" msgstr "Гуджарати" -#: ../gucharmap/unicode-blocks.h:36 ../gucharmap/unicode-scripts.h:81 +#: ../gucharmap/unicode-blocks.h:36 +#: ../gucharmap/unicode-scripts.h:81 msgid "Oriya" msgstr "Ория" -#: ../gucharmap/unicode-blocks.h:37 ../gucharmap/unicode-scripts.h:99 +#: ../gucharmap/unicode-blocks.h:37 +#: ../gucharmap/unicode-scripts.h:99 msgid "Tamil" msgstr "Тамильский" -#: ../gucharmap/unicode-blocks.h:38 ../gucharmap/unicode-scripts.h:100 +#: ../gucharmap/unicode-blocks.h:38 +#: ../gucharmap/unicode-scripts.h:100 msgid "Telugu" msgstr "Телугу" -#: ../gucharmap/unicode-blocks.h:39 ../gucharmap/unicode-scripts.h:56 +#: ../gucharmap/unicode-blocks.h:39 +#: ../gucharmap/unicode-scripts.h:56 msgid "Kannada" msgstr "Каннада" -#: ../gucharmap/unicode-blocks.h:40 ../gucharmap/unicode-scripts.h:69 +#: ../gucharmap/unicode-blocks.h:40 +#: ../gucharmap/unicode-scripts.h:69 msgid "Malayalam" msgstr "Малаялам" -#: ../gucharmap/unicode-blocks.h:41 ../gucharmap/unicode-scripts.h:90 +#: ../gucharmap/unicode-blocks.h:41 +#: ../gucharmap/unicode-scripts.h:90 msgid "Sinhala" msgstr "Сингальский" -#: ../gucharmap/unicode-blocks.h:42 ../gucharmap/unicode-scripts.h:102 +#: ../gucharmap/unicode-blocks.h:42 +#: ../gucharmap/unicode-scripts.h:102 msgid "Thai" msgstr "Тайский" -#: ../gucharmap/unicode-blocks.h:43 ../gucharmap/unicode-scripts.h:61 +#: ../gucharmap/unicode-blocks.h:43 +#: ../gucharmap/unicode-scripts.h:61 msgid "Lao" msgstr "Лаосский" -#: ../gucharmap/unicode-blocks.h:44 ../gucharmap/unicode-scripts.h:103 +#: ../gucharmap/unicode-blocks.h:44 +#: ../gucharmap/unicode-scripts.h:103 msgid "Tibetan" msgstr "Тибетский" -#: ../gucharmap/unicode-blocks.h:45 ../gucharmap/unicode-scripts.h:72 +#: ../gucharmap/unicode-blocks.h:45 +#: ../gucharmap/unicode-scripts.h:72 msgid "Myanmar" msgstr "Мьянманский" -#: ../gucharmap/unicode-blocks.h:46 ../gucharmap/unicode-scripts.h:39 +#: ../gucharmap/unicode-blocks.h:46 +#: ../gucharmap/unicode-scripts.h:39 msgid "Georgian" msgstr "Грузинский" @@ -638,7 +632,8 @@ msgid "Hangul Jamo" msgstr "Хангыль Чамо" -#: ../gucharmap/unicode-blocks.h:48 ../gucharmap/unicode-scripts.h:38 +#: ../gucharmap/unicode-blocks.h:48 +#: ../gucharmap/unicode-scripts.h:38 msgid "Ethiopic" msgstr "Эфиопский" @@ -646,7 +641,8 @@ msgid "Ethiopic Supplement" msgstr "Эфиопские дополнения" -#: ../gucharmap/unicode-blocks.h:50 ../gucharmap/unicode-scripts.h:29 +#: ../gucharmap/unicode-blocks.h:50 +#: ../gucharmap/unicode-scripts.h:29 msgid "Cherokee" msgstr "Чероки" @@ -654,35 +650,43 @@ msgid "Unified Canadian Aboriginal Syllabics" msgstr "Слоги канадских аборигенов" -#: ../gucharmap/unicode-blocks.h:52 ../gucharmap/unicode-scripts.h:75 +#: ../gucharmap/unicode-blocks.h:52 +#: ../gucharmap/unicode-scripts.h:75 msgid "Ogham" msgstr "Огамический" -#: ../gucharmap/unicode-blocks.h:53 ../gucharmap/unicode-scripts.h:86 +#: ../gucharmap/unicode-blocks.h:53 +#: ../gucharmap/unicode-scripts.h:86 msgid "Runic" msgstr "Рунический" -#: ../gucharmap/unicode-blocks.h:54 ../gucharmap/unicode-scripts.h:94 +#: ../gucharmap/unicode-blocks.h:54 +#: ../gucharmap/unicode-scripts.h:94 msgid "Tagalog" msgstr "Тагалог" -#: ../gucharmap/unicode-blocks.h:55 ../gucharmap/unicode-scripts.h:47 +#: ../gucharmap/unicode-blocks.h:55 +#: ../gucharmap/unicode-scripts.h:47 msgid "Hanunoo" msgstr "Хануноо" -#: ../gucharmap/unicode-blocks.h:56 ../gucharmap/unicode-scripts.h:25 +#: ../gucharmap/unicode-blocks.h:56 +#: ../gucharmap/unicode-scripts.h:25 msgid "Buhid" msgstr "Бухид" -#: ../gucharmap/unicode-blocks.h:57 ../gucharmap/unicode-scripts.h:95 +#: ../gucharmap/unicode-blocks.h:57 +#: ../gucharmap/unicode-scripts.h:95 msgid "Tagbanwa" msgstr "Тагбанва" -#: ../gucharmap/unicode-blocks.h:58 ../gucharmap/unicode-scripts.h:60 +#: ../gucharmap/unicode-blocks.h:58 +#: ../gucharmap/unicode-scripts.h:60 msgid "Khmer" msgstr "Кхмерский" -#: ../gucharmap/unicode-blocks.h:59 ../gucharmap/unicode-scripts.h:71 +#: ../gucharmap/unicode-blocks.h:59 +#: ../gucharmap/unicode-scripts.h:71 msgid "Mongolian" msgstr "Монгольский" @@ -690,15 +694,18 @@ msgid "Unified Canadian Aboriginal Syllabics Extended" msgstr "Расширенные унифицированные слоги канадских аборигенов" -#: ../gucharmap/unicode-blocks.h:61 ../gucharmap/unicode-scripts.h:64 +#: ../gucharmap/unicode-blocks.h:61 +#: ../gucharmap/unicode-scripts.h:64 msgid "Limbu" msgstr "Лимбу" -#: ../gucharmap/unicode-blocks.h:62 ../gucharmap/unicode-scripts.h:96 +#: ../gucharmap/unicode-blocks.h:62 +#: ../gucharmap/unicode-scripts.h:96 msgid "Tai Le" msgstr "Тай ле" -#: ../gucharmap/unicode-blocks.h:63 ../gucharmap/unicode-scripts.h:74 +#: ../gucharmap/unicode-blocks.h:63 +#: ../gucharmap/unicode-scripts.h:74 msgid "New Tai Lue" msgstr "Новый тай лю" @@ -706,27 +713,33 @@ msgid "Khmer Symbols" msgstr "Кхмерские символы" -#: ../gucharmap/unicode-blocks.h:65 ../gucharmap/unicode-scripts.h:24 +#: ../gucharmap/unicode-blocks.h:65 +#: ../gucharmap/unicode-scripts.h:24 msgid "Buginese" msgstr "Бугийский" -#: ../gucharmap/unicode-blocks.h:66 ../gucharmap/unicode-scripts.h:97 +#: ../gucharmap/unicode-blocks.h:66 +#: ../gucharmap/unicode-scripts.h:97 msgid "Tai Tham" msgstr "Тай Тхам" -#: ../gucharmap/unicode-blocks.h:67 ../gucharmap/unicode-scripts.h:19 +#: ../gucharmap/unicode-blocks.h:67 +#: ../gucharmap/unicode-scripts.h:19 msgid "Balinese" msgstr "Балийский" -#: ../gucharmap/unicode-blocks.h:68 ../gucharmap/unicode-scripts.h:91 +#: ../gucharmap/unicode-blocks.h:68 +#: ../gucharmap/unicode-scripts.h:91 msgid "Sundanese" msgstr "Сунданский" -#: ../gucharmap/unicode-blocks.h:69 ../gucharmap/unicode-scripts.h:63 +#: ../gucharmap/unicode-blocks.h:69 +#: ../gucharmap/unicode-scripts.h:63 msgid "Lepcha" msgstr "Лепча" -#: ../gucharmap/unicode-blocks.h:70 ../gucharmap/unicode-scripts.h:76 +#: ../gucharmap/unicode-blocks.h:70 +#: ../gucharmap/unicode-scripts.h:76 msgid "Ol Chiki" msgstr "Ол-Чики" @@ -850,7 +863,8 @@ msgid "Miscellaneous Symbols and Arrows" msgstr "Различные символы и стрелки" -#: ../gucharmap/unicode-blocks.h:101 ../gucharmap/unicode-scripts.h:40 +#: ../gucharmap/unicode-blocks.h:101 +#: ../gucharmap/unicode-scripts.h:40 msgid "Glagolitic" msgstr "Глаголический" @@ -858,7 +872,8 @@ msgid "Latin Extended-C" msgstr "Латинский расширение C" -#: ../gucharmap/unicode-blocks.h:103 ../gucharmap/unicode-scripts.h:31 +#: ../gucharmap/unicode-blocks.h:103 +#: ../gucharmap/unicode-scripts.h:31 msgid "Coptic" msgstr "Коптский" @@ -866,7 +881,8 @@ msgid "Georgian Supplement" msgstr "Грузинские дополнения" -#: ../gucharmap/unicode-blocks.h:105 ../gucharmap/unicode-scripts.h:104 +#: ../gucharmap/unicode-blocks.h:105 +#: ../gucharmap/unicode-scripts.h:104 msgid "Tifinagh" msgstr "Тифинаг" @@ -898,15 +914,18 @@ msgid "CJK Symbols and Punctuation" msgstr "Символы и знаки препинания CJK" -#: ../gucharmap/unicode-blocks.h:113 ../gucharmap/unicode-scripts.h:49 +#: ../gucharmap/unicode-blocks.h:113 +#: ../gucharmap/unicode-scripts.h:49 msgid "Hiragana" msgstr "Хирагана" -#: ../gucharmap/unicode-blocks.h:114 ../gucharmap/unicode-scripts.h:57 +#: ../gucharmap/unicode-blocks.h:114 +#: ../gucharmap/unicode-scripts.h:57 msgid "Katakana" msgstr "Катакана" -#: ../gucharmap/unicode-blocks.h:115 ../gucharmap/unicode-scripts.h:22 +#: ../gucharmap/unicode-blocks.h:115 +#: ../gucharmap/unicode-scripts.h:22 msgid "Bopomofo" msgstr "Бопомофо" @@ -958,11 +977,13 @@ msgid "Yi Radicals" msgstr "Корни И" -#: ../gucharmap/unicode-blocks.h:128 ../gucharmap/unicode-scripts.h:66 +#: ../gucharmap/unicode-blocks.h:128 +#: ../gucharmap/unicode-scripts.h:66 msgid "Lisu" msgstr "Лису" -#: ../gucharmap/unicode-blocks.h:129 ../gucharmap/unicode-scripts.h:106 +#: ../gucharmap/unicode-blocks.h:129 +#: ../gucharmap/unicode-scripts.h:106 msgid "Vai" msgstr "Ваи" @@ -970,7 +991,8 @@ msgid "Cyrillic Extended-B" msgstr "Кириллица расширение B" -#: ../gucharmap/unicode-blocks.h:131 ../gucharmap/unicode-scripts.h:20 +#: ../gucharmap/unicode-blocks.h:131 +#: ../gucharmap/unicode-scripts.h:20 msgid "Bamum" msgstr "Бамум" @@ -982,7 +1004,8 @@ msgid "Latin Extended-D" msgstr "Латинский расширение D" -#: ../gucharmap/unicode-blocks.h:134 ../gucharmap/unicode-scripts.h:92 +#: ../gucharmap/unicode-blocks.h:134 +#: ../gucharmap/unicode-scripts.h:92 msgid "Syloti Nagri" msgstr "Силоти Нагри" @@ -994,7 +1017,8 @@ msgid "Phags-pa" msgstr "Фагс-па" -#: ../gucharmap/unicode-blocks.h:137 ../gucharmap/unicode-scripts.h:88 +#: ../gucharmap/unicode-blocks.h:137 +#: ../gucharmap/unicode-scripts.h:88 msgid "Saurashtra" msgstr "Саураштра" @@ -1002,11 +1026,13 @@ msgid "Devanagari Extended" msgstr "Деванагари расширенный" -#: ../gucharmap/unicode-blocks.h:139 ../gucharmap/unicode-scripts.h:58 +#: ../gucharmap/unicode-blocks.h:139 +#: ../gucharmap/unicode-scripts.h:58 msgid "Kayah Li" msgstr "Кайях Ли" -#: ../gucharmap/unicode-blocks.h:140 ../gucharmap/unicode-scripts.h:85 +#: ../gucharmap/unicode-blocks.h:140 +#: ../gucharmap/unicode-scripts.h:85 msgid "Rejang" msgstr "Реджанг" @@ -1014,11 +1040,13 @@ msgid "Hangul Jamo Extended-A" msgstr "Хангыль Чамо расширение A" -#: ../gucharmap/unicode-blocks.h:142 ../gucharmap/unicode-scripts.h:54 +#: ../gucharmap/unicode-blocks.h:142 +#: ../gucharmap/unicode-scripts.h:54 msgid "Javanese" msgstr "Яванский" -#: ../gucharmap/unicode-blocks.h:143 ../gucharmap/unicode-scripts.h:28 +#: ../gucharmap/unicode-blocks.h:143 +#: ../gucharmap/unicode-scripts.h:28 msgid "Cham" msgstr "Тямский" @@ -1026,11 +1054,13 @@ msgid "Myanmar Extended-A" msgstr "Мьянманский расширение A" -#: ../gucharmap/unicode-blocks.h:145 ../gucharmap/unicode-scripts.h:98 +#: ../gucharmap/unicode-blocks.h:145 +#: ../gucharmap/unicode-scripts.h:98 msgid "Tai Viet" msgstr "Тай вьет" -#: ../gucharmap/unicode-blocks.h:146 ../gucharmap/unicode-scripts.h:70 +#: ../gucharmap/unicode-blocks.h:146 +#: ../gucharmap/unicode-scripts.h:70 msgid "Meetei Mayek" msgstr "Мейтей маек" @@ -1126,39 +1156,48 @@ msgid "Phaistos Disc" msgstr "Фестский" -#: ../gucharmap/unicode-blocks.h:170 ../gucharmap/unicode-scripts.h:67 +#: ../gucharmap/unicode-blocks.h:170 +#: ../gucharmap/unicode-scripts.h:67 msgid "Lycian" msgstr "Ликийский" -#: ../gucharmap/unicode-blocks.h:171 ../gucharmap/unicode-scripts.h:27 +#: ../gucharmap/unicode-blocks.h:171 +#: ../gucharmap/unicode-scripts.h:27 msgid "Carian" msgstr "Карианский" -#: ../gucharmap/unicode-blocks.h:172 ../gucharmap/unicode-scripts.h:77 +#: ../gucharmap/unicode-blocks.h:172 +#: ../gucharmap/unicode-scripts.h:77 msgid "Old Italic" msgstr "Старый итальянский" -#: ../gucharmap/unicode-blocks.h:173 ../gucharmap/unicode-scripts.h:41 +#: ../gucharmap/unicode-blocks.h:173 +#: ../gucharmap/unicode-scripts.h:41 msgid "Gothic" msgstr "Готский" -#: ../gucharmap/unicode-blocks.h:174 ../gucharmap/unicode-scripts.h:105 +#: ../gucharmap/unicode-blocks.h:174 +#: ../gucharmap/unicode-scripts.h:105 msgid "Ugaritic" msgstr "Угаритский" -#: ../gucharmap/unicode-blocks.h:175 ../gucharmap/unicode-scripts.h:78 +#: ../gucharmap/unicode-blocks.h:175 +#: ../gucharmap/unicode-scripts.h:78 msgid "Old Persian" msgstr "Старый персидский" -#: ../gucharmap/unicode-blocks.h:176 ../gucharmap/unicode-scripts.h:35 +#: ../gucharmap/unicode-blocks.h:176 +#: ../gucharmap/unicode-scripts.h:35 msgid "Deseret" msgstr "Десерет" -#: ../gucharmap/unicode-blocks.h:177 ../gucharmap/unicode-scripts.h:89 +#: ../gucharmap/unicode-blocks.h:177 +#: ../gucharmap/unicode-scripts.h:89 msgid "Shavian" msgstr "Шавиан" -#: ../gucharmap/unicode-blocks.h:178 ../gucharmap/unicode-scripts.h:82 +#: ../gucharmap/unicode-blocks.h:178 +#: ../gucharmap/unicode-scripts.h:82 msgid "Osmanya" msgstr "Османья" @@ -1166,39 +1205,48 @@ msgid "Cypriot Syllabary" msgstr "Слоги киприотов" -#: ../gucharmap/unicode-blocks.h:180 ../gucharmap/unicode-scripts.h:50 +#: ../gucharmap/unicode-blocks.h:180 +#: ../gucharmap/unicode-scripts.h:50 msgid "Imperial Aramaic" msgstr "Имперский арамейский" -#: ../gucharmap/unicode-blocks.h:181 ../gucharmap/unicode-scripts.h:84 +#: ../gucharmap/unicode-blocks.h:181 +#: ../gucharmap/unicode-scripts.h:84 msgid "Phoenician" msgstr "Финикийский" -#: ../gucharmap/unicode-blocks.h:182 ../gucharmap/unicode-scripts.h:68 +#: ../gucharmap/unicode-blocks.h:182 +#: ../gucharmap/unicode-scripts.h:68 msgid "Lydian" msgstr "Лидийский" -#: ../gucharmap/unicode-blocks.h:183 ../gucharmap/unicode-scripts.h:59 +#: ../gucharmap/unicode-blocks.h:183 +#: ../gucharmap/unicode-scripts.h:59 msgid "Kharoshthi" msgstr "Кхароштхи" -#: ../gucharmap/unicode-blocks.h:184 ../gucharmap/unicode-scripts.h:79 +#: ../gucharmap/unicode-blocks.h:184 +#: ../gucharmap/unicode-scripts.h:79 msgid "Old South Arabian" msgstr "Древний южноарабский" -#: ../gucharmap/unicode-blocks.h:185 ../gucharmap/unicode-scripts.h:18 +#: ../gucharmap/unicode-blocks.h:185 +#: ../gucharmap/unicode-scripts.h:18 msgid "Avestan" msgstr "Авестийский" -#: ../gucharmap/unicode-blocks.h:186 ../gucharmap/unicode-scripts.h:53 +#: ../gucharmap/unicode-blocks.h:186 +#: ../gucharmap/unicode-scripts.h:53 msgid "Inscriptional Parthian" msgstr "Парфянский" -#: ../gucharmap/unicode-blocks.h:187 ../gucharmap/unicode-scripts.h:52 +#: ../gucharmap/unicode-blocks.h:187 +#: ../gucharmap/unicode-scripts.h:52 msgid "Inscriptional Pahlavi" msgstr "Пехлевийский" -#: ../gucharmap/unicode-blocks.h:188 ../gucharmap/unicode-scripts.h:80 +#: ../gucharmap/unicode-blocks.h:188 +#: ../gucharmap/unicode-scripts.h:80 msgid "Old Turkic" msgstr "Древнетюркский" @@ -1206,11 +1254,13 @@ msgid "Rumi Numeral Symbols" msgstr "Числа Руми" -#: ../gucharmap/unicode-blocks.h:190 ../gucharmap/unicode-scripts.h:55 +#: ../gucharmap/unicode-blocks.h:190 +#: ../gucharmap/unicode-scripts.h:55 msgid "Kaithi" msgstr "Кайтхи" -#: ../gucharmap/unicode-blocks.h:191 ../gucharmap/unicode-scripts.h:32 +#: ../gucharmap/unicode-blocks.h:191 +#: ../gucharmap/unicode-scripts.h:32 msgid "Cuneiform" msgstr "Клинопись" @@ -1218,7 +1268,8 @@ msgid "Cuneiform Numbers and Punctuation" msgstr "Клинописные цифры и знаки пунктуации" -#: ../gucharmap/unicode-blocks.h:193 ../gucharmap/unicode-scripts.h:37 +#: ../gucharmap/unicode-blocks.h:193 +#: ../gucharmap/unicode-scripts.h:37 msgid "Egyptian Hieroglyphs" msgstr "Египетские иероглифы" @@ -1334,32 +1385,32 @@ msgid "Yi" msgstr "И" -#: ../gucharmap/gucharmap-search-dialog.c:565 +#: ../gucharmap/gucharmap-search-dialog.c:569 msgid "Information" msgstr "Информация" #. follow hig guidelines -#: ../gucharmap/gucharmap-search-dialog.c:729 +#: ../gucharmap/gucharmap-search-dialog.c:735 msgid "Find" msgstr "Поиск" -#: ../gucharmap/gucharmap-search-dialog.c:743 +#: ../gucharmap/gucharmap-search-dialog.c:753 msgid "_Previous" msgstr "Найти _предыдущее" -#: ../gucharmap/gucharmap-search-dialog.c:750 +#: ../gucharmap/gucharmap-search-dialog.c:764 msgid "_Next" msgstr "Найти _следующее" -#: ../gucharmap/gucharmap-search-dialog.c:765 +#: ../gucharmap/gucharmap-search-dialog.c:779 msgid "_Search:" msgstr "_Найти:" -#: ../gucharmap/gucharmap-search-dialog.c:775 +#: ../gucharmap/gucharmap-search-dialog.c:789 msgid "Match _whole word" msgstr "Соответствие слову _целиком" -#: ../gucharmap/gucharmap-search-dialog.c:780 +#: ../gucharmap/gucharmap-search-dialog.c:794 msgid "Search in character _details" msgstr "Искать в _описаниях символов" @@ -1367,10 +1418,11 @@ msgid "All" msgstr "Все" -#: ../gucharmap/gucharmap-block-chapters-model.c:190 +#: ../gucharmap/gucharmap-block-chapters-model.c:187 msgid "Unicode Block" msgstr "Блок Юникода" -#: ../gucharmap/gucharmap-script-chapters-model.c:134 +#: ../gucharmap/gucharmap-script-chapters-model.c:130 msgid "Script" msgstr "Алфавит" + diff -Nru gucharmap-2.31.91/po/zh_CN.po gucharmap-2.32.0/po/zh_CN.po --- gucharmap-2.31.91/po/zh_CN.po 2010-08-18 07:05:06.000000000 -0400 +++ gucharmap-2.32.0/po/zh_CN.po 2010-09-26 14:53:09.000000000 -0400 @@ -12,9 +12,9 @@ msgstr "" "Project-Id-Version: gucharmap master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-12 16:57+0800\n" -"PO-Revision-Date: 2010-07-12 17:05+0800\n" -"Last-Translator: Aron Xu \n" +"POT-Creation-Date: 2010-09-14 15:45+0800\n" +"PO-Revision-Date: 2010-09-07 19:04+0800\n" +"Last-Translator: Dean Lee \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -126,11 +126,11 @@ msgid "Korean Pronunciation:" msgstr "韩语发音：" -#: ../gucharmap/gucharmap-charmap.c:1178 +#: ../gucharmap/gucharmap-charmap.c:1182 msgid "Characte_r Table" msgstr "字符表(_R)" -#: ../gucharmap/gucharmap-charmap.c:1224 +#: ../gucharmap/gucharmap-charmap.c:1228 msgid "Character _Details" msgstr "字符细节(_D)" @@ -165,7 +165,7 @@ #: ../gucharmap/gucharmap-settings.c:71 msgid "GConf could not be initialized." -msgstr "无法初始化 GConf" +msgstr "无法初始化 GConf。" #. Unicode assigns "Common" as the script name for any character not #. * specifically listed in Scripts.txt @@ -330,11 +330,11 @@ msgid "" "Gucharmap is free software; you can redistribute it and/or modify it under " "the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " +"Software Foundation; either version 3 of the License, or (at your option) " "any later version." msgstr "" "Gucharmap 是自由软件；您可以按照自由软件基金会所发表的 GNU GPL 协议自由发放" -"和/或修改它；GPL 协议应该采用第二版或以后的任何版本。" +"和/或修改它；GPL 协议应该采用第三版或(由您选择)更高版本。" #: ../gucharmap/gucharmap-window.c:497 msgid "" @@ -1077,7 +1077,7 @@ #: ../gucharmap/unicode-blocks.h:161 msgid "Arabic Presentation Forms-B" -msgstr "阿拉伯表现形式B" +msgstr "阿拉伯表现形式-B" #: ../gucharmap/unicode-blocks.h:162 msgid "Halfwidth and Fullwidth Forms"