diff -Nru ghex-3.3.91/configure ghex-3.4.0/configure --- ghex-3.3.91/configure 2012-03-05 17:30:35.000000000 +0000 +++ ghex-3.4.0/configure 2012-03-26 20:08:00.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for ghex 3.3.91. +# Generated by GNU Autoconf 2.68 for ghex 3.4.0. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='ghex' PACKAGE_TARNAME='ghex' -PACKAGE_VERSION='3.3.91' -PACKAGE_STRING='ghex 3.3.91' +PACKAGE_VERSION='3.4.0' +PACKAGE_STRING='ghex 3.4.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=ghex' PACKAGE_URL='' @@ -666,6 +666,12 @@ INTLTOOL_KEYS_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_DESKTOP_RULE +intltool__v_merge_options_0 +intltool__v_merge_options_ +INTLTOOL_V_MERGE_OPTIONS +INTLTOOL__v_MERGE_0 +INTLTOOL__v_MERGE_ +INTLTOOL_V_MERGE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE @@ -1385,7 +1391,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 ghex 3.3.91 to adapt to many kinds of systems. +\`configure' configures ghex 3.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1461,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ghex 3.3.91:";; + short | recursive ) echo "Configuration of ghex 3.4.0:";; esac cat <<\_ACEOF @@ -1593,7 +1599,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ghex configure 3.3.91 +ghex configure 3.4.0 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2016,7 +2022,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ghex $as_me 3.3.91, which was +It was created by ghex $as_me 3.4.0, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2838,7 +2844,7 @@ # Define the identity of the package. PACKAGE='ghex' - VERSION='3.3.91' + VERSION='3.4.0' cat >>confdefs.h <<_ACEOF @@ -12160,14 +12166,12 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.41.1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "0.41.1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.41.1" >&5 $as_echo_n "checking for intltool >= 0.41.1... " >&6; } - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.41.1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || @@ -12298,25 +12302,48 @@ as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< $@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' + + + + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' + + + + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -14710,6 +14737,11 @@ +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi + + gdu_cv_version_required=0.9.0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5 @@ -15352,7 +15384,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ghex $as_me 3.3.91, which was +This file was extended by ghex $as_me 3.4.0, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15418,7 +15450,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ghex config.status 3.3.91 +ghex config.status 3.4.0 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru ghex-3.3.91/configure.ac ghex-3.4.0/configure.ac --- ghex-3.3.91/configure.ac 2012-03-05 17:20:59.000000000 +0000 +++ ghex-3.4.0/configure.ac 2012-03-26 20:06:51.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ(2.61) -AC_INIT([ghex],[3.3.91],[http://bugzilla.gnome.org/enter_bug.cgi?product=ghex],[ghex]) +AC_INIT([ghex],[3.4.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=ghex],[ghex]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/ghex-window.c]) diff -Nru ghex-3.3.91/data/ghex.desktop.in ghex-3.4.0/data/ghex.desktop.in --- ghex-3.3.91/data/ghex.desktop.in 2011-08-06 04:28:49.000000000 +0000 +++ ghex-3.4.0/data/ghex.desktop.in 2012-03-06 07:52:20.000000000 +0000 @@ -6,5 +6,5 @@ Terminal=false Type=Application Icon=ghex -Categories=GNOME;Development; +Categories=GNOME;GTK;Development; StartupNotify=true diff -Nru ghex-3.3.91/data/Makefile.in ghex-3.4.0/data/Makefile.in --- ghex-3.3.91/data/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/data/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -143,6 +143,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -230,6 +234,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru ghex-3.3.91/debian/changelog ghex-3.4.0/debian/changelog --- ghex-3.3.91/debian/changelog 2012-03-05 19:06:59.000000000 +0000 +++ ghex-3.4.0/debian/changelog 2012-04-02 08:02:20.000000000 +0000 @@ -1,3 +1,9 @@ +ghex (3.4.0-0ubuntu1) precise; urgency=low + + * New upstream version + + -- Sebastien Bacher Mon, 02 Apr 2012 10:02:06 +0200 + ghex (3.3.91-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru ghex-3.3.91/gnome-doc-utils.make ghex-3.4.0/gnome-doc-utils.make --- ghex-3.3.91/gnome-doc-utils.make 2012-03-05 17:30:33.000000000 +0000 +++ ghex-3.4.0/gnome-doc-utils.make 2012-03-26 20:07:58.000000000 +0000 @@ -135,7 +135,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -149,6 +148,24 @@ ################################################################################ +## Support for automake silent-rules +GDU_V_XML2PO=$(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0=@echo " XML2PO" $@; + +GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0=@echo " MSGFMT" $@; + +GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0=@echo " DB2OMF" $@; + +GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0=@echo " DB2HTM" $@; + +################################################################################ ## @@ Rules for OMF Files db2omf_args = \ @@ -180,7 +197,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_HTML ## The OMF files for HTML output @@ -195,7 +212,7 @@ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } endif - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } ## @ _DOC_OMF_ALL ## All OMF output files to be built @@ -340,18 +357,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -365,7 +379,7 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ ################################################################################ @@ -379,7 +393,7 @@ _DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -530,8 +544,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done diff -Nru ghex-3.3.91/HACKING ghex-3.4.0/HACKING --- ghex-3.3.91/HACKING 1970-01-01 00:00:00.000000000 +0000 +++ ghex-3.4.0/HACKING 2012-03-26 18:36:06.000000000 +0000 @@ -0,0 +1,35 @@ +HOW TO BUILD FROM GIT + + First install the build dependencies (i.e. libraries that ghex uses). + If you're on Debian or Ubuntu you can install the build dependencies + of the distro packaged version of ghex using the command: + + sudo apt-get build-dep ghex + + If you're on Fedora, the equivalent command is: + + sudo yum-builddep ghex + + Other distributions have similar commands for their package managers. + Of course, there is no guarantee that the build dependencies of the + distro packaged version is the same as the git version, but in practice + the former gets you quite far and if not, autogen.sh will tell you + what is missing during the next step. + + To configure and build the git version of ghex, run: + + git clone git://git.gnome.org/ghex + cd ghex + ./autogen.sh --prefix=~/ghex + make + make install + + + After you have done this you can run and test the built ghex binary using: + + GSETTINGS_SCHEMA_DIR=~/ghex/share/glib-2.0/schemas src/ghex + + + For instructions on how to prepare a patch, see: + + https://live.gnome.org/Git/Developers#Contributing_patches diff -Nru ghex-3.3.91/help/Makefile.in ghex-3.4.0/help/Makefile.in --- ghex-3.3.91/help/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/help/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -136,6 +136,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -223,6 +227,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -253,6 +259,20 @@ @ENABLE_SK_TRUE@_ENABLE_SK = true ################################################################################ +GDU_V_XML2PO = $(GDU__v_XML2PO_$(V)) +GDU__v_XML2PO_ = $(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) +GDU__v_XML2PO_0 = @echo " XML2PO" $@; +GDU_V_MSGFMT = $(GDU__v_MSGFMT_$(V)) +GDU__v_MSGFMT_ = $(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +GDU__v_MSGFMT_0 = @echo " MSGFMT" $@; +GDU_V_DB2OMF = $(GDU__v_DB2OMF_$(V)) +GDU__v_DB2OMF_ = $(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2OMF_0 = @echo " DB2OMF" $@; +GDU_V_DB2HTM = $(GDU__v_DB2HTM_$(V)) +GDU__v_DB2HTM_ = $(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) +GDU__v_DB2HTM_0 = @echo " DB2HTM" $@; + +################################################################################ db2omf_args = \ --stringparam db2omf.basename $(DOC_MODULE) \ --stringparam db2omf.format $(3) \ @@ -638,7 +658,6 @@ _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl _ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl @@ -652,7 +671,7 @@ echo "The file '$(_skcontentslist)' does not exist." >&2; \ echo "Please check your ScrollKeeper installation." >&2; \ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } $(_DOC_OMF_HTML) : $(_DOC_OMF_IN) $(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml @@ -660,7 +679,7 @@ @ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \ @ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \ @ENABLE_SK_TRUE@ exit 1; } - xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } + $(GDU_V_DB2OMF)xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } .PHONY: omf omf: $(_DOC_OMF_ALL) @@ -699,18 +718,15 @@ fi $(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi + $(GDU_V_MSGFMT)msgfmt -o $@ $< # FIXME: fix the dependancy # FIXME: hook xml2po up $(_DOC_LC_DOCS) : $(_DOC_MOFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) - if ! test -d $(dir $@); then mkdir $(dir $@); fi - if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ (cd $(dir $@) && \ @@ -720,10 +736,10 @@ .PHONY: pot pot: $(_DOC_POT) $(_DOC_POT): $(_DOC_C_DOCS_NOENT) - $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) - xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) + $(GDU_V_DB2HTM)xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) ################################################################################ @@ -859,8 +875,8 @@ xmlpath="$$lc:$(srcdir)/$$lc"; \ fi; \ for page in $(DOC_PAGES); do \ - echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \ - xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \ + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ done; \ done diff -Nru ghex-3.3.91/icons/16x16/Makefile.in ghex-3.4.0/icons/16x16/Makefile.in --- ghex-3.3.91/icons/16x16/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/icons/16x16/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -141,6 +141,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -228,6 +232,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru ghex-3.3.91/icons/22x22/Makefile.in ghex-3.4.0/icons/22x22/Makefile.in --- ghex-3.3.91/icons/22x22/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/icons/22x22/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -141,6 +141,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -228,6 +232,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru ghex-3.3.91/icons/24x24/Makefile.in ghex-3.4.0/icons/24x24/Makefile.in --- ghex-3.3.91/icons/24x24/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/icons/24x24/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -141,6 +141,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -228,6 +232,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru ghex-3.3.91/icons/32x32/Makefile.in ghex-3.4.0/icons/32x32/Makefile.in --- ghex-3.3.91/icons/32x32/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/icons/32x32/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -141,6 +141,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -228,6 +232,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru ghex-3.3.91/icons/48x48/Makefile.in ghex-3.4.0/icons/48x48/Makefile.in --- ghex-3.3.91/icons/48x48/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/icons/48x48/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -141,6 +141,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -228,6 +232,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru ghex-3.3.91/icons/Makefile.in ghex-3.4.0/icons/Makefile.in --- ghex-3.3.91/icons/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/icons/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -151,6 +151,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -238,6 +242,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ diff -Nru ghex-3.3.91/m4/gnome-doc-utils.m4 ghex-3.4.0/m4/gnome-doc-utils.m4 --- ghex-3.3.91/m4/gnome-doc-utils.m4 2012-03-05 17:30:33.000000000 +0000 +++ ghex-3.4.0/m4/gnome-doc-utils.m4 2012-03-26 20:07:58.000000000 +0000 @@ -38,6 +38,11 @@ AC_DEFUN([GNOME_DOC_INIT], [AC_REQUIRE([AC_PROG_LN_S])dnl +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) diff -Nru ghex-3.3.91/m4/intltool.m4 ghex-3.4.0/m4/intltool.m4 --- ghex-3.3.91/m4/intltool.m4 2012-03-05 17:30:33.000000000 +0000 +++ ghex-3.4.0/m4/intltool.m4 2012-03-26 20:07:58.000000000 +0000 @@ -23,7 +23,7 @@ ## the same distribution terms that you use for the rest of that program. dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL +# serial 42 IT_PROG_INTLTOOL AC_DEFUN([IT_PROG_INTLTOOL], [ AC_PREREQ([2.50])dnl AC_REQUIRE([AM_NLS])dnl @@ -36,13 +36,11 @@ ;; esac +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` if test -n "$1"; then AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) @@ -55,25 +53,48 @@ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) fi - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u --no-translations $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' _IT_SUBST(INTLTOOL_DESKTOP_RULE) _IT_SUBST(INTLTOOL_DIRECTORY_RULE) diff -Nru ghex-3.3.91/Makefile.am ghex-3.4.0/Makefile.am --- ghex-3.3.91/Makefile.am 2012-02-20 02:03:56.000000000 +0000 +++ ghex-3.4.0/Makefile.am 2012-03-26 18:36:06.000000000 +0000 @@ -8,6 +8,7 @@ EXTRA_DIST = \ gnome-doc-utils.make \ - COPYING-DOCS + COPYING-DOCS \ + HACKING -include $(top_srcdir)/git.mk diff -Nru ghex-3.3.91/Makefile.in ghex-3.4.0/Makefile.in --- ghex-3.3.91/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -171,6 +171,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -258,6 +262,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ @@ -281,7 +287,8 @@ SUBDIRS = data po help src icons EXTRA_DIST = \ gnome-doc-utils.make \ - COPYING-DOCS + COPYING-DOCS \ + HACKING all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff -Nru ghex-3.3.91/NEWS ghex-3.4.0/NEWS --- ghex-3.3.91/NEWS 2012-03-05 17:18:24.000000000 +0000 +++ ghex-3.4.0/NEWS 2012-03-26 20:05:44.000000000 +0000 @@ -1,3 +1,20 @@ +========== +GHex 3.4.0 +========== + +This is a new stable GHex release. Compared to the 3.3.91 Beta release, this +release has translation updates and no code changes. + +Changes: + - A new HACKING file describing how to build GHex from git (Martin Olsson) + - Fix a desktop-file-validate warning about ghex.desktop (Kalev Lember) + +Translation updates: + - Czech (Marek Černocký) + - Galician (Fran Diéguez) + - Latvian (Rudolfs Mazurs) + + =========== GHex 3.3.91 =========== diff -Nru ghex-3.3.91/po/cs.po ghex-3.4.0/po/cs.po --- ghex-3.3.91/po/cs.po 2011-08-02 04:29:52.000000000 +0000 +++ ghex-3.4.0/po/cs.po 2012-03-25 21:15:17.000000000 +0000 @@ -8,15 +8,15 @@ # Miloslav Trmac , 2004. # Lucas Lommer , 2009. (just an update). # Petr Kovar , 2010 -# Marek Černocký , 2010, 2011. +# Marek Černocký , 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: ghex\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=ghex&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-08-01 08:34+0000\n" -"PO-Revision-Date: 2011-08-01 22:50+0200\n" +"POT-Creation-Date: 2012-03-01 23:51+0000\n" +"PO-Revision-Date: 2012-03-25 22:31+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -26,15 +26,16 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.0\n" -#: ../ghex.desktop.in.h:1 ../src/ghex-window.c:654 ../src/ghex-window.c:1100 +#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:650 +#: ../src/ghex-window.c:1084 msgid "GHex" msgstr "GHex" -#: ../ghex.desktop.in.h:2 +#: ../data/ghex.desktop.in.h:2 msgid "Hex Editor" msgstr "Hexadecimálních editor" -#: ../ghex.desktop.in.h:3 +#: ../data/ghex.desktop.in.h:3 msgid "Inspect and edit binary files" msgstr "Zkoumat a upravovat obsah souborů" @@ -46,7 +47,7 @@ msgid "Hex" msgstr "Šestnáctkově" -#: ../src/chartable.c:147 ../src/preferences.c:143 +#: ../src/chartable.c:147 ../src/preferences.c:142 msgid "Decimal" msgstr "Desítkově" @@ -62,51 +63,51 @@ msgid "Character table" msgstr "Tabulka znaků" -#: ../src/converter.c:231 +#: ../src/converter.c:232 msgid "Base Converter" msgstr "Převodník soustav" #. entries -#: ../src/converter.c:252 +#: ../src/converter.c:253 msgid "_Binary:" msgstr "D_vojkově:" -#: ../src/converter.c:254 +#: ../src/converter.c:255 msgid "_Octal:" msgstr "_Osmičkově:" -#: ../src/converter.c:256 +#: ../src/converter.c:257 msgid "_Decimal:" msgstr "_Desítkově:" -#: ../src/converter.c:258 +#: ../src/converter.c:259 msgid "_Hex:" msgstr "Še_stnáctkově:" -#: ../src/converter.c:260 +#: ../src/converter.c:261 msgid "_ASCII:" msgstr "_ASCII:" #. get cursor button -#: ../src/converter.c:264 +#: ../src/converter.c:265 msgid "_Get cursor value" msgstr "_Načíst hodnotu pod kurzorem" -#: ../src/converter.c:278 +#: ../src/converter.c:279 msgid "Get cursor value" msgstr "Načíst hodnotu pod kurzorem" -#: ../src/converter.c:278 +#: ../src/converter.c:279 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII" msgstr "" "Načte hodnotu pod kurzorem v podobách dvojkové, osmičkové, desítkové, " "šestnáctkové nebo ASCII" -#: ../src/converter.c:418 +#: ../src/converter.c:419 msgid "ERROR" msgstr "CHYBA" -#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:1001 +#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873 #, c-format msgid "GHex (%s): Find Data" msgstr "GHex (%s): Hledání dat" @@ -147,7 +148,7 @@ msgid "Finds the previous occurrence of the search string " msgstr "Nalezne předchozí výskyt hledaného řetězce" -#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:466 +#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:469 msgid "Cancel" msgstr "Zrušit" @@ -188,7 +189,7 @@ msgid "Closes advanced find window" msgstr "Zavře okno pro pokročilého hledání" -#: ../src/findreplace.c:355 ../src/ui.c:999 +#: ../src/findreplace.c:355 ../src/ui.c:871 #, c-format msgid "GHex (%s): Find & Replace Data" msgstr "GHex (%s): Hledání a nahrazení dat" @@ -242,70 +243,70 @@ msgid "Closes find and replace data window" msgstr "Zavře okno hledání a nahrazování dat" -#: ../src/findreplace.c:434 ../src/ui.c:997 +#: ../src/findreplace.c:434 ../src/ui.c:869 #, c-format msgid "GHex (%s): Jump To Byte" msgstr "GHex (%s): Přeskočit na bajt" -#: ../src/findreplace.c:464 +#: ../src/findreplace.c:467 msgid "Jump to byte" msgstr "Skočí na bajt" -#: ../src/findreplace.c:464 +#: ../src/findreplace.c:467 msgid "Enter the byte to jump to" msgstr "Zadejte bajt, na který se má přeskočit" -#: ../src/findreplace.c:465 +#: ../src/findreplace.c:468 msgid "OK" msgstr "OK" -#: ../src/findreplace.c:465 +#: ../src/findreplace.c:468 msgid "Jumps to the specified byte" msgstr "Skočí na zadaný bajt" -#: ../src/findreplace.c:466 +#: ../src/findreplace.c:469 msgid "Closes jump to byte window" msgstr "Zavře okno přeskočení na bajt" -#: ../src/findreplace.c:529 ../src/findreplace.c:563 ../src/findreplace.c:670 +#: ../src/findreplace.c:532 ../src/findreplace.c:566 ../src/findreplace.c:673 msgid "There is no active document to search!" msgstr "Pro hledání není k dispozici žádný aktivní dokument!" -#: ../src/findreplace.c:536 ../src/findreplace.c:570 ../src/findreplace.c:677 -#: ../src/findreplace.c:711 ../src/findreplace.c:756 +#: ../src/findreplace.c:539 ../src/findreplace.c:573 ../src/findreplace.c:680 +#: ../src/findreplace.c:714 ../src/findreplace.c:759 msgid "There is no string to search for!" msgstr "Chybí řetězec, který se má hledat!" -#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877 +#: ../src/findreplace.c:551 ../src/findreplace.c:689 ../src/findreplace.c:879 msgid "End Of File reached" msgstr "Dosaženo konce souboru" -#: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685 -#: ../src/findreplace.c:878 ../src/findreplace.c:901 +#: ../src/findreplace.c:552 ../src/findreplace.c:585 ../src/findreplace.c:688 +#: ../src/findreplace.c:880 ../src/findreplace.c:903 msgid "String was not found!\n" msgstr "Řetězec nebyl nalezen!\n" -#: ../src/findreplace.c:581 ../src/findreplace.c:900 +#: ../src/findreplace.c:584 ../src/findreplace.c:902 msgid "Beginning Of File reached" msgstr "Dosaženo začátku souboru" -#: ../src/findreplace.c:598 +#: ../src/findreplace.c:601 msgid "There is no active document to move the cursor in!" msgstr "Pro přemístění kurzoru není k dispozici žádný aktivní dokument!" -#: ../src/findreplace.c:616 +#: ../src/findreplace.c:619 msgid "No offset has been specified!" msgstr "Nebylo zadaná žádná pozice!" -#: ../src/findreplace.c:641 +#: ../src/findreplace.c:644 msgid "The specified offset is beyond the file boundaries!" msgstr "Zadaný posun je mimo hranice souboru!" -#: ../src/findreplace.c:649 +#: ../src/findreplace.c:652 msgid "Can not position cursor beyond the End Of File!" msgstr "Nelze umístit kurzor za konec souboru!" -#: ../src/findreplace.c:656 +#: ../src/findreplace.c:659 msgid "" "You may only give the offset as:\n" " - a positive decimal number, or\n" @@ -317,23 +318,23 @@ " - šestnáctkové číslo začínající „0x“\n" " - znaménko „+“ nebo „-“ následované relativním posunem" -#: ../src/findreplace.c:702 +#: ../src/findreplace.c:705 msgid "There is no active buffer to replace data in!" msgstr "Pro nahrazování dat není k dispozici žádná aktivní vyrovnávací paměť!" -#: ../src/findreplace.c:727 ../src/findreplace.c:728 +#: ../src/findreplace.c:730 ../src/findreplace.c:731 msgid "End Of File reached!" msgstr "Dosaženo konce souboru!" -#: ../src/findreplace.c:747 +#: ../src/findreplace.c:750 msgid "There is no active document to replace data in!" msgstr "Pro nahrazování dat není k dispozici žádný aktivní dokument!" -#: ../src/findreplace.c:777 +#: ../src/findreplace.c:780 msgid "No occurrences were found." msgstr "Nebyl nalezen žádný výskyt." -#: ../src/findreplace.c:780 +#: ../src/findreplace.c:783 #, c-format msgid "Replaced %d occurrence." msgid_plural "Replaced %d occurrences." @@ -341,425 +342,324 @@ msgstr[1] "Nahrazeny %d výskyty." msgstr[2] "Nahrazeno %d výskytů." -#: ../src/findreplace.c:820 +#: ../src/findreplace.c:823 msgid "No string to search for!" msgstr "Chybí řetězec, který se má hledat!" -#: ../src/ghex-ui.xml.h:1 -msgid "About this application" -msgstr "O této aplikaci" - -#: ../src/ghex-ui.xml.h:2 -msgid "Add View" -msgstr "Přidat pohled" +#: ../src/ghex-window.c:75 +#, c-format +msgid "" +"Can not open URI:\n" +"%s" +msgstr "" +"Nelze otevřít URI:\n" +"%s" -#: ../src/ghex-ui.xml.h:3 -msgid "Add a new view to the buffer" -msgstr "Přidat nový pohled na vyrovnávací paměť" +#: ../src/ghex-window.c:96 +#, c-format +msgid "" +"Can not open file:\n" +"%s" +msgstr "" +"Nelze otevřít soubor:\n" +"%s" -#: ../src/ghex-ui.xml.h:4 -msgid "Advanced Find" -msgstr "Pokročilé hledání" +#: ../src/ghex-window.c:327 +msgid "_File" +msgstr "_Soubor" -#: ../src/ghex-ui.xml.h:5 -msgid "Bytes" -msgstr "Bajtů" - -#: ../src/ghex-ui.xml.h:6 -msgid "Character Table..." -msgstr "Tabulka znaků…" +#: ../src/ghex-window.c:328 +msgid "_Edit" +msgstr "_Upravit" -#: ../src/ghex-ui.xml.h:7 -msgid "Character _Table" -msgstr "_Tabulka znaků" +#: ../src/ghex-window.c:329 +msgid "_View" +msgstr "_Zobrazit" -#: ../src/ghex-ui.xml.h:9 -msgid "Close the current file" -msgstr "Zavřít aktuální soubor" +#: ../src/ghex-window.c:330 +msgid "_Group Data As" +msgstr "_Seskupit data jako" -#: ../src/ghex-ui.xml.h:10 -msgid "Configure the application" -msgstr "Nastavit aplikaci" +#. View submenu +#: ../src/ghex-window.c:331 +msgid "_Windows" +msgstr "_Okna" -#: ../src/ghex-ui.xml.h:11 -msgid "Contents" -msgstr "Obsah" - -#: ../src/ghex-ui.xml.h:12 -msgid "Converter..." -msgstr "Převodník…" - -#: ../src/ghex-ui.xml.h:13 -msgid "Copy" -msgstr "Kopírovat" +#: ../src/ghex-window.c:332 +msgid "_Help" +msgstr "_Nápověda" -#: ../src/ghex-ui.xml.h:14 -msgid "Copy selection to clipboard" -msgstr "Kopírovat výběr do schránky" +#. File menu +#: ../src/ghex-window.c:335 +msgid "_Open..." +msgstr "_Otevřít…" -#: ../src/ghex-ui.xml.h:15 -msgid "Cu_t" -msgstr "_Vyjmout" +#: ../src/ghex-window.c:336 +msgid "Open a file" +msgstr "Otevřít soubor" -#: ../src/ghex-ui.xml.h:16 -msgid "Cut" -msgstr "Vyjmout" +#: ../src/ghex-window.c:338 +msgid "_Save" +msgstr "_Uložit" -#: ../src/ghex-ui.xml.h:17 -msgid "Cut selection" -msgstr "Vyjmout výběr" +#: ../src/ghex-window.c:339 +msgid "Save the current file" +msgstr "Uložit současný soubor" -#: ../src/ghex-ui.xml.h:18 -msgid "E_xit" -msgstr "_Konec" +#: ../src/ghex-window.c:341 +msgid "Save _As..." +msgstr "Uložit j_ako…" -#: ../src/ghex-ui.xml.h:19 -msgid "Exit" -msgstr "Konec" +#: ../src/ghex-window.c:342 +msgid "Save the current file with a different name" +msgstr "Uložit současný soubor pod jiným názvem" -#: ../src/ghex-ui.xml.h:20 -msgid "Exit the program" -msgstr "Ukončit program" +#: ../src/ghex-window.c:344 +msgid "Save As _HTML..." +msgstr "Uložit jako _HTML…" -#: ../src/ghex-ui.xml.h:21 +#: ../src/ghex-window.c:345 msgid "Export data to HTML source" msgstr "Exportovat data do zdrojového kódu HTML" -#: ../src/ghex-ui.xml.h:22 -msgid "Export to HTML..." -msgstr "Export do HTML…" - -#: ../src/ghex-ui.xml.h:23 -msgid "Find" -msgstr "Hledat" - -#: ../src/ghex-ui.xml.h:24 -msgid "Goto Byte" -msgstr "Přejít na bajt" - -#: ../src/ghex-ui.xml.h:25 -msgid "Group data by 16 bits" -msgstr "Data do skupin po 16 bitech" - -#: ../src/ghex-ui.xml.h:26 -msgid "Group data by 32 bits" -msgstr "Data do skupin po 32 bitech" - -#: ../src/ghex-ui.xml.h:27 -msgid "Group data by 8 bits" -msgstr "Data do skupin po 8 bitech" - -#: ../src/ghex-ui.xml.h:28 -msgid "Help Chat" -msgstr "Rozhovor s pomocí" - -#: ../src/ghex-ui.xml.h:29 -msgid "Help on this application" -msgstr "Nápověda pro tuto aplikaci" - -#: ../src/ghex-ui.xml.h:30 -msgid "Insert Mode" -msgstr "Režim vkládání" - -#: ../src/ghex-ui.xml.h:31 -msgid "Insert/overwrite data" -msgstr "Vkládat/přepisovat data" - -#: ../src/ghex-ui.xml.h:32 -msgid "Jump to a certain position" -msgstr "Přeskočit na určitou pozici" - -#: ../src/ghex-ui.xml.h:33 -msgid "Longwords" -msgstr "Dlouhá slova" - -#: ../src/ghex-ui.xml.h:34 -msgid "Open" -msgstr "Otevřít" - -#: ../src/ghex-ui.xml.h:35 -msgid "Open a file" -msgstr "Otevřít soubor" - -#: ../src/ghex-ui.xml.h:36 -msgid "Open base conversion dialog" -msgstr "Otevřít dialogové okno převodu soustav" +#: ../src/ghex-window.c:347 +msgid "_Revert" +msgstr "V_rátit změny" -#: ../src/ghex-ui.xml.h:37 -msgid "Pa_ste" -msgstr "V_ložit" +#: ../src/ghex-window.c:348 +msgid "Revert to a saved version of the file" +msgstr "Návrat k uložené verzi souboru" -#: ../src/ghex-ui.xml.h:38 -msgid "Paste" -msgstr "Vložit" +#: ../src/ghex-window.c:350 +msgid "_Print" +msgstr "_Tisk" -#: ../src/ghex-ui.xml.h:39 -msgid "Paste data from clipboard" -msgstr "Vložení dat ze schránky" +#: ../src/ghex-window.c:351 +msgid "Print the current file" +msgstr "Tisknout aktuální dokument" -#: ../src/ghex-ui.xml.h:40 -msgid "Preferences" -msgstr "Předvolby" +#: ../src/ghex-window.c:353 +msgid "Print Previe_w..." +msgstr "Náhled t_isku…" -#: ../src/ghex-ui.xml.h:41 +#: ../src/ghex-window.c:354 msgid "Preview printed data" msgstr "Náhled tištěných dat" -#: ../src/ghex-ui.xml.h:42 -msgid "Print" -msgstr "Tisk" +#: ../src/ghex-window.c:356 +msgid "_Close" +msgstr "_Zavřít" -#: ../src/ghex-ui.xml.h:43 -msgid "Print Previe_w..." -msgstr "Náhled t_isku…" +#: ../src/ghex-window.c:357 +msgid "Close the current file" +msgstr "Zavřít aktuální soubor" + +#: ../src/ghex-window.c:359 +msgid "E_xit" +msgstr "_Konec" -#: ../src/ghex-ui.xml.h:44 -msgid "Print Preview..." -msgstr "Náhled tisku…" +#: ../src/ghex-window.c:360 +msgid "Exit the program" +msgstr "Ukončit program" -#: ../src/ghex-ui.xml.h:45 -msgid "Print the current file" -msgstr "Tisknout aktuální dokument" +#. Edit menu +#: ../src/ghex-window.c:364 +msgid "_Undo" +msgstr "_Zpět" -#: ../src/ghex-ui.xml.h:46 -msgid "R_eplace" -msgstr "Nah_radit" +#: ../src/ghex-window.c:365 +msgid "Undo the last action" +msgstr "Vrátit zpět poslední úkon" -#: ../src/ghex-ui.xml.h:47 -msgid "Redo" -msgstr "Znovu" +#: ../src/ghex-window.c:367 +msgid "_Redo" +msgstr "Zn_ovu" -#: ../src/ghex-ui.xml.h:48 +#: ../src/ghex-window.c:368 msgid "Redo the undone action" msgstr "Znovu provede vrácenou akci" -#: ../src/ghex-ui.xml.h:49 -msgid "Remove View" -msgstr "Odstranit pohled" - -#: ../src/ghex-ui.xml.h:50 -msgid "Remove the current view of the buffer" -msgstr "Odstraní aktuální pohled na vyrovnávací paměť" - -#: ../src/ghex-ui.xml.h:52 -msgid "Replace a string" -msgstr "Nahradit řetězec" - -#: ../src/ghex-ui.xml.h:53 -msgid "Revert" -msgstr "Vrátit" +#: ../src/ghex-window.c:370 +msgid "_Copy" +msgstr "_Kopírovat" -#: ../src/ghex-ui.xml.h:54 -msgid "Revert to a saved version of the file" -msgstr "Návrat k uložené verzi souboru" +#: ../src/ghex-window.c:371 +msgid "Copy selection to clipboard" +msgstr "Kopírovat výběr do schránky" -#: ../src/ghex-ui.xml.h:55 -msgid "Save" -msgstr "Uložit" - -#: ../src/ghex-ui.xml.h:56 -msgid "Save As" -msgstr "Uložit jako" +#: ../src/ghex-window.c:373 +msgid "Cu_t" +msgstr "_Vyjmout" -#: ../src/ghex-ui.xml.h:57 -msgid "Save As _HTML..." -msgstr "Uložit jako _HTML…" +#: ../src/ghex-window.c:374 +msgid "Cut selection" +msgstr "Vyjmout výběr" -#: ../src/ghex-ui.xml.h:58 -msgid "Save _As..." -msgstr "Uložit j_ako…" +#: ../src/ghex-window.c:376 +msgid "Pa_ste" +msgstr "V_ložit" -#: ../src/ghex-ui.xml.h:59 -msgid "Save the current file" -msgstr "Uložit současný soubor" +#: ../src/ghex-window.c:377 +msgid "Paste data from clipboard" +msgstr "Vložení dat ze schránky" -#: ../src/ghex-ui.xml.h:60 -msgid "Save the current file with a different name" -msgstr "Uložit současný soubor pod jiným názvem" +#: ../src/ghex-window.c:379 +msgid "_Find" +msgstr "_Hledat" -#: ../src/ghex-ui.xml.h:61 +#: ../src/ghex-window.c:380 msgid "Search for a string" msgstr "Hledat řetězec" -#: ../src/ghex-ui.xml.h:62 -msgid "Show the character table" -msgstr "Zobrazit tabulku znaků" +#: ../src/ghex-window.c:382 +msgid "_Advanced Find" +msgstr "_Pokročilé hledání" -#: ../src/ghex-ui.xml.h:63 -msgid "Show the type conversion dialog in the edit window" -msgstr "Zobrazovat dialog převodu typů v okně úprav" +#: ../src/ghex-window.c:383 +msgid "Advanced Find" +msgstr "Pokročilé hledání" -#: ../src/ghex-ui.xml.h:64 -msgid "Type Conversion Dialog..." -msgstr "Dialog převodu typů…" +#: ../src/ghex-window.c:385 +msgid "R_eplace" +msgstr "Nah_radit" -#: ../src/ghex-ui.xml.h:65 -msgid "Type Conversion _Dialog" -msgstr "_Dialog převodu typů" +#: ../src/ghex-window.c:386 +msgid "Replace a string" +msgstr "Nahradit řetězec" -#: ../src/ghex-ui.xml.h:66 -msgid "Undo" -msgstr "Zpět" +#: ../src/ghex-window.c:388 +msgid "_Goto Byte..." +msgstr "_Přejít na bajt…" -#: ../src/ghex-ui.xml.h:67 -msgid "Undo the last action" -msgstr "Vrátit zpět poslední úkon" +#: ../src/ghex-window.c:389 +msgid "Jump to a certain position" +msgstr "Přeskočit na určitou pozici" -#: ../src/ghex-ui.xml.h:68 -msgid "Words" -msgstr "Slova" +#: ../src/ghex-window.c:391 +msgid "_Preferences" +msgstr "_Předvolby" -#: ../src/ghex-ui.xml.h:69 -msgid "_About" -msgstr "O _aplikaci" +#: ../src/ghex-window.c:392 +msgid "Configure the application" +msgstr "Nastavit aplikaci" -#: ../src/ghex-ui.xml.h:70 +#. View menu +#: ../src/ghex-window.c:396 msgid "_Add View" msgstr "Přid_at pohled" -#: ../src/ghex-ui.xml.h:71 -msgid "_Advanced Find" -msgstr "_Pokročilé hledání" - -#: ../src/ghex-ui.xml.h:72 -msgid "_Base Converter" -msgstr "_Převod soustav" +#: ../src/ghex-window.c:397 +msgid "Add a new view to the buffer" +msgstr "Přidat nový pohled na vyrovnávací paměť" -#: ../src/ghex-ui.xml.h:73 ../src/ui.c:87 -msgid "_Bytes" -msgstr "_Bajty" +#: ../src/ghex-window.c:399 +msgid "_Remove View" +msgstr "Odst_ranit pohled" -#: ../src/ghex-ui.xml.h:74 -msgid "_Close" -msgstr "_Zavřít" +#: ../src/ghex-window.c:400 +msgid "Remove the current view of the buffer" +msgstr "Odstraní aktuální pohled na vyrovnávací paměť" -#: ../src/ghex-ui.xml.h:75 +#. Help menu +#: ../src/ghex-window.c:404 msgid "_Contents" msgstr "O_bsah" -#: ../src/ghex-ui.xml.h:76 -msgid "_Copy" -msgstr "_Kopírovat" - -#: ../src/ghex-ui.xml.h:77 -msgid "_Edit" -msgstr "_Upravit" - -#: ../src/ghex-ui.xml.h:78 -msgid "_File" -msgstr "_Soubor" - -#: ../src/ghex-ui.xml.h:79 -msgid "_Find" -msgstr "_Hledat" - -#: ../src/ghex-ui.xml.h:80 -msgid "_Goto Byte..." -msgstr "_Přejít na bajt…" +#: ../src/ghex-window.c:405 +msgid "Help on this application" +msgstr "Nápověda pro tuto aplikaci" -#: ../src/ghex-ui.xml.h:81 -msgid "_Group Data As" -msgstr "_Seskupit data jako" +#: ../src/ghex-window.c:407 +msgid "_About" +msgstr "O _aplikaci" -#: ../src/ghex-ui.xml.h:82 -msgid "_Help" -msgstr "_Nápověda" +#: ../src/ghex-window.c:408 +msgid "About this application" +msgstr "O této aplikaci" -#: ../src/ghex-ui.xml.h:83 +#. Edit menu +#: ../src/ghex-window.c:415 msgid "_Insert Mode" msgstr "Rež_im vkládání" -#: ../src/ghex-ui.xml.h:84 ../src/ui.c:89 -msgid "_Longwords" -msgstr "D_louhá slova" - -#: ../src/ghex-ui.xml.h:85 -msgid "_Open..." -msgstr "_Otevřít…" - -#: ../src/ghex-ui.xml.h:86 -msgid "_Preferences" -msgstr "_Předvolby" +#: ../src/ghex-window.c:416 +msgid "Insert/overwrite data" +msgstr "Vkládat/přepisovat data" -#: ../src/ghex-ui.xml.h:87 -msgid "_Print" -msgstr "_Tisk" +#. Windows menu +#: ../src/ghex-window.c:420 +msgid "Character _Table" +msgstr "_Tabulka znaků" -#: ../src/ghex-ui.xml.h:88 -msgid "_Redo" -msgstr "Zn_ovu" +#: ../src/ghex-window.c:421 +msgid "Show the character table" +msgstr "Zobrazit tabulku znaků" -#: ../src/ghex-ui.xml.h:89 -msgid "_Remove View" -msgstr "Odst_ranit pohled" +#: ../src/ghex-window.c:423 +msgid "_Base Converter" +msgstr "_Převod soustav" -#: ../src/ghex-ui.xml.h:90 -msgid "_Revert" -msgstr "V_rátit změny" +#: ../src/ghex-window.c:424 +msgid "Open base conversion dialog" +msgstr "Otevřít dialogové okno převodu soustav" -#: ../src/ghex-ui.xml.h:91 -msgid "_Save" -msgstr "_Uložit" +#: ../src/ghex-window.c:426 +msgid "Type Conversion _Dialog" +msgstr "_Dialog převodu typů" -#: ../src/ghex-ui.xml.h:92 -msgid "_Undo" -msgstr "_Zpět" +#: ../src/ghex-window.c:427 +msgid "Show the type conversion dialog in the edit window" +msgstr "Zobrazovat dialog převodu typů v okně úprav" -#: ../src/ghex-ui.xml.h:93 -msgid "_View" -msgstr "_Zobrazit" +#: ../src/ghex-window.c:433 ../src/ui.c:48 +msgid "_Bytes" +msgstr "_Bajty" -#: ../src/ghex-ui.xml.h:94 -msgid "_Windows" -msgstr "_Okna" +#: ../src/ghex-window.c:434 +msgid "Group data by 8 bits" +msgstr "Data do skupin po 8 bitech" -#: ../src/ghex-ui.xml.h:95 ../src/ui.c:88 +#: ../src/ghex-window.c:435 ../src/ui.c:49 msgid "_Words" msgstr "_Slova" -#: ../src/ghex-window.c:75 -#, c-format -msgid "" -"Can not open URI:\n" -"%s" -msgstr "" -"Nelze otevřít URI:\n" -"%s" +#: ../src/ghex-window.c:436 +msgid "Group data by 16 bits" +msgstr "Data do skupin po 16 bitech" -#: ../src/ghex-window.c:94 -#, c-format -msgid "" -"Can not open file:\n" -"%s" -msgstr "" -"Nelze otevřít soubor:\n" -"%s" +#: ../src/ghex-window.c:437 ../src/ui.c:50 +msgid "_Longwords" +msgstr "D_louhá slova" + +#: ../src/ghex-window.c:438 +msgid "Group data by 32 bits" +msgstr "Data do skupin po 32 bitech" -#: ../src/ghex-window.c:773 +#: ../src/ghex-window.c:769 #, c-format msgid "Offset: %s" msgstr "Pozice: %s" -#: ../src/ghex-window.c:776 +#: ../src/ghex-window.c:772 #, c-format msgid "; %s bytes from %s to %s selected" msgstr "; vybráno %s bajtů od %s do %s" -#: ../src/ghex-window.c:1060 +#: ../src/ghex-window.c:1044 #, c-format msgid "Activate file %s" msgstr "Aktivovat soubor %s" -#: ../src/ghex-window.c:1096 +#: ../src/ghex-window.c:1080 #, c-format msgid "%s - GHex" msgstr "%s - GHex" -#: ../src/ghex-window.c:1224 +#: ../src/ghex-window.c:1206 msgid "Select a file to save buffer as" msgstr "Vyberte soubor pro uložení vyrovnávací paměti" -#: ../src/ghex-window.c:1280 +#: ../src/ghex-window.c:1238 #, c-format msgid "" "File %s exists.\n" @@ -768,20 +668,20 @@ "Soubor %s existuje.\n" "Chcete jej přepsat?" -#: ../src/ghex-window.c:1313 ../src/ui.c:299 +#: ../src/ghex-window.c:1264 ../src/ui.c:300 #, c-format msgid "Saved buffer to file %s" msgstr "Vyrovnávací paměť uložena do souboru %s" -#: ../src/ghex-window.c:1319 +#: ../src/ghex-window.c:1271 msgid "Error saving file!" msgstr "Chyba při ukládání souboru!" -#: ../src/ghex-window.c:1325 +#: ../src/ghex-window.c:1277 msgid "Can't open file for writing!" msgstr "Soubor nelze otevřít pro zápis!" -#: ../src/ghex-window.c:1370 +#: ../src/ghex-window.c:1322 #, c-format msgid "" "File %s has changed since last save.\n" @@ -790,15 +690,15 @@ "Soubor %s byl od posledního uložení změněn.\n" "Chcete tyto změny uložit?" -#: ../src/ghex-window.c:1374 +#: ../src/ghex-window.c:1326 msgid "Do_n't save" msgstr "_Neukládat" -#: ../src/ghex-window.c:1394 ../src/ui.c:287 +#: ../src/ghex-window.c:1346 ../src/ui.c:288 msgid "You don't have the permissions to save the file!" msgstr "Nemáte oprávnění k uložení souboru!" -#: ../src/ghex-window.c:1398 ../src/ui.c:292 +#: ../src/ghex-window.c:1350 ../src/ui.c:293 msgid "An error occurred while saving file!" msgstr "Během ukládání souboru se vyskytla chyba!" @@ -827,12 +727,12 @@ msgstr "32 bitů bez znaménka:" #: ../src/hex-dialog.c:64 -msgid "32 bit float:" -msgstr "32 bitů plovoucí:" +msgid "Float 32 bit:" +msgstr "32 bitů desetinné:" #: ../src/hex-dialog.c:65 -msgid "64 bit float:" -msgstr "64 bitů plovoucí:" +msgid "Float 64 bit:" +msgstr "64 bitů desetinné:" #: ../src/hex-dialog.c:66 msgid "Hexadecimal:" @@ -846,46 +746,46 @@ msgid "Binary:" msgstr "Dvojkově:" -#: ../src/hex-dialog.c:197 +#: ../src/hex-dialog.c:204 msgid "Show little endian decoding" msgstr "Zobrazit v kódování little endian" -#: ../src/hex-dialog.c:204 +#: ../src/hex-dialog.c:211 msgid "Show unsigned and float as hexadecimal" msgstr "Zobrazit plovoucí hodnoty a bez znaménka šestnáctkově" -#: ../src/hex-dialog.c:210 +#: ../src/hex-dialog.c:217 msgid "Stream Length:" msgstr "Délka proudu:" -#: ../src/hex-dialog.c:232 +#: ../src/hex-dialog.c:239 msgid "FIXME: no conversion function" msgstr "OPRAVIT: chybí funkce pro převod" -#: ../src/hex-document.c:436 +#: ../src/hex-document.c:435 msgid "New document" msgstr "Nový dokument" -#: ../src/hex-document.c:790 +#: ../src/hex-document.c:784 #, c-format msgid "Page" msgstr "Stránka" -#: ../src/hex-document.c:796 ../src/hex-document.c:921 +#: ../src/hex-document.c:790 ../src/hex-document.c:915 #, c-format msgid "Hex dump generated by" msgstr "Hexadecimální výpis generovaný" -#: ../src/hex-document.c:807 +#: ../src/hex-document.c:801 msgid "Saving to HTML..." msgstr "Ukládá se do HTML…" -#: ../src/hex-document.c:844 +#: ../src/hex-document.c:838 #, c-format msgid "Previous page" msgstr "Předchozí stránka" -#: ../src/hex-document.c:859 +#: ../src/hex-document.c:853 #, c-format msgid "Next page" msgstr "Následující stránka" @@ -916,125 +816,125 @@ "Spuštěním „%s --help“ se zobrazí úplný seznam dostupných přepínačů " "příkazového řádku.\n" -#: ../src/main.c:81 ../src/main.c:94 +#: ../src/main.c:80 ../src/main.c:93 #, c-format msgid "Invalid geometry string \"%s\"\n" msgstr "Neplatný řetězec „%s“ s rozměry a polohou\n" -#: ../src/preferences.c:70 +#: ../src/preferences.c:69 msgid "GHex Preferences" msgstr "Předvolby GHex" -#: ../src/preferences.c:102 +#: ../src/preferences.c:101 msgid "_Maximum number of undo levels:" msgstr "_Maximální počet úkonů, které lze vrátit zpět:" -#: ../src/preferences.c:122 +#: ../src/preferences.c:121 msgid "Undo levels" msgstr "Počet vratitelných úkonů" -#: ../src/preferences.c:122 +#: ../src/preferences.c:121 msgid "Select maximum number of undo levels" msgstr "Vyberte maximální počet úkonů, které lze vrátit zpět" -#: ../src/preferences.c:126 +#: ../src/preferences.c:125 msgid "_Show cursor offset in statusbar as:" msgstr "_Zobrazit pozici kurzoru ve stavové liště:" -#: ../src/preferences.c:145 +#: ../src/preferences.c:144 msgid "Hexadecimal" msgstr "Šestnáctkově" -#: ../src/preferences.c:147 +#: ../src/preferences.c:146 msgid "Custom" msgstr "Vlastním způsobem" -#: ../src/preferences.c:156 +#: ../src/preferences.c:155 msgid "Enter the cursor offset format" msgstr "Zadejte vlastní formát pozice kurzoru" -#: ../src/preferences.c:157 +#: ../src/preferences.c:156 msgid "Select the cursor offset format" msgstr "Vyberte formát pozice kurzoru" #. show offsets check button -#: ../src/preferences.c:167 +#: ../src/preferences.c:166 msgid "Sh_ow offsets column" msgstr "Z_obrazit sloupec s pozicemi" -#: ../src/preferences.c:172 +#: ../src/preferences.c:171 msgid "Editing" msgstr "Úpravy" #. display font -#: ../src/preferences.c:181 +#: ../src/preferences.c:180 msgid "Font" msgstr "Písmo" #. default group type -#: ../src/preferences.c:204 +#: ../src/preferences.c:203 msgid "Default Group Type" msgstr "Výchozí typ seskupování" -#: ../src/preferences.c:220 +#: ../src/preferences.c:219 msgid "Display" msgstr "Zobrazit" #. paper selection -#: ../src/preferences.c:229 +#: ../src/preferences.c:228 msgid "Paper size" msgstr "Velikost papíru" #. data & header font selection -#: ../src/preferences.c:234 +#: ../src/preferences.c:233 msgid "Fonts" msgstr "Písma" -#: ../src/preferences.c:240 +#: ../src/preferences.c:245 msgid "_Data font:" msgstr "Písmo _dat:" -#: ../src/preferences.c:256 +#: ../src/preferences.c:259 msgid "Data font" msgstr "Písmo dat" -#: ../src/preferences.c:256 +#: ../src/preferences.c:259 msgid "Select the data font" msgstr "Výběr písma dat" -#: ../src/preferences.c:270 +#: ../src/preferences.c:268 msgid "Header fo_nt:" msgstr "Pís_mo hlavičky:" -#: ../src/preferences.c:285 +#: ../src/preferences.c:281 msgid "Header font" msgstr "Písmo hlavičky" -#: ../src/preferences.c:285 +#: ../src/preferences.c:281 msgid "Select the header font" msgstr "Výběr písma hlavičky" -#: ../src/preferences.c:311 +#: ../src/preferences.c:306 msgid "_Print shaded box over:" msgstr "Tisk tónované _plochy přes:" -#: ../src/preferences.c:323 +#: ../src/preferences.c:318 msgid "Box size" msgstr "Velikost plochy" -#: ../src/preferences.c:323 +#: ../src/preferences.c:318 msgid "Select size of box (in number of lines)" msgstr "Vyberte velikost plochy (v počtu řádků)" -#: ../src/preferences.c:327 +#: ../src/preferences.c:322 msgid "lines (0 for no box)" msgstr "řádků (0 pro žádnou)" -#: ../src/preferences.c:334 +#: ../src/preferences.c:329 msgid "Printing" msgstr "Tisk" -#: ../src/preferences.c:454 ../src/ui.c:208 +#: ../src/preferences.c:447 ../src/ui.c:209 #, c-format msgid "" "There was an error displaying help: \n" @@ -1043,11 +943,11 @@ "Při zobrazování nápovědy nastala chyba:\n" "%s" -#: ../src/preferences.c:507 +#: ../src/preferences.c:499 msgid "Can not open desired font!" msgstr "Nelze otevřít požadované písmo!" -#: ../src/preferences.c:570 +#: ../src/preferences.c:560 msgid "" "The offset format string contains invalid format specifier.\n" "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed." @@ -1055,38 +955,21 @@ "Řetězec s formátem pozice obsahuje neplatný specifikátor formátu.\n" "Jsou povoleny pouze „x“, „X“, „p“, „P“, „d“ a „o“." -#: ../src/print.c:67 +#: ../src/print.c:57 #, c-format msgid "Page: %i/%i" msgstr "Stránka: %i/%i" -#: ../src/print.c:223 ../src/print.c:239 -#, c-format -msgid "" -"GHex could not find the font \"%s\".\n" -"GHex is unable to print without this font installed." -msgstr "" -"Aplikaci GHex se nezdařilo najít písmo „%s“.\n" -"Pokud není toto písmo nainstalováno, nelze tisknout." - -#: ../src/ui.c:61 +#: ../src/ui.c:55 msgid "hex data" msgstr "Data jako HEXA" -#: ../src/ui.c:62 +#: ../src/ui.c:56 msgid "ASCII data" msgstr "Data jako ASCII" #: ../src/ui.c:150 msgid "" -"Copyright © 1998 - 2006 Jaka Močnik\n" -"Copyright © 2006 - 2010 GHex Contributors" -msgstr "" -"Copyright © 1998 - 2006 Jaka Močnik\n" -"Copyright © 2006 - 2010 GHex Contributors" - -#: ../src/ui.c:157 -msgid "" "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) " @@ -1097,7 +980,7 @@ "Software Foundation, a to buď ve verzi 2 této licence nebo (dle vaší volby) " "v libovolné novější verzi." -#: ../src/ui.c:161 +#: ../src/ui.c:154 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -1108,7 +991,7 @@ "bez předpokládané záruky na PRODEJNOST nebo VHODNOST PRO KONKRÉTNÍ ÚČEL. " "Více podrobností najdete přímo v licenci GNU General Public License." -#: ../src/ui.c:165 +#: ../src/ui.c:158 msgid "" "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., 51 " @@ -1118,44 +1001,50 @@ "License. Pokud se tak nestalo, napište na Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" -#: ../src/ui.c:177 +#. Translators: these two strings here indicate the copyright time span, +#. e.g. 1998-2012. +#: ../src/ui.c:170 +msgid "Copyright © %Id–%Id The GHex authors" +msgstr "Copyright © %Id – %Id autoři aplikace GHex" + +#: ../src/ui.c:174 msgid "A binary file editor" msgstr "Editor binárních souborů" -#: ../src/ui.c:183 +#: ../src/ui.c:180 msgid "About GHex" msgstr "O _aplikaci GHex" -#: ../src/ui.c:184 +#: ../src/ui.c:181 msgid "translator-credits" msgstr "Marek Černocký " -#: ../src/ui.c:187 +#: ../src/ui.c:184 msgid "GHex Website" msgstr "Webové stránky GHex" -#: ../src/ui.c:317 +#: ../src/ui.c:318 msgid "Select a file to open" msgstr "Vyberte soubor k otevření" -#: ../src/ui.c:348 +#: ../src/ui.c:349 #, c-format msgid "Loaded file %s" msgstr "Načten soubor %s" -#: ../src/ui.c:356 +#: ../src/ui.c:357 msgid "Can not open file!" msgstr "Soubor nelze otevřít!" -#: ../src/ui.c:421 +#: ../src/ui.c:422 msgid "Select path and file name for the HTML source" msgstr "Vyber cestu a název souboru pro zdroj HTML" -#: ../src/ui.c:455 +#: ../src/ui.c:454 msgid "You need to specify a base name for the HTML files." msgstr "Musíte zadat základní název pro soubory HTML." -#: ../src/ui.c:466 ../src/ui.c:490 +#: ../src/ui.c:465 ../src/ui.c:491 msgid "You don't have the permission to write to the selected path.\n" msgstr "Nemáte oprávnění k zápisu ve vybrané cestě.\n" @@ -1167,29 +1056,12 @@ "Uložením do formátu HTML se přepíší některé soubory.\n" "Chcete pokračovat?" -#: ../src/ui.c:742 +#: ../src/ui.c:745 #, c-format msgid "Really revert file %s?" msgstr "Opravdu vrátit soubor %s do původní podoby?" -#: ../src/ui.c:756 +#: ../src/ui.c:759 #, c-format msgid "Reverted buffer from file %s" msgstr "Vyrovnávací paměť vrácen do původního stavu podle souboru %s" - -#: ../src/ui.c:840 -msgid "Printing file..." -msgstr "Tiskne se soubor…" - -#: ../src/ui.c:900 -msgid "Print Hex Document" -msgstr "Tisknout dokument" - -#: ../src/ui.c:912 -msgid "Pages" -msgstr "Stránek" - -#: ../src/ui.c:937 -#, c-format -msgid "GHex (%s): Print Preview" -msgstr "GHex (%s): Náhled před tiskem" diff -Nru ghex-3.3.91/po/gl.po ghex-3.4.0/po/gl.po --- ghex-3.3.91/po/gl.po 2011-07-31 09:02:00.000000000 +0000 +++ ghex-3.4.0/po/gl.po 2012-03-24 08:34:25.000000000 +0000 @@ -6,748 +6,656 @@ # colaborar connosco, podes atopar máis información en http://www.trasno.net # # First Version: 2000-04-07 23:18+0200 +# Fran Dieguez , 2012. # msgid "" msgstr "" "Project-Id-Version: ghex\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-21 16:57+0200\n" -"PO-Revision-Date: 2010-07-08 21:02+0100\n" -"Last-Translator: \n" -"Language-Team: Galician \n" +"POT-Creation-Date: 2012-03-24 01:04+0100\n" +"PO-Revision-Date: 2012-03-24 01:06+0100\n" +"Last-Translator: Fran Dieguez \n" +"Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Poedit-Language: galician\n" -#: ../ghex.desktop.in.h:1 ../src/ghex-window.c:497 ../src/ghex-window.c:945 +#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:650 +#: ../src/ghex-window.c:1084 msgid "GHex" msgstr "GHex" -#: ../ghex.desktop.in.h:2 -msgid "Hexadecimal Editor" +#: ../data/ghex.desktop.in.h:2 +msgid "Hex Editor" msgstr "Editor hexadecimal" -#: ../ghex.desktop.in.h:3 -msgid "Inspect and edit the contents of files" -msgstr "Examina e edita os contidos dos ficheiros" +#: ../data/ghex.desktop.in.h:3 +msgid "Inspect and edit binary files" +msgstr "Examina e edita ficheiros binarios" -#: ../src/chartable.c:144 +#: ../src/chartable.c:147 msgid "ASCII" msgstr "ASCII" -#: ../src/chartable.c:144 +#: ../src/chartable.c:147 msgid "Hex" msgstr "Hexadecimal" -#: ../src/chartable.c:144 ../src/preferences.c:145 +#: ../src/chartable.c:147 ../src/preferences.c:142 msgid "Decimal" msgstr "Decimal" -#: ../src/chartable.c:145 +#: ../src/chartable.c:148 msgid "Octal" msgstr "Octal" -#: ../src/chartable.c:145 +#: ../src/chartable.c:148 msgid "Binary" msgstr "Binario" -#: ../src/chartable.c:161 +#: ../src/chartable.c:164 msgid "Character table" msgstr "Táboa de caracteres" -#: ../src/converter.c:229 +#: ../src/converter.c:232 msgid "Base Converter" msgstr "Conversor base" #. entries -#: ../src/converter.c:250 +#: ../src/converter.c:253 msgid "_Binary:" msgstr "_Binario:" -#: ../src/converter.c:252 +#: ../src/converter.c:255 msgid "_Octal:" msgstr "_Octal:" -#: ../src/converter.c:254 +#: ../src/converter.c:257 msgid "_Decimal:" msgstr "_Decimal:" -#: ../src/converter.c:256 +#: ../src/converter.c:259 msgid "_Hex:" msgstr "_Hex:" -#: ../src/converter.c:258 +#: ../src/converter.c:261 msgid "_ASCII:" msgstr "_ASCII" #. get cursor button -#: ../src/converter.c:262 +#: ../src/converter.c:265 msgid "_Get cursor value" msgstr "_Obter o valor do cursor" -#: ../src/converter.c:276 +#: ../src/converter.c:279 msgid "Get cursor value" msgstr "Obter o valor do cursor" -#: ../src/converter.c:276 +#: ../src/converter.c:279 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII" msgstr "" "Obtén o valor do cursor en binario, octal, decimal, hexadecimal e ASCII" -#: ../src/converter.c:416 +#: ../src/converter.c:419 msgid "ERROR" msgstr "ERRO" -#: ../src/findreplace.c:96 ../src/findreplace.c:220 ../src/ui.c:966 +#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873 #, c-format msgid "GHex (%s): Find Data" msgstr "GHex (%s): Buscar os datos" -#: ../src/findreplace.c:100 ../src/findreplace.c:160 ../src/findreplace.c:356 +#: ../src/findreplace.c:101 ../src/findreplace.c:161 ../src/findreplace.c:359 msgid "Find String" msgstr "Buscar a cadea" -#: ../src/findreplace.c:107 ../src/findreplace.c:257 +#: ../src/findreplace.c:108 ../src/findreplace.c:258 msgid "Find _Next" msgstr "Buscar a segui_nte" -#: ../src/findreplace.c:114 ../src/findreplace.c:266 +#: ../src/findreplace.c:115 ../src/findreplace.c:267 msgid "Find _Previous" msgstr "_Buscar a anterior" -#: ../src/findreplace.c:137 ../src/findreplace.c:410 +#: ../src/findreplace.c:138 ../src/findreplace.c:413 msgid "Find Data" msgstr "Buscar os datos" -#: ../src/findreplace.c:137 ../src/findreplace.c:410 +#: ../src/findreplace.c:138 ../src/findreplace.c:413 msgid "Enter the hex data or ASCII data to search for" msgstr "Introduza os datos hexadecimais ou ASCII que desexa buscar" -#: ../src/findreplace.c:138 +#: ../src/findreplace.c:139 msgid "Find Next" msgstr "Buscar a seguinte" -#: ../src/findreplace.c:138 ../src/findreplace.c:412 +#: ../src/findreplace.c:139 ../src/findreplace.c:415 msgid "Finds the next occurrence of the search string" msgstr "Vai á seguinte coincidencia coa cadea de busca" -#: ../src/findreplace.c:139 +#: ../src/findreplace.c:140 msgid "Find previous" msgstr "Buscar a anterior" -#: ../src/findreplace.c:139 +#: ../src/findreplace.c:140 msgid "Finds the previous occurrence of the search string " msgstr "Vai á anterior coincidencia coa cadea de busca" -#: ../src/findreplace.c:140 ../src/findreplace.c:415 ../src/findreplace.c:463 +#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:469 msgid "Cancel" msgstr "Cancelar" -#: ../src/findreplace.c:140 +#: ../src/findreplace.c:141 msgid "Closes find data window" msgstr "Pecha a xanela de busca de datos" -#: ../src/findreplace.c:156 +#: ../src/findreplace.c:157 #, c-format msgid "GHex (%s): Find Data: Add search" msgstr "GHex (%s): Buscar os datos : Engadir busca" -#: ../src/findreplace.c:178 +#: ../src/findreplace.c:179 msgid "Add" msgstr "Engadir" -#: ../src/findreplace.c:234 +#: ../src/findreplace.c:235 msgid "Search String" msgstr "Buscar a cadea" -#: ../src/findreplace.c:242 +#: ../src/findreplace.c:243 msgid "Highlight Colour" msgstr "Cor de realce" -#: ../src/findreplace.c:279 +#: ../src/findreplace.c:280 msgid "_Add New" msgstr "Eng_adir un novo" -#: ../src/findreplace.c:288 +#: ../src/findreplace.c:289 msgid "_Remove Selected" msgstr "Elimina_ar a selección" -#: ../src/findreplace.c:308 ../src/ghex-ui.xml.h:8 +#: ../src/findreplace.c:309 msgid "Close" msgstr "Pechar" -#: ../src/findreplace.c:308 +#: ../src/findreplace.c:309 msgid "Closes advanced find window" msgstr "Pecha a xanela de busca avanzada" -#: ../src/findreplace.c:352 ../src/ui.c:964 +#: ../src/findreplace.c:355 ../src/ui.c:871 #, c-format msgid "GHex (%s): Find & Replace Data" msgstr "GHex (%s): Buscar e substituír datos" -#: ../src/findreplace.c:365 +#: ../src/findreplace.c:368 msgid "Replace With" msgstr "Substituír por" -#: ../src/findreplace.c:372 +#: ../src/findreplace.c:375 msgid "Find _next" msgstr "Buscar a segui_nte" -#: ../src/findreplace.c:380 +#: ../src/findreplace.c:383 msgid "_Replace" msgstr "Substituí_r" -#: ../src/findreplace.c:388 +#: ../src/findreplace.c:391 msgid "Replace _All" msgstr "Substituír _todo" -#: ../src/findreplace.c:411 +#: ../src/findreplace.c:414 msgid "Replace Data" msgstr "Substituír os datos" -#: ../src/findreplace.c:411 +#: ../src/findreplace.c:414 msgid "Enter the hex data or ASCII data to replace with" msgstr "" "Introduza os datos hexadecimais ou ASCII cos que desexa facer a substitución" -#: ../src/findreplace.c:412 +#: ../src/findreplace.c:415 msgid "Find next" msgstr "Buscar a seguinte" -#: ../src/findreplace.c:413 ../src/ghex-ui.xml.h:51 +#: ../src/findreplace.c:416 msgid "Replace" msgstr "Substituír" -#: ../src/findreplace.c:413 +#: ../src/findreplace.c:416 msgid "Replaces the search string with the replace string" msgstr "Substitúe a cadea de busca pola cadea substituta" -#: ../src/findreplace.c:414 +#: ../src/findreplace.c:417 msgid "Replace All" msgstr "Substituír todas" -#: ../src/findreplace.c:414 +#: ../src/findreplace.c:417 msgid "Replaces all occurrences of the search string with the replace string" msgstr "" "Substitúe todas as coincidencias coa cadea de busca pola cadea substituta" -#: ../src/findreplace.c:415 +#: ../src/findreplace.c:418 msgid "Closes find and replace data window" msgstr "Pecha a xanela de busca e substitución de datos" -#: ../src/findreplace.c:431 ../src/ui.c:962 +#: ../src/findreplace.c:434 ../src/ui.c:869 #, c-format msgid "GHex (%s): Jump To Byte" msgstr "GHex (%s): Ir ao byte" -#: ../src/findreplace.c:461 +#: ../src/findreplace.c:467 msgid "Jump to byte" msgstr "Ir ao byte" -#: ../src/findreplace.c:461 +#: ../src/findreplace.c:467 msgid "Enter the byte to jump to" msgstr "Introduza o byte ao que ir" -#: ../src/findreplace.c:462 +#: ../src/findreplace.c:468 msgid "OK" msgstr "Aceptar" -#: ../src/findreplace.c:462 +#: ../src/findreplace.c:468 msgid "Jumps to the specified byte" msgstr "Vai ao byte especificado" -#: ../src/findreplace.c:463 +#: ../src/findreplace.c:469 msgid "Closes jump to byte window" msgstr "Pecha a xanela de «Ir ao byte»" -#: ../src/findreplace.c:526 ../src/findreplace.c:560 ../src/findreplace.c:644 +#: ../src/findreplace.c:532 ../src/findreplace.c:566 ../src/findreplace.c:673 msgid "There is no active document to search!" msgstr "Non hai ningún documento activo para buscar" -#: ../src/findreplace.c:533 ../src/findreplace.c:567 ../src/findreplace.c:651 -#: ../src/findreplace.c:685 ../src/findreplace.c:730 +#: ../src/findreplace.c:539 ../src/findreplace.c:573 ../src/findreplace.c:680 +#: ../src/findreplace.c:714 ../src/findreplace.c:759 msgid "There is no string to search for!" msgstr "Non hai ningunha cadea para buscar" -#: ../src/findreplace.c:545 ../src/findreplace.c:660 ../src/findreplace.c:851 +#: ../src/findreplace.c:551 ../src/findreplace.c:689 ../src/findreplace.c:879 msgid "End Of File reached" msgstr "Alcanzouse o final do ficheiro" -#: ../src/findreplace.c:546 ../src/findreplace.c:579 ../src/findreplace.c:659 -#: ../src/findreplace.c:852 ../src/findreplace.c:875 +#: ../src/findreplace.c:552 ../src/findreplace.c:585 ../src/findreplace.c:688 +#: ../src/findreplace.c:880 ../src/findreplace.c:903 msgid "String was not found!\n" msgstr "Non foi posíbel encontrar a cadea\n" -#: ../src/findreplace.c:578 ../src/findreplace.c:874 +#: ../src/findreplace.c:584 ../src/findreplace.c:902 msgid "Beginning Of File reached" msgstr "Alcanzouse o inicio do ficheiro" -#: ../src/findreplace.c:594 +#: ../src/findreplace.c:601 msgid "There is no active document to move the cursor in!" msgstr "Non hai ningún documento activo no que mover o cursor" -#: ../src/findreplace.c:600 +#: ../src/findreplace.c:619 msgid "No offset has been specified!" msgstr "Non se indicou ningunha posición" -#: ../src/findreplace.c:624 +#: ../src/findreplace.c:644 +msgid "The specified offset is beyond the file boundaries!" +msgstr "O desprazamento especificado está fora dos límites do ficheiro" + +#: ../src/findreplace.c:652 msgid "Can not position cursor beyond the End Of File!" msgstr "Non é posíbel posicionar o cursor máis alá do final do ficheiro" -#: ../src/findreplace.c:631 +#: ../src/findreplace.c:659 msgid "" "You may only give the offset as:\n" " - a positive decimal number, or\n" -" - a hex number, beginning with '0x'" +" - a hex number, beginning with '0x', or\n" +" - a '+' or '-' sign, followed by a relative offset" msgstr "" -"Unicamente pode indicar a posición como:\n" +"Unicamente pode indicar o desprazamento como:\n" " - un número decimal positivo, ou\n" -" - un número hexadecimal que comece con «0x»" +" - un número hexadecimal que comece con «0x»\n" +" - un signo «+» o «-». seguido dun desplazamento relativo" -#: ../src/findreplace.c:676 +#: ../src/findreplace.c:705 msgid "There is no active buffer to replace data in!" msgstr "Non hai ningún buffer activo no que substituír os datos" -#: ../src/findreplace.c:701 ../src/findreplace.c:702 +#: ../src/findreplace.c:730 ../src/findreplace.c:731 msgid "End Of File reached!" msgstr "Alcanzouse o final do ficheiro" -#: ../src/findreplace.c:721 +#: ../src/findreplace.c:750 msgid "There is no active document to replace data in!" msgstr "Non hai ningún documento activo no que substituír os datos" -#: ../src/findreplace.c:751 +#: ../src/findreplace.c:780 msgid "No occurrences were found." msgstr "Non se encontraron coincidencias." -#: ../src/findreplace.c:754 +#: ../src/findreplace.c:783 #, c-format msgid "Replaced %d occurrence." msgid_plural "Replaced %d occurrences." msgstr[0] "Substituída %d coincidencia." msgstr[1] "Substituídas %d coincidencias." -#: ../src/findreplace.c:794 +#: ../src/findreplace.c:823 msgid "No string to search for!" msgstr "Non hai ningunha cadea para buscar" -#: ../src/ghex-ui.xml.h:1 -msgid "About this application" -msgstr "Sobre este aplicativo" - -#: ../src/ghex-ui.xml.h:2 -msgid "Add View" -msgstr "Engadir unha visulización" +#: ../src/ghex-window.c:75 +#, c-format +msgid "" +"Can not open URI:\n" +"%s" +msgstr "" +"Non é posíbel abrir o URI:\n" +"%s" -#: ../src/ghex-ui.xml.h:3 -msgid "Add a new view to the buffer" -msgstr "Engadir unha nova visualización ao buffer" +#: ../src/ghex-window.c:96 +#, c-format +msgid "" +"Can not open file:\n" +"%s" +msgstr "" +"Non é posíbel abrir o ficheiro:\n" +"%s" -#: ../src/ghex-ui.xml.h:4 -msgid "Advanced Find" -msgstr "Busca avanzada" +#: ../src/ghex-window.c:327 +msgid "_File" +msgstr "_Ficheiro" -#: ../src/ghex-ui.xml.h:5 -msgid "Bytes" -msgstr "Bytes" - -#: ../src/ghex-ui.xml.h:6 -msgid "Character Table..." -msgstr "Táboa de caracteres..." +#: ../src/ghex-window.c:328 +msgid "_Edit" +msgstr "_Editar" -#: ../src/ghex-ui.xml.h:7 -msgid "Character _Table" -msgstr "_Táboa de caracteres..." +#: ../src/ghex-window.c:329 +msgid "_View" +msgstr "_Visualización" -#: ../src/ghex-ui.xml.h:9 -msgid "Close the current file" -msgstr "Pechar o ficheiro actual" +#: ../src/ghex-window.c:330 +msgid "_Group Data As" +msgstr "A_grupar os datos como" -#: ../src/ghex-ui.xml.h:10 -msgid "Configure the application" -msgstr "Configurar o aplicativo" +#. View submenu +#: ../src/ghex-window.c:331 +msgid "_Windows" +msgstr "_Xanelas" -#: ../src/ghex-ui.xml.h:11 -msgid "Contents" -msgstr "Contidos" - -#: ../src/ghex-ui.xml.h:12 -msgid "Converter..." -msgstr "Con_versor..." - -#: ../src/ghex-ui.xml.h:13 -msgid "Copy" -msgstr "Copiar" +#: ../src/ghex-window.c:332 +msgid "_Help" +msgstr "_Axuda" -#: ../src/ghex-ui.xml.h:14 -msgid "Copy selection to clipboard" -msgstr "Copiar a selección ao portapapeis" +#. File menu +#: ../src/ghex-window.c:335 +msgid "_Open..." +msgstr "_Abrir..." -#: ../src/ghex-ui.xml.h:15 -msgid "Cu_t" -msgstr "Cor_tar" +#: ../src/ghex-window.c:336 +msgid "Open a file" +msgstr "Abrir un ficheiro" -#: ../src/ghex-ui.xml.h:16 -msgid "Cut" -msgstr "Cortar" +#: ../src/ghex-window.c:338 +msgid "_Save" +msgstr "_Gardar" -#: ../src/ghex-ui.xml.h:17 -msgid "Cut selection" -msgstr "Cortar a selección" +#: ../src/ghex-window.c:339 +msgid "Save the current file" +msgstr "Gardar o ficheiro actual" -#: ../src/ghex-ui.xml.h:18 -msgid "E_xit" -msgstr "_Saír" +#: ../src/ghex-window.c:341 +msgid "Save _As..." +msgstr "G_ardar como..." -#: ../src/ghex-ui.xml.h:19 -msgid "Exit" -msgstr "Saír" +#: ../src/ghex-window.c:342 +msgid "Save the current file with a different name" +msgstr "Gardar o ficheiro actual cun nome diferente" -#: ../src/ghex-ui.xml.h:20 -msgid "Exit the program" -msgstr "Saír do programa" +#: ../src/ghex-window.c:344 +msgid "Save As _HTML..." +msgstr "Gardar como _HTML..." -#: ../src/ghex-ui.xml.h:21 +#: ../src/ghex-window.c:345 msgid "Export data to HTML source" msgstr "Exportar os datos a código HTML" -#: ../src/ghex-ui.xml.h:22 -msgid "Export to HTML..." -msgstr "Exportar a HTML..." - -#: ../src/ghex-ui.xml.h:23 -msgid "Find" -msgstr "Buscar" - -#: ../src/ghex-ui.xml.h:24 -msgid "Goto Byte" -msgstr "Ir ao byte" - -#: ../src/ghex-ui.xml.h:25 -msgid "Group data by 16 bits" -msgstr "Agrupar os datos por 16 bits" - -#: ../src/ghex-ui.xml.h:26 -msgid "Group data by 32 bits" -msgstr "Agrupar os datos por 32 bits" - -#: ../src/ghex-ui.xml.h:27 -msgid "Group data by 8 bits" -msgstr "Agrupar os datos por 8 bits" - -#: ../src/ghex-ui.xml.h:28 -msgid "Help Chat" -msgstr "Conversa de axuda" - -#: ../src/ghex-ui.xml.h:29 -msgid "Help on this application" -msgstr "Axuda sobre este aplicativo" - -#: ../src/ghex-ui.xml.h:30 -msgid "Insert Mode" -msgstr "Modo inserir" - -#: ../src/ghex-ui.xml.h:31 -msgid "Insert/overwrite data" -msgstr "Inserir/sobrescribir datos" - -#: ../src/ghex-ui.xml.h:32 -msgid "Jump to a certain position" -msgstr "Ir a unha determinada posición" - -#: ../src/ghex-ui.xml.h:33 -msgid "Longwords" -msgstr "Palabras longas" - -#: ../src/ghex-ui.xml.h:34 -msgid "Open" -msgstr "Abrir" - -#: ../src/ghex-ui.xml.h:35 -msgid "Open a file" -msgstr "Abrir un ficheiro" - -#: ../src/ghex-ui.xml.h:36 -msgid "Open base conversion dialog" -msgstr "Abrir o diálogo de conversión base" +#: ../src/ghex-window.c:347 +msgid "_Revert" +msgstr "_Reverter" -#: ../src/ghex-ui.xml.h:37 -msgid "Pa_ste" -msgstr "_Pegar" +#: ../src/ghex-window.c:348 +msgid "Revert to a saved version of the file" +msgstr "Recuperar unha versión gardada do ficheiro" -#: ../src/ghex-ui.xml.h:38 -msgid "Paste" -msgstr "Pegar" +#: ../src/ghex-window.c:350 +msgid "_Print" +msgstr "Im_primir" -#: ../src/ghex-ui.xml.h:39 -msgid "Paste data from clipboard" -msgstr "Pegar os datos do portapapeis" +#: ../src/ghex-window.c:351 +msgid "Print the current file" +msgstr "Imprimir o ficheiro actual" -#: ../src/ghex-ui.xml.h:40 -msgid "Preferences" -msgstr "Preferencias" +#: ../src/ghex-window.c:353 +msgid "Print Previe_w..." +msgstr "Imprimir a pre_visualización..." -#: ../src/ghex-ui.xml.h:41 +#: ../src/ghex-window.c:354 msgid "Preview printed data" msgstr "Previsualizar os datos para imprimir" -#: ../src/ghex-ui.xml.h:42 -msgid "Print" -msgstr "Imprimir" +#: ../src/ghex-window.c:356 +msgid "_Close" +msgstr "Pe_char" + +#: ../src/ghex-window.c:357 +msgid "Close the current file" +msgstr "Pechar o ficheiro actual" -#: ../src/ghex-ui.xml.h:43 -msgid "Print Previe_w..." -msgstr "Imprimir a pre_visualización..." +#: ../src/ghex-window.c:359 +msgid "E_xit" +msgstr "_Saír" -#: ../src/ghex-ui.xml.h:44 -msgid "Print Preview..." -msgstr "Imprimir a previsualización..." +#: ../src/ghex-window.c:360 +msgid "Exit the program" +msgstr "Saír do programa" -#: ../src/ghex-ui.xml.h:45 -msgid "Print the current file" -msgstr "Imprimir o ficheiro actual" +#. Edit menu +#: ../src/ghex-window.c:364 +msgid "_Undo" +msgstr "_Desfacer" -#: ../src/ghex-ui.xml.h:46 -msgid "R_eplace" -msgstr "_Substituír" +#: ../src/ghex-window.c:365 +msgid "Undo the last action" +msgstr "Desfacer a última acción" -#: ../src/ghex-ui.xml.h:47 -msgid "Redo" -msgstr "Refacer" +#: ../src/ghex-window.c:367 +msgid "_Redo" +msgstr "_Refacer" -#: ../src/ghex-ui.xml.h:48 +#: ../src/ghex-window.c:368 msgid "Redo the undone action" msgstr "Refacer a acción desfeita" -#: ../src/ghex-ui.xml.h:49 -msgid "Remove View" -msgstr "Eliminar a visualización" - -#: ../src/ghex-ui.xml.h:50 -msgid "Remove the current view of the buffer" -msgstr "Eliminar a vista actual do buffer" - -#: ../src/ghex-ui.xml.h:52 -msgid "Replace a string" -msgstr "Substituír unha cadea" - -#: ../src/ghex-ui.xml.h:53 -msgid "Revert" -msgstr "Reverter" +#: ../src/ghex-window.c:370 +msgid "_Copy" +msgstr "_Copiar" -#: ../src/ghex-ui.xml.h:54 -msgid "Revert to a saved version of the file" -msgstr "Recuperar unha versión gardada do ficheiro" +#: ../src/ghex-window.c:371 +msgid "Copy selection to clipboard" +msgstr "Copiar a selección ao portapapeis" -#: ../src/ghex-ui.xml.h:55 -msgid "Save" -msgstr "Gardar" - -#: ../src/ghex-ui.xml.h:56 -msgid "Save As" -msgstr "Gardar como" +#: ../src/ghex-window.c:373 +msgid "Cu_t" +msgstr "Cor_tar" -#: ../src/ghex-ui.xml.h:57 -msgid "Save As _HTML..." -msgstr "Gardar como _HTML..." +#: ../src/ghex-window.c:374 +msgid "Cut selection" +msgstr "Cortar a selección" -#: ../src/ghex-ui.xml.h:58 -msgid "Save _As..." -msgstr "G_ardar como..." +#: ../src/ghex-window.c:376 +msgid "Pa_ste" +msgstr "_Pegar" -#: ../src/ghex-ui.xml.h:59 -msgid "Save the current file" -msgstr "Gardar o ficheiro actual" +#: ../src/ghex-window.c:377 +msgid "Paste data from clipboard" +msgstr "Pegar os datos do portapapeis" -#: ../src/ghex-ui.xml.h:60 -msgid "Save the current file with a different name" -msgstr "Gardar o ficheiro actual cun nome diferente" +#: ../src/ghex-window.c:379 +msgid "_Find" +msgstr "_Buscar" -#: ../src/ghex-ui.xml.h:61 +#: ../src/ghex-window.c:380 msgid "Search for a string" msgstr "Buscar unha cadea" -#: ../src/ghex-ui.xml.h:62 -msgid "Show the character table" -msgstr "Mostrar a táboa de caracteres" +#: ../src/ghex-window.c:382 +msgid "_Advanced Find" +msgstr "Busca _avanzada" -#: ../src/ghex-ui.xml.h:63 -msgid "Show the type conversion dialog in the edit window" -msgstr "Mostrar na xanela de edición o diálogo sobre o tipo de conversión" +#: ../src/ghex-window.c:383 +msgid "Advanced Find" +msgstr "Busca avanzada" -#: ../src/ghex-ui.xml.h:64 -msgid "Type Conversion Dialog..." -msgstr "Diálogo sobre o tipo de conversión..." +#: ../src/ghex-window.c:385 +msgid "R_eplace" +msgstr "_Substituír" -#: ../src/ghex-ui.xml.h:65 -msgid "Type Conversion _Dialog" -msgstr "Diálogo sobre o tipo _de conversión" +#: ../src/ghex-window.c:386 +msgid "Replace a string" +msgstr "Substituír unha cadea" -#: ../src/ghex-ui.xml.h:66 -msgid "Undo" -msgstr "Desfacer" +#: ../src/ghex-window.c:388 +msgid "_Goto Byte..." +msgstr "_Ir ao byte..." -#: ../src/ghex-ui.xml.h:67 -msgid "Undo the last action" -msgstr "Desfacer a última acción" +#: ../src/ghex-window.c:389 +msgid "Jump to a certain position" +msgstr "Ir a unha determinada posición" -#: ../src/ghex-ui.xml.h:68 -msgid "Words" -msgstr "Palabras" +#: ../src/ghex-window.c:391 +msgid "_Preferences" +msgstr "_Preferencias" -#: ../src/ghex-ui.xml.h:69 -msgid "_About" -msgstr "_Sobre" +#: ../src/ghex-window.c:392 +msgid "Configure the application" +msgstr "Configurar o aplicativo" -#: ../src/ghex-ui.xml.h:70 +#. View menu +#: ../src/ghex-window.c:396 msgid "_Add View" msgstr "_Engadir unha visualización" -#: ../src/ghex-ui.xml.h:71 -msgid "_Advanced Find" -msgstr "Busca _avanzada" - -#: ../src/ghex-ui.xml.h:72 -msgid "_Base Converter" -msgstr "Conversor _base" +#: ../src/ghex-window.c:397 +msgid "Add a new view to the buffer" +msgstr "Engadir unha nova visualización ao buffer" -#: ../src/ghex-ui.xml.h:73 ../src/ui.c:87 -msgid "_Bytes" -msgstr "_Bytes" +#: ../src/ghex-window.c:399 +msgid "_Remove View" +msgstr "Elimina_r a visualización" -#: ../src/ghex-ui.xml.h:74 -msgid "_Close" -msgstr "Pe_char" +#: ../src/ghex-window.c:400 +msgid "Remove the current view of the buffer" +msgstr "Eliminar a vista actual do buffer" -#: ../src/ghex-ui.xml.h:75 +#. Help menu +#: ../src/ghex-window.c:404 msgid "_Contents" msgstr "_Contidos" -#: ../src/ghex-ui.xml.h:76 -msgid "_Copy" -msgstr "_Copiar" - -#: ../src/ghex-ui.xml.h:77 -msgid "_Edit" -msgstr "_Editar" - -#: ../src/ghex-ui.xml.h:78 -msgid "_File" -msgstr "_Ficheiro" - -#: ../src/ghex-ui.xml.h:79 -msgid "_Find" -msgstr "_Buscar" - -#: ../src/ghex-ui.xml.h:80 -msgid "_Goto Byte..." -msgstr "_Ir ao byte..." +#: ../src/ghex-window.c:405 +msgid "Help on this application" +msgstr "Axuda sobre este aplicativo" -#: ../src/ghex-ui.xml.h:81 -msgid "_Group Data As" -msgstr "A_grupar os datos como" +#: ../src/ghex-window.c:407 +msgid "_About" +msgstr "_Sobre" -#: ../src/ghex-ui.xml.h:82 -msgid "_Help" -msgstr "_Axuda" +#: ../src/ghex-window.c:408 +msgid "About this application" +msgstr "Sobre este aplicativo" -#: ../src/ghex-ui.xml.h:83 +#. Edit menu +#: ../src/ghex-window.c:415 msgid "_Insert Mode" msgstr "Modo in_serir" -#: ../src/ghex-ui.xml.h:84 ../src/ui.c:89 -msgid "_Longwords" -msgstr "Palabras _longas" - -#: ../src/ghex-ui.xml.h:85 -msgid "_Open..." -msgstr "_Abrir..." - -#: ../src/ghex-ui.xml.h:86 -msgid "_Preferences" -msgstr "_Preferencias" +#: ../src/ghex-window.c:416 +msgid "Insert/overwrite data" +msgstr "Inserir/sobrescribir datos" -#: ../src/ghex-ui.xml.h:87 -msgid "_Print" -msgstr "Im_primir" +#. Windows menu +#: ../src/ghex-window.c:420 +msgid "Character _Table" +msgstr "_Táboa de caracteres..." -#: ../src/ghex-ui.xml.h:88 -msgid "_Redo" -msgstr "_Refacer" +#: ../src/ghex-window.c:421 +msgid "Show the character table" +msgstr "Mostrar a táboa de caracteres" -#: ../src/ghex-ui.xml.h:89 -msgid "_Remove View" -msgstr "Elimina_r a visualización" +#: ../src/ghex-window.c:423 +msgid "_Base Converter" +msgstr "Conversor _base" -#: ../src/ghex-ui.xml.h:90 -msgid "_Revert" -msgstr "_Reverter" +#: ../src/ghex-window.c:424 +msgid "Open base conversion dialog" +msgstr "Abrir o diálogo de conversión base" -#: ../src/ghex-ui.xml.h:91 -msgid "_Save" -msgstr "_Gardar" +#: ../src/ghex-window.c:426 +msgid "Type Conversion _Dialog" +msgstr "Diálogo sobre o tipo _de conversión" -#: ../src/ghex-ui.xml.h:92 -msgid "_Undo" -msgstr "_Desfacer" +#: ../src/ghex-window.c:427 +msgid "Show the type conversion dialog in the edit window" +msgstr "Mostrar na xanela de edición o diálogo sobre o tipo de conversión" -#: ../src/ghex-ui.xml.h:93 -msgid "_View" -msgstr "_Visualización" +#: ../src/ghex-window.c:433 ../src/ui.c:48 +msgid "_Bytes" +msgstr "_Bytes" -#: ../src/ghex-ui.xml.h:94 -msgid "_Windows" -msgstr "_Xanelas" +#: ../src/ghex-window.c:434 +msgid "Group data by 8 bits" +msgstr "Agrupar os datos por 8 bits" -#: ../src/ghex-ui.xml.h:95 ../src/ui.c:88 +#: ../src/ghex-window.c:435 ../src/ui.c:49 msgid "_Words" msgstr "_Palabras" -#: ../src/ghex-window.c:91 -#, c-format -msgid "" -"Can not open URI:\n" -"%s" -msgstr "" -"Non é posíbel abrir o URI:\n" -"%s" +#: ../src/ghex-window.c:436 +msgid "Group data by 16 bits" +msgstr "Agrupar os datos por 16 bits" -#: ../src/ghex-window.c:110 -#, c-format -msgid "" -"Can not open file:\n" -"%s" -msgstr "" -"Non é posíbel abrir o ficheiro:\n" -"%s" +#: ../src/ghex-window.c:437 ../src/ui.c:50 +msgid "_Longwords" +msgstr "Palabras _longas" + +#: ../src/ghex-window.c:438 +msgid "Group data by 32 bits" +msgstr "Agrupar os datos por 32 bits" -#: ../src/ghex-window.c:644 +#: ../src/ghex-window.c:769 #, c-format msgid "Offset: %s" msgstr "Posición: %s" -#: ../src/ghex-window.c:647 +#: ../src/ghex-window.c:772 #, c-format msgid "; %s bytes from %s to %s selected" msgstr "; seleccionados %s bytes desde %s até %s" -#: ../src/ghex-window.c:899 +#: ../src/ghex-window.c:1044 #, c-format msgid "Activate file %s" msgstr "Activar o ficheiro %s" -#: ../src/ghex-window.c:941 +#: ../src/ghex-window.c:1080 #, c-format msgid "%s - GHex" msgstr "%s - GHex" -#: ../src/ghex-window.c:1070 +#: ../src/ghex-window.c:1206 msgid "Select a file to save buffer as" msgstr "Indicar un ficheiro no que gardar o buffer como" -#: ../src/ghex-window.c:1126 +#: ../src/ghex-window.c:1238 #, c-format msgid "" "File %s exists.\n" @@ -756,20 +664,20 @@ "O ficheiro %s xa existe.\n" "Desexa sobrescribilo?" -#: ../src/ghex-window.c:1159 ../src/ui.c:381 +#: ../src/ghex-window.c:1264 ../src/ui.c:300 #, c-format msgid "Saved buffer to file %s" msgstr "O buffer gardouse no ficheiro %s" -#: ../src/ghex-window.c:1165 +#: ../src/ghex-window.c:1271 msgid "Error saving file!" msgstr "Produciuse un erro ao gardar o ficheiro" -#: ../src/ghex-window.c:1171 +#: ../src/ghex-window.c:1277 msgid "Can't open file for writing!" msgstr "Non é posíbel abrir o ficheiro para escribir" -#: ../src/ghex-window.c:1216 +#: ../src/ghex-window.c:1322 #, c-format msgid "" "File %s has changed since last save.\n" @@ -778,143 +686,49 @@ "O ficheiro %s foi modificado desde a última gravación.\n" "Desexa gardar os cambios?" -#: ../src/ghex-window.c:1220 +#: ../src/ghex-window.c:1326 msgid "Do_n't save" msgstr "No_n gardar" -#: ../src/ghex-window.c:1240 ../src/ui.c:369 +#: ../src/ghex-window.c:1346 ../src/ui.c:288 msgid "You don't have the permissions to save the file!" msgstr "Non ten permisos para gardar o ficheiro" -#: ../src/ghex-window.c:1244 ../src/ui.c:374 +#: ../src/ghex-window.c:1350 ../src/ui.c:293 msgid "An error occurred while saving file!" msgstr "Produciuse un erro ao gardar o ficheiro" -#: ../src/gnome-print-font-dialog.c:102 -msgid "_Insert a new preview phrase." -msgstr "_Inserir unha nova frase para previsualizar." - -#: ../src/gnome-print-font-dialog.c:108 -msgid "Modify preview phrase..." -msgstr "Modificar a frase de previsualización..." - -#: ../src/gnome-print-font-dialog.c:162 -msgid "Preview" -msgstr "Previsualización" - -#: ../src/gnome-print-font-dialog.c:175 -msgid "_Modify preview phrase..." -msgstr "_Modificar a frase de previsualización..." - -#: ../src/gnome-print-font-dialog.c:238 -msgid "Font Selection" -msgstr "Selección do tipo de letra" - -#: ../src/gnome-print-font-picker.c:76 -msgid "Sans Regular 12" -msgstr "Sans Regular 12" - -#: ../src/gnome-print-font-picker.c:77 -msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz" -msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz" - -#: ../src/gnome-print-font-picker.c:78 -msgid "Pick a Font" -msgstr "Escoller un tipo de letra" - -#: ../src/gnome-print-font-picker.c:162 -msgid "Title" -msgstr "Título" - -#: ../src/gnome-print-font-picker.c:163 -msgid "The title of the selection dialog box" -msgstr "O título do diálogo de selección" - -#: ../src/gnome-print-font-picker.c:183 -msgid "Font name" -msgstr "Nome do tipo de letra" - -#: ../src/gnome-print-font-picker.c:184 -msgid "Name of the selected font" -msgstr "Nome do tipo de letra seleccionado" - -#: ../src/gnome-print-font-picker.c:192 -msgid "Preview text" -msgstr "Previsualizar o texto" - -#: ../src/gnome-print-font-picker.c:193 -msgid "Preview text shown in the dialog" -msgstr "Texto de previsualización mostrado no diálogo" - -#: ../src/gnome-print-font-picker.c:201 -msgid "Use font in label" -msgstr "Usar o tipo de letra na etiqueta" - -#: ../src/gnome-print-font-picker.c:202 -msgid "Use font in the label in font info mode" -msgstr "" -"Usar o tipo de letra na etiqueta no modo de información sobre tipo de letra" - -#: ../src/gnome-print-font-picker.c:210 -msgid "Font size for label" -msgstr "Tamaño do tipo de letra para a etiqueta" - -#: ../src/gnome-print-font-picker.c:211 -msgid "Font size for label in font info mode" -msgstr "" -"Tamaño do tipo de letra para a etiqueta no modo de información sobre tipo de " -"letra" - -#: ../src/gnome-print-font-picker.c:221 -msgid "Show size" -msgstr "Mostrar o tamaño" - -#: ../src/gnome-print-font-picker.c:222 -msgid "Show size in font info mode" -msgstr "Mostrar o tamaño no modo informativo" - -#. display font -#: ../src/gnome-print-font-picker.c:1003 ../src/preferences.c:183 -msgid "Font" -msgstr "Tipo de letra" - #: ../src/hex-dialog.c:58 -#, fuzzy msgid "Signed 8 bit:" msgstr "8 bits con signo:" #: ../src/hex-dialog.c:59 -#, fuzzy msgid "Unsigned 8 bit:" msgstr "8 bits sen signo:" #: ../src/hex-dialog.c:60 -#, fuzzy msgid "Signed 16 bit:" msgstr "16 bits con signo:" #: ../src/hex-dialog.c:61 -#, fuzzy msgid "Unsigned 16 bit:" msgstr "16 bits sen signo:" #: ../src/hex-dialog.c:62 -#, fuzzy msgid "Signed 32 bit:" msgstr "32 bits con signo:" #: ../src/hex-dialog.c:63 -#, fuzzy msgid "Unsigned 32 bit:" msgstr "32 bits sen signo:" #: ../src/hex-dialog.c:64 -msgid "32 bit float:" -msgstr "" +msgid "Float 32 bit:" +msgstr "32 bits en coma flotante:" #: ../src/hex-dialog.c:65 -msgid "64 bit float:" -msgstr "" +msgid "Float 64 bit:" +msgstr "64 bits en coma flotante:" #: ../src/hex-dialog.c:66 msgid "Hexadecimal:" @@ -928,68 +742,67 @@ msgid "Binary:" msgstr "Binario:" -#: ../src/hex-dialog.c:197 -#, fuzzy +#: ../src/hex-dialog.c:204 msgid "Show little endian decoding" -msgstr "Mostrar a decodificación «little endian»" +msgstr "Mostrar decodificación «little endian»" -#: ../src/hex-dialog.c:204 +#: ../src/hex-dialog.c:211 msgid "Show unsigned and float as hexadecimal" -msgstr "" +msgstr "Mostrar unsigned e float como hexadecimal" -#: ../src/hex-dialog.c:210 +#: ../src/hex-dialog.c:217 msgid "Stream Length:" msgstr "Lonxitude da serie:" -#: ../src/hex-dialog.c:232 +#: ../src/hex-dialog.c:239 msgid "FIXME: no conversion function" msgstr "FIXME: non hai función de conversión" -#: ../src/hex-document.c:436 +#: ../src/hex-document.c:435 msgid "New document" msgstr "Novo documento" -#: ../src/hex-document.c:790 +#: ../src/hex-document.c:784 #, c-format msgid "Page" msgstr "Páxina" -#: ../src/hex-document.c:796 ../src/hex-document.c:921 +#: ../src/hex-document.c:790 ../src/hex-document.c:915 #, c-format msgid "Hex dump generated by" msgstr "Emborcado hexadecimal xerado por" -#: ../src/hex-document.c:807 +#: ../src/hex-document.c:801 msgid "Saving to HTML..." msgstr "Gardando como _HTML..." -#: ../src/hex-document.c:844 +#: ../src/hex-document.c:838 #, c-format msgid "Previous page" msgstr "Páxina anterior" -#: ../src/hex-document.c:859 +#: ../src/hex-document.c:853 #, c-format msgid "Next page" msgstr "Páxina seguinte" -#: ../src/main.c:35 +#: ../src/main.c:36 msgid "X geometry specification (see \"X\" man page)." msgstr "Especificación de xeometría X (vexa a páxina de axuda de «X»)" -#: ../src/main.c:35 +#: ../src/main.c:36 msgid "GEOMETRY" msgstr "XEOMETRÍA" -#: ../src/main.c:36 +#: ../src/main.c:37 msgid "FILES" msgstr "FICHEIROS" -#: ../src/main.c:52 +#: ../src/main.c:53 msgid "- GTK+ binary editor" msgstr "- Editor binario GTK+" -#: ../src/main.c:56 +#: ../src/main.c:57 #, c-format msgid "" "%s\n" @@ -999,124 +812,125 @@ "Execute «%s --help» para ver unha lista completa das opcións por liña de " "ordes.\n" -#: ../src/main.c:73 -msgid "Could not initialize Bonobo!\n" -msgstr "Non foi posíbel iniciar Bonobo\n" - -#: ../src/main.c:83 ../src/main.c:96 +#: ../src/main.c:80 ../src/main.c:93 #, c-format msgid "Invalid geometry string \"%s\"\n" msgstr "A xeometría da cadea «%s» non é correcta\n" -#: ../src/preferences.c:72 +#: ../src/preferences.c:69 msgid "GHex Preferences" msgstr "Preferencias de GHex" -#: ../src/preferences.c:104 +#: ../src/preferences.c:101 msgid "_Maximum number of undo levels:" msgstr "Número máximo de niveles a desfacer" -#: ../src/preferences.c:124 +#: ../src/preferences.c:121 msgid "Undo levels" msgstr "Niveis a desfacer" -#: ../src/preferences.c:124 +#: ../src/preferences.c:121 msgid "Select maximum number of undo levels" msgstr "Seleccionar o número máximo de niveis a desfacer" -#: ../src/preferences.c:128 +#: ../src/preferences.c:125 msgid "_Show cursor offset in statusbar as:" msgstr "Mostrar a posición do cursor na barra de estado como:" -#: ../src/preferences.c:147 +#: ../src/preferences.c:144 msgid "Hexadecimal" msgstr "Hexadecimal" -#: ../src/preferences.c:149 +#: ../src/preferences.c:146 msgid "Custom" msgstr "Personalizado" -#: ../src/preferences.c:158 +#: ../src/preferences.c:155 msgid "Enter the cursor offset format" msgstr "Introducir o formato da posición do cursor" -#: ../src/preferences.c:159 +#: ../src/preferences.c:156 msgid "Select the cursor offset format" msgstr "Seleccionar o formato de posición do cursor" #. show offsets check button -#: ../src/preferences.c:169 +#: ../src/preferences.c:166 msgid "Sh_ow offsets column" msgstr "M_ostrar a columna de posicións" -#: ../src/preferences.c:174 +#: ../src/preferences.c:171 msgid "Editing" msgstr "Edición" +#. display font +#: ../src/preferences.c:180 +msgid "Font" +msgstr "Tipo de letra" + #. default group type -#: ../src/preferences.c:206 +#: ../src/preferences.c:203 msgid "Default Group Type" msgstr "Tipo de agrupamento por defecto" -#: ../src/preferences.c:222 +#: ../src/preferences.c:219 msgid "Display" msgstr "Visualización" #. paper selection -#: ../src/preferences.c:231 +#: ../src/preferences.c:228 msgid "Paper size" msgstr "Tamaño do papel" #. data & header font selection -#: ../src/preferences.c:236 +#: ../src/preferences.c:233 msgid "Fonts" msgstr "Tipos de letra" -#: ../src/preferences.c:242 +#: ../src/preferences.c:245 msgid "_Data font:" msgstr "Tipo de letra dos _datos:" -#: ../src/preferences.c:261 +#: ../src/preferences.c:259 msgid "Data font" msgstr "TIpo de letra dos datos" -#: ../src/preferences.c:261 +#: ../src/preferences.c:259 msgid "Select the data font" msgstr "Seleccionar o tipo de letra dos datos" -#: ../src/preferences.c:275 +#: ../src/preferences.c:268 msgid "Header fo_nt:" msgstr "Tipo de letra da cabeceira" -#: ../src/preferences.c:293 +#: ../src/preferences.c:281 msgid "Header font" msgstr "Tipo de letra da cabeceira" -#: ../src/preferences.c:293 +#: ../src/preferences.c:281 msgid "Select the header font" msgstr "Seleccionar o tipo de letra da cabeceira" -#: ../src/preferences.c:319 +#: ../src/preferences.c:306 msgid "_Print shaded box over:" -msgstr "" +msgstr "Sobreim_primir un recadro sombreado:" -#: ../src/preferences.c:331 +#: ../src/preferences.c:318 msgid "Box size" msgstr "Tamaño da caixa" -#: ../src/preferences.c:331 +#: ../src/preferences.c:318 msgid "Select size of box (in number of lines)" msgstr "Seleccionar o tamaño da caixa (en número de liñas)" -#: ../src/preferences.c:335 +#: ../src/preferences.c:322 msgid "lines (0 for no box)" msgstr "liñas (0 para que non haxa caixa)" -#: ../src/preferences.c:342 +#: ../src/preferences.c:329 msgid "Printing" msgstr "Impresión" -#: ../src/preferences.c:464 ../src/ui.c:295 +#: ../src/preferences.c:447 ../src/ui.c:209 #, c-format msgid "" "There was an error displaying help: \n" @@ -1125,11 +939,11 @@ "Produciuse un erro mostrando a axuda: \n" "%s" -#: ../src/preferences.c:517 +#: ../src/preferences.c:499 msgid "Can not open desired font!" msgstr "Non é posíbel abrir o tipo de letra desexado" -#: ../src/preferences.c:580 +#: ../src/preferences.c:560 msgid "" "The offset format string contains invalid format specifier.\n" "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed." @@ -1137,37 +951,20 @@ "A cadea de formato da posición contén un indicador de formato incorrecto.\n" "Só se permiten 'x', 'X', 'p', 'P', 'd' e 'o'." -#: ../src/print.c:67 +#: ../src/print.c:57 #, c-format msgid "Page: %i/%i" msgstr "Páxina: %i/%i" -#: ../src/print.c:223 ../src/print.c:239 -#, c-format -msgid "" -"GHex could not find the font \"%s\".\n" -"GHex is unable to print without this font installed." -msgstr "" -"GHex non puido atopar o tipo de letra «%s».\n" -"Non é posíbel imprimir sen ese tipo de letra instalado." - -#: ../src/ui.c:94 +#: ../src/ui.c:55 msgid "hex data" msgstr "datos hexadecimais" -#: ../src/ui.c:95 +#: ../src/ui.c:56 msgid "ASCII data" msgstr "datos ASCII" -#: ../src/ui.c:238 -msgid "" -"Copyright © 1998 - 2006 Jaka Močnik\n" -"Copyright © 2006 - 2010 GHex Contributors" -msgstr "" -"Copyright © 1998 - 2006 Jaka Močnik\n" -"Copyright © 2006 - 2010 GHex Contributors" - -#: ../src/ui.c:245 +#: ../src/ui.c:150 msgid "" "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 " @@ -1179,7 +976,7 @@ "Foundation; xa sexa a versión 2, ou (á súa elección) calquera versión " "posterior." -#: ../src/ui.c:249 +#: ../src/ui.c:154 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -1191,7 +988,7 @@ "PARA UN PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública " "xeral GNU." -#: ../src/ui.c:253 +#: ../src/ui.c:158 msgid "" "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., 51 " @@ -1201,48 +998,54 @@ "programa, se non é así, escriba á Free Software Foundation, Inc, 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-1301 EE. UU." -#: ../src/ui.c:265 +#. Translators: these two strings here indicate the copyright time span, +#. e.g. 1998-2012. +#: ../src/ui.c:170 +msgid "Copyright © %Id–%Id The GHex authors" +msgstr "Copyright © %Id–%Id Os autores de GHex" + +#: ../src/ui.c:174 msgid "A binary file editor" msgstr "Un editor de ficheiros binarios" -#: ../src/ui.c:271 +#: ../src/ui.c:180 msgid "About GHex" msgstr "Sobre GHex" -#: ../src/ui.c:272 +#: ../src/ui.c:181 msgid "translator-credits" msgstr "Marcos Lans , 2010; " -#: ../src/ui.c:275 +#: ../src/ui.c:184 msgid "GHex Website" msgstr "Sitio web de GHex" -#: ../src/ui.c:398 +#: ../src/ui.c:318 msgid "Select a file to open" msgstr "Seleccionar un ficheiro para abrir" -#: ../src/ui.c:429 +#: ../src/ui.c:349 #, c-format msgid "Loaded file %s" msgstr "Cargouse o ficheiro %s" -#: ../src/ui.c:437 +#: ../src/ui.c:357 msgid "Can not open file!" msgstr "Non é posíbel abrir o ficheiro" -#: ../src/ui.c:498 +#: ../src/ui.c:422 msgid "Select path and file name for the HTML source" msgstr "Seleccionar o camiño e o nome do ficheiro para o código HTML" -#: ../src/ui.c:532 +#: ../src/ui.c:454 msgid "You need to specify a base name for the HTML files." msgstr "Indique o nome base para os ficheiros HTML." -#: ../src/ui.c:543 ../src/ui.c:567 +#: ../src/ui.c:465 ../src/ui.c:491 msgid "You don't have the permission to write to the selected path.\n" msgstr "Non ten permisos para escribir no camiño seleccionado.\n" -#: ../src/ui.c:554 +#: ../src/ui.c:477 msgid "" "Saving to HTML will overwrite some files.\n" "Do you want to proceed?" @@ -1250,32 +1053,189 @@ "Se o garda como HTML sobrescribirá algúns ficheiros.\n" "Desexa continuar?" -#: ../src/ui.c:707 +#: ../src/ui.c:745 #, c-format msgid "Really revert file %s?" msgstr "Desexa reverter realmente o ficheiro %s?" -#: ../src/ui.c:721 +#: ../src/ui.c:759 #, c-format msgid "Reverted buffer from file %s" msgstr "Reverteuse o buffer do ficheiro %s" -#: ../src/ui.c:805 -msgid "Printing file..." -msgstr "Imprimindo o ficheiro..." - -#: ../src/ui.c:865 -msgid "Print Hex Document" -msgstr "Imprimir documento hexadecimal" - -#: ../src/ui.c:877 -msgid "Pages" -msgstr "Páxinas" +#~ msgid "Add View" +#~ msgstr "Engadir unha visulización" -#: ../src/ui.c:902 -#, c-format -msgid "GHex (%s): Print Preview" -msgstr "GHex (%s): Previsualización da impresión" +#~ msgid "Bytes" +#~ msgstr "Bytes" + +#~ msgid "Character Table..." +#~ msgstr "Táboa de caracteres..." + +#~ msgid "Contents" +#~ msgstr "Contidos" + +#~ msgid "Converter..." +#~ msgstr "Con_versor..." + +#~ msgid "Copy" +#~ msgstr "Copiar" + +#~ msgid "Cut" +#~ msgstr "Cortar" + +#~ msgid "Exit" +#~ msgstr "Saír" + +#~ msgid "Export to HTML..." +#~ msgstr "Exportar a HTML..." + +#~ msgid "Find" +#~ msgstr "Buscar" + +#~ msgid "Goto Byte" +#~ msgstr "Ir ao byte" + +#~ msgid "Help Chat" +#~ msgstr "Conversa de axuda" + +#~ msgid "Insert Mode" +#~ msgstr "Modo inserir" + +#~ msgid "Longwords" +#~ msgstr "Palabras longas" + +#~ msgid "Open" +#~ msgstr "Abrir" + +#~ msgid "Paste" +#~ msgstr "Pegar" + +#~ msgid "Preferences" +#~ msgstr "Preferencias" + +#~ msgid "Print" +#~ msgstr "Imprimir" + +#~ msgid "Print Preview..." +#~ msgstr "Imprimir a previsualización..." + +#~ msgid "Redo" +#~ msgstr "Refacer" + +#~ msgid "Remove View" +#~ msgstr "Eliminar a visualización" + +#~ msgid "Revert" +#~ msgstr "Reverter" + +#~ msgid "Save" +#~ msgstr "Gardar" + +#~ msgid "Save As" +#~ msgstr "Gardar como" + +#~ msgid "Type Conversion Dialog..." +#~ msgstr "Diálogo sobre o tipo de conversión..." + +#~ msgid "Undo" +#~ msgstr "Desfacer" + +#~ msgid "Words" +#~ msgstr "Palabras" + +#~ msgid "_Insert a new preview phrase." +#~ msgstr "_Inserir unha nova frase para previsualizar." + +#~ msgid "Modify preview phrase..." +#~ msgstr "Modificar a frase de previsualización..." + +#~ msgid "Preview" +#~ msgstr "Previsualización" + +#~ msgid "_Modify preview phrase..." +#~ msgstr "_Modificar a frase de previsualización..." + +#~ msgid "Font Selection" +#~ msgstr "Selección do tipo de letra" + +#~ msgid "Sans Regular 12" +#~ msgstr "Sans Regular 12" + +#~ msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz" +#~ msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz" + +#~ msgid "Pick a Font" +#~ msgstr "Escoller un tipo de letra" + +#~ msgid "Title" +#~ msgstr "Título" + +#~ msgid "The title of the selection dialog box" +#~ msgstr "O título do diálogo de selección" + +#~ msgid "Font name" +#~ msgstr "Nome do tipo de letra" + +#~ msgid "Name of the selected font" +#~ msgstr "Nome do tipo de letra seleccionado" + +#~ msgid "Preview text" +#~ msgstr "Previsualizar o texto" + +#~ msgid "Preview text shown in the dialog" +#~ msgstr "Texto de previsualización mostrado no diálogo" + +#~ msgid "Use font in label" +#~ msgstr "Usar o tipo de letra na etiqueta" + +#~ msgid "Use font in the label in font info mode" +#~ msgstr "" +#~ "Usar o tipo de letra na etiqueta no modo de información sobre tipo de " +#~ "letra" + +#~ msgid "Font size for label" +#~ msgstr "Tamaño do tipo de letra para a etiqueta" + +#~ msgid "Font size for label in font info mode" +#~ msgstr "" +#~ "Tamaño do tipo de letra para a etiqueta no modo de información sobre tipo " +#~ "de letra" + +#~ msgid "Show size" +#~ msgstr "Mostrar o tamaño" + +#~ msgid "Show size in font info mode" +#~ msgstr "Mostrar o tamaño no modo informativo" + +#~ msgid "Could not initialize Bonobo!\n" +#~ msgstr "Non foi posíbel iniciar Bonobo\n" + +#~ msgid "" +#~ "GHex could not find the font \"%s\".\n" +#~ "GHex is unable to print without this font installed." +#~ msgstr "" +#~ "GHex non puido atopar o tipo de letra «%s».\n" +#~ "Non é posíbel imprimir sen ese tipo de letra instalado." + +#~ msgid "" +#~ "Copyright © 1998 - 2006 Jaka Močnik\n" +#~ "Copyright © 2006 - 2010 GHex Contributors" +#~ msgstr "" +#~ "Copyright © 1998 - 2006 Jaka Močnik\n" +#~ "Copyright © 2006 - 2010 GHex Contributors" + +#~ msgid "Printing file..." +#~ msgstr "Imprimindo o ficheiro..." + +#~ msgid "Print Hex Document" +#~ msgstr "Imprimir documento hexadecimal" + +#~ msgid "Pages" +#~ msgstr "Páxinas" + +#~ msgid "GHex (%s): Print Preview" +#~ msgstr "GHex (%s): Previsualización da impresión" #~ msgid "The offset must be a positive integer value!" #~ msgstr "¡A posición ten que ser un valor enteiro positivo!" diff -Nru ghex-3.3.91/po/lv.po ghex-3.4.0/po/lv.po --- ghex-3.3.91/po/lv.po 2012-02-09 00:02:51.000000000 +0000 +++ ghex-3.4.0/po/lv.po 2012-03-16 23:25:18.000000000 +0000 @@ -4,16 +4,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Raivis Dejus , 2007. -# Rūdofls Mazurs , 2011. +# Rūdofls Mazurs , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: ghex.HEAD\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -"cgi?product=ghex&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-08-04 08:07+0000\n" -"PO-Revision-Date: 2011-09-16 12:19+0300\n" -"Last-Translator: Rūdofls Mazurs \n" -"Language-Team: Latvian \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=ghex&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-03-01 23:51+0000\n" +"PO-Revision-Date: 2012-03-15 19:57+0200\n" +"Last-Translator: Rūdolfs Mazurs \n" +"Language-Team: Latvian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -22,16 +22,16 @@ "2);\n" "Language: lv\n" -#: ../ghex.desktop.in.h:1 ../src/ghex-window.c:654 ../src/ghex-window.c:1100 +#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:650 +#: ../src/ghex-window.c:1084 msgid "GHex" msgstr "GHex" -#: ../ghex.desktop.in.h:2 +#: ../data/ghex.desktop.in.h:2 msgid "Hex Editor" msgstr "Heksadecimālais redaktors" -#: ../ghex.desktop.in.h:3 -#| msgid "Inspect and edit the contents of files" +#: ../data/ghex.desktop.in.h:3 msgid "Inspect and edit binary files" msgstr "Pētiet un rediģējiet bināros failus" @@ -59,51 +59,51 @@ msgid "Character table" msgstr "Rakstzīmju tabula" -#: ../src/converter.c:231 +#: ../src/converter.c:232 msgid "Base Converter" msgstr "Pamata pārveidotājs" #. entries -#: ../src/converter.c:252 +#: ../src/converter.c:253 msgid "_Binary:" msgstr "_Binārs:" -#: ../src/converter.c:254 +#: ../src/converter.c:255 msgid "_Octal:" msgstr "_Oktāls:" -#: ../src/converter.c:256 +#: ../src/converter.c:257 msgid "_Decimal:" msgstr "_Decimāls:" -#: ../src/converter.c:258 +#: ../src/converter.c:259 msgid "_Hex:" msgstr "_Heksa:" -#: ../src/converter.c:260 +#: ../src/converter.c:261 msgid "_ASCII:" msgstr "_ASCII:" #. get cursor button -#: ../src/converter.c:264 +#: ../src/converter.c:265 msgid "_Get cursor value" msgstr "Dabūt _kursora vērtību" -#: ../src/converter.c:278 +#: ../src/converter.c:279 msgid "Get cursor value" msgstr "Dabūt kursora vērtibu" -#: ../src/converter.c:278 +#: ../src/converter.c:279 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII" msgstr "" "Dabū vērtibu pie kursora binārā, oktālā, decimālā, heksadecimālā un ASCII " "formā" -#: ../src/converter.c:418 +#: ../src/converter.c:419 msgid "ERROR" msgstr "ERROR" -#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:864 +#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873 #, c-format msgid "GHex (%s): Find Data" msgstr "GHex (%s): Atrast datus" @@ -144,7 +144,7 @@ msgid "Finds the previous occurrence of the search string " msgstr "Atrod iepriekšejo meklēšanas rindas gadījumu" -#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:466 +#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:469 msgid "Cancel" msgstr "Atsaukt" @@ -185,7 +185,7 @@ msgid "Closes advanced find window" msgstr "Aizver izvērsto meklēšanas logu" -#: ../src/findreplace.c:355 ../src/ui.c:862 +#: ../src/findreplace.c:355 ../src/ui.c:871 #, c-format msgid "GHex (%s): Find & Replace Data" msgstr "GHex (%s): Atrast un aizvietot datus" @@ -238,74 +238,70 @@ msgid "Closes find and replace data window" msgstr "Aizver datu atrašanas un aizvēršanas logu" -#: ../src/findreplace.c:434 ../src/ui.c:860 +#: ../src/findreplace.c:434 ../src/ui.c:869 #, c-format msgid "GHex (%s): Jump To Byte" msgstr "GHex (%s): Lekt uz baitu" -#: ../src/findreplace.c:464 +#: ../src/findreplace.c:467 msgid "Jump to byte" msgstr "Lekt uz baitu" -#: ../src/findreplace.c:464 +#: ../src/findreplace.c:467 msgid "Enter the byte to jump to" msgstr "Ievadiet baitu uz kuru lekt" -#: ../src/findreplace.c:465 +#: ../src/findreplace.c:468 msgid "OK" msgstr "Labi" -#: ../src/findreplace.c:465 +#: ../src/findreplace.c:468 msgid "Jumps to the specified byte" msgstr "Lec uz norādito baitu" -#: ../src/findreplace.c:466 +#: ../src/findreplace.c:469 msgid "Closes jump to byte window" msgstr "Aizver lekšanas uz baitu logu" -#: ../src/findreplace.c:529 ../src/findreplace.c:563 ../src/findreplace.c:670 +#: ../src/findreplace.c:532 ../src/findreplace.c:566 ../src/findreplace.c:673 msgid "There is no active document to search!" msgstr "Nav aktīva dokumenta meklēšanai!" -#: ../src/findreplace.c:536 ../src/findreplace.c:570 ../src/findreplace.c:677 -#: ../src/findreplace.c:711 ../src/findreplace.c:756 +#: ../src/findreplace.c:539 ../src/findreplace.c:573 ../src/findreplace.c:680 +#: ../src/findreplace.c:714 ../src/findreplace.c:759 msgid "There is no string to search for!" msgstr "Nav virknes ko meklēt!" -#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877 +#: ../src/findreplace.c:551 ../src/findreplace.c:689 ../src/findreplace.c:879 msgid "End Of File reached" msgstr "Sasniegtas faila beigas" -#: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685 -#: ../src/findreplace.c:878 ../src/findreplace.c:901 +#: ../src/findreplace.c:552 ../src/findreplace.c:585 ../src/findreplace.c:688 +#: ../src/findreplace.c:880 ../src/findreplace.c:903 msgid "String was not found!\n" msgstr "Virkne netika atrasta!\n" -#: ../src/findreplace.c:581 ../src/findreplace.c:900 +#: ../src/findreplace.c:584 ../src/findreplace.c:902 msgid "Beginning Of File reached" msgstr "Sasniegts faila sākums" -#: ../src/findreplace.c:598 +#: ../src/findreplace.c:601 msgid "There is no active document to move the cursor in!" msgstr "Nav aktīva dokumenta kurā pārvietot kursoru!" -#: ../src/findreplace.c:616 +#: ../src/findreplace.c:619 msgid "No offset has been specified!" msgstr "Nav noteikta nobīde!" -#: ../src/findreplace.c:641 +#: ../src/findreplace.c:644 msgid "The specified offset is beyond the file boundaries!" msgstr "Norādītā nobīde iziet ārpus faila robežām!" -#: ../src/findreplace.c:649 +#: ../src/findreplace.c:652 msgid "Can not position cursor beyond the End Of File!" msgstr "NAv iespējams pozicionēt kursoru zem faila beigām!" -#: ../src/findreplace.c:656 -#| msgid "" -#| "You may only give the offset as:\n" -#| " - a positive decimal number, or\n" -#| " - a hex number, beginning with '0x'" +#: ../src/findreplace.c:659 msgid "" "You may only give the offset as:\n" " - a positive decimal number, or\n" @@ -317,23 +313,23 @@ " - heksadecimālu skaitli, sākot ar '0x' vai\n" " - '+' vai '-' zīme, kam seko relatīva nobīde" -#: ../src/findreplace.c:702 +#: ../src/findreplace.c:705 msgid "There is no active buffer to replace data in!" msgstr "Nav aktīva bufera kurā aizvietot datus!" -#: ../src/findreplace.c:727 ../src/findreplace.c:728 +#: ../src/findreplace.c:730 ../src/findreplace.c:731 msgid "End Of File reached!" msgstr "SAsniegtas faila beigas!" -#: ../src/findreplace.c:747 +#: ../src/findreplace.c:750 msgid "There is no active document to replace data in!" msgstr "Nav aktīva dokumenta kurā aizvietot datus!" -#: ../src/findreplace.c:777 +#: ../src/findreplace.c:780 msgid "No occurrences were found." msgstr "Neviens gadījums netika atrasts." -#: ../src/findreplace.c:780 +#: ../src/findreplace.c:783 #, c-format msgid "Replaced %d occurrence." msgid_plural "Replaced %d occurrences." @@ -341,7 +337,7 @@ msgstr[1] "Aizvietoti %d gadījumi." msgstr[2] "Aizvietoti %d gadījumi." -#: ../src/findreplace.c:820 +#: ../src/findreplace.c:823 msgid "No string to search for!" msgstr "Nav virknes ko meklēt!" @@ -354,7 +350,7 @@ "Nav iespējams atvērt URI:\n" "%s" -#: ../src/ghex-window.c:94 +#: ../src/ghex-window.c:96 #, c-format msgid "" "Can not open file:\n" @@ -363,302 +359,302 @@ "Nav iespējams atvērt failu:\n" "%s" -#: ../src/ghex-window.c:325 +#: ../src/ghex-window.c:327 msgid "_File" msgstr "_Fails" -#: ../src/ghex-window.c:326 +#: ../src/ghex-window.c:328 msgid "_Edit" msgstr "_Rediģēt" -#: ../src/ghex-window.c:327 +#: ../src/ghex-window.c:329 msgid "_View" msgstr "_Skats" -#: ../src/ghex-window.c:328 +#: ../src/ghex-window.c:330 msgid "_Group Data As" msgstr "_Grupēt datus kā" #. View submenu -#: ../src/ghex-window.c:329 +#: ../src/ghex-window.c:331 msgid "_Windows" msgstr "_Logi" -#: ../src/ghex-window.c:330 +#: ../src/ghex-window.c:332 msgid "_Help" msgstr "_Palīdzība" #. File menu -#: ../src/ghex-window.c:333 +#: ../src/ghex-window.c:335 msgid "_Open..." msgstr "_Atvērt..." -#: ../src/ghex-window.c:334 +#: ../src/ghex-window.c:336 msgid "Open a file" msgstr "Atvērt failu" -#: ../src/ghex-window.c:336 +#: ../src/ghex-window.c:338 msgid "_Save" msgstr "_Saglabāt" -#: ../src/ghex-window.c:337 +#: ../src/ghex-window.c:339 msgid "Save the current file" msgstr "Saglabāt pašreizējo failu" -#: ../src/ghex-window.c:339 +#: ../src/ghex-window.c:341 msgid "Save _As..." msgstr "Saglabāt _Kā..." -#: ../src/ghex-window.c:340 +#: ../src/ghex-window.c:342 msgid "Save the current file with a different name" msgstr "Saglabāt pašreizējo failu ar citu nosaukumu" -#: ../src/ghex-window.c:342 +#: ../src/ghex-window.c:344 msgid "Save As _HTML..." msgstr "Saglabāt kā _HTML..." -#: ../src/ghex-window.c:343 +#: ../src/ghex-window.c:345 msgid "Export data to HTML source" msgstr "Eksportēt datus uz HTML avotu" -#: ../src/ghex-window.c:345 +#: ../src/ghex-window.c:347 msgid "_Revert" msgstr "_Atgriezt" -#: ../src/ghex-window.c:346 +#: ../src/ghex-window.c:348 msgid "Revert to a saved version of the file" msgstr "Atgriezt faila saglabāto versiju" -#: ../src/ghex-window.c:348 +#: ../src/ghex-window.c:350 msgid "_Print" msgstr "_Drukāt" -#: ../src/ghex-window.c:349 +#: ../src/ghex-window.c:351 msgid "Print the current file" msgstr "Drukāt pašreizējo failu" -#: ../src/ghex-window.c:351 +#: ../src/ghex-window.c:353 msgid "Print Previe_w..." msgstr "Drukas priekšska_ts..." -#: ../src/ghex-window.c:352 +#: ../src/ghex-window.c:354 msgid "Preview printed data" msgstr "Priekšskatīt drukājamos datus" -#: ../src/ghex-window.c:354 +#: ../src/ghex-window.c:356 msgid "_Close" msgstr "_Aizvērt" -#: ../src/ghex-window.c:355 +#: ../src/ghex-window.c:357 msgid "Close the current file" msgstr "Aizvērt pašreizējo failu" -#: ../src/ghex-window.c:357 +#: ../src/ghex-window.c:359 msgid "E_xit" msgstr "I_ziet" -#: ../src/ghex-window.c:358 +#: ../src/ghex-window.c:360 msgid "Exit the program" msgstr "Iziet no programmas" #. Edit menu -#: ../src/ghex-window.c:362 +#: ../src/ghex-window.c:364 msgid "_Undo" msgstr "_Atsaukt" -#: ../src/ghex-window.c:363 +#: ../src/ghex-window.c:365 msgid "Undo the last action" msgstr "Atsaukt pēdējo darbību" -#: ../src/ghex-window.c:365 +#: ../src/ghex-window.c:367 msgid "_Redo" msgstr "_Restaurēt" -#: ../src/ghex-window.c:366 +#: ../src/ghex-window.c:368 msgid "Redo the undone action" msgstr "Pārdarīt atcelto darbību" -#: ../src/ghex-window.c:368 +#: ../src/ghex-window.c:370 msgid "_Copy" msgstr "_Kopēt" -#: ../src/ghex-window.c:369 +#: ../src/ghex-window.c:371 msgid "Copy selection to clipboard" msgstr "Kopēt izvēlēto iztvērumu uz starpliktuvi" -#: ../src/ghex-window.c:371 +#: ../src/ghex-window.c:373 msgid "Cu_t" msgstr "Izgriez_t" -#: ../src/ghex-window.c:372 +#: ../src/ghex-window.c:374 msgid "Cut selection" msgstr "Izgriezt izvēlēto" -#: ../src/ghex-window.c:374 +#: ../src/ghex-window.c:376 msgid "Pa_ste" msgstr "_Ielīmēt" -#: ../src/ghex-window.c:375 +#: ../src/ghex-window.c:377 msgid "Paste data from clipboard" msgstr "Ievietot datus no starpliktuves" -#: ../src/ghex-window.c:377 +#: ../src/ghex-window.c:379 msgid "_Find" msgstr "At_rast" -#: ../src/ghex-window.c:378 +#: ../src/ghex-window.c:380 msgid "Search for a string" msgstr "Meklēt virkni" -#: ../src/ghex-window.c:380 +#: ../src/ghex-window.c:382 msgid "_Advanced Find" msgstr "Izvērstā meklēšan_a" -#: ../src/ghex-window.c:381 +#: ../src/ghex-window.c:383 msgid "Advanced Find" msgstr "Izvērstā meklēšana" -#: ../src/ghex-window.c:383 +#: ../src/ghex-window.c:385 msgid "R_eplace" msgstr "_Aizvietot" -#: ../src/ghex-window.c:384 +#: ../src/ghex-window.c:386 msgid "Replace a string" msgstr "Aizvietot virkni" -#: ../src/ghex-window.c:386 +#: ../src/ghex-window.c:388 msgid "_Goto Byte..." msgstr "_Iet uz baitu..." -#: ../src/ghex-window.c:387 +#: ../src/ghex-window.c:389 msgid "Jump to a certain position" msgstr "Lekt uz noteiktu pozīciju" -#: ../src/ghex-window.c:389 +#: ../src/ghex-window.c:391 msgid "_Preferences" msgstr "_Iestatījumi" -#: ../src/ghex-window.c:390 +#: ../src/ghex-window.c:392 msgid "Configure the application" msgstr "Konfigurēt šo aplikāciju" #. View menu -#: ../src/ghex-window.c:394 +#: ../src/ghex-window.c:396 msgid "_Add View" msgstr "Pievienot Sk_atu" -#: ../src/ghex-window.c:395 +#: ../src/ghex-window.c:397 msgid "Add a new view to the buffer" msgstr "Pievienot jaunu skatu buferim" -#: ../src/ghex-window.c:397 +#: ../src/ghex-window.c:399 msgid "_Remove View" msgstr "_Aizvākt skatu" -#: ../src/ghex-window.c:398 +#: ../src/ghex-window.c:400 msgid "Remove the current view of the buffer" msgstr "AIzvākt tekošo bufera skatu" #. Help menu -#: ../src/ghex-window.c:402 +#: ../src/ghex-window.c:404 msgid "_Contents" msgstr "_Saturs" -#: ../src/ghex-window.c:403 +#: ../src/ghex-window.c:405 msgid "Help on this application" msgstr "Palīdziba šai aplikācijai" -#: ../src/ghex-window.c:405 +#: ../src/ghex-window.c:407 msgid "_About" msgstr "P_ar" -#: ../src/ghex-window.c:406 +#: ../src/ghex-window.c:408 msgid "About this application" msgstr "Par šo programmu" #. Edit menu -#: ../src/ghex-window.c:413 +#: ../src/ghex-window.c:415 msgid "_Insert Mode" msgstr "_Ievietošanas režīms" -#: ../src/ghex-window.c:414 +#: ../src/ghex-window.c:416 msgid "Insert/overwrite data" msgstr "Ievietot/pārrakstīt datus" #. Windows menu -#: ../src/ghex-window.c:418 +#: ../src/ghex-window.c:420 msgid "Character _Table" msgstr "Rakstzīmju _tabula" -#: ../src/ghex-window.c:419 +#: ../src/ghex-window.c:421 msgid "Show the character table" msgstr "Rādīt simbolu tabulu" -#: ../src/ghex-window.c:421 +#: ../src/ghex-window.c:423 msgid "_Base Converter" msgstr "_Pamata pārveidotājs" -#: ../src/ghex-window.c:422 +#: ../src/ghex-window.c:424 msgid "Open base conversion dialog" msgstr "Atvērt pamata pārveidošanas dialogu" -#: ../src/ghex-window.c:424 +#: ../src/ghex-window.c:426 msgid "Type Conversion _Dialog" msgstr "Tipa pārvēršanas _dialogs" -#: ../src/ghex-window.c:425 +#: ../src/ghex-window.c:427 msgid "Show the type conversion dialog in the edit window" msgstr "Rādit tipa pārvēršanas dialogu rediģēšanas logā" -#: ../src/ghex-window.c:431 ../src/ui.c:48 +#: ../src/ghex-window.c:433 ../src/ui.c:48 msgid "_Bytes" msgstr "_Baiti" -#: ../src/ghex-window.c:432 +#: ../src/ghex-window.c:434 msgid "Group data by 8 bits" msgstr "Grupēt datus pēc 8 bitiem" -#: ../src/ghex-window.c:433 ../src/ui.c:49 +#: ../src/ghex-window.c:435 ../src/ui.c:49 msgid "_Words" msgstr "_Vārdi" -#: ../src/ghex-window.c:434 +#: ../src/ghex-window.c:436 msgid "Group data by 16 bits" msgstr "Grupēt datus pēc 16 bitiem" -#: ../src/ghex-window.c:435 ../src/ui.c:50 +#: ../src/ghex-window.c:437 ../src/ui.c:50 msgid "_Longwords" msgstr "_Garie vārdi" -#: ../src/ghex-window.c:436 +#: ../src/ghex-window.c:438 msgid "Group data by 32 bits" msgstr "Grupēt datus pēc 32 bitiem" -#: ../src/ghex-window.c:773 +#: ../src/ghex-window.c:769 #, c-format msgid "Offset: %s" msgstr "Nobīde: %s" -#: ../src/ghex-window.c:776 +#: ../src/ghex-window.c:772 #, c-format msgid "; %s bytes from %s to %s selected" msgstr "; %s baiti no %s uz %s izvēlēti" -#: ../src/ghex-window.c:1060 +#: ../src/ghex-window.c:1044 #, c-format msgid "Activate file %s" msgstr "Aktivizēt failu %s" -#: ../src/ghex-window.c:1096 +#: ../src/ghex-window.c:1080 #, c-format msgid "%s - GHex" msgstr "%s - GHex" -#: ../src/ghex-window.c:1224 +#: ../src/ghex-window.c:1206 msgid "Select a file to save buffer as" msgstr "Izvēlieties failu lai saglabātu buferi kā" -#: ../src/ghex-window.c:1280 +#: ../src/ghex-window.c:1238 #, c-format msgid "" "File %s exists.\n" @@ -667,20 +663,20 @@ "Fails %s jau eksistē.\n" "Vai vēlaties pārrakstīt to?" -#: ../src/ghex-window.c:1313 ../src/ui.c:293 +#: ../src/ghex-window.c:1264 ../src/ui.c:300 #, c-format msgid "Saved buffer to file %s" msgstr "Buferis saglabāts failā %s" -#: ../src/ghex-window.c:1319 +#: ../src/ghex-window.c:1271 msgid "Error saving file!" msgstr "Kļūda saglabājot failu!" -#: ../src/ghex-window.c:1325 +#: ../src/ghex-window.c:1277 msgid "Can't open file for writing!" msgstr "Nevar atvērt failu rakstīšanai!" -#: ../src/ghex-window.c:1370 +#: ../src/ghex-window.c:1322 #, c-format msgid "" "File %s has changed since last save.\n" @@ -689,15 +685,15 @@ "Fails %s ticis mainīts pēc pēdejās saglabāšanas.\n" "Vai jūs vēlaties saglabāt izmaiņas?" -#: ../src/ghex-window.c:1374 +#: ../src/ghex-window.c:1326 msgid "Do_n't save" msgstr "_Nesaglabāt" -#: ../src/ghex-window.c:1394 ../src/ui.c:281 +#: ../src/ghex-window.c:1346 ../src/ui.c:288 msgid "You don't have the permissions to save the file!" msgstr "Jums nav tiesību saglabāt failu!" -#: ../src/ghex-window.c:1398 ../src/ui.c:286 +#: ../src/ghex-window.c:1350 ../src/ui.c:293 msgid "An error occurred while saving file!" msgstr "Gadījās kļūda faila saglabāšanas laikā!" @@ -726,12 +722,12 @@ msgstr "Pozitīvs 32 bitu:" #: ../src/hex-dialog.c:64 -msgid "32 bit float:" -msgstr "32 bitu peldošs:" +msgid "Float 32 bit:" +msgstr "Peldošs 32 bitu:" #: ../src/hex-dialog.c:65 -msgid "64 bit float:" -msgstr "64 bitu peldošs:" +msgid "Float 64 bit:" +msgstr "Peldošs 64 bitu:" #: ../src/hex-dialog.c:66 msgid "Hexadecimal:" @@ -745,46 +741,46 @@ msgid "Binary:" msgstr "Binārs:" -#: ../src/hex-dialog.c:197 +#: ../src/hex-dialog.c:204 msgid "Show little endian decoding" msgstr "Rādīt little endian atšifrēšanu" -#: ../src/hex-dialog.c:204 +#: ../src/hex-dialog.c:211 msgid "Show unsigned and float as hexadecimal" msgstr "Rādit absolūtos un reālos skaitļus heksadecimālā formā" -#: ../src/hex-dialog.c:210 +#: ../src/hex-dialog.c:217 msgid "Stream Length:" msgstr "Plūsmas garums:" -#: ../src/hex-dialog.c:232 +#: ../src/hex-dialog.c:239 msgid "FIXME: no conversion function" msgstr "FIXME: nav pārveidošanas funkcijas" -#: ../src/hex-document.c:436 +#: ../src/hex-document.c:435 msgid "New document" msgstr "Jauns dokuments" -#: ../src/hex-document.c:790 +#: ../src/hex-document.c:784 #, c-format msgid "Page" msgstr "Lapa" -#: ../src/hex-document.c:796 ../src/hex-document.c:921 +#: ../src/hex-document.c:790 ../src/hex-document.c:915 #, c-format msgid "Hex dump generated by" msgstr "Heksadecimālās atmiņas izmetni radījis" -#: ../src/hex-document.c:807 +#: ../src/hex-document.c:801 msgid "Saving to HTML..." msgstr "Saglabā kā HTML..." -#: ../src/hex-document.c:844 +#: ../src/hex-document.c:838 #, c-format msgid "Previous page" msgstr "Iepriekšējā lapa" -#: ../src/hex-document.c:859 +#: ../src/hex-document.c:853 #, c-format msgid "Next page" msgstr "Nākamā lapa" @@ -815,7 +811,7 @@ "Palaidiet '%s --help', lai redzētu pilnu sarakstu ar pieejamajām " "komandrindas opcijām.\n" -#: ../src/main.c:81 ../src/main.c:94 +#: ../src/main.c:80 ../src/main.c:93 #, c-format msgid "Invalid geometry string \"%s\"\n" msgstr "Nederīga ģeometrijas virkne \"%s\"\n" @@ -889,51 +885,51 @@ msgid "Fonts" msgstr "Fonti" -#: ../src/preferences.c:239 +#: ../src/preferences.c:245 msgid "_Data font:" msgstr "_DAtu fonts:" -#: ../src/preferences.c:255 +#: ../src/preferences.c:259 msgid "Data font" msgstr "Datu fonts" -#: ../src/preferences.c:255 +#: ../src/preferences.c:259 msgid "Select the data font" msgstr "Izvēlieties datu fontu" -#: ../src/preferences.c:269 +#: ../src/preferences.c:268 msgid "Header fo_nt:" msgstr "Galvenes fo_nts:" -#: ../src/preferences.c:284 +#: ../src/preferences.c:281 msgid "Header font" msgstr "Galvenes fonts" -#: ../src/preferences.c:284 +#: ../src/preferences.c:281 msgid "Select the header font" msgstr "Izvēlieties galvenes fontu" -#: ../src/preferences.c:310 +#: ../src/preferences.c:306 msgid "_Print shaded box over:" msgstr "_Drukāt ēnotu rāmīti pāri:" -#: ../src/preferences.c:322 +#: ../src/preferences.c:318 msgid "Box size" msgstr "Rāmīša izmērs" -#: ../src/preferences.c:322 +#: ../src/preferences.c:318 msgid "Select size of box (in number of lines)" msgstr "Izvēlieties rāmīša izmēru (norādiet rindu skaitu)" -#: ../src/preferences.c:326 +#: ../src/preferences.c:322 msgid "lines (0 for no box)" msgstr "rindas (0 lai nebūtu rāmīša)" -#: ../src/preferences.c:333 +#: ../src/preferences.c:329 msgid "Printing" msgstr "Drukāju" -#: ../src/preferences.c:453 ../src/ui.c:202 +#: ../src/preferences.c:447 ../src/ui.c:209 #, c-format msgid "" "There was an error displaying help: \n" @@ -942,11 +938,11 @@ "kļūda, parādot palīdzību: \n" "%s" -#: ../src/preferences.c:506 +#: ../src/preferences.c:499 msgid "Can not open desired font!" msgstr "Nav iespējams atvērt izvēlēto fontu!" -#: ../src/preferences.c:569 +#: ../src/preferences.c:560 msgid "" "The offset format string contains invalid format specifier.\n" "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed." @@ -954,7 +950,7 @@ "Nobīdes formāta virkne satur nederīgu formāta noteicēju.\n" "Tikai 'x', 'X', 'p', 'P', 'd' un 'o' ir atļauti." -#: ../src/print.c:58 +#: ../src/print.c:57 #, c-format msgid "Page: %i/%i" msgstr "Lapa: %i/%i" @@ -967,15 +963,7 @@ msgid "ASCII data" msgstr "ASCII dati" -#: ../src/ui.c:144 -msgid "" -"Copyright © 1998 - 2006 Jaka Močnik\n" -"Copyright © 2006 - 2010 GHex Contributors" -msgstr "" -"Autortiesības © 1998 - 2006 Jaka Močnik\n" -"Autortiesības © 2006 - 2010 GHex veidotāji" - -#: ../src/ui.c:151 +#: ../src/ui.c:150 msgid "" "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 " @@ -986,7 +974,7 @@ "saskaņā ar Free Software Foundation GNU Vispārējās publiskās licences 2 vai " "kādas brīvi izvēlētas vēlākas versijas noteikumiem." -#: ../src/ui.c:155 +#: ../src/ui.c:154 msgid "" "This program is distributed in the hope that it will be useful, but WITHOUT " "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " @@ -997,7 +985,7 @@ "BEZ JEBKĀDAS GARANTIJAS vai DERĪBAS KĀDAM MĒRĶIM. Sīkāku informāciju " "meklējiet GNU Vispārējās publiskās licences tekstā." -#: ../src/ui.c:159 +#: ../src/ui.c:158 msgid "" "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., 51 " @@ -1007,49 +995,55 @@ "kopiju. Ja tas tā nav, tad rakstiet Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../src/ui.c:171 +#. Translators: these two strings here indicate the copyright time span, +#. e.g. 1998-2012. +#: ../src/ui.c:170 +msgid "Copyright © %Id–%Id The GHex authors" +msgstr "Autortiesības © %Id–%Id GHex autori" + +#: ../src/ui.c:174 msgid "A binary file editor" msgstr "Bināru failu redaktors" -#: ../src/ui.c:177 +#: ../src/ui.c:180 msgid "About GHex" msgstr "P_ar GHex" -#: ../src/ui.c:178 +#: ../src/ui.c:181 msgid "translator-credits" msgstr "" "Raivis Dejus Rūdolfs Mazurs " -#: ../src/ui.c:181 +#: ../src/ui.c:184 msgid "GHex Website" msgstr "GHex tīmekļa vietne" -#: ../src/ui.c:311 +#: ../src/ui.c:318 msgid "Select a file to open" msgstr "Izvēlieties failu, ko atvērt" -#: ../src/ui.c:342 +#: ../src/ui.c:349 #, c-format msgid "Loaded file %s" msgstr "Ielādets fails %s" -#: ../src/ui.c:350 +#: ../src/ui.c:357 msgid "Can not open file!" msgstr "Nav iespējams atvērt failu!" -#: ../src/ui.c:415 +#: ../src/ui.c:422 msgid "Select path and file name for the HTML source" msgstr "Norādiet atrašanās vietu un faila vārdu HTML avotam" -#: ../src/ui.c:449 +#: ../src/ui.c:454 msgid "You need to specify a base name for the HTML files." msgstr "Jums nepieciešams norādit pamata vārdu HTML failiem." -#: ../src/ui.c:460 ../src/ui.c:484 +#: ../src/ui.c:465 ../src/ui.c:491 msgid "You don't have the permission to write to the selected path.\n" msgstr "Jums nav tiesību rakstīt norāditajā vietā.\n" -#: ../src/ui.c:471 +#: ../src/ui.c:477 msgid "" "Saving to HTML will overwrite some files.\n" "Do you want to proceed?" @@ -1057,16 +1051,29 @@ "Saglabājot kā HTML tiks pārrakstīti daži faili.\n" "Vēlaties turpināt?" -#: ../src/ui.c:736 +#: ../src/ui.c:745 #, c-format msgid "Really revert file %s?" msgstr "Tiešām atgriezt failu %s?" -#: ../src/ui.c:750 +#: ../src/ui.c:759 #, c-format msgid "Reverted buffer from file %s" msgstr "Atgrieztais buferis no faila %s" +#~ msgid "32 bit float:" +#~ msgstr "32 bitu peldošs:" + +#~ msgid "64 bit float:" +#~ msgstr "64 bitu peldošs:" + +#~ msgid "" +#~ "Copyright © 1998 - 2006 Jaka Močnik\n" +#~ "Copyright © 2006 - 2010 GHex Contributors" +#~ msgstr "" +#~ "Autortiesības © 1998 - 2006 Jaka Močnik\n" +#~ "Autortiesības © 2006 - 2010 GHex veidotāji" + #~| msgid "GNOME Hexadecimal Editor" #~ msgid "Hexadecimal Editor" #~ msgstr "Heksadecimālais redaktors" diff -Nru ghex-3.3.91/po/Makefile.in.in ghex-3.4.0/po/Makefile.in.in --- ghex-3.3.91/po/Makefile.in.in 2012-03-05 17:30:33.000000000 +0000 +++ ghex-3.4.0/po/Makefile.in.in 2012-03-26 20:07:58.000000000 +0000 @@ -49,8 +49,8 @@ XGETTEXT = @XGETTEXT@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) XGETTEXT=$(XGETTEXT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot +MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ALL_LINGUAS = @ALL_LINGUAS@ @@ -73,15 +73,20 @@ .SUFFIXES: .SUFFIXES: .po .pox .gmo .mo .msg .cat +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V)) +INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) +INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@; + .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: - $(MSGFMT) -o $@ $< + $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< .po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ + $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \ && rm -f $$file && $(GMSGFMT) -o $$file $< .po.cat: diff -Nru ghex-3.3.91/src/Makefile.in ghex-3.4.0/src/Makefile.in --- ghex-3.3.91/src/Makefile.in 2012-03-05 17:30:36.000000000 +0000 +++ ghex-3.4.0/src/Makefile.in 2012-03-26 20:08:01.000000000 +0000 @@ -193,6 +193,10 @@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -280,6 +284,8 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@