diff -Nru ghex-3.0.0/configure ghex-3.3.90/configure --- ghex-3.0.0/configure 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/configure 2012-02-21 06:09:19.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.0.0. +# Generated by GNU Autoconf 2.68 for ghex 3.3.90. # # Report bugs to . # @@ -571,8 +571,8 @@ # Identity of this package. PACKAGE_NAME='ghex' PACKAGE_TARNAME='ghex' -PACKAGE_VERSION='3.0.0' -PACKAGE_STRING='ghex 3.0.0' +PACKAGE_VERSION='3.3.90' +PACKAGE_STRING='ghex 3.3.90' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=ghex' PACKAGE_URL='' @@ -731,11 +731,11 @@ LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE -AM_BACKSLASH -AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -800,8 +800,8 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_silent_rules enable_maintainer_mode +enable_silent_rules enable_dependency_tracking enable_static enable_shared @@ -1383,7 +1383,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.0.0 to adapt to many kinds of systems. +\`configure' configures ghex 3.3.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1453,7 +1453,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ghex 3.0.0:";; + short | recursive ) echo "Configuration of ghex 3.3.90:";; esac cat <<\_ACEOF @@ -1461,10 +1461,10 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-maintainer-mode disable make rules and dependencies not useful + (and sometimes confusing) to the casual installer --enable-silent-rules less verbose build output (undo: `make V=1') --disable-silent-rules verbose build output (undo: `make V=0') - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --enable-static[=PKGS] build static libraries [default=no] @@ -1591,7 +1591,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ghex configure 3.0.0 +ghex configure 3.3.90 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2014,7 +2014,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.0.0, which was +It was created by ghex $as_me 3.3.90, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2836,7 +2836,7 @@ # Define the identity of the package. PACKAGE='ghex' - VERSION='3.0.0' + VERSION='3.3.90' cat >>confdefs.h <<_ACEOF @@ -2876,26 +2876,14 @@ -# Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : - enableval=$enable_silent_rules; -fi - -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; -esac -AM_BACKSLASH='\' - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else - USE_MAINTAINER_MODE=no + USE_MAINTAINER_MODE=yes fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 @@ -2911,6 +2899,18 @@ MAINT=$MAINTAINER_MODE_TRUE +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +AM_BACKSLASH='\' + # Check for programs ac_ext=c @@ -14510,8 +14510,6 @@ _ACEOF -# Uncomment this when we get rid of bonobo code: GB #590996 -#GNOME_MAINTAINER_MODE_DEFINES # Check whether --enable-compile-warnings was given. @@ -15270,7 +15268,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.0.0, which was +This file was extended by ghex $as_me 3.3.90, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15336,7 +15334,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.0.0 +ghex config.status 3.3.90 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru ghex-3.0.0/configure.ac ghex-3.3.90/configure.ac --- ghex-3.0.0/configure.ac 2011-09-26 17:27:22.000000000 +0000 +++ ghex-3.3.90/configure.ac 2012-02-21 06:05:46.000000000 +0000 @@ -1,13 +1,13 @@ AC_PREREQ(2.61) -AC_INIT([ghex],[3.0.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=ghex],[ghex]) +AC_INIT([ghex],[3.3.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=ghex],[ghex]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([src/ghex-window.c]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -AM_MAINTAINER_MODE +AM_INIT_AUTOMAKE([1.11 dist-xz no-dist-gzip]) +AM_MAINTAINER_MODE([enable]) +AM_SILENT_RULES([yes]) # Check for programs AC_PROG_CC @@ -65,8 +65,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package name.]) dnl ================================================================= -# Uncomment this when we get rid of bonobo code: GB #590996 -#GNOME_MAINTAINER_MODE_DEFINES GNOME_COMPILE_WARNINGS([maximum]) AC_ARG_ENABLE(debug, diff -Nru ghex-3.0.0/data/Makefile.am ghex-3.3.90/data/Makefile.am --- ghex-3.0.0/data/Makefile.am 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/data/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -20,3 +20,5 @@ CLEANFILES = \ $(desktop_DATA) + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/data/Makefile.in ghex-3.3.90/data/Makefile.in --- ghex-3.0.0/data/Makefile.in 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/data/Makefile.in 2012-02-21 06:09:19.000000000 +0000 @@ -520,6 +520,8 @@ @INTLTOOL_DESKTOP_RULE@ +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/debian/changelog ghex-3.3.90/debian/changelog --- ghex-3.0.0/debian/changelog 2011-10-07 01:04:22.000000000 +0000 +++ ghex-3.3.90/debian/changelog 2012-02-21 13:31:35.000000000 +0000 @@ -1,3 +1,13 @@ +ghex (3.3.90-0ubuntu1) precise; urgency=low + + * New upstream release. + - Fix excessive scrolling back to cursor + - Remove the use of deprecated GTK+ API + - Visual improvements with latest Adwaita theme + * debian/watch: Watch for unstable releases + + -- Jeremy Bicha Tue, 21 Feb 2012 08:31:24 -0500 + ghex (3.0.0-1) unstable; urgency=low * New upstream release. diff -Nru ghex-3.0.0/debian/control ghex-3.3.90/debian/control --- ghex-3.0.0/debian/control 2011-10-07 01:11:23.000000000 +0000 +++ ghex-3.3.90/debian/control 2012-02-21 13:31:37.000000000 +0000 @@ -6,8 +6,9 @@ Source: ghex Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Loic Minier , Michael Biebl , Sebastian Dröge +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Loic Minier , Michael Biebl , Sebastian Dröge Build-Depends: cdbs, gnome-pkg-tools, debhelper (>= 8), diff -Nru ghex-3.0.0/debian/control.in ghex-3.3.90/debian/control.in --- ghex-3.0.0/debian/control.in 2011-10-07 00:41:20.000000000 +0000 +++ ghex-3.3.90/debian/control.in 2012-02-21 13:31:35.000000000 +0000 @@ -1,7 +1,8 @@ Source: ghex Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs, gnome-pkg-tools, diff -Nru ghex-3.0.0/debian/watch ghex-3.3.90/debian/watch --- ghex-3.0.0/debian/watch 2011-10-06 22:22:35.000000000 +0000 +++ ghex-3.3.90/debian/watch 2012-02-21 13:31:35.000000000 +0000 @@ -1,3 +1,3 @@ version=3 http://ftp.gnome.org/pub/GNOME/sources/ghex/([\d\.]+)/ \ - ghex-(.*)\.tar\.bz2 + ghex-(.*)\.tar\.xz diff -Nru ghex-3.0.0/help/ja/ghex.xml ghex-3.3.90/help/ja/ghex.xml --- ghex-3.0.0/help/ja/ghex.xml 2011-09-26 17:43:18.000000000 +0000 +++ ghex-3.3.90/help/ja/ghex.xml 2012-02-21 06:09:35.000000000 +0000 @@ -195,7 +195,7 @@ -「アクセサリ」「バイナリエディタ」を選択します。 +「アクセサリ」「バイナリエディター」を選択します。 Execute the following command: ghex @@ -338,7 +338,7 @@ -現在のファイルを新規ファイル名で保存するには、<menuchoice><guimenu>「ファイル」</guimenu><guimenuitem>「名前をつけて保存」</guimenuitem></menuchoice>を選択します。この場合は<guilabel>「バッファを書き込むファイル名を選択」</guilabel>ダイアログに新規フ ァイル名を入力し、<guibutton>「了解」</guibutton>をクリックします。 +現在のファイルを新規ファイル名で保存するには、<menuchoice><guimenu>「ファイル」</guimenu><guimenuitem>「名前をつけて保存」</guimenuitem></menuchoice>を選択します。この場合は<guilabel>「バッファーを書き込むファイル名を選択」</guilabel>ダイアログに新規フ ァイル名を入力し、<guibutton>「了解」</guibutton>をクリックします。 ファイル内のデータを検索する ファイル内にある ASCII ないし 16 進の文字列を検索するには、下記の手順に従います。 @@ -490,13 +490,13 @@ <application>GHex</application> ウィンドウ内のデータを HTML にエクスポートするには、<menuchoice><guimenu>「ファイル」</guimenu><guimenuitem>「HTMLとして保存」</guimenuitem></menuchoice>を選択します。HTML ファイルを作成するディレクトリおよびファイル名を指定し、<guibutton>「了解」</guibutton>をクリックします。<application>GHex</application> により下記の処理が実行されます。 <placeholder-1/>たとえばファイル名を <filename>log.html</filename> と指定すると、<application>GHex</application> の作成する HTML ファイルの名前は <filename>log00000000.html</filename>、<filename>log00000001.html</filename>、<filename>log00000002.html</filename> のようになります。 -キャラクタテーブルを表示する +キャラクターテーブルを表示する -0 から 255 の各値に対応する ASCII キャラクタ、16 進数、10 進数、8 進数、2 進数を示した表を表示するには、<menuchoice><guimenu>「ウィンドウ」</guimenu><guimenuitem>「文字一覧表」</guimenuitem></menuchoice>を選択します。 +0 から 255 の各値に対応する ASCII キャラクター、16 進数、10 進数、8 進数、2 進数を示した表を表示するには、<menuchoice><guimenu>「ウィンドウ」</guimenu><guimenuitem>「文字一覧表」</guimenuitem></menuchoice>を選択します。 データを変換表示する 2 進数、10 進数、16 進数、ASCII 間でのデータを変換表示 (最大 4 バイト) するには、下記の手順に従います。 diff -Nru ghex-3.0.0/help/ja/ja.po ghex-3.3.90/help/ja/ja.po --- ghex-3.0.0/help/ja/ja.po 2011-09-26 17:43:19.000000000 +0000 +++ ghex-3.3.90/help/ja/ja.po 2012-02-21 06:09:36.000000000 +0000 @@ -1,215 +1,356 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-08-08 11:36-0400\n" +"POT-Creation-Date: 2011-12-26 14:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"Last-Translator: Jiro Matsuzawa \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: C/ghex2.xml:27(year) -msgid "2002" +#: C/legal.xml:2(para) +msgid "" +"Permission is granted to copy, distribute and/or modify this document under " +"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " +"later version published by the Free Software Foundation with no Invariant " +"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " +"of the GFDL at this link or " +"in the file COPYING-DOCS distributed with this manual." msgstr "" +"GNU Free Documentation License (GFDL) の管理下でこのドキュメント をコピー、配" +"布、または変更することを許可します。Free Software Foundation から発行された" +"バージョン 1.1 以降のドキュメントには、 セクションや表紙などがありません。" +"GFDL のコピーは、URL またはこ" +"のマニュアルと 一緒に配布された COPYING-DOCS を参照してください。" -#: C/ghex2.xml:31(year) -msgid "1998" +#: C/legal.xml:12(para) +msgid "" +"This manual is part of a collection of GNOME manuals distributed under the " +"GFDL. If you want to distribute this manual separately from the collection, " +"you can do so by adding a copy of the license to the manual, as described in " +"section 6 of the license." msgstr "" +"このマニュアルは、GFDL から配布された GNOME マニュアルの 一部です。このコレク" +"ションと別にマニュアルを提供したい場合は、 ライセンスのセクション 6 で説明し" +"ているように、マニュアルに ライセンスを追加してください。" -#: C/ghex2.xml:32(year) -msgid "1999" +#: C/legal.xml:19(para) +msgid "" +"Many of the names used by companies to distinguish their products and " +"services are claimed as trademarks. Where those names appear in any GNOME " +"documentation, and the members of the GNOME Documentation Project are made " +"aware of those trademarks, then the names are in capital letters or initial " +"capital letters." msgstr "" +"他の企業の製品やサービスと区別するために使用する名前を登録商標 と呼びます。" +"GNOME プロジェクトで使用する場合は、すべて大文字か 最初の 1 文字だけ大文字で" +"記載しています。" -#: C/ghex2.xml:33(year) C/ghex2.xml:126(date) -msgid "2000" +#: C/legal.xml:35(para) +msgid "" +"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " +"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " +"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " +"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " +"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " +"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " +"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " +"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " +"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " +"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " +"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" +msgstr "" +"ドキュメントは、「現状のまま」をベースとして提供 され、商品性、特定目的へも適" +"合性または第三者の権利の 非侵害の黙示の保証を含みそれに限定されない、明示的" +"で あるか黙示的であるかを問わない、なんらの保証も行われ ないものとします。" + +#: C/legal.xml:55(para) +msgid "" +"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " +"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " +"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " +"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " +"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " +"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " +"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " +"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " +"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " +"POSSIBILITY OF SUCH DAMAGES." +msgstr "" +"本製品が、外国為替および外国貿易管理法 (外為法) に 定められる戦略物資等 (貨物" +"または役務) に該当する場合、 本製品を輸出または日本国外へ持ち出す際には、事前" +"の 書面による承諾を得ることのほか、外為法および関連法規 に基づく輸出手続き、" +"また場合によっては、米国商務省 または米国所轄官庁の許可を得ることが必要です。" + +#: C/legal.xml:28(para) +msgid "" +"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " +"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " +"" +msgstr "" +"ドキュメントおよび変更されているドキュメントは、下記の GNU FREE " +"DOCUMENTATION ライセンスのもとにおいて頒布されます。 " + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/ghex.xml:222(None) +msgid "" +"@@image: 'figures/ghex_window_empty.png'; " +"md5=89b78d734e989c368b82592f385db8dd" +msgstr "" + +#. When image changes, this message will be marked fuzzy or untranslated for you. +#. It doesn't matter what you translate it to: it's not used at all. +#: C/ghex.xml:248(None) +msgid "" +"@@image: 'figures/ghex_window_open.png'; md5=9c4ae66bb45a43803e1f70abfaede88b" +msgstr "" + +#: C/ghex.xml:23(title) +#, fuzzy +#| msgid "User manual for GHex." +msgid "User manual for GHex" +msgstr "GHex ユーザーマニュアル" + +#: C/ghex.xml:26(para) +msgid "" +"GHex is a simple binary editor. It lets users view and edit a binary file in " +"both hex and ascii with a multiple level undo/redo mechanism. Features " +"include find and replace functions, conversion between binary, octal, " +"decimal and hexadecimal values, and use of an alternative, user-configurable " +"MDI concept that lets users edit multiple documents with multiple views of " +"each." +msgstr "" + +#: C/ghex.xml:37(year) +msgid "2002" +msgstr "" + +#: C/ghex.xml:38(year) +#, fuzzy +#| msgid "2000" +msgid "2003" +msgstr "GHex のマニュアル V1.0" + +#: C/ghex.xml:39(year) +#, fuzzy +#| msgid "2000" +msgid "2004" msgstr "GHex のマニュアル V1.0" -#: C/ghex2.xml:34(holder) +#: C/ghex.xml:40(holder) C/ghex.xml:67(orgname) +msgid "Sun Microsystems" +msgstr "" + +#: C/ghex.xml:43(year) +#, fuzzy +#| msgid "2000" +msgid "1998-2000" +msgstr "GHex のマニュアル V1.0" + +#: C/ghex.xml:44(holder) msgid "Jaka Mocnik" msgstr "" -#: C/ghex2.xml:54(firstname) +#: C/ghex.xml:54(publishername) C/ghex.xml:75(orgname) C/ghex.xml:99(para) +#: C/ghex.xml:107(para) C/ghex.xml:115(para) C/ghex.xml:123(para) +#: C/ghex.xml:131(para) C/ghex.xml:139(para) C/ghex.xml:149(para) +#, fuzzy +#| msgid "GNOME Documentation Team" +msgid "GNOME Documentation Project" +msgstr "GNOME ドキュメンテーションチーム" + +#: C/ghex.xml:64(firstname) msgid "Sun" msgstr "" -#: C/ghex2.xml:55(surname) +#: C/ghex.xml:65(surname) msgid "GNOME Documentation Team" msgstr "GNOME ドキュメンテーションチーム" -#: C/ghex2.xml:58(email) -msgid "gdocteam@sun.com" -msgstr "" - -#: C/ghex2.xml:62(firstname) +#: C/ghex.xml:72(firstname) msgid "Jaka" msgstr "" -#: C/ghex2.xml:63(surname) +#: C/ghex.xml:73(surname) msgid "Mocnik" msgstr "" -#: C/ghex2.xml:66(email) +#: C/ghex.xml:76(email) msgid "jaka@gnu.org" msgstr "" -#: C/ghex2.xml:95(revnumber) -msgid "GHex Manual V2.2" +#: C/ghex.xml:95(revnumber) +msgid "GHex Manual V2.5" +msgstr "GHex" + +#: C/ghex.xml:96(date) +msgid "December 2005" +msgstr "" + +#: C/ghex.xml:98(para) C/ghex.xml:106(para) C/ghex.xml:114(para) +#: C/ghex.xml:122(para) C/ghex.xml:130(para) C/ghex.xml:138(para) +#, fuzzy +#| msgid "GNOME Documentation Team" +msgid "Sun GNOME Documentation Team" +msgstr "GNOME ドキュメンテーションチーム" + +#: C/ghex.xml:103(revnumber) +#, fuzzy +#| msgid "GHex Manual V2.2" +msgid "GHex Manual V2.4" msgstr "GNOME ドキュメンテーションプロジェクト" -#: C/ghex2.xml:96(date) +#: C/ghex.xml:104(date) +msgid "April 2003" +msgstr "" + +#: C/ghex.xml:111(revnumber) +#, fuzzy +#| msgid "GHex Manual V2.2" +msgid "GHex Manual V2.3" +msgstr "GNOME ドキュメンテーションプロジェクト" + +#: C/ghex.xml:112(date) C/ghex.xml:120(date) msgid "August 2002" msgstr "GHex のマニュアル V2.2" -#: C/ghex2.xml:105(revnumber) +#: C/ghex.xml:119(revnumber) +msgid "GHex Manual V2.2" +msgstr "GNOME ドキュメンテーションプロジェクト" + +#: C/ghex.xml:127(revnumber) msgid "GHex Manual V2.1" msgstr "GNOME ドキュメンテーションプロジェクト" -#: C/ghex2.xml:106(date) +#: C/ghex.xml:128(date) msgid "July 2002" msgstr "GHex のマニュアル V2.1" -#: C/ghex2.xml:115(revnumber) +#: C/ghex.xml:135(revnumber) msgid "GHex Manual V2.0" msgstr "GNOME ドキュメンテーションプロジェクト" -#: C/ghex2.xml:116(date) +#: C/ghex.xml:136(date) msgid "March 2002" msgstr "GHex のマニュアル V2.0" -#: C/ghex2.xml:125(revnumber) +#: C/ghex.xml:143(revnumber) msgid "GHex Manual V1.0" msgstr "GNOME ドキュメンテーションプロジェクト" -#: C/ghex2.xml:128(para) +#: C/ghex.xml:144(date) +msgid "2000" +msgstr "GHex のマニュアル V1.0" + +#: C/ghex.xml:146(para) msgid "Jaka Mocnik jaka@gnu.org" msgstr "2000 年" -#: C/ghex2.xml:136(releaseinfo) -msgid "This manual describes version 1.99.0.1 of GHex." +#: C/ghex.xml:154(releaseinfo) +#, fuzzy +#| msgid "This manual describes version 1.99.0.1 of GHex." +msgid "This manual describes version 2.19 of GHex." msgstr "GNOME ドキュメンテーションプロジェクト" -#: C/ghex2.xml:139(title) +#: C/ghex.xml:157(title) msgid "Feedback" msgstr "このマニュアルは GHex のバージョン 1.99.0.1 について説明します。" -#: C/ghex2.xml:140(para) +#: C/ghex.xml:158(para) msgid "" "To report a bug or make a suggestion regarding the GHex application or this " "manual, follow the directions in the GNOME Feedback Page." msgstr "フィードバック" -#: C/ghex2.xml:150(primary) +#: C/ghex.xml:165(primary) msgid "GHex" msgstr "" "GHex アプリケーションまたはこのマニュアルに関してバグやご意見をご報告いただく" "場合は、『GNOME フィード" "バックページ』 を参照してください。" -#: C/ghex2.xml:159(title) +#: C/ghex.xml:174(title) msgid "Introduction" msgstr "GHex" -#: C/ghex2.xml:160(para) +#: C/ghex.xml:175(para) msgid "" "The GHex application enables you to perform the " "following actions:" msgstr "概要" -#: C/ghex2.xml:162(para) +#: C/ghex.xml:177(para) msgid "View a file in ASCII or hexadecimal format simultaneously." msgstr "" "GHex アプリケーションでは、下記の処理を行うことが" "できます。" -#: C/ghex2.xml:164(para) +#: C/ghex.xml:179(para) msgid "Edit a file in either ASCII or hexadecimal format." msgstr "ファイルの内容を、ASCII および 16 進形式で同時に表示する。" -#: C/ghex2.xml:172(title) +#: C/ghex.xml:187(title) msgid "Getting Started" msgstr "ファイルを ASCII または 16 進形式で編集する。" -#: C/ghex2.xml:177(title) +#: C/ghex.xml:192(title) msgid "To Start GHex" msgstr "基本的な使用方法" -#: C/ghex2.xml:179(para) +#: C/ghex.xml:194(para) msgid "You can start GHex in the following ways:" msgstr "GHex を起動する" -#: C/ghex2.xml:182(term) +#: C/ghex.xml:197(term) msgid "Applications menu" msgstr "以下の方法で GHex を起動してください。" -#: C/ghex2.xml:184(para) +#: C/ghex.xml:199(para) msgid "" "Choose AccessoriesHex " "Editor." msgstr "「アプリケーション」メニュー" -#: C/ghex2.xml:192(term) +#: C/ghex.xml:203(term) msgid "Command line" msgstr "" "「アクセサリ」「バイナリエ" -"ディタ」を選択します。" - -#: C/ghex2.xml:194(para) -msgid "" -"You can open a single file or multiple files when you run GHex from a command line. To open multiple files from a command " -"line, type the following command, then press Return:" -msgstr "コマンドライン" +"ディター」を選択します。" -#: C/ghex2.xml:195(command) -msgid "ghex2" +#: C/ghex.xml:205(para) +msgid "Execute the following command: ghex" msgstr "" -"コマンドラインから GHex を実行する際には、複数の" -"ファイルを同時に開くことができます。複数のファイルを開く場合は、下記の形式で" -"コマンドを入力 し、リターン キーを押します。" -#: C/ghex2.xml:195(replaceable) -msgid "file1.txt" -msgstr "ghex2" - -#: C/ghex2.xml:195(replaceable) -msgid "file2.txt" -msgstr "file1.txt" - -#: C/ghex2.xml:196(para) -msgid "" -"where file1.txt and file2.txt are the names of the files you want to open." -msgstr "file2.txt" - -#: C/ghex2.xml:203(title) +#: C/ghex.xml:212(title) msgid "When You Start GHex" msgstr "" "ここで file1.txt や file2.txt には開きたいファイル名を指定します。" -#: C/ghex2.xml:205(para) +#: C/ghex.xml:214(para) msgid "" "When you start GHex, the following window is " "displayed." msgstr "起動時の GHex の状態" -#: C/ghex2.xml:209(title) +#: C/ghex.xml:218(title) msgid "GHex Window Before You Open a File" msgstr "" "GHex を起動すると、以下のウィンドウが表示されま" "す。" -#: C/ghex2.xml:216(phrase) +#: C/ghex.xml:225(phrase) msgid "Shows GHex main window before you open a file." msgstr "ファイルを開く前の GHex ウィンドウ" -#: C/ghex2.xml:229(title) +#: C/ghex.xml:238(title) msgid "To Open a File" msgstr "ファイルを開く前の GHex メインウィンドウを表示。" -#: C/ghex2.xml:230(para) +#: C/ghex.xml:239(para) msgid "" "To open a file, choose FileOpen. Select the file that you want to open, then click " @@ -218,7 +359,7 @@ "window." msgstr "ファイルを開く" -#: C/ghex2.xml:234(para) +#: C/ghex.xml:240(para) msgid "" "When you open a file in GHex, the application " "displays the file in the following window." @@ -229,105 +370,120 @@ "application> では、複数のファイルを同時に開くことができます。" "GHex は各ファイルを新しいウィンドウに表示します。" -#: C/ghex2.xml:238(title) +#: C/ghex.xml:244(title) msgid "GHex Window with an Open File" msgstr "" "GHex で開いたファイルは、下記のウィンドウに表示さ" "れます。" -#: C/ghex2.xml:245(phrase) +#: C/ghex.xml:251(phrase) msgid "Shows GHex main window with an open file" msgstr "ファイルを開いた状態の GHex ウィンドウ" -#: C/ghex2.xml:252(para) +#. ==== End of Figure ==== +#: C/ghex.xml:258(para) msgid "" "The GHex window contains the following elements:" msgstr "ファイルを開いた状態の GHex メインウィンドウ" -#: C/ghex2.xml:255(term) +#: C/ghex.xml:261(term) msgid "Menubar" msgstr "" "GHex ウィンドウには、以下の要素が含まれています。" -#: C/ghex2.xml:257(para) +#: C/ghex.xml:263(para) msgid "" "The menus on the menubar contain all the commands that you need to work with " "files in GHex." msgstr "メニューバー" -#: C/ghex2.xml:261(term) +#: C/ghex.xml:267(term) msgid "Cursor offsets column" msgstr "" "メニューバーのメニューには、GHex でのファイル操作" "に用いるすべてのコマンドが用意されています。" -#: C/ghex2.xml:263(para) +#: C/ghex.xml:269(para) msgid "" "The cursor offset is the distance between the beginning of the file and the " "first byte in each line. By default, GHex " "displays the cursor offsets column to the left of the hexadecimal view." msgstr "カーソルオフセット列" -#: C/ghex2.xml:268(term) +#: C/ghex.xml:273(term) msgid "Display pane on left side" msgstr "" "カーソルオフセットとは、ファイルの先頭から各行の先頭バイトまでの間隔を示しま" "す。 通常 GHex は、カーソルオフセット列を 16 進表" "示ビューの左側に表示します。" -#: C/ghex2.xml:270(para) +#: C/ghex.xml:275(para) msgid "" "The display pane on the left side of the display area displays a hexadecimal " "view of the file." msgstr "左側の表示区画" -#: C/ghex2.xml:274(term) +#: C/ghex.xml:279(term) msgid "Display pane on right side" msgstr "" "表示領域の左側にある表示区画には、ファイルの 16 進表示ビューが表示されます。" -#: C/ghex2.xml:276(para) +#: C/ghex.xml:281(para) msgid "" "The display pane on the right side of the display area displays an ASCII " "view of the file." msgstr "右側の表示区画" -#: C/ghex2.xml:286(title) +#: C/ghex.xml:285(term) +msgid "Type conversion dialog" +msgstr "" + +#: C/ghex.xml:287(para) +msgid "" +"The type conversion dialog below the display area displays the value of the " +"selected character in several different numeric types." +msgstr "" + +#: C/ghex.xml:297(title) msgid "Usage" msgstr "" "表示領域の右側にある表示区画には、ファイルの ASCII 表示ビューが表示されます。" -#: C/ghex2.xml:291(title) +#: C/ghex.xml:302(title) msgid "To Edit a File" msgstr "使用方法" -#: C/ghex2.xml:292(para) +#: C/ghex.xml:303(para) msgid "To edit a file, perform the following steps:" msgstr "ファイルを編集する" -#: C/ghex2.xml:294(para) +#: C/ghex.xml:305(para) msgid "" "Click in the hexadecimal or ASCII view of the file. The view in which the " "cursor is active displays a full cursor. The view in which the cursor is not " "active displays an outline of the cursor." msgstr "ファイルを編集するには、下記の手順に従います。" -#: C/ghex2.xml:296(para) +#: C/ghex.xml:307(para) msgid "Use any of the following methods to move the cursor around the file:" msgstr "" "ファイルの ASCII ビューまたは 16 進ビューをクリックします。カーソルがアクティ" "ブなビューでは、カーソルがフル表示されます。カーソルがアクティブでない ビュー" "では、カーソルがアウトライン表示されます。" -#: C/ghex2.xml:298(para) +#: C/ghex.xml:309(para) +#, fuzzy +#| msgid "" +#| "Scroll through the file using the scrollbar on the window or the arrow " +#| "keys on the keyboard." msgid "" -"Scroll through the file using the scrollbar on the window or the arrow keys " -"on the keyboard." +"Use the scrollbar on the window or the arrow keys on the keyboard to scroll " +"through the file." msgstr "" "下記のいずれかの操作により、ファイル内の変更を加える位置にカーソルを移動しま" "す。" -#: C/ghex2.xml:300(para) +#: C/ghex.xml:311(para) msgid "" "Choose EditGoto Byte, type the cursor offset as a decimal or " @@ -337,19 +493,28 @@ "ウィンドウ上のスクロールバーまたはキーボード上の矢印キーを用いて、ファイルを" "スクロールします。" -#: C/ghex2.xml:307(para) +#: C/ghex.xml:315(para) +#, fuzzy +#| msgid "" +#| "Edit the ASCII format in the same way you edit a normal text file. Edit " +#| "the hexadecimal format using the values 0 to 9 and a to f." msgid "" -"Edit the ASCII format in the same way you edit a normal text file. Edit the " -"hexadecimal format using the values 0 to 9 and a to f." +"Edit the ASCII format in the same way you edit a normal text file. To edit " +"the hexadecimal format, use the values 0 to 9 and a to f." msgstr "" "「編集」「バイトに移動」を選択し、10 進数ないし 16 進数でカーソルオフセット" "を入力し、「了解」をクリックします。なお 16 進数で指定" "する場合は、0x3 のように、オフセット値の前に 0x を付ける必要があります。" -#: C/ghex2.xml:310(para) +#: C/ghex.xml:318(para) +#, fuzzy +#| msgid "" +#| "To insert data without overwriting existing data, choose " +#| "EditInsert Mode." msgid "" -"To insert data without overwriting existing data, choose " +"To insert data and not overwrite existing data, choose " "EditInsert Mode." msgstr "" @@ -357,24 +522,44 @@ "います。16 進形式の場合は、0 から 9 および a から f で構成される 16 進値を入" "力することで、必要な編集を行います。" -#: C/ghex2.xml:319(title) +#: C/ghex.xml:319(para) +msgid "" +"To cut, copy, and paste data, choose EditCut, " +"EditCopy, and EditPaste." +msgstr "" + +#: C/ghex.xml:320(para) +msgid "" +"To undo an edit, choose EditUndo. To redo an edit, " +"choose EditRedo. The number of previous edits that you can undo is determined by " +"the Maximum number of undo levels setting in the tabbed section of the " +"Preferences dialog." +msgstr "" + +#: C/ghex.xml:326(title) msgid "To Save a File" msgstr "" "既存のデータを上書きせずに新規データを挿入したい場合は" "「編集」「挿入モード」を選" "択します。" -#: C/ghex2.xml:320(para) +#: C/ghex.xml:327(para) msgid "You can save a file in the following ways:" msgstr "ファイルを保存する" -#: C/ghex2.xml:322(para) +#: C/ghex.xml:329(para) msgid "" "To save changes to the current file, choose FileSave." msgstr "ファイルの保存は、下記のいずれかの方法で行えます。" -#: C/ghex2.xml:327(para) +#: C/ghex.xml:331(para) msgid "" "To save the current file under a new filename, choose " "FileSave As「ファイル」「保存」を選択します。" -#: C/ghex2.xml:338(title) +#: C/ghex.xml:339(title) +msgid "To Revert to the Last Saved Version of a File" +msgstr "" + +#: C/ghex.xml:340(para) +msgid "" +"To revert to the last version of the current file that you saved and undo " +"all of the edits that you made to the file since you last saved the file, " +"choose FileRevert, then click Yes in the " +"Question dialog." +msgstr "" + +#: C/ghex.xml:346(title) msgid "To Find Data in a File" msgstr "" "現在のファイルを新規ファイル名で保存するには、「ファイ" "ル」「名前をつけて保存」を" -"選択します。この場合は「バッファを書き込むファイル名を選択」「バッファーを書き込むファイル名を選択」ダイアログに新規フ ァイル名を入力し、「了解」" "をクリックします。" -#: C/ghex2.xml:339(para) +#: C/ghex.xml:347(para) msgid "" "To search a file for a hexadecimal or ASCII string, perform the following " "steps:" msgstr "ファイル内のデータを検索する" -#: C/ghex2.xml:341(para) +#: C/ghex.xml:349(para) msgid "" "Choose EditFind." @@ -407,7 +605,7 @@ "ファイル内にある ASCII ないし 16 進の文字列を検索するには、下記の手順に従いま" "す。" -#: C/ghex2.xml:346(para) +#: C/ghex.xml:351(para) msgid "" "In the Find Data dialog, choose one of the following " "options:" @@ -415,27 +613,27 @@ "「編集」「検索」を選択します。" -#: C/ghex2.xml:348(guilabel) +#: C/ghex.xml:353(guilabel) C/ghex.xml:402(guilabel) msgid "Search for hex data" msgstr "" "「データ検索」ダイアログで、下記のオプションのいずれかを" "選択します。" -#: C/ghex2.xml:350(guilabel) +#: C/ghex.xml:355(guilabel) C/ghex.xml:404(guilabel) msgid "Search for ASCII data" msgstr "「16進データを検索」" -#: C/ghex2.xml:354(para) +#: C/ghex.xml:359(para) C/ghex.xml:408(para) msgid "Type the string that you want to find." msgstr "「ASCIIデータを検索」" -#: C/ghex2.xml:356(para) +#: C/ghex.xml:361(para) C/ghex.xml:381(para) msgid "" "Click Find Next to find the next occurrence of the " "string." msgstr "検索する文字列を入力します。" -#: C/ghex2.xml:358(para) +#: C/ghex.xml:363(para) C/ghex.xml:383(para) msgid "" "Click Find Previous to find the previous occurrence " "of the string." @@ -443,19 +641,136 @@ "文字列の次の一致を検索するには、「次を検索」をクリック" "します。" -#: C/ghex2.xml:367(title) +#: C/ghex.xml:365(para) C/ghex.xml:415(para) C/ghex.xml:430(para) +msgid "" +"Click Cancel to close the Find Data dialog." +msgstr "" + +#: C/ghex.xml:373(title) +msgid "To Perform an Advanced Find" +msgstr "" + +#: C/ghex.xml:374(para) +#, fuzzy +#| msgid "To edit a file, perform the following steps:" +msgid "To perform an advanced find, perform the following steps:" +msgstr "ファイルを編集する" + +#: C/ghex.xml:376(para) C/ghex.xml:396(para) C/ghex.xml:424(para) +#, fuzzy +#| msgid "" +#| "Choose EditFind." +msgid "" +"Choose EditAdvanced Find." +msgstr "" +"ファイル内にある ASCII ないし 16 進の文字列を検索するには、下記の手順に従いま" +"す。" + +#: C/ghex.xml:378(para) +msgid "" +"In the Find Data dialog, select the required search " +"criteria. For information about how to add new search criteria, see ." +msgstr "" + +#: C/ghex.xml:385(para) +msgid "" +"Click Close to close the Find Data dialog." +msgstr "" + +#: C/ghex.xml:393(title) +msgid "To Add Search Criteria" +msgstr "" + +#: C/ghex.xml:394(para) +#, fuzzy +#| msgid "To edit a file, perform the following steps:" +msgid "To add search criteria, perform the following steps:" +msgstr "ファイルを編集する" + +#: C/ghex.xml:398(para) +#, fuzzy +#| msgid "" +#| "In the Find Data dialog, choose one of the following " +#| "options:" +msgid "" +"In the Find Data dialog, click Add New." +msgstr "" +"「編集」「検索」を選択します。" + +#: C/ghex.xml:400(para) +#, fuzzy +#| msgid "" +#| "In the Find Data dialog, choose one of the following " +#| "options:" +msgid "" +"In the Find Data: Add Search dialog, choose one of the " +"following options:" +msgstr "" +"「編集」「検索」を選択します。" + +#: C/ghex.xml:410(para) +msgid "" +"Use the color wheel or the spin boxes to select a color to highlight the " +"search criteria." +msgstr "" + +#: C/ghex.xml:413(para) +#, fuzzy +#| msgid "Click Find Next." +msgid "Click Add." +msgstr "" +"2 番目のテキストボックスに、検索した文字列と置換する文字列を入力します。" + +#: C/ghex.xml:421(title) +msgid "To Remove Search Criteria" +msgstr "" + +#: C/ghex.xml:422(para) +#, fuzzy +#| msgid "To edit a file, perform the following steps:" +msgid "To remove search criteria, perform the following steps:" +msgstr "ファイルを編集する" + +#: C/ghex.xml:426(para) +#, fuzzy +#| msgid "" +#| "In the Find Data dialog, choose one of the following " +#| "options:" +msgid "" +"In the Find Data dialog, select the search criteria " +"that you want to remove." +msgstr "" +"「編集」「検索」を選択します。" + +#: C/ghex.xml:428(para) +#, fuzzy +#| msgid "Click Find Next." +msgid "Click Remove Selected." +msgstr "" +"2 番目のテキストボックスに、検索した文字列と置換する文字列を入力します。" + +#: C/ghex.xml:438(title) msgid "To Find and Replace Data in a File" msgstr "" "文字列の前の一致を検索するには、「前を検索」をクリック" "します。" -#: C/ghex2.xml:368(para) +#: C/ghex.xml:439(para) msgid "" "To search a file for a hexadecimal or ASCII string and then replace the " "string, perform the following steps:" msgstr "ファイル内のデータを検索して置換する" -#: C/ghex2.xml:370(para) +#: C/ghex.xml:441(para) msgid "" "Choose EditReplace." @@ -463,7 +778,7 @@ "ファイル内にある ASCII ないし 16 進の文字列の検索と置換をするには、下記の手順" "に従います。" -#: C/ghex2.xml:375(para) +#: C/ghex.xml:443(para) msgid "" "In the Find & Replace Data dialog, choose one of " "the following options:" @@ -471,53 +786,64 @@ "「編集」「置換」を選択します。" -#: C/ghex2.xml:377(guilabel) +#: C/ghex.xml:445(guilabel) msgid "Replace hex data" msgstr "" "「 検索およびデータの置換」ダイアログで、下記のオプショ" "ンのいずれかを選択します。" -#: C/ghex2.xml:379(guilabel) +#: C/ghex.xml:447(guilabel) msgid "Replace ASCII data" msgstr "「16進データを置換」" -#: C/ghex2.xml:383(para) +#: C/ghex.xml:451(para) msgid "In the first text box, type the string that you want to find." msgstr "「ASCII データを置換」" -#: C/ghex2.xml:385(para) +#: C/ghex.xml:453(para) msgid "" "In the second text box, type the string that you want to use to replace the " "string that you find." msgstr "最初のテキストボックスに、検索する文字列を入力します。" -#: C/ghex2.xml:387(para) +#: C/ghex.xml:455(para) msgid "Click Find Next." msgstr "" "2 番目のテキストボックスに、検索した文字列と置換する文字列を入力します。" -#: C/ghex2.xml:389(para) +#: C/ghex.xml:457(para) msgid "" "Click Replace to replace the current occurrence of " "the string or click Replace All to replace all " "occurrences of the string." msgstr "「次を検索」をクリックします。" -#: C/ghex2.xml:397(title) +#: C/ghex.xml:459(para) +msgid "" +"Click Cancel to close the Find & " +"Replace Data dialog." +msgstr "" + +#: C/ghex.xml:467(title) msgid "To Add or Remove Additional Views of a File" msgstr "" "現在の該当文字列を置換するには「置換」をクリックし、す" "べての該当文字列を一 度に置換するには「全て置換」をク" "リックします。" -#: C/ghex2.xml:398(para) +#: C/ghex.xml:468(para) +#, fuzzy +#| msgid "" +#| "To add another view of the current file to your GHex window or to the desktop, choose ViewAdd View." msgid "" "To add another view of the current file to your GHex window or to the desktop, choose View window, choose ViewAdd View." msgstr "ファイルのビューの追加および削除" -#: C/ghex2.xml:402(para) +#: C/ghex.xml:469(para) msgid "" "To remove a view of the current file, choose ViewRemove View. If you remove " @@ -527,7 +853,44 @@ "トップに追加するには、「ビュー」" "「ビューを追加」を選択します。" -#: C/ghex2.xml:411(title) +#: C/ghex.xml:475(title) +msgid "To Change the Data Group Type" +msgstr "" + +#: C/ghex.xml:476(para) +#, fuzzy +#| msgid "" +#| "To add another view of the current file to your GHex window or to the desktop, choose ViewAdd View." +msgid "" +"To change how GHex displays the hexadecimal " +"content of a file in the GHex window, choose " +"ViewGroup Data As, then select one of the following menu items:" +msgstr "ファイルのビューの追加および削除" + +#: C/ghex.xml:478(para) C/ghex.xml:657(para) +#, fuzzy +#| msgid "Bytes - single bytes." +msgid "Bytes - single bytes" +msgstr "" +"ここでは GHex ウィンドウでの 16 進数を、どの形式で" +"表示するかを指定します。指定できるのは下記のオプションです。" + +#: C/ghex.xml:480(para) C/ghex.xml:659(para) +#, fuzzy +#| msgid "Words - groups of two bytes." +msgid "Words - groups of two bytes" +msgstr "「バイト」 - 1 バイト単位で表示。" + +#: C/ghex.xml:482(para) C/ghex.xml:661(para) +#, fuzzy +#| msgid "Longwords - groups of four bytes." +msgid "Longwords - groups of four bytes" +msgstr "「ワード」 - 2 バイトでグループ化。" + +#: C/ghex.xml:490(title) msgid "To Export the GHex Display to HTML" msgstr "" "現在のファイルのビューを削除するには、「ビュー」GHex window." msgstr "GHex の表示データを HTML にエクスポートする" -#: C/ghex2.xml:418(para) +#: C/ghex.xml:494(para) msgid "Uses the HTML filename that you specify as the basis for the filename." msgstr "" "GHexウィンドウ内に表示される個々のページごとに、個" "別の HTML ファイルを作成。" -#: C/ghex2.xml:420(para) +#: C/ghex.xml:496(para) msgid "Appends a page number to the filename to differentiate the files." msgstr "各ファイルのベース名には、指定されたファイル名を使用。" -#: C/ghex2.xml:412(para) +#: C/ghex.xml:491(para) msgid "" "To export the data contained in the GHex window " "to HTML, choose FileSave As " @@ -564,7 +927,7 @@ "filename>, log00000002.html, and so on." msgstr "ファイルを区別するために、ファイル名にページ番号を追加。" -#: C/ghex2.xml:428(title) +#: C/ghex.xml:504(title) msgid "To View a Character Table" msgstr "" "GHex ウィンドウ内のデータを HTML にエクスポートす" @@ -577,28 +940,28 @@ "log00000000.html、log00000001.html、log00000002.html のようになります。" -#: C/ghex2.xml:429(para) +#: C/ghex.xml:505(para) msgid "" "To view a table that contains the ASCII, hexadecimal, decimal, octal, and " "binary representations for the values 0 to 255, choose " "WindowsCharacter Table." -msgstr "キャラクタテーブルを表示する" +msgstr "キャラクターテーブルを表示する" -#: C/ghex2.xml:438(title) +#: C/ghex.xml:511(title) msgid "To View Data Conversions" msgstr "" -"0 から 255 の各値に対応する ASCII キャラクタ、16 進数、10 進数、8 進数、2 進" -"数を示した表を表示するには、「ウィンドウ」「ウィンドウ」「文字一覧表」を選択します。" -#: C/ghex2.xml:439(para) +#: C/ghex.xml:512(para) msgid "" "To display the binary, decimal, hexadecimal, and ASCII conversions for up to " "four bytes of data, perform the following steps:" msgstr "データを変換表示する" -#: C/ghex2.xml:441(para) +#: C/ghex.xml:514(para) msgid "" "Choose WindowsBase Converter." @@ -606,20 +969,20 @@ "2 進数、10 進数、16 進数、ASCII 間でのデータを変換表示 (最大 4 バイト) するに" "は、下記の手順に従います。" -#: C/ghex2.xml:446(para) +#: C/ghex.xml:516(para) msgid "Perform one of the following actions:" msgstr "" "「ウィンドウ」「基底変換」を選択します。" -#: C/ghex2.xml:448(para) +#: C/ghex.xml:518(para) msgid "" "Type the data that you want to convert in one of the fields in the " "Base Converter dialog, then press Return." msgstr "次のアクションから 1 つを実行します。" -#: C/ghex2.xml:451(para) +#: C/ghex.xml:520(para) msgid "" "To display the conversions for the data at the cursor position in the " "current file, click on the Get cursor value button." @@ -627,7 +990,7 @@ "「基底変換」ダイアログ上の該当するフィールドに変換する" "データを入力し、リターン キーを押します。" -#: C/ghex2.xml:455(para) +#: C/ghex.xml:523(para) msgid "" "GHex updates the values of the other fields to " "display the data conversions." @@ -635,13 +998,113 @@ "また、現在のカーソル位置にあるデータを変換する場合は、「カーソル下" "の値を取得」ボタンをクリックします。" -#: C/ghex2.xml:464(title) +#: C/ghex.xml:525(para) +msgid "" +"Click Close to close the Base Converter dialog." +msgstr "" + +#: C/ghex.xml:533(title) +msgid "To Show or Hide the Type Conversion Dialog" +msgstr "" + +#: C/ghex.xml:534(para) +#, fuzzy +#| msgid "" +#| "To save changes to the current file, choose FileSave." +msgid "" +"To show or hide the type conversion dialog, choose " +"WindowsType Conversion Dialog." +msgstr "ファイルの保存は、下記のいずれかの方法で行えます。" + +#: C/ghex.xml:535(para) +msgid "" +"The type conversion dialog displays the value of the selected character in " +"the following representations:" +msgstr "" + +#: C/ghex.xml:538(guilabel) +msgid "Signed 8 bit" +msgstr "" + +#: C/ghex.xml:541(guilabel) +msgid "Unsigned 8 bit" +msgstr "" + +#: C/ghex.xml:544(guilabel) +msgid "Signed 16 bit" +msgstr "" + +#: C/ghex.xml:547(guilabel) +msgid "Unsigned 16 bit" +msgstr "" + +#: C/ghex.xml:550(guilabel) +msgid "Signed 32 bit" +msgstr "" + +#: C/ghex.xml:553(guilabel) +msgid "Unsigned 32 bit" +msgstr "" + +#: C/ghex.xml:556(guilabel) +msgid "32 bit float" +msgstr "" + +#: C/ghex.xml:559(guilabel) +msgid "64 bit float" +msgstr "" + +#: C/ghex.xml:562(guilabel) +msgid "Hexadecimal" +msgstr "" + +#: C/ghex.xml:565(guilabel) +msgid "Octal" +msgstr "" + +#: C/ghex.xml:568(guilabel) +msgid "Binary" +msgstr "" + +#: C/ghex.xml:571(guilabel) +msgid "Stream Length" +msgstr "" + +#: C/ghex.xml:574(para) +#, fuzzy +#| msgid "" +#| "The GHex window contains the following " +#| "elements:" +msgid "The type conversion dialog also contains the following options:" +msgstr "ファイルを開いた状態の GHex メインウィンドウ" + +#: C/ghex.xml:577(guilabel) +msgid "Show little endian decoding" +msgstr "" + +#: C/ghex.xml:579(para) +msgid "Select this option to show little endian decoding." +msgstr "" + +#: C/ghex.xml:583(guilabel) +msgid "Show unsigned and float as hexadecimal" +msgstr "" + +#: C/ghex.xml:585(para) +msgid "" +"Select this option to show unsigned and float numbers as hexadecimal numbers." +msgstr "" + +#: C/ghex.xml:594(title) msgid "To Print a File" msgstr "" "GHex によりデータの変換結果が、他のフィールドに表" "示されます。" -#: C/ghex2.xml:465(para) +#: C/ghex.xml:595(para) msgid "" "To print a file, choose FilePrint. Select the print " @@ -649,7 +1112,7 @@ "click OK." msgstr "ファイルを印刷する" -#: C/ghex2.xml:469(para) +#: C/ghex.xml:596(para) msgid "" "To preview a printed copy of the file, choose FilePrint Preview." @@ -659,14 +1122,14 @@ "「印刷」ダイアログで必要な印刷オプションを選択して、" "「 了解」をクリックします。" -#: C/ghex2.xml:481(title) +#: C/ghex.xml:604(title) msgid "Preferences" msgstr "" "印刷したファイルのプレビューを表示するには、「ファイル」" "「印刷プレビュー」を選択し" "ます。" -#: C/ghex2.xml:482(para) +#: C/ghex.xml:605(para) msgid "" "To configure GHex, choose " "EditPreferencesGHex を設定するには、「編集」" "「設定」を選択します。" "「設定」ダイアログには下記のタブが表示されます。" -#: C/ghex2.xml:501(guilabel) +#: C/ghex.xml:621(guilabel) msgid "Maximum number of undo levels" msgstr "「編集」" -#: C/ghex2.xml:503(para) +#: C/ghex.xml:623(para) +#, fuzzy +#| msgid "" +#| "Use this spin box to specify the maximum number of edits that you can " +#| "undo using the Undo menu item on the " +#| "Edit menu." msgid "" -"Use this spin box to specify the maximum number of edits that you can undo " -"using the Undo menu item on the Edit menu." +"Use this spin box to specify the maximum number of edits that you can undo." msgstr "「元に戻せる最大回数」" -#: C/ghex2.xml:509(guilabel) +#: C/ghex.xml:627(guilabel) msgid "Show cursor offset in statusbar as" msgstr "" "このスピンボックスでは、「編集」メニューの" "「元に戻す」で元に戻 せる最大回数を指定します。" -#: C/ghex2.xml:511(para) -msgid "" -"Use this drop-down list box to select the format in which the cursor offset " -"is displayed. The format can be decimal, hexadecimal, or a custom print " -"style string that only contains the format specifiers x, o, and s." +#: C/ghex.xml:629(para) +#, fuzzy +#| msgid "" +#| "Use this drop-down list box to select the format in which the cursor " +#| "offset is displayed. The format can be decimal, hexadecimal, or a custom " +#| "print style string that only contains the format specifiers x, o, and s." +msgid "" +"Use this drop-down list to select the format in which the cursor offset is " +"displayed. The format can be decimal, hexadecimal, or a custom print style " +"string that only contains the format specifiers x, o, and s." msgstr "「ステータスバーのカーソルオフセット表現」" -#: C/ghex2.xml:517(guilabel) +#: C/ghex.xml:633(guilabel) msgid "Show offsets column" msgstr "" "このドロップダウンリストでは、カーソルオフセットの表示形式を選択します。選択" "可能な表示形式には 10 進数および 16 進数の他に、形式指示子 x、o、s からなるカ" "スタム印刷スタイル文字列があります。" -#: C/ghex2.xml:519(para) +#: C/ghex.xml:635(para) msgid "" "Select this option to display the cursor offsets in a column to the left of " "the hexadecimal view of the GHex window." msgstr "「オフセット欄の表示」" -#: C/ghex2.xml:530(title) +#: C/ghex.xml:644(title) msgid "Display" msgstr "" "このオプションを選択するとカーソルオフセット列が、GHexウィンドウの 16 進表示ビューの左側に表示されます。" -#: C/ghex2.xml:533(guilabel) +#: C/ghex.xml:647(guilabel) msgid "Font" msgstr "「表示」" -#: C/ghex2.xml:535(para) -msgid "" -"Click on this button to display the font selector dialog. Use the font " -"selector dialog to edit the existing font information or type new font " -"information. Specify a font type, style, and size for displaying the " -"contents of files in GHex, then click " -"OK. The font information that you specify is " -"displayed on the Font button." +#: C/ghex.xml:649(para) +#, fuzzy +#| msgid "" +#| "Click on this button to display the font selector dialog. Use the font " +#| "selector dialog to edit the existing font information or type new font " +#| "information. Specify a font type, style, and size for displaying the " +#| "contents of files in GHex, then click " +#| "OK. The font information that you specify is " +#| "displayed on the Font button." +msgid "" +"Use the font selector list boxes to edit the existing font information or " +"type new font information. Specify a font type, style, and size to display " +"the contents of files in GHex." msgstr "「フォント」" -#: C/ghex2.xml:541(guilabel) +#: C/ghex.xml:653(guilabel) msgid "Default Group Type" msgstr "" "このボタンをクリックすると、フォント選択ダイアログが表示されます。このフォン" @@ -748,162 +1224,106 @@ "「了解」をクリックし ます。指定したフォント情報は、" "「フォント」ボタンに表示されます。" -#: C/ghex2.xml:543(para) -msgid "" -"Select how the application displays the hexadecimal content of a file in the " -"GHex window. The options are as follows:" +#: C/ghex.xml:655(para) +#, fuzzy +#| msgid "" +#| "Select how the application displays the hexadecimal content of a file in " +#| "the GHex window. The options are as follows:" +msgid "" +"Select one of the following options to specify how GHex displays the hexadecimal content of a file in the " +"GHex window:" msgstr "「デフォルトのデータ表示」" -#: C/ghex2.xml:545(para) -msgid "Bytes - single bytes." -msgstr "" -"ここでは GHex ウィンドウでの 16 進数を、どの形式で" -"表示するかを指定します。指定できるのは下記のオプションです。" - -#: C/ghex2.xml:547(para) -msgid "Words - groups of two bytes." -msgstr "「バイト」 - 1 バイト単位で表示。" - -#: C/ghex2.xml:549(para) -msgid "Longwords - groups of four bytes." -msgstr "「ワード」 - 2 バイトでグループ化。" - -#: C/ghex2.xml:563(title) +#: C/ghex.xml:672(title) msgid "Printing" msgstr "「ロングワード」 - 4 バイトでグループ化。" -#: C/ghex2.xml:566(guilabel) +#: C/ghex.xml:675(guilabel) msgid "Data font" msgstr "「印刷」" -#: C/ghex2.xml:568(para) +#: C/ghex.xml:677(para) +#, fuzzy +#| msgid "" +#| "Click on the Data font button to specify the size " +#| "of the font to use to print the data contained in a file." msgid "" -"Click on the Data font button to specify the size of " -"the font to use to print the data contained in a file." +"Click on the Data font button to specify the font " +"type, style, and size to use to print the data contained in a file." msgstr "「データ用フォント」" -#: C/ghex2.xml:574(guilabel) +#: C/ghex.xml:681(guilabel) msgid "Header font" msgstr "" "ファイルのデータの印刷用フォントサイズを指定するには、この「データ" "用フォント」ボタン をクリックします。" -#: C/ghex2.xml:576(para) -msgid "" -"Click on the Header font button to specify the size " -"of the font to use to print the header information that is contained in the " -"file." +#: C/ghex.xml:683(para) +#, fuzzy +#| msgid "" +#| "Click on the Header font button to specify the " +#| "size of the font to use to print the header information that is contained " +#| "in the file." +msgid "" +"Click on the Header font button to specify the font " +"type, style, and size to use to print the header information that is " +"contained in the file." msgstr "「ヘッダー用フォント」" -#: C/ghex2.xml:582(guilabel) +#: C/ghex.xml:687(guilabel) msgid "Print shaded box over" msgstr "" "ファイルのヘッダー情報の印刷用フォントサイズを指定するには、この" "「ヘッダー用フォント」ボタンをクリックします。" -#: C/ghex2.xml:584(para) +#: C/ghex.xml:689(para) +#, fuzzy +#| msgid "" +#| "Use this spin box to specify the number of lines that GHex prints with a surrounding shaded box. If the value of the " +#| "spin box is 10, GHex prints the first 10 lines " +#| "of the file within a shaded box." msgid "" "Use this spin box to specify the number of lines that GHex prints with a surrounding shaded box. If the value of the spin " -"box is 10, GHex prints the first 10 lines of the " -"file within a shaded box." +"application> alternately prints with a surrounding shaded box. If the value " +"of the spin box is 10, GHex prints the first 10 " +"lines of the file without a shaded box, the next 10 lines with a shaded box, " +"and so on. If the value of the spin box is 0, GHex does not print any shaded box." msgstr "「陰影を付けて印刷」" -#: C/legal.xml:2(para) -msgid "" -"Permission is granted to copy, distribute and/or modify this document under " -"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any " -"later version published by the Free Software Foundation with no Invariant " -"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy " -"of the GFDL at this link or " -"in the file COPYING-DOCS distributed with this manual." -msgstr "" -"GNU Free Documentation License (GFDL) の管理下でこのドキュメント をコピー、配" -"布、または変更することを許可します。Free Software Foundation から発行された" -"バージョン 1.1 以降のドキュメントには、 セクションや表紙などがありません。" -"GFDL のコピーは、URL またはこ" -"のマニュアルと 一緒に配布された COPYING-DOCS を参照してください。" +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/ghex.xml:0(None) +msgid "translator-credits" +msgstr "" + +#~ msgid "" +#~ "You can open a single file or multiple files when you run " +#~ "GHex from a command line. To open multiple " +#~ "files from a command line, type the following command, then press " +#~ "Return:" +#~ msgstr "コマンドライン" + +#~ msgid "ghex2" +#~ msgstr "" +#~ "コマンドラインから GHex を実行する際には、複数" +#~ "のファイルを同時に開くことができます。複数のファイルを開く場合は、下記の形" +#~ "式でコマンドを入力 し、リターン キーを押します。" + +#~ msgid "file1.txt" +#~ msgstr "ghex2" + +#~ msgid "file2.txt" +#~ msgstr "file1.txt" + +#~ msgid "" +#~ "where file1.txt and file2.txt are the names of the files you want to open." +#~ msgstr "file2.txt" -#: C/legal.xml:12(para) -msgid "" -"This manual is part of a collection of GNOME manuals distributed under the " -"GFDL. If you want to distribute this manual separately from the collection, " -"you can do so by adding a copy of the license to the manual, as described in " -"section 6 of the license." -msgstr "" -"このマニュアルは、GFDL から配布された GNOME マニュアルの 一部です。このコレク" -"ションと別にマニュアルを提供したい場合は、 ライセンスのセクション 6 で説明し" -"ているように、マニュアルに ライセンスを追加してください。" - -#: C/legal.xml:19(para) -msgid "" -"Many of the names used by companies to distinguish their products and " -"services are claimed as trademarks. Where those names appear in any GNOME " -"documentation, and the members of the GNOME Documentation Project are made " -"aware of those trademarks, then the names are in capital letters or initial " -"capital letters." -msgstr "" -"他の企業の製品やサービスと区別するために使用する名前を登録商標 と呼びます。" -"GNOME プロジェクトで使用する場合は、すべて大文字か 最初の 1 文字だけ大文字で" -"記載しています。" - -#: C/legal.xml:35(para) -msgid "" -"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, " -"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT " -"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS " -"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE " -"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR " -"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR " -"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL " -"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY " -"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN " -"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION " -"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND" -msgstr "" -"ドキュメントは、「現状のまま」をベースとして提供 され、商品性、特定目的へも適" -"合性または第三者の権利の 非侵害の黙示の保証を含みそれに限定されない、明示的" -"で あるか黙示的であるかを問わない、なんらの保証も行われ ないものとします。" - -#: C/legal.xml:55(para) -msgid "" -"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING " -"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY " -"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE " -"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON " -"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF " -"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, " -"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES " -"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED " -"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE " -"POSSIBILITY OF SUCH DAMAGES." -msgstr "" -"本製品が、外国為替および外国貿易管理法 (外為法) に 定められる戦略物資等 (貨物" -"または役務) に該当する場合、 本製品を輸出または日本国外へ持ち出す際には、事前" -"の 書面による承諾を得ることのほか、外為法および関連法規 に基づく輸出手続き、" -"また場合によっては、米国商務省 または米国所轄官庁の許可を得ることが必要です。" - -#: C/legal.xml:28(para) -msgid "" -"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS " -"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: " -"" -msgstr "" -"ドキュメントおよび変更されているドキュメントは、下記の GNU FREE " -"DOCUMENTATION ライセンスのもとにおいて頒布されます。 " - -#: C/ghex2-C.omf:10(title) -msgid "GHex Manual V2.5" -msgstr "GHex" - -#: C/ghex2-C.omf:13(date) -msgid "2004-03-04" -msgstr "2002-08-28" - -#: C/ghex2-C.omf:18(description) -msgid "User manual for GHex." -msgstr "GHex ユーザーマニュアル" +#~ msgid "2004-03-04" +#~ msgstr "2002-08-28" -#: C/ghex2-C.omf:21(type) -msgid "user's guide" -msgstr "ユーザーズガイド" +#~ msgid "user's guide" +#~ msgstr "ユーザーズガイド" diff -Nru ghex-3.0.0/help/Makefile.am ghex-3.3.90/help/Makefile.am --- ghex-3.0.0/help/Makefile.am 2011-08-06 04:26:45.000000000 +0000 +++ ghex-3.3.90/help/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -11,3 +11,5 @@ figures/ghex_window_open.png DOC_LINGUAS = cs de es fr it ja ko oc sl sv th zh_CN zh_TW + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/help/Makefile.in ghex-3.3.90/help/Makefile.in --- ghex-3.0.0/help/Makefile.in 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/help/Makefile.in 2012-02-21 06:09:19.000000000 +0000 @@ -971,6 +971,8 @@ done dist-hook: doc-dist-hook +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/icons/16x16/Makefile.am ghex-3.3.90/icons/16x16/Makefile.am --- ghex-3.0.0/icons/16x16/Makefile.am 2011-08-06 04:26:45.000000000 +0000 +++ ghex-3.3.90/icons/16x16/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -8,3 +8,5 @@ EXTRA_DIST = \ $(icons_DATA) + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/icons/16x16/Makefile.in ghex-3.3.90/icons/16x16/Makefile.in --- ghex-3.0.0/icons/16x16/Makefile.in 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/icons/16x16/Makefile.in 2012-02-21 06:09:19.000000000 +0000 @@ -459,6 +459,8 @@ uninstall uninstall-am uninstall-iconsDATA +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/icons/22x22/Makefile.am ghex-3.3.90/icons/22x22/Makefile.am --- ghex-3.0.0/icons/22x22/Makefile.am 2011-08-06 04:26:45.000000000 +0000 +++ ghex-3.3.90/icons/22x22/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -8,3 +8,5 @@ EXTRA_DIST = \ $(icons_DATA) + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/icons/22x22/Makefile.in ghex-3.3.90/icons/22x22/Makefile.in --- ghex-3.0.0/icons/22x22/Makefile.in 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/icons/22x22/Makefile.in 2012-02-21 06:09:19.000000000 +0000 @@ -459,6 +459,8 @@ uninstall uninstall-am uninstall-iconsDATA +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/icons/24x24/Makefile.am ghex-3.3.90/icons/24x24/Makefile.am --- ghex-3.0.0/icons/24x24/Makefile.am 2011-08-06 04:26:45.000000000 +0000 +++ ghex-3.3.90/icons/24x24/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -8,3 +8,5 @@ EXTRA_DIST = \ $(icons_DATA) + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/icons/24x24/Makefile.in ghex-3.3.90/icons/24x24/Makefile.in --- ghex-3.0.0/icons/24x24/Makefile.in 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/icons/24x24/Makefile.in 2012-02-21 06:09:19.000000000 +0000 @@ -459,6 +459,8 @@ uninstall uninstall-am uninstall-iconsDATA +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/icons/32x32/Makefile.am ghex-3.3.90/icons/32x32/Makefile.am --- ghex-3.0.0/icons/32x32/Makefile.am 2011-08-06 04:26:45.000000000 +0000 +++ ghex-3.3.90/icons/32x32/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -8,3 +8,5 @@ EXTRA_DIST = \ $(icons_DATA) + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/icons/32x32/Makefile.in ghex-3.3.90/icons/32x32/Makefile.in --- ghex-3.0.0/icons/32x32/Makefile.in 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/icons/32x32/Makefile.in 2012-02-21 06:09:20.000000000 +0000 @@ -459,6 +459,8 @@ uninstall uninstall-am uninstall-iconsDATA +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/icons/48x48/Makefile.am ghex-3.3.90/icons/48x48/Makefile.am --- ghex-3.0.0/icons/48x48/Makefile.am 2011-08-06 04:26:45.000000000 +0000 +++ ghex-3.3.90/icons/48x48/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -14,3 +14,5 @@ EXTRA_DIST = \ $(icons_DATA) \ $(svg_DATA) + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/icons/48x48/Makefile.in ghex-3.3.90/icons/48x48/Makefile.in --- ghex-3.0.0/icons/48x48/Makefile.in 2011-09-26 17:42:38.000000000 +0000 +++ ghex-3.3.90/icons/48x48/Makefile.in 2012-02-21 06:09:20.000000000 +0000 @@ -485,6 +485,8 @@ uninstall-svgDATA +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/icons/Makefile.am ghex-3.3.90/icons/Makefile.am --- ghex-3.0.0/icons/Makefile.am 2011-08-06 04:26:45.000000000 +0000 +++ ghex-3.3.90/icons/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -1 +1,3 @@ SUBDIRS = 16x16 22x22 24x24 32x32 48x48 + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/icons/Makefile.in ghex-3.3.90/icons/Makefile.in --- ghex-3.0.0/icons/Makefile.in 2011-09-26 17:42:39.000000000 +0000 +++ ghex-3.3.90/icons/Makefile.in 2012-02-21 06:09:20.000000000 +0000 @@ -606,6 +606,8 @@ uninstall uninstall-am +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/ltmain.sh ghex-3.3.90/ltmain.sh --- ghex-3.0.0/ltmain.sh 2011-09-26 17:42:35.000000000 +0000 +++ ghex-3.3.90/ltmain.sh 2012-02-21 06:09:16.000000000 +0000 @@ -8050,7 +8050,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done diff -Nru ghex-3.0.0/Makefile.am ghex-3.3.90/Makefile.am --- ghex-3.0.0/Makefile.am 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/Makefile.am 2012-02-20 02:03:56.000000000 +0000 @@ -9,3 +9,5 @@ EXTRA_DIST = \ gnome-doc-utils.make \ COPYING-DOCS + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/Makefile.in ghex-3.3.90/Makefile.in --- ghex-3.0.0/Makefile.in 2011-09-26 17:42:39.000000000 +0000 +++ ghex-3.3.90/Makefile.in 2012-02-21 06:09:20.000000000 +0000 @@ -113,7 +113,7 @@ done; \ reldir="$$dir2" GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.xz distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ @@ -550,6 +550,7 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -557,7 +558,6 @@ dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz $(am__remove_distdir) @@ -576,7 +576,7 @@ $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -774,6 +774,8 @@ ps ps-am tags tags-recursive uninstall uninstall-am +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/NEWS ghex-3.3.90/NEWS --- ghex-3.0.0/NEWS 2011-09-26 17:41:18.000000000 +0000 +++ ghex-3.3.90/NEWS 2012-02-21 06:05:46.000000000 +0000 @@ -1,3 +1,22 @@ +=========== +GHex 3.3.90 +=========== + +Changes: + - Fix excessive scrolling back to cursor (Edward Sheldrake) + - Use maintainer mode by default (Javier Jardón) + - Remove the use of deprecated GTK+ API (Kalev Lember) + - Windows port fixes (Kalev Lember) + - Visual improvements with latest Adwaita theme (Kalev Lember) + +Translation updates: + - Estonian (Kalev Lember) + - Japanese (Jiro Matsuzawa) + - Lithuanian (Algimantas Margevičius) + - Polish (Piotr Drąg) + - Spanish (Daniel Mustieles) + + ========== GHex 3.0.0 ========== diff -Nru ghex-3.0.0/po/es.po ghex-3.3.90/po/es.po --- ghex-3.0.0/po/es.po 2011-08-04 08:13:52.000000000 +0000 +++ ghex-3.3.90/po/es.po 2012-02-21 01:13:58.000000000 +0000 @@ -7,15 +7,15 @@ # Lucas 'Basurero' Vieites , 2002,2003. # Francisco Javier F. Serrador , 2004, 2005, 2006. # Jorge González , 2007, 2010. -# Daniel Mustieles , 2010, 2011. +# Daniel Mustieles , 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: ghex.HEAD.es\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-02 04:36+0000\n" -"PO-Revision-Date: 2011-08-04 09:42+0200\n" +"POT-Creation-Date: 2012-02-18 21:30+0000\n" +"PO-Revision-Date: 2012-02-20 09:45+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -24,16 +24,16 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\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:673 +#: ../src/ghex-window.c:1107 msgid "GHex" msgstr "GHex" -#: ../ghex.desktop.in.h:2 +#: ../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" +#: ../data/ghex.desktop.in.h:3 msgid "Inspect and edit binary files" msgstr "Inspeccionar y editar archivos binarios" @@ -45,7 +45,7 @@ msgid "Hex" msgstr "Hexadecimal" -#: ../src/chartable.c:147 ../src/preferences.c:143 +#: ../src/chartable.c:147 ../src/preferences.c:142 msgid "Decimal" msgstr "Decimal" @@ -103,7 +103,7 @@ msgid "ERROR" msgstr "ERROR" -#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:1001 +#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:866 #, c-format msgid "GHex (%s): Find Data" msgstr "GHex (%s): Buscar datos" @@ -185,7 +185,7 @@ msgid "Closes advanced find window" msgstr "Cierra la ventana de búsqueda avanzada" -#: ../src/findreplace.c:355 ../src/ui.c:999 +#: ../src/findreplace.c:355 ../src/ui.c:864 #, c-format msgid "GHex (%s): Find & Replace Data" msgstr "GHex (%s): Buscar y reemplazar datos" @@ -240,7 +240,7 @@ msgid "Closes find and replace data window" msgstr "Cierra la ventana buscar y reemplazar" -#: ../src/findreplace.c:434 ../src/ui.c:997 +#: ../src/findreplace.c:434 ../src/ui.c:862 #, c-format msgid "GHex (%s): Jump To Byte" msgstr "GHex (%s): Saltar al byte" @@ -605,7 +605,7 @@ msgid "Show the type conversion dialog in the edit window" msgstr "Mostrar el diálogo de conversión de tipo en la ventana de edición" -#: ../src/ghex-window.c:431 ../src/ui.c:54 +#: ../src/ghex-window.c:431 ../src/ui.c:48 msgid "_Bytes" msgstr "_Bytes" @@ -613,7 +613,7 @@ msgid "Group data by 8 bits" msgstr "Agrupar datos por 8 bits" -#: ../src/ghex-window.c:433 ../src/ui.c:55 +#: ../src/ghex-window.c:433 ../src/ui.c:49 msgid "_Words" msgstr "_Palabras" @@ -621,7 +621,7 @@ msgid "Group data by 16 bits" msgstr "Agrupar datos por 16 bits" -#: ../src/ghex-window.c:435 ../src/ui.c:56 +#: ../src/ghex-window.c:435 ../src/ui.c:50 msgid "_Longwords" msgstr "Palabras _largas" @@ -629,31 +629,36 @@ msgid "Group data by 32 bits" msgstr "Agrupar datos por 32 bits" -#: ../src/ghex-window.c:773 +#: ../src/ghex-window.c:583 +#, c-format +msgid "Failed to load UI: %s" +msgstr "Fallo al cargar la IU: %s" + +#: ../src/ghex-window.c:792 #, c-format msgid "Offset: %s" msgstr "Desplazamiento: %s" -#: ../src/ghex-window.c:776 +#: ../src/ghex-window.c:795 #, c-format msgid "; %s bytes from %s to %s selected" msgstr "; seleccionados %s bytes desde %s hasta %s" -#: ../src/ghex-window.c:1060 +#: ../src/ghex-window.c:1067 #, c-format msgid "Activate file %s" msgstr "Activar archivo %s" -#: ../src/ghex-window.c:1096 +#: ../src/ghex-window.c:1103 #, c-format msgid "%s - GHex" msgstr "%s - GHex" -#: ../src/ghex-window.c:1224 +#: ../src/ghex-window.c:1229 msgid "Select a file to save buffer as" msgstr "Seleccione un archivo en el que guardar el búfer actual" -#: ../src/ghex-window.c:1280 +#: ../src/ghex-window.c:1261 #, c-format msgid "" "File %s exists.\n" @@ -662,20 +667,20 @@ "El archivo %s existe.\n" "¿Desea sobreescribirlo?" -#: ../src/ghex-window.c:1313 ../src/ui.c:299 +#: ../src/ghex-window.c:1287 ../src/ui.c:293 #, c-format msgid "Saved buffer to file %s" msgstr "Búfer guardado en el archivo %s" -#: ../src/ghex-window.c:1319 +#: ../src/ghex-window.c:1294 msgid "Error saving file!" msgstr "Error al guardar el archivo." -#: ../src/ghex-window.c:1325 +#: ../src/ghex-window.c:1300 msgid "Can't open file for writing!" msgstr "No se puede abrir el archivo para escritura." -#: ../src/ghex-window.c:1370 +#: ../src/ghex-window.c:1345 #, c-format msgid "" "File %s has changed since last save.\n" @@ -684,15 +689,15 @@ "El archivo %s ha cambiado desde la última vez que se guardó.\n" "¿Desea guardar los cambios?" -#: ../src/ghex-window.c:1374 +#: ../src/ghex-window.c:1349 msgid "Do_n't save" msgstr "_No guardar" -#: ../src/ghex-window.c:1394 ../src/ui.c:287 +#: ../src/ghex-window.c:1369 ../src/ui.c:281 msgid "You don't have the permissions to save the file!" msgstr "No tiene permisos para guardar el archivo." -#: ../src/ghex-window.c:1398 ../src/ui.c:292 +#: ../src/ghex-window.c:1373 ../src/ui.c:286 msgid "An error occurred while saving file!" msgstr "Sucedió un error al guardar el archivo." @@ -760,26 +765,26 @@ msgid "New document" msgstr "Nuevo documento" -#: ../src/hex-document.c:790 +#: ../src/hex-document.c:785 #, c-format msgid "Page" msgstr "Página" -#: ../src/hex-document.c:796 ../src/hex-document.c:921 +#: ../src/hex-document.c:791 ../src/hex-document.c:916 #, c-format msgid "Hex dump generated by" msgstr "Volcado hexadecimal generado por" -#: ../src/hex-document.c:807 +#: ../src/hex-document.c:802 msgid "Saving to HTML..." msgstr "Guardando a HTML..." -#: ../src/hex-document.c:844 +#: ../src/hex-document.c:839 #, c-format msgid "Previous page" msgstr "Página anterior" -#: ../src/hex-document.c:859 +#: ../src/hex-document.c:854 #, c-format msgid "Next page" msgstr "Página siguiente" @@ -810,125 +815,125 @@ "Ejecute «%s --help» para ver una lista completa de las opciones de línea de " "comandos.\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 "Cadena de geometría inválida «%s»\n" -#: ../src/preferences.c:70 +#: ../src/preferences.c:69 msgid "GHex Preferences" msgstr "Preferencias GHex" -#: ../src/preferences.c:102 +#: ../src/preferences.c:101 msgid "_Maximum number of undo levels:" msgstr "Número _máximo de niveles de deshacer:" -#: ../src/preferences.c:122 +#: ../src/preferences.c:121 msgid "Undo levels" msgstr "Niveles de deshacer" -#: ../src/preferences.c:122 +#: ../src/preferences.c:121 msgid "Select maximum number of undo levels" msgstr "Seleccione el número máximo de niveles de deshacer" -#: ../src/preferences.c:126 +#: ../src/preferences.c:125 msgid "_Show cursor offset in statusbar as:" msgstr "Mo_strar desplazamiento del cursor en la barra de estado como:" -#: ../src/preferences.c:145 +#: ../src/preferences.c:144 msgid "Hexadecimal" msgstr "Hexadecimal" -#: ../src/preferences.c:147 +#: ../src/preferences.c:146 msgid "Custom" msgstr "Personalizado" -#: ../src/preferences.c:156 +#: ../src/preferences.c:155 msgid "Enter the cursor offset format" msgstr "Introduzca el formato del desplazamiento del cursor" -#: ../src/preferences.c:157 +#: ../src/preferences.c:156 msgid "Select the cursor offset format" msgstr "Seleccione el formato de desplazamiento del cursor" #. show offsets check button -#: ../src/preferences.c:167 +#: ../src/preferences.c:166 msgid "Sh_ow offsets column" msgstr "M_ostrar columna de los desplazamientos" -#: ../src/preferences.c:172 +#: ../src/preferences.c:171 msgid "Editing" msgstr "Editando" #. display font -#: ../src/preferences.c:181 +#: ../src/preferences.c:180 msgid "Font" msgstr "Tipografía" #. default group type -#: ../src/preferences.c:204 +#: ../src/preferences.c:203 msgid "Default Group Type" msgstr "Tipo de grupo predeterminado" -#: ../src/preferences.c:220 +#: ../src/preferences.c:219 msgid "Display" msgstr "Pantalla" #. paper selection -#: ../src/preferences.c:229 +#: ../src/preferences.c:228 msgid "Paper size" msgstr "Tamaño del papel" #. data & header font selection -#: ../src/preferences.c:234 +#: ../src/preferences.c:233 msgid "Fonts" msgstr "Tipografía" -#: ../src/preferences.c:240 +#: ../src/preferences.c:239 msgid "_Data font:" msgstr "Tipografía de los _datos:" -#: ../src/preferences.c:256 +#: ../src/preferences.c:255 msgid "Data font" msgstr "Tipografía de los datos" -#: ../src/preferences.c:256 +#: ../src/preferences.c:255 msgid "Select the data font" msgstr "Selecciona la tipografía de los datos" -#: ../src/preferences.c:270 +#: ../src/preferences.c:269 msgid "Header fo_nt:" msgstr "Tipografía de las _cabeceras:" -#: ../src/preferences.c:285 +#: ../src/preferences.c:284 msgid "Header font" msgstr "Tipografía de las cabeceras" -#: ../src/preferences.c:285 +#: ../src/preferences.c:284 msgid "Select the header font" msgstr "Selecciona la tipografía de las cabeceras" -#: ../src/preferences.c:311 +#: ../src/preferences.c:310 msgid "_Print shaded box over:" msgstr "Sobreim_primir un recuadro sombreado:" -#: ../src/preferences.c:323 +#: ../src/preferences.c:322 msgid "Box size" msgstr "Tamaño del recuadro" -#: ../src/preferences.c:323 +#: ../src/preferences.c:322 msgid "Select size of box (in number of lines)" msgstr "Seleccione el tamaño del recuadro (cantidad de líneas)" -#: ../src/preferences.c:327 +#: ../src/preferences.c:326 msgid "lines (0 for no box)" msgstr "líneas (0 significa sin recuadro)" -#: ../src/preferences.c:334 +#: ../src/preferences.c:333 msgid "Printing" msgstr "Imprimiendo" -#: ../src/preferences.c:454 ../src/ui.c:208 +#: ../src/preferences.c:451 ../src/ui.c:202 #, c-format msgid "" "There was an error displaying help: \n" @@ -937,11 +942,11 @@ "Ha ocurrido un error al mostrar ayuda: \n" "%s" -#: ../src/preferences.c:507 +#: ../src/preferences.c:503 msgid "Can not open desired font!" msgstr "No se puede abrir la tipografía deseada." -#: ../src/preferences.c:570 +#: ../src/preferences.c:564 msgid "" "The offset format string contains invalid format specifier.\n" "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed." @@ -950,37 +955,20 @@ "inválido.\n" "Solo se permiten «x», «X», «p», «P», «d» y «o»." -#: ../src/print.c:67 +#: ../src/print.c:57 #, c-format msgid "Page: %i/%i" msgstr "Página: %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 no pudo encontrar la tipografía «%s».\n" -"Ghex es incapaz de imprimir si esta tipografía no está instalada." - -#: ../src/ui.c:61 +#: ../src/ui.c:55 msgid "hex data" msgstr "datos hexadecimales" -#: ../src/ui.c:62 +#: ../src/ui.c:56 msgid "ASCII data" msgstr "datos 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 Colaboradores de GHex" - -#: ../src/ui.c:157 +#: ../src/ui.c:151 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 " @@ -992,7 +980,7 @@ "Free Software Foundation; ya sea la versión 2 de la Licencia, o (a su " "elección) cualquier versión posterior." -#: ../src/ui.c:161 +#: ../src/ui.c:155 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 " @@ -1004,7 +992,7 @@ "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General GNU " "para más detalles." -#: ../src/ui.c:165 +#: ../src/ui.c:159 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 " @@ -1014,48 +1002,48 @@ "con este programa, si no es así, escriba a la Free Software Foundation, Inc, " "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE UU." -#: ../src/ui.c:177 +#: ../src/ui.c:171 msgid "A binary file editor" msgstr "Un editor de archivos binarios" -#: ../src/ui.c:183 +#: ../src/ui.c:177 msgid "About GHex" msgstr "Acerca de GHex" -#: ../src/ui.c:184 +#: ../src/ui.c:178 msgid "translator-credits" msgstr "Daniel Mustieles , 2007-2010" -#: ../src/ui.c:187 +#: ../src/ui.c:181 msgid "GHex Website" msgstr "Página web de GHex" -#: ../src/ui.c:317 +#: ../src/ui.c:311 msgid "Select a file to open" msgstr "Seleccione un archivo para abrir" -#: ../src/ui.c:348 +#: ../src/ui.c:342 #, c-format msgid "Loaded file %s" msgstr "Se ha cargado el archivo %s" -#: ../src/ui.c:356 +#: ../src/ui.c:350 msgid "Can not open file!" msgstr "No se puede abrir el archivo." -#: ../src/ui.c:421 +#: ../src/ui.c:415 msgid "Select path and file name for the HTML source" msgstr "Seleccione la ruta y nombre del archivo para el código HTML" -#: ../src/ui.c:455 +#: ../src/ui.c:447 msgid "You need to specify a base name for the HTML files." msgstr "Debe especificar un nombre base para los archivos HTML." -#: ../src/ui.c:466 ../src/ui.c:490 +#: ../src/ui.c:458 ../src/ui.c:484 msgid "You don't have the permission to write to the selected path.\n" msgstr "No tiene permisos para escribir en la ruta especificada.\n" -#: ../src/ui.c:477 +#: ../src/ui.c:470 msgid "" "Saving to HTML will overwrite some files.\n" "Do you want to proceed?" @@ -1063,32 +1051,41 @@ "Al guardar como HTML se sobrescribirán algunos archivos.\n" "¿Desea continuar?" -#: ../src/ui.c:742 +#: ../src/ui.c:738 #, c-format msgid "Really revert file %s?" msgstr "¿Desea realmente revertir los cambios del archivo %s?" -#: ../src/ui.c:756 +#: ../src/ui.c:752 #, c-format msgid "Reverted buffer from file %s" msgstr "Se ha revertido el búfer desde el archivo %s" -#: ../src/ui.c:840 -msgid "Printing file..." -msgstr "Imprimiendo archivo..." - -#: ../src/ui.c:900 -msgid "Print Hex Document" -msgstr "Imprimir documento hexadecimal" - -#: ../src/ui.c:912 -msgid "Pages" -msgstr "Páginas" +#~ msgid "" +#~ "GHex could not find the font \"%s\".\n" +#~ "GHex is unable to print without this font installed." +#~ msgstr "" +#~ "Ghex no pudo encontrar la tipografía «%s».\n" +#~ "Ghex es incapaz de imprimir si esta tipografía no está instalada." + +#~ msgid "" +#~ "Copyright © 1998 - 2006 Jaka Močnik\n" +#~ "Copyright © 2006 - 2010 GHex Contributors" +#~ msgstr "" +#~ "Copyright © 1998 - 2006 Jaka Močnik\n" +#~ "Copyright © 2006 - 2010 Colaboradores de GHex" + +#~ msgid "Printing file..." +#~ msgstr "Imprimiendo archivo..." -#: ../src/ui.c:937 -#, c-format -msgid "GHex (%s): Print Preview" -msgstr "GHex (%s): Vista preliminar" +#~ msgid "Print Hex Document" +#~ msgstr "Imprimir documento hexadecimal" + +#~ msgid "Pages" +#~ msgstr "Páginas" + +#~ msgid "GHex (%s): Print Preview" +#~ msgstr "GHex (%s): Vista preliminar" #~ msgid "Hexadecimal Editor" #~ msgstr "Editor hexadecimal" diff -Nru ghex-3.0.0/po/et.po ghex-3.3.90/po/et.po --- ghex-3.0.0/po/et.po 2011-07-31 09:02:00.000000000 +0000 +++ ghex-3.3.90/po/et.po 2012-02-21 06:08:19.000000000 +0000 @@ -3,853 +3,947 @@ # Lauris Kaplinski , 1999. # Ilmar Kerm , 2002. # Tõivo Leedjärv , 2002. +# Kalev Lember , 2012. # msgid "" msgstr "" "Project-Id-Version: ghex\n" -"POT-Creation-Date: 2002-11-06 02:30+0200\n" -"PO-Revision-Date: 2002-11-06 02:35+0300\n" -"Last-Translator: Tõivo Leedjärv \n" -"Language-Team: Estonian \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=ghex&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-02-21 04:50+0000\n" +"PO-Revision-Date: 2012-02-21 08:02+0200\n" +"Last-Translator: Kalev Lember \n" +"Language-Team: Estonian <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: ghex.desktop.in.h:1 -msgid "GNOME Hexadecimal Editor" -msgstr "GNOME'i 16nd-süsteemi redaktor" +#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:675 +#: ../src/ghex-window.c:1109 +msgid "GHex" +msgstr "GHex" -#: ghex.desktop.in.h:2 +#: ../data/ghex.desktop.in.h:2 msgid "Hex Editor" msgstr "16nd-süsteemi redaktor" -#: src/chartable.c:122 +#: ../data/ghex.desktop.in.h:3 +msgid "Inspect and edit binary files" +msgstr "Binaarfailide vaatamine ja redigeerimine" + +#: ../src/chartable.c:147 msgid "ASCII" msgstr "ASCII" -#: src/chartable.c:122 +#: ../src/chartable.c:147 msgid "Hex" msgstr "16nd-süsteem" -#: src/chartable.c:122 src/preferences.c:174 +#: ../src/chartable.c:147 ../src/preferences.c:142 msgid "Decimal" msgstr "10nd-süsteem" -#: src/chartable.c:123 +#: ../src/chartable.c:148 msgid "Octal" msgstr "8nd-süsteem" -#: src/chartable.c:123 +#: ../src/chartable.c:148 msgid "Binary" msgstr "2nd-süsteem" -#: src/chartable.c:137 +#: ../src/chartable.c:164 msgid "Character table" msgstr "Märgitabel" -#: src/converter.c:198 +#: ../src/converter.c:232 msgid "Base Converter" msgstr "Aluse konverter" #. entries -#: src/converter.c:217 +#: ../src/converter.c:253 msgid "_Binary:" msgstr "_2nd-süsteem:" -#: src/converter.c:219 +#: ../src/converter.c:255 msgid "_Octal:" msgstr "_8nd-süsteem:" -#: src/converter.c:221 +#: ../src/converter.c:257 msgid "_Decimal:" msgstr "_10nd-süsteem:" -#: src/converter.c:223 +#: ../src/converter.c:259 msgid "_Hex:" msgstr "1_6nd-süsteem:" -#: src/converter.c:225 +#: ../src/converter.c:261 msgid "_ASCII:" msgstr "_ASCII:" #. get cursor button -#: src/converter.c:229 +#: ../src/converter.c:265 msgid "_Get cursor value" msgstr "_Võta kursori väärtus" -#: src/converter.c:241 +#: ../src/converter.c:279 msgid "Get cursor value" msgstr "Võta kursori väärtus" -#: src/converter.c:241 +#: ../src/converter.c:279 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII" msgstr "" "Võtab kursori all oleva märgi väärtuse 2nd-, 8nd-, 10nd-, 16-ndarvuna ja " "ASCII koodina" -#: src/converter.c:374 +#: ../src/converter.c:419 msgid "ERROR" msgstr "VIGA" -#: src/findreplace.c:60 src/ui.c:889 +#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:873 #, c-format msgid "GHex (%s): Find Data" -msgstr "GHex (%s): Otsi andmeid" +msgstr "GHex (%s): Andmete otsimine" -#: src/findreplace.c:69 -#, c-format -msgid "Search for %s" -msgstr "Otsi %s" +#: ../src/findreplace.c:101 ../src/findreplace.c:161 ../src/findreplace.c:359 +msgid "Find String" +msgstr "Teksti otsimine" -#: src/findreplace.c:86 +#: ../src/findreplace.c:108 ../src/findreplace.c:258 msgid "Find _Next" msgstr "Otsi _järgmine" -#: src/findreplace.c:94 +#: ../src/findreplace.c:115 ../src/findreplace.c:267 msgid "Find _Previous" msgstr "Otsi _eelmine" -#: src/findreplace.c:118 src/findreplace.c:210 +#: ../src/findreplace.c:138 ../src/findreplace.c:413 msgid "Find Data" msgstr "Otsi andmeid" -#: src/findreplace.c:118 src/findreplace.c:210 +#: ../src/findreplace.c:138 ../src/findreplace.c:413 msgid "Enter the hex data or ASCII data to search for" msgstr "Sisesta otsitavad andmed 16nd või ASCII kujul" -#: src/findreplace.c:119 +#: ../src/findreplace.c:139 msgid "Find Next" msgstr "Otsi järgmine" -#: src/findreplace.c:119 src/findreplace.c:212 +#: ../src/findreplace.c:139 ../src/findreplace.c:415 msgid "Finds the next occurrence of the search string" msgstr "Otsi stringi järgmist esinemist" -#: src/findreplace.c:120 +#: ../src/findreplace.c:140 msgid "Find previous" msgstr "Otsi eelmine" -#: src/findreplace.c:120 +#: ../src/findreplace.c:140 msgid "Finds the previous occurrence of the search string " msgstr "Otsi stringi eelmist esinemist" -#: src/findreplace.c:121 src/findreplace.c:215 src/findreplace.c:263 +#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:466 msgid "Cancel" msgstr "Loobu" -#: src/findreplace.c:121 +#: ../src/findreplace.c:141 msgid "Closes find data window" -msgstr "Sulge andmete otsimise aken" +msgstr "Sulgeb andmete otsimise akna" -#: src/findreplace.c:140 src/ui.c:887 +#: ../src/findreplace.c:157 #, c-format -msgid "GHex (%s): Find & Replace Data" -msgstr "GHex (%s): Otsi ja asenda" +msgid "GHex (%s): Find Data: Add search" +msgstr "GHex (%s): Andmete otsimine: Otsingu lisamine" + +#: ../src/findreplace.c:179 +msgid "Add" +msgstr "Lisa" + +#: ../src/findreplace.c:235 +msgid "Search String" +msgstr "Otsi teksti" + +#: ../src/findreplace.c:243 +msgid "Highlight Colour" +msgstr "Esile tõstetud värv" + +#: ../src/findreplace.c:280 +msgid "_Add New" +msgstr "_Lisa uus" + +#: ../src/findreplace.c:289 +msgid "_Remove Selected" +msgstr "_Eemalda valitud" -#: src/findreplace.c:155 +#: ../src/findreplace.c:309 +msgid "Close" +msgstr "Sulge" + +#: ../src/findreplace.c:309 +msgid "Closes advanced find window" +msgstr "Sulgeb andmete otsimise akna" + +#: ../src/findreplace.c:355 ../src/ui.c:871 #, c-format -msgid "Replace %s" -msgstr "Asenda %s" +msgid "GHex (%s): Find & Replace Data" +msgstr "GHex (%s): Otsi ja asenda andmeid" -#: src/findreplace.c:172 +#: ../src/findreplace.c:368 +msgid "Replace With" +msgstr "Asendada tekstiga" + +#: ../src/findreplace.c:375 msgid "Find _next" msgstr "Otsi _järgmine" -#: src/findreplace.c:180 src/ghex-ui.xml.h:85 +#: ../src/findreplace.c:383 msgid "_Replace" msgstr "_Asenda" -#: src/findreplace.c:188 +#: ../src/findreplace.c:391 msgid "Replace _All" msgstr "Asenda _kõik" -#: src/findreplace.c:211 +#: ../src/findreplace.c:414 msgid "Replace Data" -msgstr "Asenda andmed" +msgstr "Andmete asendamine" -#: src/findreplace.c:211 +#: ../src/findreplace.c:414 msgid "Enter the hex data or ASCII data to replace with" msgstr "Sisesta asendusandmed 16nd või ASCII kujul" -#: src/findreplace.c:212 +#: ../src/findreplace.c:415 msgid "Find next" msgstr "Otsi järgmine" -#: src/findreplace.c:213 src/ghex-ui.xml.h:48 +#: ../src/findreplace.c:416 msgid "Replace" msgstr "Asenda" -#: src/findreplace.c:213 +#: ../src/findreplace.c:416 msgid "Replaces the search string with the replace string" -msgstr "Asenda otsingustring asendusstringiga" +msgstr "Asendab otsingustringi asendusstringiga" -#: src/findreplace.c:214 +#: ../src/findreplace.c:417 msgid "Replace All" msgstr "Asenda kõik" -#: src/findreplace.c:214 +#: ../src/findreplace.c:417 msgid "Replaces all occurrences of the search string with the replace string" -msgstr "Asenda kõik otsingustringi leiud asendusstringiga" +msgstr "Asendab kõik otsingustringi leiud asendusstringiga" -#: src/findreplace.c:215 +#: ../src/findreplace.c:418 msgid "Closes find and replace data window" -msgstr "Sulge andmete otsimise ja asendamise aken" +msgstr "Sulgeb andmete otsimise ja asendamise akna" -#: src/findreplace.c:231 src/ui.c:885 +#: ../src/findreplace.c:434 ../src/ui.c:869 #, c-format msgid "GHex (%s): Jump To Byte" msgstr "GHex (%s): Hüppa baidile" -#: src/findreplace.c:261 +#: ../src/findreplace.c:464 msgid "Jump to byte" msgstr "Hüppa baidile" -#: src/findreplace.c:261 +#: ../src/findreplace.c:464 msgid "Enter the byte to jump to" msgstr "Sisesta bait, kuhu hüpata" -#: src/findreplace.c:262 +#: ../src/findreplace.c:465 msgid "OK" msgstr "Olgu" -#: src/findreplace.c:262 +#: ../src/findreplace.c:465 msgid "Jumps to the specified byte" msgstr "Hüppa määratud baidile" -#: src/findreplace.c:263 +#: ../src/findreplace.c:466 msgid "Closes jump to byte window" -msgstr "Sulge baidile hüppamise aken" +msgstr "Sulgeb baidile hüppamise akna" -#: src/findreplace.c:329 src/findreplace.c:357 src/findreplace.c:413 +#: ../src/findreplace.c:529 ../src/findreplace.c:563 ../src/findreplace.c:670 msgid "There is no active document to search!" msgstr "Pole aktiivset dokumenti, kust otsida!" -#: src/findreplace.c:337 src/findreplace.c:365 -msgid "The string is not appropriate for the selected data type!" -msgstr "String ei ole valitud andmetüübiga ühilduv!" +#: ../src/findreplace.c:536 ../src/findreplace.c:570 ../src/findreplace.c:677 +#: ../src/findreplace.c:711 ../src/findreplace.c:756 +msgid "There is no string to search for!" +msgstr "Pole teksti mida otsida!" -#: src/findreplace.c:344 src/findreplace.c:430 +#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:876 msgid "End Of File reached" msgstr "Faili lõpp käes" -#: src/findreplace.c:373 +#: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685 +#: ../src/findreplace.c:877 ../src/findreplace.c:900 +msgid "String was not found!\n" +msgstr "Teksti ei leitud!\n" + +#: ../src/findreplace.c:581 ../src/findreplace.c:899 msgid "Beginning Of File reached" msgstr "Faili algus käes" -#: src/findreplace.c:385 +#: ../src/findreplace.c:598 msgid "There is no active document to move the cursor in!" msgstr "Ei ole aktiivset dokumenti, kus kursorit liigutada!" -#: src/findreplace.c:390 +#: ../src/findreplace.c:616 msgid "No offset has been specified!" msgstr "Asukoht ei ole määratud!" -#: src/findreplace.c:397 +#: ../src/findreplace.c:641 +msgid "The specified offset is beyond the file boundaries!" +msgstr "Asukoht on faili piiridest väljaspool!" + +#: ../src/findreplace.c:649 msgid "Can not position cursor beyond the End Of File!" msgstr "Kursorit ei saa panna faili lõpust kaugemale!" -#: src/findreplace.c:402 -msgid "The offset must be a positive integer value!" -msgstr "Asukoht peab olema positiivne täisarv!" - -#: src/findreplace.c:421 -msgid "There seems to be no string to search for!" -msgstr "Tundub, et pole teksti, mida otsida!" +#: ../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', or\n" +" - a '+' or '-' sign, followed by a relative offset" +msgstr "" +"Asukohta võib määrata kas:\n" +" - positiivse 10nd-numbrina, või\n" +" - 16nd-numbrina, mis algab '0x'-ga, või\n" +" - '+' või '-' märgiga, millele järgneb suhteline asukoht" -#: src/findreplace.c:443 +#: ../src/findreplace.c:702 msgid "There is no active buffer to replace data in!" msgstr "Ei ole aktiivset puhvrit, kus teksti asendada!" -#: src/findreplace.c:455 src/findreplace.c:496 -msgid "Strings are not appropriate for the selected data type!" -msgstr "Stringid ei ole valitud andmetüübiga ühilduvad!" - -#: src/findreplace.c:470 src/findreplace.c:471 +#: ../src/findreplace.c:727 ../src/findreplace.c:728 msgid "End Of File reached!" msgstr "Faili lõpp käes!" -#: src/findreplace.c:484 +#: ../src/findreplace.c:747 msgid "There is no active document to replace data in!" msgstr "Ei ole aktiivset dokumenti, kus teksti asendada!" -#: src/findreplace.c:516 -msgid "No occurences were found." +#: ../src/findreplace.c:777 +msgid "No occurrences were found." msgstr "Ei leia ühtegi otsitavat." -#: src/findreplace.c:519 +#: ../src/findreplace.c:780 #, c-format -msgid "Replaced %d occurencies." -msgstr "%d leidu asendatud." - -#: src/ghex-ui.xml.h:1 -msgid "About this application" -msgstr "Programmist" +msgid "Replaced %d occurrence." +msgid_plural "Replaced %d occurrences." +msgstr[0] "%d leid asendatud." +msgstr[1] "%d leidu asendatud." + +#: ../src/findreplace.c:820 +msgid "No string to search for!" +msgstr "Pole teksti mida otsida!" -#: src/ghex-ui.xml.h:2 -msgid "Add View" -msgstr "Lisa vaade" - -#: src/ghex-ui.xml.h:3 -msgid "Add a new view to the buffer" -msgstr "Lisa puhvrile uus vaade" +#: ../src/ghex-window.c:75 +#, c-format +msgid "" +"Can not open URI:\n" +"%s" +msgstr "" +"Ei saa URI avada:\n" +"%s" -#: src/ghex-ui.xml.h:4 src/ui.c:64 -msgid "Bytes" -msgstr "Baidid" +#: ../src/ghex-window.c:96 +#, c-format +msgid "" +"Can not open file:\n" +"%s" +msgstr "" +"Ei saa faili avada:\n" +"%s" -#: src/ghex-ui.xml.h:5 -msgid "C_ut" -msgstr "_Lõika" +#: ../src/ghex-window.c:327 +msgid "_File" +msgstr "_Fail" -#: src/ghex-ui.xml.h:6 -msgid "Character Table..." -msgstr "Märgistik..." +#: ../src/ghex-window.c:328 +msgid "_Edit" +msgstr "_Redaktor" -#: src/ghex-ui.xml.h:7 -msgid "Character _Table..." -msgstr "_Märgistik" +#: ../src/ghex-window.c:329 +msgid "_View" +msgstr "_Vaade" -#: src/ghex-ui.xml.h:8 -msgid "Close" -msgstr "Sulge" +#: ../src/ghex-window.c:330 +msgid "_Group Data As" +msgstr "_Rühmita andmed" -#: src/ghex-ui.xml.h:9 -msgid "Close the current file" -msgstr "Sulge see fail" +#. View submenu +#: ../src/ghex-window.c:331 +msgid "_Windows" +msgstr "_Aknad" -#: src/ghex-ui.xml.h:10 -msgid "Configure the application" -msgstr "Programmi konfiguratsioon" +#: ../src/ghex-window.c:332 +msgid "_Help" +msgstr "_Abi" -#: src/ghex-ui.xml.h:11 -msgid "Contents" -msgstr "Sisu" - -#: src/ghex-ui.xml.h:12 -msgid "Converter..." -msgstr "Konverter..." - -#: src/ghex-ui.xml.h:13 -msgid "Copy" -msgstr "Kopeeri" +#. File menu +#: ../src/ghex-window.c:335 +msgid "_Open..." +msgstr "_Ava..." -#: src/ghex-ui.xml.h:14 -msgid "Copy selection to clipboard" -msgstr "Kopeeri valik lõikelauale" +#: ../src/ghex-window.c:336 +msgid "Open a file" +msgstr "Ava fail..." -#: src/ghex-ui.xml.h:15 -msgid "Cut" -msgstr "Lõik" +#: ../src/ghex-window.c:338 +msgid "_Save" +msgstr "_Salvesta" -#: src/ghex-ui.xml.h:16 -msgid "Cut selection" -msgstr "Lõika valik" +#: ../src/ghex-window.c:339 +msgid "Save the current file" +msgstr "Käesoleva faili salvestamine" -#: src/ghex-ui.xml.h:17 -msgid "E_xit" -msgstr "_Välju" +#: ../src/ghex-window.c:341 +msgid "Save _As..." +msgstr "Salvesta _kui..." -#: src/ghex-ui.xml.h:18 -msgid "Exit" -msgstr "Välju" +#: ../src/ghex-window.c:342 +msgid "Save the current file with a different name" +msgstr "Käesoleva faili salvestamine teise nime alla" -#: src/ghex-ui.xml.h:19 -msgid "Exit the program" -msgstr "Välju programmist" +#: ../src/ghex-window.c:344 +msgid "Save As _HTML..." +msgstr "Salvesta kui _HTML..." -#: src/ghex-ui.xml.h:20 +#: ../src/ghex-window.c:345 msgid "Export data to HTML source" -msgstr "Ekspordi andmed HTML failiks" - -#: src/ghex-ui.xml.h:21 -msgid "Export to HTML..." -msgstr "Ekspordi HTML-i..." - -#: src/ghex-ui.xml.h:22 -msgid "Find" -msgstr "Otsi" - -#: src/ghex-ui.xml.h:23 -msgid "Goto Byte" -msgstr "Mine baidile" - -#: src/ghex-ui.xml.h:24 -msgid "Group data by 16 bits" -msgstr "Rühmitab andmed 16 biti kaupa" - -#: src/ghex-ui.xml.h:25 -msgid "Group data by 32 bits" -msgstr "Rühmitab andmed 32 biti kaupa" - -#: src/ghex-ui.xml.h:26 -msgid "Group data by 8 bits" -msgstr "Rühmitab andmed 8 biti kaupa" - -#: src/ghex-ui.xml.h:27 -msgid "Help Chat" -msgstr "Abi jututuba" - -#: src/ghex-ui.xml.h:28 -msgid "Help on this application" -msgstr "Programmi abiinfo" +msgstr "Andmete eksport HTML failiks" -#: src/ghex-ui.xml.h:29 -msgid "Insert Mode" -msgstr "Lisamise režiim" - -#: src/ghex-ui.xml.h:30 -msgid "Insert/overwrite data" -msgstr "Lisa/kirjuta andmed üle" - -#: src/ghex-ui.xml.h:31 -msgid "Jump to a certain position" -msgstr "Liigu määratud asukohta" - -#: src/ghex-ui.xml.h:32 src/ui.c:66 -msgid "Longwords" -msgstr "Pikad sõnad" - -#: src/ghex-ui.xml.h:33 -msgid "Open" -msgstr "Ava" - -#: src/ghex-ui.xml.h:34 -msgid "Open a file" -msgstr "Ava fail..." +#: ../src/ghex-window.c:347 +msgid "_Revert" +msgstr "_Taasta" -#: src/ghex-ui.xml.h:35 -msgid "Open base conversion dialog" -msgstr "Avab arvusüsteemide konverteri" +#: ../src/ghex-window.c:348 +msgid "Revert to a saved version of the file" +msgstr "Käesoleva faili salvestatud versioon taastamine" -#: src/ghex-ui.xml.h:36 -msgid "Paste" -msgstr "Aseta" +#: ../src/ghex-window.c:350 +msgid "_Print" +msgstr "_Prindi" -#: src/ghex-ui.xml.h:37 -msgid "Paste data from clipboard" -msgstr "Aseta lõikelaua andmed" +#: ../src/ghex-window.c:351 +msgid "Print the current file" +msgstr "Käesoleva faili printimine" -#: src/ghex-ui.xml.h:38 -msgid "Preferences" -msgstr "Häälestus" +#: ../src/ghex-window.c:353 +msgid "Print Previe_w..." +msgstr "Printimise eel_vaade..." -#: src/ghex-ui.xml.h:39 +#: ../src/ghex-window.c:354 msgid "Preview printed data" msgstr "Vaata prinditavaid andmeid" -#: src/ghex-ui.xml.h:40 -msgid "Print" -msgstr "Prindi" - -#: src/ghex-ui.xml.h:41 -msgid "Print Previe_w..." -msgstr "Prindi_vaade..." - -#: src/ghex-ui.xml.h:42 -msgid "Print Preview..." -msgstr "Printimise eelvaade" +#: ../src/ghex-window.c:356 +msgid "_Close" +msgstr "_Sulge" -#: src/ghex-ui.xml.h:43 -msgid "Print the current file" -msgstr "Prindi see fail" +#: ../src/ghex-window.c:357 +msgid "Close the current file" +msgstr "Käesoleva faili sulgemine" -#: src/ghex-ui.xml.h:44 -msgid "Redo" -msgstr "Uuesti" +#: ../src/ghex-window.c:359 +msgid "E_xit" +msgstr "_Lõpeta" -#: src/ghex-ui.xml.h:45 -msgid "Redo the undone action" -msgstr "Teosta unustatud operatsioon uuesti" +#: ../src/ghex-window.c:360 +msgid "Exit the program" +msgstr "Programmi töö lõpetamine" -#: src/ghex-ui.xml.h:46 -msgid "Remove View" -msgstr "Eemalda vaade" +#. Edit menu +#: ../src/ghex-window.c:364 +msgid "_Undo" +msgstr "_Unusta" -#: src/ghex-ui.xml.h:47 -msgid "Remove the current view of the buffer" -msgstr "Eemaldab käesoleva puhvri vaate" +#: ../src/ghex-window.c:365 +msgid "Undo the last action" +msgstr "Viimase tegevuse unustamine" -#: src/ghex-ui.xml.h:49 -msgid "Replace a string" -msgstr "Asenda string" +#: ../src/ghex-window.c:367 +msgid "_Redo" +msgstr "_Uuesti" -#: src/ghex-ui.xml.h:50 -msgid "Revert" -msgstr "Taasta" +#: ../src/ghex-window.c:368 +msgid "Redo the undone action" +msgstr "Unustatud tegevuse uuestitegemine" -#: src/ghex-ui.xml.h:51 -msgid "Revert to a saved version of the file" -msgstr "Taasta selle faili salvestatud versioon" +#: ../src/ghex-window.c:370 +msgid "_Copy" +msgstr "_Kopeeri" -#: src/ghex-ui.xml.h:52 -msgid "Save" -msgstr "Salvesta" +#: ../src/ghex-window.c:371 +msgid "Copy selection to clipboard" +msgstr "Kopeeri valik lõikelauale" -#: src/ghex-ui.xml.h:53 -msgid "Save As" -msgstr "Salvesta kui..." +#: ../src/ghex-window.c:373 +msgid "Cu_t" +msgstr "_Lõika" -#: src/ghex-ui.xml.h:54 -msgid "Save As _HTML..." -msgstr "Salvesta kui _HTML..." +#: ../src/ghex-window.c:374 +msgid "Cut selection" +msgstr "Valiku lõikamine" -#: src/ghex-ui.xml.h:55 -msgid "Save _As..." -msgstr "Salvesta _kui..." +#: ../src/ghex-window.c:376 +msgid "Pa_ste" +msgstr "_Aseta" -#: src/ghex-ui.xml.h:56 -msgid "Save the current file" -msgstr "Salvesta see fail" +#: ../src/ghex-window.c:377 +msgid "Paste data from clipboard" +msgstr "Lõikepuhvri sisu asetamine" -#: src/ghex-ui.xml.h:57 -msgid "Save the current file with a different name" -msgstr "Salvesta see fail teise nime all" +#: ../src/ghex-window.c:379 +msgid "_Find" +msgstr "_Otsi" -#: src/ghex-ui.xml.h:58 +#: ../src/ghex-window.c:380 msgid "Search for a string" msgstr "Otsi stringi" -#: src/ghex-ui.xml.h:59 -msgid "Show the character table" -msgstr "Näitab märgistikku" +#: ../src/ghex-window.c:382 +msgid "_Advanced Find" +msgstr "_Täiustatud otsing" + +#: ../src/ghex-window.c:383 +msgid "Advanced Find" +msgstr "Täiustatud otsing" -#: src/ghex-ui.xml.h:60 -msgid "Undo" -msgstr "Unusta" +#: ../src/ghex-window.c:385 +msgid "R_eplace" +msgstr "_Asenda" -#: src/ghex-ui.xml.h:61 -msgid "Undo the last action" -msgstr "Unusta viimane tegevus" +#: ../src/ghex-window.c:386 +msgid "Replace a string" +msgstr "Asenda string" -#: src/ghex-ui.xml.h:62 src/ui.c:65 -msgid "Words" -msgstr "Sõnad" +#: ../src/ghex-window.c:388 +msgid "_Goto Byte..." +msgstr "_Mine baidile..." -#: src/ghex-ui.xml.h:63 -msgid "_About" -msgstr "_Info" +#: ../src/ghex-window.c:389 +msgid "Jump to a certain position" +msgstr "Liigu määratud asukohta" -#: src/ghex-ui.xml.h:64 -msgid "_About..." -msgstr "_Info..." +#: ../src/ghex-window.c:391 +msgid "_Preferences" +msgstr "_Häälestus" -#: src/ghex-ui.xml.h:65 +#: ../src/ghex-window.c:392 +msgid "Configure the application" +msgstr "Programmi konfiguratsioon" + +#. View menu +#: ../src/ghex-window.c:396 msgid "_Add View" msgstr "_Lisa vaade" -#: src/ghex-ui.xml.h:66 -msgid "_Base Converter" -msgstr "_Aluse konverter" +#: ../src/ghex-window.c:397 +msgid "Add a new view to the buffer" +msgstr "Lisa puhvrile uus vaade" -#: src/ghex-ui.xml.h:67 -msgid "_Bytes" -msgstr "_Baidid" +#: ../src/ghex-window.c:399 +msgid "_Remove View" +msgstr "_Eemalda vaade" -#: src/ghex-ui.xml.h:68 -msgid "_Close" -msgstr "_Sulge" +#: ../src/ghex-window.c:400 +msgid "Remove the current view of the buffer" +msgstr "Eemaldab käesoleva puhvri vaate" -#: src/ghex-ui.xml.h:69 +#. Help menu +#: ../src/ghex-window.c:404 msgid "_Contents" msgstr "_Sisu" -#: src/ghex-ui.xml.h:70 -msgid "_Copy" -msgstr "_Kopeeri" - -#: src/ghex-ui.xml.h:71 -msgid "_Edit" -msgstr "_Redaktor" - -#: src/ghex-ui.xml.h:72 -msgid "_File" -msgstr "_Fail" - -#: src/ghex-ui.xml.h:73 -msgid "_Find" -msgstr "_Otsi" - -#: src/ghex-ui.xml.h:74 -msgid "_Goto Byte..." -msgstr "_Mine baidile..." +#: ../src/ghex-window.c:405 +msgid "Help on this application" +msgstr "Programmi abiinfo" -#: src/ghex-ui.xml.h:75 -msgid "_Group Data As" -msgstr "_Rühmita andmed" +#: ../src/ghex-window.c:407 +msgid "_About" +msgstr "_Programmist lähemalt" -#: src/ghex-ui.xml.h:76 -msgid "_Help" -msgstr "_Abi" +#: ../src/ghex-window.c:408 +msgid "About this application" +msgstr "Lähema teabe kuvamine programmi kohta" -#: src/ghex-ui.xml.h:77 +#. Edit menu +#: ../src/ghex-window.c:415 msgid "_Insert Mode" msgstr "_Lisamise režiim" -#: src/ghex-ui.xml.h:78 -msgid "_Longwords" -msgstr "_Pikad sõnad" - -#: src/ghex-ui.xml.h:79 -msgid "_Open..." -msgstr "_Ava..." +#: ../src/ghex-window.c:416 +msgid "Insert/overwrite data" +msgstr "Lisa/kirjuta andmed üle" -#: src/ghex-ui.xml.h:80 -msgid "_Paste" -msgstr "_Aseta" +#. Windows menu +#: ../src/ghex-window.c:420 +msgid "Character _Table" +msgstr "_Märgistik" -#: src/ghex-ui.xml.h:81 -msgid "_Preferences" -msgstr "_Häälestus" +#: ../src/ghex-window.c:421 +msgid "Show the character table" +msgstr "Näitab märgistikku" -#: src/ghex-ui.xml.h:82 -msgid "_Print" -msgstr "_Prindi" +#: ../src/ghex-window.c:423 +msgid "_Base Converter" +msgstr "_Aluse konverter" -#: src/ghex-ui.xml.h:83 -msgid "_Redo" -msgstr "_Uuesti" +#: ../src/ghex-window.c:424 +msgid "Open base conversion dialog" +msgstr "Avab arvusüsteemide konverteri" -#: src/ghex-ui.xml.h:84 -msgid "_Remove View" -msgstr "_Eemalda vaade" +#: ../src/ghex-window.c:426 +msgid "Type Conversion _Dialog" +msgstr "Avab arvusüsteemide _konverteri" + +#: ../src/ghex-window.c:427 +msgid "Show the type conversion dialog in the edit window" +msgstr "Näita konverterit redigeerimise aknas" -#: src/ghex-ui.xml.h:86 -msgid "_Revert" -msgstr "_Taasta" +#: ../src/ghex-window.c:433 ../src/ui.c:48 +msgid "_Bytes" +msgstr "_Baidid" -#: src/ghex-ui.xml.h:87 -msgid "_Save" -msgstr "_Salvesta" +#: ../src/ghex-window.c:434 +msgid "Group data by 8 bits" +msgstr "Rühmitab andmed 8 biti kaupa" -#: src/ghex-ui.xml.h:88 -msgid "_Undo" -msgstr "_Unusta" +#: ../src/ghex-window.c:435 ../src/ui.c:49 +msgid "_Words" +msgstr "_Sõnad" -#: src/ghex-ui.xml.h:89 -msgid "_View" -msgstr "_Vaade" +#: ../src/ghex-window.c:436 +msgid "Group data by 16 bits" +msgstr "Rühmitab andmed 16 biti kaupa" -#: src/ghex-ui.xml.h:90 -msgid "_Windows" -msgstr "_Aknad" +#: ../src/ghex-window.c:437 ../src/ui.c:50 +msgid "_Longwords" +msgstr "_Pikad sõnad" -#: src/ghex-ui.xml.h:91 -msgid "_Words" -msgstr "_Sõnad" +#: ../src/ghex-window.c:438 +msgid "Group data by 32 bits" +msgstr "Rühmitab andmed 32 biti kaupa" -#: src/ghex-window.c:435 -msgid "GHex" -msgstr "GHex" +#: ../src/ghex-window.c:585 +#, c-format +#| msgid "Failed to load ui: %s" +msgid "Failed to load UI: %s" +msgstr "Kasutajaliidese laadimine ebaõnnestus: %s" -#: src/ghex-window.c:554 +#: ../src/ghex-window.c:794 #, c-format msgid "Offset: %s" msgstr "Asukoht: %s" -#: src/ghex-window.c:689 +#: ../src/ghex-window.c:797 +#, c-format +msgid "; %s bytes from %s to %s selected" +msgstr "; märgistatud %s baiti alates %s kuni %s" + +#: ../src/ghex-window.c:1069 #, c-format msgid "Activate file %s" msgstr "Aktiiveeri fail %s" -#: src/ghex-window.c:728 +#: ../src/ghex-window.c:1105 #, c-format -msgid "GHex - %s" -msgstr "GHex - %s" +msgid "%s - GHex" +msgstr "%s - GHex" -#: src/ghex-window.c:857 +#: ../src/ghex-window.c:1231 msgid "Select a file to save buffer as" msgstr "Valige fail, kuhu puhver salvestada" -#: src/ghex-window.c:883 +#: ../src/ghex-window.c:1263 #, c-format msgid "" "File %s exists.\n" "Do you want to overwrite it?" msgstr "" "Fail %s on olemas.\n" -"Soovite Te faili üle kirjutada?" +"Kas kirjutada üle?" -#: src/ghex-window.c:915 src/ui.c:353 +#: ../src/ghex-window.c:1289 ../src/ui.c:300 #, c-format msgid "Saved buffer to file %s" msgstr "Puhver salvestatud faili %s" -#: src/ghex-window.c:920 +#: ../src/ghex-window.c:1296 msgid "Error saving file!" msgstr "Viga faili salvestamisel!" -#: src/ghex-window.c:926 +#: ../src/ghex-window.c:1302 msgid "Can't open file for writing!" msgstr "Ei saa avada faili kirjutamiseks!" -#: src/ghex-window.c:953 +#: ../src/ghex-window.c:1347 #, c-format msgid "" "File %s has changed since last save.\n" "Do you want to save changes?" msgstr "" "Faili %s on viimasest salvestamisest alates muudetud.\n" -"Soovite Te muudatusi salvestada?" +"Kas salvestada tehtud muudatused?" -#: src/ghex-window.c:963 +#: ../src/ghex-window.c:1351 msgid "Do_n't save" msgstr "_Ära salvesta" -#: src/ghex-window.c:983 src/ui.c:344 +#: ../src/ghex-window.c:1371 ../src/ui.c:288 msgid "You don't have the permissions to save the file!" msgstr "Sul ei ole faili salvestamiseks piisavalt õigusi!" -#: src/ghex-window.c:987 src/ui.c:349 -msgid "An error occured while saving file!" +#: ../src/ghex-window.c:1375 ../src/ui.c:293 +msgid "An error occurred while saving file!" msgstr "Faili salvestamisel tekkis viga!" -#: src/hex-document.c:740 +#: ../src/hex-dialog.c:58 +msgid "Signed 8 bit:" +msgstr "Märgiga 8 bit:" + +#: ../src/hex-dialog.c:59 +msgid "Unsigned 8 bit:" +msgstr "Märgita 8 bit:" + +#: ../src/hex-dialog.c:60 +msgid "Signed 16 bit:" +msgstr "Märgiga 16 bit:" + +#: ../src/hex-dialog.c:61 +msgid "Unsigned 16 bit:" +msgstr "Märgita 16 bit:" + +#: ../src/hex-dialog.c:62 +msgid "Signed 32 bit:" +msgstr "Märgiga 32 bit:" + +#: ../src/hex-dialog.c:63 +msgid "Unsigned 32 bit:" +msgstr "Märgita 32 bit:" + +#: ../src/hex-dialog.c:64 +msgid "Float 32 bit:" +msgstr "Ujukoma 32 bit:" + +#: ../src/hex-dialog.c:65 +msgid "Float 64 bit:" +msgstr "Ujukoma 64 bit:" + +#: ../src/hex-dialog.c:66 +msgid "Hexadecimal:" +msgstr "16nd-süsteem:" + +#: ../src/hex-dialog.c:67 +msgid "Octal:" +msgstr "8nd-süsteem:" + +#: ../src/hex-dialog.c:68 +msgid "Binary:" +msgstr "2nd-süsteem:" + +#: ../src/hex-dialog.c:204 +msgid "Show little endian decoding" +msgstr "Näita 'little endian' teisendust" + +#: ../src/hex-dialog.c:211 +msgid "Show unsigned and float as hexadecimal" +msgstr "Näita märgita- ja ujukomaarve 16nd-süsteemis" + +#: ../src/hex-dialog.c:217 +msgid "Stream Length:" +msgstr "Voo pikkus:" + +#: ../src/hex-dialog.c:239 +msgid "FIXME: no conversion function" +msgstr "PARANDA MIND: konversiooni funktsioon puudub" + +#: ../src/hex-document.c:436 +msgid "New document" +msgstr "Uus dokument" + +#: ../src/hex-document.c:785 +#, c-format msgid "Page" msgstr "Lehekülg" -#: src/hex-document.c:746 src/hex-document.c:871 +#: ../src/hex-document.c:791 ../src/hex-document.c:916 +#, c-format msgid "Hex dump generated by" msgstr "Hex dump generated by" -#: src/hex-document.c:756 +#: ../src/hex-document.c:802 msgid "Saving to HTML..." msgstr "HTMLina salvestamine..." -#: src/hex-document.c:794 +#: ../src/hex-document.c:839 +#, c-format msgid "Previous page" msgstr "Eelmine lehekülg" -#: src/hex-document.c:809 +#: ../src/hex-document.c:854 +#, c-format msgid "Next page" msgstr "Järgmine lehekülg" -#: src/main.c:49 -msgid "The gnome binary editor" -msgstr "GNOME binaarfailide redaktor" - -#: src/main.c:64 -msgid "Could not initialize Bonobo!\n" -msgstr "Ei saa Bonobot algväärtustada!\n" +#: ../src/main.c:36 +msgid "X geometry specification (see \"X\" man page)." +msgstr "Xi geomeetria spetsifikatsioon (vaata \"X\" manuaalilehte)." + +#: ../src/main.c:36 +msgid "GEOMETRY" +msgstr "GEOMEETRIA" -#: src/main.c:87 src/main.c:99 +#: ../src/main.c:37 +msgid "FILES" +msgstr "FAILID" + +#: ../src/main.c:53 +msgid "- GTK+ binary editor" +msgstr "- GTK+ binaarfailide redaktor" + +#: ../src/main.c:57 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options.\n" +msgstr "" +"%s\n" +"Kõigi saadaolevate käsureavõtmete vaatamiseks Käivita '%s --help'.\n" + +#: ../src/main.c:80 ../src/main.c:93 #, c-format msgid "Invalid geometry string \"%s\"\n" msgstr "Vigane geomeetriastring \"%s\"\n" -#: src/preferences.c:91 +#: ../src/preferences.c:69 msgid "GHex Preferences" msgstr "GHex häälestus" -#: src/preferences.c:136 +#: ../src/preferences.c:101 msgid "_Maximum number of undo levels:" msgstr "_Mitu tegevust on võimalik järjest unustada:" -#: src/preferences.c:156 +#: ../src/preferences.c:121 msgid "Undo levels" msgstr "Unustamiste arv" -#: src/preferences.c:156 +#: ../src/preferences.c:121 msgid "Select maximum number of undo levels" msgstr "Mitu tegevust on võimalik järjest unustada" -#: src/preferences.c:160 -msgid "Show cursor offset in statusbar as:" -msgstr "Näita kursori asukohta staatusreal kui:" +#: ../src/preferences.c:125 +msgid "_Show cursor offset in statusbar as:" +msgstr "_Näita kursori asukohta staatusreal kui:" -#: src/preferences.c:179 +#: ../src/preferences.c:144 msgid "Hexadecimal" msgstr "16nd-süsteem" -#: src/preferences.c:185 +#: ../src/preferences.c:146 msgid "Custom" msgstr "Omamääratud" -#: src/preferences.c:196 +#: ../src/preferences.c:155 msgid "Enter the cursor offset format" msgstr "Sisesta kursori asukoha vorming" -#: src/preferences.c:197 +#: ../src/preferences.c:156 msgid "Select the cursor offset format" msgstr "Vali kursori asukoha vorming" #. show offsets check button -#: src/preferences.c:207 -msgid "Show offsets column" -msgstr "Näita asukoha veergu" +#: ../src/preferences.c:166 +msgid "Sh_ow offsets column" +msgstr "_Näita asukoha veergu" -#: src/preferences.c:212 +#: ../src/preferences.c:171 msgid "Editing" msgstr "Redaktor" #. display font -#: src/preferences.c:221 +#: ../src/preferences.c:180 msgid "Font" msgstr "Kirjatüüp" #. default group type -#: src/preferences.c:249 +#: ../src/preferences.c:203 msgid "Default Group Type" msgstr "Vaikimisi grupeering" -#: src/preferences.c:265 +#: ../src/preferences.c:219 msgid "Display" msgstr "Esitus" #. paper selection -#: src/preferences.c:274 +#: ../src/preferences.c:228 msgid "Paper size" msgstr "Paberi suurus" #. data & header font selection -#: src/preferences.c:279 +#: ../src/preferences.c:233 msgid "Fonts" msgstr "Kirjatüübid" -#: src/preferences.c:285 +#: ../src/preferences.c:245 msgid "_Data font:" msgstr "_Andmete kirjatüüp:" -#: src/preferences.c:305 +#: ../src/preferences.c:259 msgid "Data font" msgstr "Andmete kirjatüüp" -#: src/preferences.c:305 +#: ../src/preferences.c:259 msgid "Select the data font" msgstr "Vali andmete kirjatüüp" -#: src/preferences.c:319 +#: ../src/preferences.c:268 msgid "Header fo_nt:" msgstr "_Päise kirjatüüp:" -#: src/preferences.c:338 +#: ../src/preferences.c:281 msgid "Header font" msgstr "Päise kirjatüüp" -#: src/preferences.c:338 +#: ../src/preferences.c:281 msgid "Select the header font" msgstr "Vali päise kirjatüüp" -#: src/preferences.c:366 +#: ../src/preferences.c:306 msgid "_Print shaded box over:" msgstr "Prindi _tumedam taust üle:" -#: src/preferences.c:378 +#: ../src/preferences.c:318 msgid "Box size" msgstr "Tumedama ala suurus" -#: src/preferences.c:378 +#: ../src/preferences.c:318 msgid "Select size of box (in number of lines)" -msgstr "Vali tumeda ala suursu (ridade arv)" +msgstr "Vali tumeda ala suurus (ridade arv)" -#: src/preferences.c:382 +#: ../src/preferences.c:322 msgid "lines (0 for no box)" msgstr "rea (0, kui ei soovi)" -#: src/preferences.c:389 +#: ../src/preferences.c:329 msgid "Printing" msgstr "Printimine" -#: src/preferences.c:531 +#: ../src/preferences.c:447 ../src/ui.c:209 +#, c-format +msgid "" +"There was an error displaying help: \n" +"%s" +msgstr "" +"Abiinfo kuvamisel tekkis viga: \n" +"%s" + +#: ../src/preferences.c:499 +msgid "Can not open desired font!" +msgstr "Ei saa avada soovitud kirjatüüpi!" + +#: ../src/preferences.c:560 msgid "" "The offset format string contains invalid format specifier.\n" "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed." @@ -857,83 +951,106 @@ "Asukoha vormingustring sisaldab vigaseid vormingutunnuseid.\n" "Ainult 'x', 'X', 'p', 'P', 'd' ja 'o' on lubatud." -#: src/preferences.c:563 -msgid "Can not open desired font!" -msgstr "Ei saa avada soovitud kirjatüüpi!" - -#: src/print.c:54 +#: ../src/print.c:57 #, c-format msgid "Page: %i/%i" msgstr "Lehekülg: %i/%i" -#: src/print.c:205 src/print.c:219 -#, c-format -msgid "" -"GHex could not find the font \"%s\".\n" -"GHex is unable to print without this font installed." -msgstr "" -"Ei leia kirjatüüpi \"%s\".\n" -"Ilma selle kirjatüübita ei saa printida." - -#: src/session.c:29 -msgid "X geometry specification (see \"X\" man page)." -msgstr "Xi geomeetria spetsifikatsioon (vaata \"X\" manuaalilehte)." - -#: src/session.c:30 -msgid "GEOMETRY" -msgstr "GEOMETRY" - -#: src/ui.c:71 +#: ../src/ui.c:55 msgid "hex data" msgstr "16-nd süsteemis" -#: src/ui.c:72 +#: ../src/ui.c:56 msgid "ASCII data" msgstr "ASCII-s" -#: src/ui.c:243 -msgid "GHex, a binary file editor" -msgstr "GHex, binaarfailide redaktor" - -#: src/ui.c:245 -msgid "Released under the terms of GNU Public License" -msgstr "Litsenseeritud vastavalt GNU GPL litsentsile" +#: ../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 " +"Software Foundation; either version 2 of the License, or (at your option) " +"any later version." +msgstr "" +"See programm on vaba tarkvara. Te võite seda edasi levitada ja/või muuta " +"vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu need on Vaba " +"Tarkvara Fondi \n" +"poolt avaldatud; kas Litsentsi versioon number 2 või (vastavalt Teie " +"valikule) ükskõik milline hilisem versioon." -#: src/ui.c:268 -#, c-format +#: ../src/ui.c:154 msgid "" -"There was an error displaying help: \n" -"%s" +"This program is distributed in the hope that it will be useful, but WITHOUT " +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " +"more details." msgstr "" -"Abiinfo kuvamisel tekkis viga: \n" -"%s" +"Seda programmi levitatakse lootuses, et see on kasulik, kuid ILMA IGASUGUSE " +"GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDIGARANTIITA või SOBIVUSELE " +"TEATUD KINDLAKS EESMÄRGIKS. Üksikasjade suhtes vaata GNU Üldist Avalikku " +"Litsentsi." + +#: ../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 " +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" +msgstr "" +"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos selle " +"programmiga; kui ei, siis võtke ühendust Free Software Foundation'iga, 51 " +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" + +#. 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 "Autoriõigused © %Id–%Id GHex autorid" + +#: ../src/ui.c:174 +msgid "A binary file editor" +msgstr "Binaarfailide redaktor" + +#: ../src/ui.c:180 +msgid "About GHex" +msgstr "GHex'st lähemalt" -#: src/ui.c:382 +#: ../src/ui.c:181 +msgid "translator-credits" +msgstr "" +"Lauris Kaplinski , 1999.\n" +"Ilmar Kerm , 2002.\n" +"Tõivo Leedjärv , 2002.\n" +"Kalev Lember , 2012." + +#: ../src/ui.c:184 +msgid "GHex Website" +msgstr "GHex veebisait" + +#: ../src/ui.c:318 msgid "Select a file to open" -msgstr "Valide fail, mis avada" +msgstr "Valige fail, mis avada" -#: src/ui.c:416 +#: ../src/ui.c:349 #, c-format msgid "Loaded file %s" msgstr "Fail %s loetud" -#: src/ui.c:424 +#: ../src/ui.c:357 msgid "Can not open file!" msgstr "Ei saa faili avada!" -#: src/ui.c:488 +#: ../src/ui.c:422 msgid "Select path and file name for the HTML source" msgstr "Vali kataloogitee ja failinimi HTML lähtekoodifaili jaoks" -#: src/ui.c:523 +#: ../src/ui.c:454 msgid "You need to specify a base name for the HTML files." msgstr "Sa pead HTML failide jaoks alusnime määrama." -#: src/ui.c:534 src/ui.c:556 +#: ../src/ui.c:465 ../src/ui.c:491 msgid "You don't have the permission to write to the selected path.\n" msgstr "Sul ei ole valitud sihtkohta kirjutamiseks piisavalt õigusi.\n" -#: src/ui.c:540 +#: ../src/ui.c:477 msgid "" "Saving to HTML will overwrite some files.\n" "Do you want to proceed?" @@ -941,28 +1058,142 @@ "HTMLi salvestamine kirjutab mõned failid üle.\n" "Kas soovid jätkata?" -#: src/ui.c:687 +#: ../src/ui.c:745 #, c-format msgid "Really revert file %s?" msgstr "Soovite tõesti faili %s endisena taastada?" -#: src/ui.c:702 +#: ../src/ui.c:759 #, c-format msgid "Reverted buffer from file %s" msgstr "Puhver taastatud failist %s" -#: src/ui.c:776 -msgid "Print Hex Document" -msgstr "Prindi 16nd-süsteemis dokument" - -#: src/ui.c:781 -msgid "Pages" -msgstr "Lehekülge" +#~ msgid "32 bit float:" +#~ msgstr "32 bit ujukomaarv:" -#: src/ui.c:827 -#, c-format -msgid "GHex (%s): Print Preview" -msgstr "GHex (%s): printimise eelvaade" +#~ msgid "64 bit float:" +#~ msgstr "64 bit ujukomaarv:" + +#~ msgid "GNOME Hexadecimal Editor" +#~ msgstr "GNOME'i 16nd-süsteemi redaktor" + +#~ msgid "Search for %s" +#~ msgstr "Otsi %s" + +#~ msgid "Replace %s" +#~ msgstr "Asenda %s" + +#~ msgid "The string is not appropriate for the selected data type!" +#~ msgstr "String ei ole valitud andmetüübiga ühilduv!" + +#~ msgid "The offset must be a positive integer value!" +#~ msgstr "Asukoht peab olema positiivne täisarv!" + +#~ msgid "Strings are not appropriate for the selected data type!" +#~ msgstr "Stringid ei ole valitud andmetüübiga ühilduvad!" + +#~ msgid "Add View" +#~ msgstr "Lisa vaade" + +#~ msgid "Bytes" +#~ msgstr "Baidid" + +#~ msgid "C_ut" +#~ msgstr "_Lõika" + +#~ msgid "Character Table..." +#~ msgstr "Märgistik..." + +#~ msgid "Contents" +#~ msgstr "Sisu" + +#~ msgid "Converter..." +#~ msgstr "Konverter..." + +#~ msgid "Copy" +#~ msgstr "Kopeeri" + +#~ msgid "Exit" +#~ msgstr "Välju" + +#~ msgid "Export to HTML..." +#~ msgstr "Ekspordi HTML-i..." + +#~ msgid "Find" +#~ msgstr "Otsi" + +#~ msgid "Goto Byte" +#~ msgstr "Mine baidile" + +#~ msgid "Help Chat" +#~ msgstr "Abi jututuba" + +#~ msgid "Insert Mode" +#~ msgstr "Lisamise režiim" + +#~ msgid "Longwords" +#~ msgstr "Pikad sõnad" + +#~ msgid "Open" +#~ msgstr "Ava" + +#~ msgid "Preferences" +#~ msgstr "Häälestus" + +#~ msgid "Print" +#~ msgstr "Prindi" + +#~ msgid "Print Preview..." +#~ msgstr "Printimise eelvaade" + +#~ msgid "Redo" +#~ msgstr "Uuesti" + +#~ msgid "Remove View" +#~ msgstr "Eemalda vaade" + +#~ msgid "Revert" +#~ msgstr "Taasta" + +#~ msgid "Save" +#~ msgstr "Salvesta" + +#~ msgid "Save As" +#~ msgstr "Salvesta kui..." + +#~ msgid "Undo" +#~ msgstr "Unusta" + +#~ msgid "Words" +#~ msgstr "Sõnad" + +#~ msgid "_About..." +#~ msgstr "_Info..." + +#~ msgid "_Paste" +#~ msgstr "_Aseta" + +#~ msgid "GHex - %s" +#~ msgstr "GHex - %s" + +#~ msgid "Could not initialize Bonobo!\n" +#~ msgstr "Ei saa Bonobot algväärtustada!\n" + +#~ msgid "" +#~ "GHex could not find the font \"%s\".\n" +#~ "GHex is unable to print without this font installed." +#~ msgstr "" +#~ "Ei leia kirjatüüpi \"%s\".\n" +#~ "Ilma selle kirjatüübita ei saa printida." + +#~ msgid "Released under the terms of GNU Public License" +#~ msgstr "Litsenseeritud vastavalt GNU GPL litsentsile" + +#~ msgid "Pages" +#~ msgstr "Lehekülge" + +#~ msgid "GHex (%s): Print Preview" +#~ msgstr "GHex (%s): printimise eelvaade" #~ msgid "About..." #~ msgstr "Info..." diff -Nru ghex-3.0.0/po/ja.po ghex-3.3.90/po/ja.po --- ghex-3.0.0/po/ja.po 2011-09-19 10:04:24.000000000 +0000 +++ ghex-3.3.90/po/ja.po 2012-02-09 00:02:51.000000000 +0000 @@ -9,15 +9,16 @@ msgid "" msgstr "" "Project-Id-Version: ghex master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-09-19 15:52+0900\n" -"PO-Revision-Date: 2011-09-19 15:48+0900\n" -"Last-Translator: Takeshi AIHANA \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=ghex&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-12-26 14:48+0000\n" +"PO-Revision-Date: 2012-01-01 19:55+0900\n" +"Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" -"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:651 @@ -27,7 +28,7 @@ #: ../data/ghex.desktop.in.h:2 msgid "Hex Editor" -msgstr "Hex エディタ" +msgstr "Hex エディター" #: ../data/ghex.desktop.in.h:3 msgid "Inspect and edit binary files" @@ -59,7 +60,7 @@ #: ../src/converter.c:231 msgid "Base Converter" -msgstr "基数コンバータ" +msgstr "基数コンバーター" #. entries #: ../src/converter.c:252 @@ -311,7 +312,7 @@ #: ../src/findreplace.c:702 msgid "There is no active buffer to replace data in!" -msgstr "置換を行なうべきアクティブなバッファがありません！" +msgstr "置換を行なうべきアクティブなバッファーがありません！" #: ../src/findreplace.c:727 ../src/findreplace.c:728 msgid "End Of File reached!" @@ -540,7 +541,7 @@ #: ../src/ghex-window.c:395 msgid "Add a new view to the buffer" -msgstr "新しいビューをバッファに追加します" +msgstr "新しいビューをバッファーに追加します" #: ../src/ghex-window.c:397 msgid "_Remove View" @@ -548,7 +549,7 @@ #: ../src/ghex-window.c:398 msgid "Remove the current view of the buffer" -msgstr "このバッファのビューを削除します" +msgstr "このバッファーのビューを削除します" #. Help menu #: ../src/ghex-window.c:402 @@ -587,7 +588,7 @@ #: ../src/ghex-window.c:421 msgid "_Base Converter" -msgstr "基数コンバータ(_B)" +msgstr "基数コンバーター(_B)" #: ../src/ghex-window.c:422 msgid "Open base conversion dialog" @@ -647,7 +648,7 @@ #: ../src/ghex-window.c:1221 msgid "Select a file to save buffer as" -msgstr "バッファを書き込むファイル名は" +msgstr "バッファーを書き込むファイル名は" #: ../src/ghex-window.c:1277 #, c-format @@ -661,7 +662,7 @@ #: ../src/ghex-window.c:1310 ../src/ui.c:293 #, c-format msgid "Saved buffer to file %s" -msgstr "バッファを %s ファイルに保存しました" +msgstr "バッファーを %s ファイルに保存しました" #: ../src/ghex-window.c:1316 msgid "Error saving file!" @@ -794,7 +795,7 @@ #: ../src/main.c:53 msgid "- GTK+ binary editor" -msgstr "- GTK+ 版のバイナリ・エディタ" +msgstr "- GTK+ 版のバイナリ・エディター" #: ../src/main.c:57 #, c-format @@ -895,15 +896,15 @@ #: ../src/preferences.c:269 msgid "Header fo_nt:" -msgstr "ヘッダのフォント(_N):" +msgstr "ヘッダーのフォント(_N):" #: ../src/preferences.c:284 msgid "Header font" -msgstr "ヘッダのフォント" +msgstr "ヘッダーのフォント" #: ../src/preferences.c:284 msgid "Select the header font" -msgstr "ヘッダの表示に使用するフォントを選択して下さい" +msgstr "ヘッダーの表示に使用するフォントを選択して下さい" #: ../src/preferences.c:310 msgid "_Print shaded box over:" @@ -1001,7 +1002,7 @@ #: ../src/ui.c:171 msgid "A binary file editor" -msgstr "バイナリ・ファイルのエディタです。" +msgstr "バイナリ・ファイルのエディターです。" #: ../src/ui.c:177 msgid "About GHex" @@ -1043,7 +1044,7 @@ #: ../src/ui.c:460 ../src/ui.c:484 msgid "You don't have the permission to write to the selected path.\n" -msgstr "指定したフォルダに書き込む権限がありません。\n" +msgstr "指定したフォルダーに書き込む権限がありません。\n" #: ../src/ui.c:471 msgid "" @@ -1061,7 +1062,7 @@ #: ../src/ui.c:750 #, c-format msgid "Reverted buffer from file %s" -msgstr "ファイル %s を使ってバッファをもとに戻しました" +msgstr "ファイル %s を使ってバッファーをもとに戻しました" #~ msgid "GNOME Hexadecimal Editor" #~ msgstr "GNOME 向けの16進数バイナリ・エディタです" diff -Nru ghex-3.0.0/po/LINGUAS ghex-3.3.90/po/LINGUAS --- ghex-3.0.0/po/LINGUAS 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/po/LINGUAS 2012-02-09 00:02:51.000000000 +0000 @@ -25,6 +25,7 @@ ja ko lv +lt mk ml ms diff -Nru ghex-3.0.0/po/lt.po ghex-3.3.90/po/lt.po --- ghex-3.0.0/po/lt.po 1970-01-01 00:00:00.000000000 +0000 +++ ghex-3.3.90/po/lt.po 2012-02-09 00:02:51.000000000 +0000 @@ -0,0 +1,1075 @@ +# Lithuanian translation for ghex. +# Copyright (C) 2011 ghex's COPYRIGHT HOLDER +# This file is distributed under the same license as the ghex package. +# Algimantas Margevičius , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: ghex master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=ghex&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-09-27 09:00+0000\n" +"PO-Revision-Date: 2011-10-08 18:08+0300\n" +"Last-Translator: Aurimas Černius \n" +"Language-Team: Lietuvių <>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n" + +#: ../data/ghex.desktop.in.h:1 +#: ../src/ghex-window.c:651 +#: ../src/ghex-window.c:1097 +msgid "GHex" +msgstr "GHex" + +#: ../data/ghex.desktop.in.h:2 +msgid "Hex Editor" +msgstr "Šešioliktainis redaktorius" + +#: ../data/ghex.desktop.in.h:3 +msgid "Inspect and edit binary files" +msgstr "Peržiūrėti ir redaguoti dvejetainius failus" + +#: ../src/chartable.c:147 +msgid "ASCII" +msgstr "ASCII" + +#: ../src/chartable.c:147 +msgid "Hex" +msgstr "Šešioliktainis" + +#: ../src/chartable.c:147 +#: ../src/preferences.c:142 +msgid "Decimal" +msgstr "Dešimtainis" + +#: ../src/chartable.c:148 +msgid "Octal" +msgstr "Aštuntainis" + +#: ../src/chartable.c:148 +msgid "Binary" +msgstr "Dvejetainis" + +#: ../src/chartable.c:164 +msgid "Character table" +msgstr "Simbolių lentelė" + +#: ../src/converter.c:231 +msgid "Base Converter" +msgstr "Bazės konvertavimas" + +#. entries +#: ../src/converter.c:252 +msgid "_Binary:" +msgstr "_Dvejetainis:" + +#: ../src/converter.c:254 +msgid "_Octal:" +msgstr "_Aštuntainis:" + +#: ../src/converter.c:256 +msgid "_Decimal:" +msgstr "_Dešimtainis:" + +#: ../src/converter.c:258 +msgid "_Hex:" +msgstr "_Šešioliktainis:" + +#: ../src/converter.c:260 +msgid "_ASCII:" +msgstr "_ASCII:" + +#. get cursor button +#: ../src/converter.c:264 +msgid "_Get cursor value" +msgstr "_Gauti žymeklio reikšmę" + +#: ../src/converter.c:278 +msgid "Get cursor value" +msgstr "Gauti žymeklio reikšmę" + +#: ../src/converter.c:278 +msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII" +msgstr "Gauna žymeklio reikšmę dvejetaine, aštuntaine, dešimtaine, šešioliktaine ir ASCII išraiška" + +#: ../src/converter.c:418 +msgid "ERROR" +msgstr "KLAIDA" + +#: ../src/findreplace.c:97 +#: ../src/findreplace.c:221 +#: ../src/ui.c:864 +#, c-format +msgid "GHex (%s): Find Data" +msgstr "GHex (%s): Surasti duomenis" + +#: ../src/findreplace.c:101 +#: ../src/findreplace.c:161 +#: ../src/findreplace.c:359 +msgid "Find String" +msgstr "Surasti eilutę" + +#: ../src/findreplace.c:108 +#: ../src/findreplace.c:258 +msgid "Find _Next" +msgstr "Surasti _kitą" + +#: ../src/findreplace.c:115 +#: ../src/findreplace.c:267 +msgid "Find _Previous" +msgstr "Surasti _ankstesnį" + +#: ../src/findreplace.c:138 +#: ../src/findreplace.c:413 +msgid "Find Data" +msgstr "Surasti duomenis" + +#: ../src/findreplace.c:138 +#: ../src/findreplace.c:413 +msgid "Enter the hex data or ASCII data to search for" +msgstr "Įveskite duomenis paieškai šešioliktaine ar ASCII išraiška" + +#: ../src/findreplace.c:139 +msgid "Find Next" +msgstr "Surasti kitą" + +#: ../src/findreplace.c:139 +#: ../src/findreplace.c:415 +msgid "Finds the next occurrence of the search string" +msgstr "Suranda kitą žodį, atitinkantį paieškos kriterijus" + +#: ../src/findreplace.c:140 +msgid "Find previous" +msgstr "Surasti ankstesnį" + +#: ../src/findreplace.c:140 +msgid "Finds the previous occurrence of the search string " +msgstr "Suranda ankstesnį žodį, atitinkantį paieškos kriterijus" + +#: ../src/findreplace.c:141 +#: ../src/findreplace.c:418 +#: ../src/findreplace.c:466 +msgid "Cancel" +msgstr "Atsisakyti" + +#: ../src/findreplace.c:141 +msgid "Closes find data window" +msgstr "Uždaro paieškos langą" + +#: ../src/findreplace.c:157 +#, c-format +msgid "GHex (%s): Find Data: Add search" +msgstr "GHex (%s): Surasti: Pridėti paiešką" + +#: ../src/findreplace.c:179 +msgid "Add" +msgstr "Pridėti" + +#: ../src/findreplace.c:235 +msgid "Search String" +msgstr "Ieškoti žodžio" + +#: ../src/findreplace.c:243 +msgid "Highlight Colour" +msgstr "Paryškinimo spalva" + +#: ../src/findreplace.c:280 +msgid "_Add New" +msgstr "_Pridėti naują" + +#: ../src/findreplace.c:289 +msgid "_Remove Selected" +msgstr "_Pašalinti pasirinktą" + +#: ../src/findreplace.c:309 +msgid "Close" +msgstr "Užverti" + +#: ../src/findreplace.c:309 +msgid "Closes advanced find window" +msgstr "Užveria papildomą paieškos langą" + +#: ../src/findreplace.c:355 +#: ../src/ui.c:862 +#, c-format +msgid "GHex (%s): Find & Replace Data" +msgstr "GHex (%s): Surasti ir pakeisti" + +#: ../src/findreplace.c:368 +msgid "Replace With" +msgstr "Kuo pakeisti" + +#: ../src/findreplace.c:375 +msgid "Find _next" +msgstr "Surasti _kitą" + +#: ../src/findreplace.c:383 +msgid "_Replace" +msgstr "_Pakeisti" + +#: ../src/findreplace.c:391 +msgid "Replace _All" +msgstr "Pakeisti _visus" + +#: ../src/findreplace.c:414 +msgid "Replace Data" +msgstr "Pakeisti duomenis" + +#: ../src/findreplace.c:414 +msgid "Enter the hex data or ASCII data to replace with" +msgstr "Įveskite reikšmę, kuria pakeisti šešioliktaine arba ASCII išraišką" + +#: ../src/findreplace.c:415 +msgid "Find next" +msgstr "Surasti kitą" + +#: ../src/findreplace.c:416 +msgid "Replace" +msgstr "Pakeisti" + +#: ../src/findreplace.c:416 +msgid "Replaces the search string with the replace string" +msgstr "Pakeičia paieškos eilutę pakeitimo eilute" + +#: ../src/findreplace.c:417 +msgid "Replace All" +msgstr "Pakeisti visus" + +#: ../src/findreplace.c:417 +msgid "Replaces all occurrences of the search string with the replace string" +msgstr "Pakeisti visus rastus žodžius " + +#: ../src/findreplace.c:418 +msgid "Closes find and replace data window" +msgstr "Užveria paieškos ir keitimo langą" + +#: ../src/findreplace.c:434 +#: ../src/ui.c:860 +#, c-format +msgid "GHex (%s): Jump To Byte" +msgstr "GHex (%s): Peršokti į baitą" + +#: ../src/findreplace.c:464 +msgid "Jump to byte" +msgstr "Peršokti į baitą" + +#: ../src/findreplace.c:464 +msgid "Enter the byte to jump to" +msgstr "Įvesk baitą, į kurį pereiti" + +#: ../src/findreplace.c:465 +msgid "OK" +msgstr "GERAI" + +#: ../src/findreplace.c:465 +msgid "Jumps to the specified byte" +msgstr "Peršoka į nurodytą baitą" + +#: ../src/findreplace.c:466 +msgid "Closes jump to byte window" +msgstr "Užveria peršokimo į baitą langą" + +#: ../src/findreplace.c:529 +#: ../src/findreplace.c:563 +#: ../src/findreplace.c:670 +msgid "There is no active document to search!" +msgstr "Nėra aktyvaus dokumento, kuriame galima būtų ieškoti!" + +#: ../src/findreplace.c:536 +#: ../src/findreplace.c:570 +#: ../src/findreplace.c:677 +#: ../src/findreplace.c:711 +#: ../src/findreplace.c:756 +msgid "There is no string to search for!" +msgstr "Nėra paieškos eilutės!" + +#: ../src/findreplace.c:548 +#: ../src/findreplace.c:686 +#: ../src/findreplace.c:877 +msgid "End Of File reached" +msgstr "Pasiekta failo pabaiga" + +#: ../src/findreplace.c:549 +#: ../src/findreplace.c:582 +#: ../src/findreplace.c:685 +#: ../src/findreplace.c:878 +#: ../src/findreplace.c:901 +msgid "String was not found!\n" +msgstr "Eilutė rastas!\n" + +#: ../src/findreplace.c:581 +#: ../src/findreplace.c:900 +msgid "Beginning Of File reached" +msgstr "Prieita failo pradžia" + +#: ../src/findreplace.c:598 +msgid "There is no active document to move the cursor in!" +msgstr "Nėra dokumento, į kurį būtų galima nuvesti žymeklį!" + +#: ../src/findreplace.c:616 +msgid "No offset has been specified!" +msgstr "Nenurodyta poslinkio reikšmė!" + +#: ../src/findreplace.c:641 +msgid "The specified offset is beyond the file boundaries!" +msgstr "Nurodytas poslinkis yra už failo ribų!" + +#: ../src/findreplace.c:649 +msgid "Can not position cursor beyond the End Of File!" +msgstr "Negaliu perkelti žymeklio už failo pabaigos!" + +#: ../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', or\n" +" - a '+' or '-' sign, followed by a relative offset" +msgstr "" +"Gali nurodyti poslinkį kaip:\n" +" - teigiamą dešimtainį skaičių, arba\n" +" - šešioliktainį skaičių, pradedantį '0x', arba\n" +" - „+“ arba „-“ ženklas ir santykinis poslinkis" + +#: ../src/findreplace.c:702 +msgid "There is no active buffer to replace data in!" +msgstr "Nėra aktyvaus buferio, kuriame galim būtų pakeisti duomenis!" + +#: ../src/findreplace.c:727 +#: ../src/findreplace.c:728 +msgid "End Of File reached!" +msgstr "Pasiekta failo pabaiga!" + +#: ../src/findreplace.c:747 +msgid "There is no active document to replace data in!" +msgstr "Nėra aktyvaus dokumento, kuriame galim būtų pakeisti duomenis!" + +#: ../src/findreplace.c:777 +msgid "No occurrences were found." +msgstr "Nerasta pasikartojimų." + +#: ../src/findreplace.c:780 +#, c-format +msgid "Replaced %d occurrence." +msgid_plural "Replaced %d occurrences." +msgstr[0] "Pakeistas %d pasikartojimas." +msgstr[1] "Pakeisti %d pasikartojimai." +msgstr[2] "Pakeista %d pasikartojimų." + +#: ../src/findreplace.c:820 +msgid "No string to search for!" +msgstr "Nėra ko ieškoti!" + +#: ../src/ghex-window.c:75 +#, c-format +msgid "" +"Can not open URI:\n" +"%s" +msgstr "" +"Nepavyko atverti URI:\n" +"%s" + +#: ../src/ghex-window.c:94 +#, c-format +msgid "" +"Can not open file:\n" +"%s" +msgstr "" +"Nepavyko atverti failo:\n" +"%s" + +#: ../src/ghex-window.c:325 +msgid "_File" +msgstr "_Failas" + +#: ../src/ghex-window.c:326 +msgid "_Edit" +msgstr "_Keisti" + +#: ../src/ghex-window.c:327 +msgid "_View" +msgstr "_Rodymas" + +#: ../src/ghex-window.c:328 +msgid "_Group Data As" +msgstr "_Grupuoti duomenis kaip" + +#. View submenu +#: ../src/ghex-window.c:329 +msgid "_Windows" +msgstr "_Langai" + +#: ../src/ghex-window.c:330 +msgid "_Help" +msgstr "_Žinynas" + +#. File menu +#: ../src/ghex-window.c:333 +msgid "_Open..." +msgstr "_Atverti" + +#: ../src/ghex-window.c:334 +msgid "Open a file" +msgstr "Atverti failą" + +#: ../src/ghex-window.c:336 +msgid "_Save" +msgstr "_Išsaugoti" + +#: ../src/ghex-window.c:337 +msgid "Save the current file" +msgstr "Išsaugoti šį failą" + +#: ../src/ghex-window.c:339 +msgid "Save _As..." +msgstr "Išsaugoti _kaip..." + +#: ../src/ghex-window.c:340 +msgid "Save the current file with a different name" +msgstr "Išsaugoti šį failą kitu vardu" + +#: ../src/ghex-window.c:342 +msgid "Save As _HTML..." +msgstr "Išsaugoti kaip _HTML..." + +#: ../src/ghex-window.c:343 +msgid "Export data to HTML source" +msgstr "Eksportuoti duomenis į HTML pradinį kodą" + +#: ../src/ghex-window.c:345 +msgid "_Revert" +msgstr "_Atstatyti" + +#: ../src/ghex-window.c:346 +msgid "Revert to a saved version of the file" +msgstr "Sugrąžina išsaugotą failo versiją" + +#: ../src/ghex-window.c:348 +msgid "_Print" +msgstr "_Spausdinti" + +#: ../src/ghex-window.c:349 +msgid "Print the current file" +msgstr "Spausdina failą" + +#: ../src/ghex-window.c:351 +msgid "Print Previe_w..." +msgstr "Spausdinti peržiū_rą..." + +#: ../src/ghex-window.c:352 +msgid "Preview printed data" +msgstr "Peržiūrėti spausdinamus duomenis" + +#: ../src/ghex-window.c:354 +msgid "_Close" +msgstr "_Užverti" + +#: ../src/ghex-window.c:355 +msgid "Close the current file" +msgstr "Užverti dabartinį failą" + +#: ../src/ghex-window.c:357 +msgid "E_xit" +msgstr "Iš_eiti" + +#: ../src/ghex-window.c:358 +msgid "Exit the program" +msgstr "Išeiti iš programos" + +#. Edit menu +#: ../src/ghex-window.c:362 +msgid "_Undo" +msgstr "_Atšaukti" + +#: ../src/ghex-window.c:363 +msgid "Undo the last action" +msgstr "Panaikina paskutinį veiksmą" + +#: ../src/ghex-window.c:365 +msgid "_Redo" +msgstr "_Pakartoti" + +#: ../src/ghex-window.c:366 +msgid "Redo the undone action" +msgstr "Pakartoja atšauktą veiksmą" + +#: ../src/ghex-window.c:368 +msgid "_Copy" +msgstr "_Kopijuoti" + +#: ../src/ghex-window.c:369 +msgid "Copy selection to clipboard" +msgstr "Kopijuoti pasirinkimą į iškarpinę" + +#: ../src/ghex-window.c:371 +msgid "Cu_t" +msgstr "Iškirp_ti" + +#: ../src/ghex-window.c:372 +msgid "Cut selection" +msgstr "Iškerpa pasirinkimą" + +#: ../src/ghex-window.c:374 +msgid "Pa_ste" +msgstr "Į_dėti" + +#: ../src/ghex-window.c:375 +msgid "Paste data from clipboard" +msgstr "Įdeda duomenis iš iškarpinės" + +#: ../src/ghex-window.c:377 +msgid "_Find" +msgstr "_Ieškoti" + +#: ../src/ghex-window.c:378 +msgid "Search for a string" +msgstr "Ieškoti eilutės" + +#: ../src/ghex-window.c:380 +msgid "_Advanced Find" +msgstr "_Išplėstinė paieška" + +#: ../src/ghex-window.c:381 +msgid "Advanced Find" +msgstr "Išplėstinė paieška" + +#: ../src/ghex-window.c:383 +msgid "R_eplace" +msgstr "Pa_keisti" + +#: ../src/ghex-window.c:384 +msgid "Replace a string" +msgstr "Pakeisti žodį" + +#: ../src/ghex-window.c:386 +msgid "_Goto Byte..." +msgstr "_Eiti į baitą..." + +#: ../src/ghex-window.c:387 +msgid "Jump to a certain position" +msgstr "Peršokti į nurodytą vietą" + +#: ../src/ghex-window.c:389 +msgid "_Preferences" +msgstr "_Nustatymai" + +#: ../src/ghex-window.c:390 +msgid "Configure the application" +msgstr "Konfigūruoti programą" + +#. View menu +#: ../src/ghex-window.c:394 +msgid "_Add View" +msgstr "_Pridėti rodinį" + +#: ../src/ghex-window.c:395 +msgid "Add a new view to the buffer" +msgstr "Pridėti rodinį buferiui" + +#: ../src/ghex-window.c:397 +msgid "_Remove View" +msgstr "_Pašalinti rodinį" + +#: ../src/ghex-window.c:398 +msgid "Remove the current view of the buffer" +msgstr "Pašalinti esamą rodinį" + +#. Help menu +#: ../src/ghex-window.c:402 +msgid "_Contents" +msgstr "_Turinys" + +#: ../src/ghex-window.c:403 +msgid "Help on this application" +msgstr "Programos žinynas" + +#: ../src/ghex-window.c:405 +msgid "_About" +msgstr "_Apie" + +#: ../src/ghex-window.c:406 +msgid "About this application" +msgstr "Apie programą" + +#. Edit menu +#: ../src/ghex-window.c:413 +msgid "_Insert Mode" +msgstr "_Įterpimo režimas" + +#: ../src/ghex-window.c:414 +msgid "Insert/overwrite data" +msgstr "Įterpti/perrašyti duomenis" + +#. Windows menu +#: ../src/ghex-window.c:418 +msgid "Character _Table" +msgstr "Simbolių _Lentelė" + +#: ../src/ghex-window.c:419 +msgid "Show the character table" +msgstr "Parodyti simbolių lentelę" + +#: ../src/ghex-window.c:421 +msgid "_Base Converter" +msgstr "_Bazės konvertavimas" + +#: ../src/ghex-window.c:422 +msgid "Open base conversion dialog" +msgstr "Atverti sistemos keitimo langą" + +#: ../src/ghex-window.c:424 +msgid "Type Conversion _Dialog" +msgstr "Tipo konvertavimo _langas" + +#: ../src/ghex-window.c:425 +msgid "Show the type conversion dialog in the edit window" +msgstr "Rodyti tipo konvertavimo langą redagavimo lange" + +#: ../src/ghex-window.c:431 +#: ../src/ui.c:48 +msgid "_Bytes" +msgstr "_Baitai" + +#: ../src/ghex-window.c:432 +msgid "Group data by 8 bits" +msgstr "Grupuoti duomenis po 8 bitus" + +#: ../src/ghex-window.c:433 +#: ../src/ui.c:49 +msgid "_Words" +msgstr "_Žodžiai" + +#: ../src/ghex-window.c:434 +msgid "Group data by 16 bits" +msgstr "Grupuoti duomenis po 16 bitų" + +#: ../src/ghex-window.c:435 +#: ../src/ui.c:50 +msgid "_Longwords" +msgstr "_Ilgi žodžiai" + +#: ../src/ghex-window.c:436 +msgid "Group data by 32 bits" +msgstr "Grupuoti duomenis po 32 bitus" + +#: ../src/ghex-window.c:770 +#, c-format +msgid "Offset: %s" +msgstr "Poslinkis: %s" + +#: ../src/ghex-window.c:773 +#, c-format +msgid "; %s bytes from %s to %s selected" +msgstr "; %s baitai nuo %s iki %s pasirinkti" + +#: ../src/ghex-window.c:1057 +#, c-format +msgid "Activate file %s" +msgstr "Aktyvuoti failą %s" + +#: ../src/ghex-window.c:1093 +#, c-format +msgid "%s - GHex" +msgstr "%s - GHex" + +#: ../src/ghex-window.c:1221 +msgid "Select a file to save buffer as" +msgstr "Pasirinkti failą, į kurį saugoti buferį kaip" + +#: ../src/ghex-window.c:1277 +#, c-format +msgid "" +"File %s exists.\n" +"Do you want to overwrite it?" +msgstr "" +"Failas %s egzistuoja.\n" +"Perrašyti?" + +#: ../src/ghex-window.c:1310 +#: ../src/ui.c:293 +#, c-format +msgid "Saved buffer to file %s" +msgstr "Buferis išsaugotas faile %s" + +#: ../src/ghex-window.c:1316 +msgid "Error saving file!" +msgstr "Klaida saugant failą!" + +#: ../src/ghex-window.c:1322 +msgid "Can't open file for writing!" +msgstr "Negaliu atidaryti failo rašymui!" + +#: ../src/ghex-window.c:1367 +#, c-format +msgid "" +"File %s has changed since last save.\n" +"Do you want to save changes?" +msgstr "" +"Failas %s buvo pakeistas nuo paskutinio saugojimo.\n" +"Ar išsaugoti keitimus?" + +#: ../src/ghex-window.c:1371 +msgid "Do_n't save" +msgstr "Nesa_ugoti" + +#: ../src/ghex-window.c:1391 +#: ../src/ui.c:281 +msgid "You don't have the permissions to save the file!" +msgstr "Neturite teisių išsaugoti failą!" + +#: ../src/ghex-window.c:1395 +#: ../src/ui.c:286 +msgid "An error occurred while saving file!" +msgstr "Klaida bandant išsaugoti failą!" + +#: ../src/hex-dialog.c:58 +msgid "Signed 8 bit:" +msgstr "8 bitai su ženklu:" + +#: ../src/hex-dialog.c:59 +msgid "Unsigned 8 bit:" +msgstr "8 bitai be ženklo:" + +#: ../src/hex-dialog.c:60 +msgid "Signed 16 bit:" +msgstr "16 bitų su ženklu:" + +#: ../src/hex-dialog.c:61 +msgid "Unsigned 16 bit:" +msgstr "16 bitų be ženklo:" + +#: ../src/hex-dialog.c:62 +msgid "Signed 32 bit:" +msgstr "32 bitų su ženklu:" + +#: ../src/hex-dialog.c:63 +msgid "Unsigned 32 bit:" +msgstr "32 bitų be ženklo:" + +#: ../src/hex-dialog.c:64 +msgid "32 bit float:" +msgstr "32 bitų slankaus kablelio:" + +#: ../src/hex-dialog.c:65 +msgid "64 bit float:" +msgstr "64 bitų slankaus kablelio:" + +#: ../src/hex-dialog.c:66 +msgid "Hexadecimal:" +msgstr "Šešioliktainis:" + +#: ../src/hex-dialog.c:67 +msgid "Octal:" +msgstr "Aštuntainis:" + +#: ../src/hex-dialog.c:68 +msgid "Binary:" +msgstr "Dvejetainis:" + +#: ../src/hex-dialog.c:197 +msgid "Show little endian decoding" +msgstr "Rodyti didėjančio reikšmingumo (little endian) dekodavimą" + +#: ../src/hex-dialog.c:204 +msgid "Show unsigned and float as hexadecimal" +msgstr "Rodyti be ženklo ir slankaus kablelio kaip šešioliktainius" + +#: ../src/hex-dialog.c:210 +msgid "Stream Length:" +msgstr "Srauto ilgis:" + +#: ../src/hex-dialog.c:232 +msgid "FIXME: no conversion function" +msgstr "IŠTAISYK: nėra konvertavimo funkcijos" + +#: ../src/hex-document.c:436 +msgid "New document" +msgstr "Naujas dokumentas" + +#: ../src/hex-document.c:790 +#, c-format +msgid "Page" +msgstr "Puslapis" + +#: ../src/hex-document.c:796 +#: ../src/hex-document.c:921 +#, c-format +msgid "Hex dump generated by" +msgstr "Šešioliktainę išklotinę sukūrė" + +#: ../src/hex-document.c:807 +msgid "Saving to HTML..." +msgstr "Saugojama į HTML..." + +#: ../src/hex-document.c:844 +#, c-format +msgid "Previous page" +msgstr "Ankstesnis puslapis" + +#: ../src/hex-document.c:859 +#, c-format +msgid "Next page" +msgstr "Kitas puslapis" + +#: ../src/main.c:36 +msgid "X geometry specification (see \"X\" man page)." +msgstr "X geometrijos specifikacija (žiūrėkite „X“ man puslapį)." + +#: ../src/main.c:36 +msgid "GEOMETRY" +msgstr "GEOMETRIJA" + +#: ../src/main.c:37 +msgid "FILES" +msgstr "FAILAI" + +#: ../src/main.c:53 +msgid "- GTK+ binary editor" +msgstr "- GTK+ kompiliuotos programos redaktorius" + +#: ../src/main.c:57 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options.\n" +msgstr "" +"%s\n" +"Paleisk '%s --help' visoms galimoms komandoms pamatyti.\n" + +#: ../src/main.c:81 +#: ../src/main.c:94 +#, c-format +msgid "Invalid geometry string \"%s\"\n" +msgstr "Neteisingas geometrijos apibrėžimas „%s“\n" + +#: ../src/preferences.c:69 +msgid "GHex Preferences" +msgstr "GHex nustatymai" + +#: ../src/preferences.c:101 +msgid "_Maximum number of undo levels:" +msgstr "_Daugiausia atšaukimo lygių:" + +#: ../src/preferences.c:121 +msgid "Undo levels" +msgstr "Atšaukimo lygiai" + +#: ../src/preferences.c:121 +msgid "Select maximum number of undo levels" +msgstr "Pasirinkite, kiek daugiausia bus atšaukimo lygių" + +#: ../src/preferences.c:125 +msgid "_Show cursor offset in statusbar as:" +msgstr "_Rodyti žymeklio koordinates būsenos eilutėje kaip:" + +#: ../src/preferences.c:144 +msgid "Hexadecimal" +msgstr "Šešioliktainis" + +#: ../src/preferences.c:146 +msgid "Custom" +msgstr "Pasirinktinis" + +#: ../src/preferences.c:155 +msgid "Enter the cursor offset format" +msgstr "Įvesk žymeklio koordinačių formatą" + +#: ../src/preferences.c:156 +msgid "Select the cursor offset format" +msgstr "Pasirinkite žymeklio poslinkio formatą" + +#. show offsets check button +#: ../src/preferences.c:166 +msgid "Sh_ow offsets column" +msgstr "Rod_yti poslinkių stulpelį" + +#: ../src/preferences.c:171 +msgid "Editing" +msgstr "Redagavimas" + +#. display font +#: ../src/preferences.c:180 +msgid "Font" +msgstr "Šriftas" + +#. default group type +#: ../src/preferences.c:203 +msgid "Default Group Type" +msgstr "Numatytasis grupės tipas" + +#: ../src/preferences.c:219 +msgid "Display" +msgstr "Ekranas" + +#. paper selection +#: ../src/preferences.c:228 +msgid "Paper size" +msgstr "Popieriaus dydis" + +#. data & header font selection +#: ../src/preferences.c:233 +msgid "Fonts" +msgstr "Šriftai" + +#: ../src/preferences.c:239 +msgid "_Data font:" +msgstr "_Duomenų šriftas:" + +#: ../src/preferences.c:255 +msgid "Data font" +msgstr "Duomenų šriftas" + +#: ../src/preferences.c:255 +msgid "Select the data font" +msgstr "Pasirinkite duomenų šriftą" + +#: ../src/preferences.c:269 +msgid "Header fo_nt:" +msgstr "Antraštės šrif_tas:" + +#: ../src/preferences.c:284 +msgid "Header font" +msgstr "Antraštės šriftas" + +#: ../src/preferences.c:284 +msgid "Select the header font" +msgstr "Pasirinkite antraštės šriftą" + +#: ../src/preferences.c:310 +msgid "_Print shaded box over:" +msgstr "_Spausdinti rėmelyje su šešėliu:" + +#: ../src/preferences.c:322 +msgid "Box size" +msgstr "Rėmelio dydis" + +#: ../src/preferences.c:322 +msgid "Select size of box (in number of lines)" +msgstr "Pasirinkite rėmelio dydį (išreikštą eilučių skaičiumi)" + +#: ../src/preferences.c:326 +msgid "lines (0 for no box)" +msgstr "eilutės (0, jei be rėmelio)" + +#: ../src/preferences.c:333 +msgid "Printing" +msgstr "Spausdinama" + +#: ../src/preferences.c:451 +#: ../src/ui.c:202 +#, c-format +msgid "" +"There was an error displaying help: \n" +"%s" +msgstr "" +"Kilo klaida atveriant žinyną:\n" +"%s" + +#: ../src/preferences.c:503 +msgid "Can not open desired font!" +msgstr "Negaliu atidaryti pageidaujamo šrifto!" + +#: ../src/preferences.c:564 +msgid "" +"The offset format string contains invalid format specifier.\n" +"Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed." +msgstr "" +"Poslinkio formatas turi netinkamų reikšmių.\n" +"Leidžiama tik „x“, „X“, „p“, „P“, „d“ ir „o“." + +#: ../src/print.c:57 +#, c-format +msgid "Page: %i/%i" +msgstr "Puslapis: %i/%i" + +#: ../src/ui.c:55 +msgid "hex data" +msgstr "šešioliktainiai duomenys" + +#: ../src/ui.c:56 +msgid "ASCII data" +msgstr "ASCII duomenys" + +#: ../src/ui.c:144 +msgid "" +"Copyright © 1998 - 2006 Jaka Močnik\n" +"Copyright © 2006 - 2010 GHex Contributors" +msgstr "" +"Autorinės teisės © 1998 - 2006 Jaka Močnik\n" +"Autorinės teisės © 2006 - 2010 GHex pagalbininkai" + +#: ../src/ui.c:151 +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) any later version." +msgstr "Ši programa yra laisva programinė įranga; jūs galite ją platinti bei keisti pagal GNU bendrosios viešos licencijos sąlygas, kaip jas pateikia Free Software Foundation; licencijos versija 2 arba (jūsų pasirinkta) bet kuri vėlesnė versija." + +#: ../src/ui.c:155 +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 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details." +msgstr "Ši programa platinama tikintis, kad ji bus naudinga, be BE JOKIOS GARANTIJOS; netgi be numanomos PREKYBINĖS ar TINKAMUMO TAM TIKRAM TIKSLUI garantijos. Daugiau informacijos rasite GNU bendrojoje viešoje licencijoje." + +#: ../src/ui.c:159 +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 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" +msgstr "Jūs turėjote gauti GNU bendros viešosios licencijos kopiją kartu su programa; jei negavote, parašykite į Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" + +#: ../src/ui.c:171 +msgid "A binary file editor" +msgstr "Dvejetainių failų redaktorius" + +#: ../src/ui.c:177 +msgid "About GHex" +msgstr "Apie GHex" + +#: ../src/ui.c:178 +msgid "translator-credits" +msgstr "" +"padėka vertėjams:\n" +"Algimantas Margevičius\n" +"Aurimas Černius" + +#: ../src/ui.c:181 +msgid "GHex Website" +msgstr "GHex svetainė" + +#: ../src/ui.c:311 +msgid "Select a file to open" +msgstr "Pasirinkite failą atvėrimui" + +#: ../src/ui.c:342 +#, c-format +msgid "Loaded file %s" +msgstr "Įkeltas failas %s" + +#: ../src/ui.c:350 +msgid "Can not open file!" +msgstr "Negaliu atverti failo!" + +#: ../src/ui.c:415 +msgid "Select path and file name for the HTML source" +msgstr "Pasirink kelią ir failo vardą HTML pradiniam kodui" + +#: ../src/ui.c:449 +msgid "You need to specify a base name for the HTML files." +msgstr "Turi nurodyti vardą HTML failams." + +#: ../src/ui.c:460 +#: ../src/ui.c:484 +msgid "You don't have the permission to write to the selected path.\n" +msgstr "Neturi teisės rašyti į pasirinktą kelią.\n" + +#: ../src/ui.c:471 +msgid "" +"Saving to HTML will overwrite some files.\n" +"Do you want to proceed?" +msgstr "" +"Saugant į HTML perrašys kelis failus.\n" +"Tęsti?" + +#: ../src/ui.c:736 +#, c-format +msgid "Really revert file %s?" +msgstr "Tikrai atstatyti failą %s?" + +#: ../src/ui.c:750 +#, c-format +msgid "Reverted buffer from file %s" +msgstr "Atstatytas buferis iš failo %s" + diff -Nru ghex-3.0.0/po/pl.po ghex-3.3.90/po/pl.po --- ghex-3.0.0/po/pl.po 2011-07-31 09:02:00.000000000 +0000 +++ ghex-3.3.90/po/pl.po 2012-02-21 01:21:58.000000000 +0000 @@ -1,1099 +1,1070 @@ -# Copyright (C) 2001-2002 Free Software Foundation, Inc. # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Aktualną wersję tego pliku możesz odnaleźć w repozytorium cvs.gnome.pl -# (:pserver:anonymous@cvs.gnome.pl:/gnomepl, puste hasło) +# Aviary.pl # Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz -# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas na adres: -# translators@gnome.pl +# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: +# gnomepl@aviary.pl # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- msgid "" msgstr "" "Project-Id-Version: ghex\n" -"POT-Creation-Date: 2003-11-16 22:58+0100\n" -"PO-Revision-Date: 2003-10-17 21:16+0100\n" -"Last-Translator: GNOME PL Team \n" -"Language-Team: Polish \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-02-18 21:04+0100\n" +"PO-Revision-Date: 2012-02-18 21:05+0100\n" +"Last-Translator: Piotr Drąg \n" +"Language-Team: Polish \n" +"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" +"X-Poedit-Language: Polish\n" +"X-Poedit-Country: Poland\n" -#: ghex.desktop.in.h:1 -msgid "GNOME Hexadecimal Editor" -msgstr "Edytor szesnastkowy dla GNOME" +#: ../data/ghex.desktop.in.h:1 ../src/ghex-window.c:673 +#: ../src/ghex-window.c:1107 +msgid "GHex" +msgstr "GHex" -#: ghex.desktop.in.h:2 +#: ../data/ghex.desktop.in.h:2 msgid "Hex Editor" msgstr "Edytor szesnastkowy" -#: src/chartable.c:140 +#: ../data/ghex.desktop.in.h:3 +msgid "Inspect and edit binary files" +msgstr "Badanie i modyfikacja plików binarnych" + +#: ../src/chartable.c:147 msgid "ASCII" msgstr "ASCII" -#: src/chartable.c:140 +#: ../src/chartable.c:147 msgid "Hex" msgstr "Szesnastkowo" -#: src/chartable.c:140 src/preferences.c:164 +#: ../src/chartable.c:147 ../src/preferences.c:142 msgid "Decimal" msgstr "Dziesiętnie" -#: src/chartable.c:141 +#: ../src/chartable.c:148 msgid "Octal" msgstr "Ósemkowo" -#: src/chartable.c:141 +#: ../src/chartable.c:148 msgid "Binary" msgstr "Binarnie" -#: src/chartable.c:157 +#: ../src/chartable.c:164 msgid "Character table" msgstr "Tablica znaków" -#: src/converter.c:225 +#: ../src/converter.c:231 msgid "Base Converter" msgstr "Konwerter zapisu liczb" #. entries -#: src/converter.c:246 +#: ../src/converter.c:252 msgid "_Binary:" msgstr "_Binarnie:" -#: src/converter.c:248 +#: ../src/converter.c:254 msgid "_Octal:" msgstr "Ó_semkowo:" -#: src/converter.c:250 +#: ../src/converter.c:256 msgid "_Decimal:" msgstr "_Dziesiętnie:" -#: src/converter.c:252 +#: ../src/converter.c:258 msgid "_Hex:" msgstr "_Szesnastkowo:" -#: src/converter.c:254 +#: ../src/converter.c:260 msgid "_ASCII:" msgstr "_ASCII:" #. get cursor button -#: src/converter.c:258 +#: ../src/converter.c:264 msgid "_Get cursor value" msgstr "_Pobierz wartość pod kursorem" -#: src/converter.c:272 +#: ../src/converter.c:278 msgid "Get cursor value" msgstr "Pobierz wartość pod kursorem" -#: src/converter.c:272 +#: ../src/converter.c:278 msgid "Gets the value at cursor in binary, octal, decimal, hex and ASCII" msgstr "" -"Pobierz wartość pod kursorem w formie binarnej, ósemkowej dziesiętnej, " -"szesnastkowej i znaku ASCII" +"Pobiera wartość pod kursorem w formie binarnej, ósemkowej, dziesiętnej, " +"szesnastkowej i ASCII" -#: src/converter.c:405 +#: ../src/converter.c:418 msgid "ERROR" msgstr "BŁĄD" -#: src/findreplace.c:85 src/findreplace.c:239 src/ui.c:901 +#: ../src/findreplace.c:97 ../src/findreplace.c:221 ../src/ui.c:866 #, c-format msgid "GHex (%s): Find Data" -msgstr "GHex (%s): Wyszukiwanie danych" +msgstr "GHex (%s): wyszukiwanie danych" -#: src/findreplace.c:94 src/findreplace.c:172 -#, c-format -msgid "Search for %s" -msgstr "Szukaj %s" +#: ../src/findreplace.c:101 ../src/findreplace.c:161 ../src/findreplace.c:359 +msgid "Find String" +msgstr "Znajdź ciąg" -#: src/findreplace.c:111 src/findreplace.c:276 +#: ../src/findreplace.c:108 ../src/findreplace.c:258 msgid "Find _Next" msgstr "Znajdź _następne" -#: src/findreplace.c:118 src/findreplace.c:285 +#: ../src/findreplace.c:115 ../src/findreplace.c:267 msgid "Find _Previous" msgstr "Znajdź poprz_ednie" -#: src/findreplace.c:141 src/findreplace.c:441 +#: ../src/findreplace.c:138 ../src/findreplace.c:413 msgid "Find Data" msgstr "Wyszukiwanie danych" -#: src/findreplace.c:141 src/findreplace.c:441 +#: ../src/findreplace.c:138 ../src/findreplace.c:413 msgid "Enter the hex data or ASCII data to search for" -msgstr "Wprowadź wyszukiwane dane szesnastkowo lub w postaci znaków ASCII" +msgstr "Proszę wprowadzić wyszukiwane dane szesnastkowe lub ASCII" -#: src/findreplace.c:142 +#: ../src/findreplace.c:139 msgid "Find Next" msgstr "Znajdź następne" -#: src/findreplace.c:142 src/findreplace.c:443 +#: ../src/findreplace.c:139 ../src/findreplace.c:415 msgid "Finds the next occurrence of the search string" -msgstr "Wyszukuje następne wystąpienie napisu" +msgstr "Wyszukuje następne wystąpienie ciągu" -#: src/findreplace.c:143 +#: ../src/findreplace.c:140 msgid "Find previous" msgstr "Znajdź poprzednie" -#: src/findreplace.c:143 +#: ../src/findreplace.c:140 msgid "Finds the previous occurrence of the search string " -msgstr "Wyszukuje poprzednie wystąpienie napisu" +msgstr "Wyszukuje poprzednie wystąpienie ciągu " -#: src/findreplace.c:144 src/findreplace.c:446 src/findreplace.c:494 +#: ../src/findreplace.c:141 ../src/findreplace.c:418 ../src/findreplace.c:466 msgid "Cancel" msgstr "Anuluj" -#: src/findreplace.c:144 +#: ../src/findreplace.c:141 msgid "Closes find data window" msgstr "Zamyka okno wyszukiwania danych" -#: src/findreplace.c:163 +#: ../src/findreplace.c:157 #, c-format msgid "GHex (%s): Find Data: Add search" -msgstr "GHex (%s): Znajdź dane: Dodawanie wyszukiwania" +msgstr "GHex (%s): wyszukiwanie danych: dodawanie wyszukiwania" -#: src/findreplace.c:186 +#: ../src/findreplace.c:179 msgid "Add" msgstr "Dodaj" -#: src/findreplace.c:208 src/findreplace.c:261 +#: ../src/findreplace.c:235 +msgid "Search String" +msgstr "Znajdź ciąg" + +#: ../src/findreplace.c:243 msgid "Highlight Colour" msgstr "Kolor wyróżniania" -#: src/findreplace.c:253 -msgid "Search String" -msgstr "" - -#: src/findreplace.c:298 +#: ../src/findreplace.c:280 msgid "_Add New" msgstr "_Dodaj nowy" -#: src/findreplace.c:307 +#: ../src/findreplace.c:289 msgid "_Remove Selected" msgstr "_Usuń zaznaczony" -#: src/findreplace.c:327 src/ghex-ui.xml.h:9 +#: ../src/findreplace.c:309 msgid "Close" msgstr "Zamknij" -#: src/findreplace.c:327 +#: ../src/findreplace.c:309 msgid "Closes advanced find window" msgstr "Zamyka okno zaawansowanego wyszukiwania" -#: src/findreplace.c:371 src/ui.c:899 +#: ../src/findreplace.c:355 ../src/ui.c:864 #, c-format msgid "GHex (%s): Find & Replace Data" -msgstr "GHex (%s): Wyszukiwanie i zmiana danych" +msgstr "GHex (%s): wyszukiwanie i zamiana danych" -#: src/findreplace.c:386 -#, c-format -msgid "Replace %s" -msgstr "Zmień %s" +#: ../src/findreplace.c:368 +msgid "Replace With" +msgstr "Zmiana na" -#: src/findreplace.c:403 +#: ../src/findreplace.c:375 msgid "Find _next" msgstr "Znajdź _następne" -#: src/findreplace.c:411 src/ghex-ui.xml.h:89 +#: ../src/findreplace.c:383 msgid "_Replace" msgstr "Z_mień" -#: src/findreplace.c:419 +#: ../src/findreplace.c:391 msgid "Replace _All" msgstr "Zmień _wszystkie" -#: src/findreplace.c:442 +#: ../src/findreplace.c:414 msgid "Replace Data" msgstr "Zmiana danych" -#: src/findreplace.c:442 +#: ../src/findreplace.c:414 msgid "Enter the hex data or ASCII data to replace with" -msgstr "Wprowadź zastępujące dane szesnastkowo lub w postaci znaków ASCII" +msgstr "Proszę wprowadzić dane szesnastkowo lub ASCII do zastąpienia" -#: src/findreplace.c:443 +#: ../src/findreplace.c:415 msgid "Find next" msgstr "Znajdź następne" -#: src/findreplace.c:444 src/ghex-ui.xml.h:49 +#: ../src/findreplace.c:416 msgid "Replace" msgstr "Zmień" -#: src/findreplace.c:444 +#: ../src/findreplace.c:416 msgid "Replaces the search string with the replace string" -msgstr "Zastępuje wyszukiwany napis nowym napisem" +msgstr "Zastępuje wyszukiwany ciąg nowym" -#: src/findreplace.c:445 +#: ../src/findreplace.c:417 msgid "Replace All" msgstr "Zmień wszystkie" -#: src/findreplace.c:445 +#: ../src/findreplace.c:417 msgid "Replaces all occurrences of the search string with the replace string" -msgstr "Zastępuje wszystkie wystąpienia wyszukiwanego napisu nowym napisem" +msgstr "Zastępuje wszystkie wystąpienia wyszukiwanego ciągu nowym" -#: src/findreplace.c:446 +#: ../src/findreplace.c:418 msgid "Closes find and replace data window" msgstr "Zamyka okno wyszukiwania i zmiany danych" -#: src/findreplace.c:462 src/ui.c:897 +#: ../src/findreplace.c:434 ../src/ui.c:862 #, c-format msgid "GHex (%s): Jump To Byte" -msgstr "GHex (%s): Przejście do bajtu" +msgstr "GHex (%s): przejście do bajtu" -#: src/findreplace.c:492 +#: ../src/findreplace.c:464 msgid "Jump to byte" msgstr "Przejście do bajtu" -#: src/findreplace.c:492 +#: ../src/findreplace.c:464 msgid "Enter the byte to jump to" -msgstr "Podaj bajt, do którego chcesz przejść" +msgstr "Proszę podać bajt, do którego przejść" -#: src/findreplace.c:493 +#: ../src/findreplace.c:465 msgid "OK" msgstr "OK" -#: src/findreplace.c:493 +#: ../src/findreplace.c:465 msgid "Jumps to the specified byte" msgstr "Przechodzi do podanego bajtu" -#: src/findreplace.c:494 +#: ../src/findreplace.c:466 msgid "Closes jump to byte window" msgstr "Zamyka okno przejścia do bajtu" -#: src/findreplace.c:598 src/findreplace.c:631 src/findreplace.c:690 +#: ../src/findreplace.c:529 ../src/findreplace.c:563 ../src/findreplace.c:670 msgid "There is no active document to search!" -msgstr "Brak aktywnego pliku, który można przeszukiwać!" +msgstr "Brak aktywnego dokumentu, który można przeszukiwać." -#: src/findreplace.c:606 src/findreplace.c:639 src/findreplace.c:836 -msgid "The string is not appropriate for the selected data type!" -msgstr "Napis nie odpowiada wybranemu typowi danych!" +#: ../src/findreplace.c:536 ../src/findreplace.c:570 ../src/findreplace.c:677 +#: ../src/findreplace.c:711 ../src/findreplace.c:756 +msgid "There is no string to search for!" +msgstr "Brak ciągu do wyszukania." -#: src/findreplace.c:618 src/findreplace.c:707 src/findreplace.c:899 +#: ../src/findreplace.c:548 ../src/findreplace.c:686 ../src/findreplace.c:877 msgid "End Of File reached" msgstr "Osiągnięto koniec pliku" -#: src/findreplace.c:619 src/findreplace.c:651 src/findreplace.c:706 -#: src/findreplace.c:900 src/findreplace.c:923 +#: ../src/findreplace.c:549 ../src/findreplace.c:582 ../src/findreplace.c:685 +#: ../src/findreplace.c:878 ../src/findreplace.c:901 msgid "String was not found!\n" -msgstr "Nie odnaleziono napisów!\n" +msgstr "Nie odnaleziono ciągu.\n" -#: src/findreplace.c:650 src/findreplace.c:922 +#: ../src/findreplace.c:581 ../src/findreplace.c:900 msgid "Beginning Of File reached" msgstr "Osiągnięto początek pliku" -#: src/findreplace.c:662 +#: ../src/findreplace.c:598 msgid "There is no active document to move the cursor in!" -msgstr "Brak aktywnego pliku, w którym można przemieścić kursor!" +msgstr "Brak aktywnego dokumentu, w którym można przenieść kursor." -#: src/findreplace.c:667 +#: ../src/findreplace.c:616 msgid "No offset has been specified!" -msgstr "Nie określono przesunięcia" +msgstr "Nie podano przesunięcia." -#: src/findreplace.c:674 -msgid "Can not position cursor beyond the End Of File!" -msgstr "Nie można umieścić kursora poza końcem pliku!" +#: ../src/findreplace.c:641 +msgid "The specified offset is beyond the file boundaries!" +msgstr "Podane przesunięcie jest poza granicami pliku." -#: src/findreplace.c:679 -msgid "The offset must be a positive integer value!" -msgstr "Przesunięcie musi być nieujemną liczbą całkowitą!" +#: ../src/findreplace.c:649 +msgid "Can not position cursor beyond the End Of File!" +msgstr "Nie można umieścić kursora poza końcem pliku." -#: src/findreplace.c:698 -msgid "There seems to be no string to search for!" -msgstr "Poszukiwany napis nie może być pusty!" +#: ../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', or\n" +" - a '+' or '-' sign, followed by a relative offset" +msgstr "" +"Można podawać offset tylko jako:\n" +" - dodatnia liczba dziesiętna lub\n" +" - liczba szesnastkowa, zaczynająca się od \"0x\" lub\n" +" - znak \"+\" lub \"-\" następujący po przesunięciu względnym" -#: src/findreplace.c:720 +#: ../src/findreplace.c:702 msgid "There is no active buffer to replace data in!" -msgstr "Brak aktywnego pliku, w którym można zmienić dane!" - -#: src/findreplace.c:732 src/findreplace.c:773 -msgid "Strings are not appropriate for the selected data type!" -msgstr "Napisy nie odpowiadają wybranemu typowi danych!" +msgstr "Brak aktywnego bufora, w którym można zmienić dane." -#: src/findreplace.c:747 src/findreplace.c:748 +#: ../src/findreplace.c:727 ../src/findreplace.c:728 msgid "End Of File reached!" -msgstr "Osiągnięto koniec pliku!" +msgstr "Osiągnięto koniec pliku." -#: src/findreplace.c:761 +#: ../src/findreplace.c:747 msgid "There is no active document to replace data in!" -msgstr "Brak aktywnego pliku, w którym można zmienić dane!" +msgstr "Brak aktywnego dokumentu, w którym można zmienić dane." -#: src/findreplace.c:793 -msgid "No occurences were found." +#: ../src/findreplace.c:777 +msgid "No occurrences were found." msgstr "Nie odnaleziono wystąpień." -#: src/findreplace.c:796 +#: ../src/findreplace.c:780 #, c-format -msgid "Replaced %d occurencies." -msgstr "Zmieniono %d wystąpień." +msgid "Replaced %d occurrence." +msgid_plural "Replaced %d occurrences." +msgstr[0] "Zmieniono %d wystąpienie." +msgstr[1] "Zmieniono %d wystąpienia." +msgstr[2] "Zmieniono %d wystąpień." + +#: ../src/findreplace.c:820 +msgid "No string to search for!" +msgstr "Brak ciągu do wyszukania." -#: src/ghex-ui.xml.h:1 -msgid "About this application" -msgstr "Informacje o aplikacji" - -#: src/ghex-ui.xml.h:2 -msgid "Add View" -msgstr "Dodaj widok" +#: ../src/ghex-window.c:75 +#, c-format +msgid "" +"Can not open URI:\n" +"%s" +msgstr "" +"Nie można otworzyć adresu URI:\n" +"%s" -#: src/ghex-ui.xml.h:3 -msgid "Add a new view to the buffer" -msgstr "Dodaje nowy widok bufora" +#: ../src/ghex-window.c:94 +#, c-format +msgid "" +"Can not open file:\n" +"%s" +msgstr "" +"Nie można otworzyć pliku:\n" +"%s" -#: src/ghex-ui.xml.h:4 -msgid "Advanced Find" -msgstr "Zaawansowane wyszukiwanie" +#: ../src/ghex-window.c:325 +msgid "_File" +msgstr "_Plik" -#: src/ghex-ui.xml.h:5 src/ui.c:67 -msgid "Bytes" -msgstr "Bajty" - -#: src/ghex-ui.xml.h:6 -msgid "C_ut" -msgstr "_Wytnij" - -#: src/ghex-ui.xml.h:7 -msgid "Character Table..." -msgstr "Tablica znaków..." - -#: src/ghex-ui.xml.h:8 -msgid "Character _Table..." -msgstr "_Tablica znaków..." +#: ../src/ghex-window.c:326 +msgid "_Edit" +msgstr "_Edycja" -#: src/ghex-ui.xml.h:10 -msgid "Close the current file" -msgstr "Zamyka bieżący plik" +#: ../src/ghex-window.c:327 +msgid "_View" +msgstr "_Widok" -#: src/ghex-ui.xml.h:11 -msgid "Configure the application" -msgstr "Konfiguruje aplikację" +#: ../src/ghex-window.c:328 +msgid "_Group Data As" +msgstr "_Grupowanie danych" -#: src/ghex-ui.xml.h:12 -msgid "Contents" -msgstr "Zawartość" +#. View submenu +#: ../src/ghex-window.c:329 +msgid "_Windows" +msgstr "O_kna" -#: src/ghex-ui.xml.h:13 -msgid "Converter..." -msgstr "Konwerter..." +#: ../src/ghex-window.c:330 +msgid "_Help" +msgstr "Pomo_c" -#: src/ghex-ui.xml.h:14 -msgid "Copy" -msgstr "Skopiuj" +#. File menu +#: ../src/ghex-window.c:333 +msgid "_Open..." +msgstr "_Otwórz..." -#: src/ghex-ui.xml.h:15 -msgid "Copy selection to clipboard" -msgstr "Kopiuje zaznaczenie do schowka" +#: ../src/ghex-window.c:334 +msgid "Open a file" +msgstr "Otwiera plik" -#: src/ghex-ui.xml.h:16 -msgid "Cut" -msgstr "Wytnij" +#: ../src/ghex-window.c:336 +msgid "_Save" +msgstr "_Zapisz" -#: src/ghex-ui.xml.h:17 -msgid "Cut selection" -msgstr "Wycina zaznaczenie" +#: ../src/ghex-window.c:337 +msgid "Save the current file" +msgstr "Zapisuje bieżący plik" -#: src/ghex-ui.xml.h:18 -msgid "E_xit" -msgstr "Za_kończ" +#: ../src/ghex-window.c:339 +msgid "Save _As..." +msgstr "Z_apisz jako..." -#: src/ghex-ui.xml.h:19 -msgid "Exit" -msgstr "Zakończ" +#: ../src/ghex-window.c:340 +msgid "Save the current file with a different name" +msgstr "Zapisuje bieżący plik pod inną nazwą" -#: src/ghex-ui.xml.h:20 -msgid "Exit the program" -msgstr "Kończy działanie programu" +#: ../src/ghex-window.c:342 +msgid "Save As _HTML..." +msgstr "Zapisz w formacie _HTML..." -#: src/ghex-ui.xml.h:21 +#: ../src/ghex-window.c:343 msgid "Export data to HTML source" -msgstr "Eksportuje dane do pliku w HTML-u" - -#: src/ghex-ui.xml.h:22 -msgid "Export to HTML..." -msgstr "Wyeksportuj do formatu HTML..." - -#: src/ghex-ui.xml.h:23 -msgid "Find" -msgstr "Znajdź" - -#: src/ghex-ui.xml.h:24 -msgid "Goto Byte" -msgstr "Przejdź do bajtu" - -#: src/ghex-ui.xml.h:25 -msgid "Group data by 16 bits" -msgstr "Grupuje dane po 16 bitów" - -#: src/ghex-ui.xml.h:26 -msgid "Group data by 32 bits" -msgstr "Grupuje dane po 32 bity" - -#: src/ghex-ui.xml.h:27 -msgid "Group data by 8 bits" -msgstr "Grupuje dane po 8 bitów" - -#: src/ghex-ui.xml.h:28 -msgid "Help Chat" -msgstr "Pomoc interaktywna" - -#: src/ghex-ui.xml.h:29 -msgid "Help on this application" -msgstr "Pomoc na temat aplikacji" - -#: src/ghex-ui.xml.h:30 -msgid "Insert Mode" -msgstr "Tryb wstawiania" +msgstr "Eksportuje dane do pliku HTML" -#: src/ghex-ui.xml.h:31 -msgid "Insert/overwrite data" -msgstr "Wstawia/Nadpisuje dane" - -#: src/ghex-ui.xml.h:32 -msgid "Jump to a certain position" -msgstr "Przechodzi do określonej pozycji" +#: ../src/ghex-window.c:345 +msgid "_Revert" +msgstr "_Przywróć" -#: src/ghex-ui.xml.h:33 src/ui.c:69 -msgid "Longwords" -msgstr "Długie słowa" - -#: src/ghex-ui.xml.h:34 -msgid "Open" -msgstr "Otwórz" +#: ../src/ghex-window.c:346 +msgid "Revert to a saved version of the file" +msgstr "Przywraca zapisaną wersję pliku" -#: src/ghex-ui.xml.h:35 -msgid "Open a file" -msgstr "Otwiera plik" +#: ../src/ghex-window.c:348 +msgid "_Print" +msgstr "Wy_drukuj" -#: src/ghex-ui.xml.h:36 -msgid "Open base conversion dialog" -msgstr "Otwiera okno konwersji pomiędzy systemami liczenia" +#: ../src/ghex-window.c:349 +msgid "Print the current file" +msgstr "Drukuje bieżący plik" -#: src/ghex-ui.xml.h:37 -msgid "Paste" -msgstr "Wklej" +#: ../src/ghex-window.c:351 +msgid "Print Previe_w..." +msgstr "Podgląd _wydruku..." -#: src/ghex-ui.xml.h:38 -msgid "Paste data from clipboard" -msgstr "Wkleja dane ze schowka" +#: ../src/ghex-window.c:352 +msgid "Preview printed data" +msgstr "Wyświetla podgląd drukowanych danych" -#: src/ghex-ui.xml.h:39 -msgid "Preferences" -msgstr "Preferencje" +#: ../src/ghex-window.c:354 +msgid "_Close" +msgstr "Za_mknij" -#: src/ghex-ui.xml.h:40 -msgid "Preview printed data" -msgstr "Wyświetla podgląd danych w postaci przygotowanej do druku" +#: ../src/ghex-window.c:355 +msgid "Close the current file" +msgstr "Zamyka bieżący plik" -#: src/ghex-ui.xml.h:41 -msgid "Print" -msgstr "Wydrukuj" +#: ../src/ghex-window.c:357 +msgid "E_xit" +msgstr "Za_kończ" -#: src/ghex-ui.xml.h:42 -msgid "Print Previe_w..." -msgstr "Podgląd _wydruku..." +#: ../src/ghex-window.c:358 +msgid "Exit the program" +msgstr "Kończy działanie programu" -#: src/ghex-ui.xml.h:43 -msgid "Print Preview..." -msgstr "Podgląd wydruku..." +#. Edit menu +#: ../src/ghex-window.c:362 +msgid "_Undo" +msgstr "Cof_nij" -#: src/ghex-ui.xml.h:44 -msgid "Print the current file" -msgstr "Drukuje bieżący plik" +#: ../src/ghex-window.c:363 +msgid "Undo the last action" +msgstr "Cofa ostatnią czynność" -#: src/ghex-ui.xml.h:45 -msgid "Redo" -msgstr "Ponów" +#: ../src/ghex-window.c:365 +msgid "_Redo" +msgstr "P_onów" -#: src/ghex-ui.xml.h:46 +#: ../src/ghex-window.c:366 msgid "Redo the undone action" msgstr "Ponawia cofniętą czynność" -#: src/ghex-ui.xml.h:47 -msgid "Remove View" -msgstr "Usuń widok" - -#: src/ghex-ui.xml.h:48 -msgid "Remove the current view of the buffer" -msgstr "Usuwa bieżący widok bufora" - -#: src/ghex-ui.xml.h:50 -msgid "Replace a string" -msgstr "Zmień napis" - -#: src/ghex-ui.xml.h:51 -msgid "Revert" -msgstr "Przywróć" +#: ../src/ghex-window.c:368 +msgid "_Copy" +msgstr "S_kopiuj" -#: src/ghex-ui.xml.h:52 -msgid "Revert to a saved version of the file" -msgstr "Przywraca zapisaną wersję pliku" +#: ../src/ghex-window.c:369 +msgid "Copy selection to clipboard" +msgstr "Kopiuje zaznaczenie do schowka" -#: src/ghex-ui.xml.h:53 -msgid "Save" -msgstr "Zapisz" - -#: src/ghex-ui.xml.h:54 -msgid "Save As" -msgstr "Zapisz jako" +#: ../src/ghex-window.c:371 +msgid "Cu_t" +msgstr "Wy_tnij" -#: src/ghex-ui.xml.h:55 -msgid "Save As _HTML..." -msgstr "Zapisz w formacie _HTML..." +#: ../src/ghex-window.c:372 +msgid "Cut selection" +msgstr "Wycina zaznaczenie" -#: src/ghex-ui.xml.h:56 -msgid "Save _As..." -msgstr "Z_apisz jako..." +#: ../src/ghex-window.c:374 +msgid "Pa_ste" +msgstr "_Wklej" -#: src/ghex-ui.xml.h:57 -msgid "Save the current file" -msgstr "Zapisuje bieżący plik" +#: ../src/ghex-window.c:375 +msgid "Paste data from clipboard" +msgstr "Wkleja dane ze schowka" -#: src/ghex-ui.xml.h:58 -msgid "Save the current file with a different name" -msgstr "Zapisuje bieżący plik pod inną nazwą" +#: ../src/ghex-window.c:377 +msgid "_Find" +msgstr "_Znajdź" -#: src/ghex-ui.xml.h:59 +#: ../src/ghex-window.c:378 msgid "Search for a string" -msgstr "Wyszukuje napis" +msgstr "Wyszukuje ciąg" -#: src/ghex-ui.xml.h:60 -msgid "Show the character table" -msgstr "Wyświetla tablicę znaków" +#: ../src/ghex-window.c:380 +msgid "_Advanced Find" +msgstr "Z_aawansowane wyszukiwanie" -#: src/ghex-ui.xml.h:61 -msgid "Show the type conversion dialog in the edit window" -msgstr "" +#: ../src/ghex-window.c:381 +msgid "Advanced Find" +msgstr "Zaawansowane wyszukiwanie" -#: src/ghex-ui.xml.h:62 -msgid "Type Conversion Dialog..." -msgstr "" +#: ../src/ghex-window.c:383 +msgid "R_eplace" +msgstr "Z_mień" -#: src/ghex-ui.xml.h:63 -#, fuzzy -msgid "Type Conversion _Dialog" -msgstr "Otwiera okno konwersji pomiędzy systemami liczenia" +#: ../src/ghex-window.c:384 +msgid "Replace a string" +msgstr "Zmienia ciąg" -#: src/ghex-ui.xml.h:64 -msgid "Undo" -msgstr "Cofnij" +#: ../src/ghex-window.c:386 +msgid "_Goto Byte..." +msgstr "_Przejdź do bajtu..." -#: src/ghex-ui.xml.h:65 -msgid "Undo the last action" -msgstr "Cofa ostatnią czynność" +#: ../src/ghex-window.c:387 +msgid "Jump to a certain position" +msgstr "Przechodzi do określonej pozycji" -#: src/ghex-ui.xml.h:66 src/ui.c:68 -msgid "Words" -msgstr "Słowa" +#: ../src/ghex-window.c:389 +msgid "_Preferences" +msgstr "_Preferencje" -#: src/ghex-ui.xml.h:67 -msgid "_About" -msgstr "_Informacje o" +#: ../src/ghex-window.c:390 +msgid "Configure the application" +msgstr "Konfiguruje program" -#: src/ghex-ui.xml.h:68 +#. View menu +#: ../src/ghex-window.c:394 msgid "_Add View" -msgstr "_Dodaj widok" - -#: src/ghex-ui.xml.h:69 -msgid "_Advanced Find" -msgstr "_Zaawansowane wyszukiwanie" +msgstr "Dod_aj widok" -#: src/ghex-ui.xml.h:70 -msgid "_Base Converter" -msgstr "Konwerter _zapisu liczb" +#: ../src/ghex-window.c:395 +msgid "Add a new view to the buffer" +msgstr "Dodaje nowy widok do bufora" -#: src/ghex-ui.xml.h:71 -msgid "_Bytes" -msgstr "_Bajty" +#: ../src/ghex-window.c:397 +msgid "_Remove View" +msgstr "_Usuń widok" -#: src/ghex-ui.xml.h:72 -msgid "_Close" -msgstr "Za_mknij" +#: ../src/ghex-window.c:398 +msgid "Remove the current view of the buffer" +msgstr "Usuwa bieżący widok bufora" -#: src/ghex-ui.xml.h:73 +#. Help menu +#: ../src/ghex-window.c:402 msgid "_Contents" -msgstr "_Zawartość" +msgstr "_Spis treści" -#: src/ghex-ui.xml.h:74 -msgid "_Copy" -msgstr "S_kopiuj" - -#: src/ghex-ui.xml.h:75 -msgid "_Edit" -msgstr "_Edycja" - -#: src/ghex-ui.xml.h:76 -msgid "_File" -msgstr "_Plik" - -#: src/ghex-ui.xml.h:77 -msgid "_Find" -msgstr "_Znajdź" - -#: src/ghex-ui.xml.h:78 -msgid "_Goto Byte..." -msgstr "_Przejdź do bajtu..." +#: ../src/ghex-window.c:403 +msgid "Help on this application" +msgstr "Pomoc tego programu" -#: src/ghex-ui.xml.h:79 -msgid "_Group Data As" -msgstr "_Grupowanie danych" +#: ../src/ghex-window.c:405 +msgid "_About" +msgstr "_O programie" -#: src/ghex-ui.xml.h:80 -msgid "_Help" -msgstr "Pomo_c" +#: ../src/ghex-window.c:406 +msgid "About this application" +msgstr "Informacje o tym programie" -#: src/ghex-ui.xml.h:81 +#. Edit menu +#: ../src/ghex-window.c:413 msgid "_Insert Mode" msgstr "Tryb _wstawiania" -#: src/ghex-ui.xml.h:82 -msgid "_Longwords" -msgstr "_Długie słowa" +#: ../src/ghex-window.c:414 +msgid "Insert/overwrite data" +msgstr "Wstawia/zastępuje dane" -#: src/ghex-ui.xml.h:83 -msgid "_Open..." -msgstr "_Otwórz..." +#. Windows menu +#: ../src/ghex-window.c:418 +msgid "Character _Table" +msgstr "_Tablica znaków" -#: src/ghex-ui.xml.h:84 -msgid "_Paste" -msgstr "Wk_lej" +#: ../src/ghex-window.c:419 +msgid "Show the character table" +msgstr "Wyświetla tablicę znaków" -#: src/ghex-ui.xml.h:85 -msgid "_Preferences" -msgstr "_Preferencje" +#: ../src/ghex-window.c:421 +msgid "_Base Converter" +msgstr "Konwerter _zapisu liczb" -#: src/ghex-ui.xml.h:86 -msgid "_Print" -msgstr "Wy_drukuj" +#: ../src/ghex-window.c:422 +msgid "Open base conversion dialog" +msgstr "Otwiera okno konwersji między systemami liczenia" -#: src/ghex-ui.xml.h:87 -msgid "_Redo" -msgstr "P_onów" +#: ../src/ghex-window.c:424 +msgid "Type Conversion _Dialog" +msgstr "_Okno konwersji pomiędzy rodzajami" -#: src/ghex-ui.xml.h:88 -msgid "_Remove View" -msgstr "_Usuń widok" +#: ../src/ghex-window.c:425 +msgid "Show the type conversion dialog in the edit window" +msgstr "Wyświetla okno konwersji między rodzajami w oknie modyfikacji" -#: src/ghex-ui.xml.h:90 -msgid "_Revert" -msgstr "_Przywróć" +#: ../src/ghex-window.c:431 ../src/ui.c:48 +msgid "_Bytes" +msgstr "_Bajty" -#: src/ghex-ui.xml.h:91 -msgid "_Save" -msgstr "_Zapisz" +#: ../src/ghex-window.c:432 +msgid "Group data by 8 bits" +msgstr "Grupuje dane po 8 bitów" -#: src/ghex-ui.xml.h:92 -msgid "_Undo" -msgstr "Cof_nij" +#: ../src/ghex-window.c:433 ../src/ui.c:49 +msgid "_Words" +msgstr "_Słowa" -#: src/ghex-ui.xml.h:93 -msgid "_View" -msgstr "_Widok" +#: ../src/ghex-window.c:434 +msgid "Group data by 16 bits" +msgstr "Grupuje dane po 16 bitów" -#: src/ghex-ui.xml.h:94 -msgid "_Windows" -msgstr "O_kna" +#: ../src/ghex-window.c:435 ../src/ui.c:50 +msgid "_Longwords" +msgstr "_Długie słowa" -#: src/ghex-ui.xml.h:95 -msgid "_Words" -msgstr "_Słowa" +#: ../src/ghex-window.c:436 +msgid "Group data by 32 bits" +msgstr "Grupuje dane po 32 bity" -#: src/ghex-window.c:461 src/ghex-window.c:875 -msgid "GHex" -msgstr "GHex" +#: ../src/ghex-window.c:583 +#, c-format +msgid "Failed to load UI: %s" +msgstr "Wczytanie interfejsu użytkownika się nie powiodło: %s" -#: src/ghex-window.c:603 +#: ../src/ghex-window.c:792 #, c-format msgid "Offset: %s" msgstr "Przesunięcie: %s" -#: src/ghex-window.c:829 +#: ../src/ghex-window.c:795 +#, c-format +msgid "; %s bytes from %s to %s selected" +msgstr "; zaznaczono %s bajtów od %s do %s" + +#: ../src/ghex-window.c:1067 #, c-format msgid "Activate file %s" -msgstr "Uaktywnia plik %s" +msgstr "Aktywuje plik %s" -#: src/ghex-window.c:871 +#: ../src/ghex-window.c:1103 #, c-format -msgid "GHex - %s" -msgstr "GHex - %s" +msgid "%s - GHex" +msgstr "%s - GHex" -#: src/ghex-window.c:1005 +#: ../src/ghex-window.c:1229 msgid "Select a file to save buffer as" msgstr "Wybór pliku do zapisu buforu" -#: src/ghex-window.c:1061 +#: ../src/ghex-window.c:1261 #, c-format msgid "" "File %s exists.\n" "Do you want to overwrite it?" msgstr "" "Plik o nazwie %s już istnieje.\n" -"Czy chcesz go nadpisać?" +"Zastąpić go?" -#: src/ghex-window.c:1093 src/ui.c:355 +#: ../src/ghex-window.c:1287 ../src/ui.c:293 #, c-format msgid "Saved buffer to file %s" msgstr "Zapisano bufor do pliku %s" -#: src/ghex-window.c:1099 +#: ../src/ghex-window.c:1294 msgid "Error saving file!" -msgstr "Błąd przy zapisie pliku!" +msgstr "Błąd podczas zapisywania pliku." -#: src/ghex-window.c:1105 +#: ../src/ghex-window.c:1300 msgid "Can't open file for writing!" -msgstr "Nie można otworzyć pliku do zapisu!" +msgstr "Nie można otworzyć pliku do zapisania." -#: src/ghex-window.c:1150 +#: ../src/ghex-window.c:1345 #, c-format msgid "" "File %s has changed since last save.\n" "Do you want to save changes?" msgstr "" -"Plik %s uległ zmianie od ostatniego zapisu.\n" -"Czy chcesz zapisać zmiany?" +"Plik %s został zmieniony od ostatniego zapisu.\n" +"Zapisać zmiany?" -#: src/ghex-window.c:1154 +#: ../src/ghex-window.c:1349 msgid "Do_n't save" -msgstr "_Nie zapisuj" +msgstr "_Bez zapisywania" -#: src/ghex-window.c:1174 src/ui.c:343 +#: ../src/ghex-window.c:1369 ../src/ui.c:281 msgid "You don't have the permissions to save the file!" -msgstr "Brak uprawnień do zapisania pliku!" +msgstr "Brak uprawnień do zapisania pliku." + +#: ../src/ghex-window.c:1373 ../src/ui.c:286 +msgid "An error occurred while saving file!" +msgstr "Wystąpił błąd podczas zapisywania pliku." + +#: ../src/hex-dialog.c:58 +msgid "Signed 8 bit:" +msgstr "Podpisane 8 bitów:" -#: src/ghex-window.c:1178 src/ui.c:348 -msgid "An error occured while saving file!" -msgstr "Przy zapisywaniu pliku wystąpił błąd!" +#: ../src/hex-dialog.c:59 +msgid "Unsigned 8 bit:" +msgstr "Niepodpisane 8 bitów:" -#: src/hex-document.c:746 +#: ../src/hex-dialog.c:60 +msgid "Signed 16 bit:" +msgstr "Podpisane 16 bitów:" + +#: ../src/hex-dialog.c:61 +msgid "Unsigned 16 bit:" +msgstr "Niepodpisane 16 bitów:" + +#: ../src/hex-dialog.c:62 +msgid "Signed 32 bit:" +msgstr "Podpisane 32 bity:" + +#: ../src/hex-dialog.c:63 +msgid "Unsigned 32 bit:" +msgstr "Niepodpisane 32 bity:" + +#: ../src/hex-dialog.c:64 +msgid "32 bit float:" +msgstr "Zmiennoprzecinkowe 32 bity:" + +#: ../src/hex-dialog.c:65 +msgid "64 bit float:" +msgstr "Zmiennoprzecinkowe 64 bity:" + +#: ../src/hex-dialog.c:66 +msgid "Hexadecimal:" +msgstr "Szesnastkowo:" + +#: ../src/hex-dialog.c:67 +msgid "Octal:" +msgstr "Ósemkowo:" + +#: ../src/hex-dialog.c:68 +msgid "Binary:" +msgstr "Binarnie:" + +#: ../src/hex-dialog.c:197 +msgid "Show little endian decoding" +msgstr "Wyświetlanie dekodowania cienkokońcowości" + +#: ../src/hex-dialog.c:204 +msgid "Show unsigned and float as hexadecimal" +msgstr "Wyświetlanie niepodpisanych i zmiennoprzecinkowych jako szesnastkowe" + +#: ../src/hex-dialog.c:210 +msgid "Stream Length:" +msgstr "Długość potoku:" + +#: ../src/hex-dialog.c:232 +msgid "FIXME: no conversion function" +msgstr "FIXME: brak funkcji konwersji" + +#: ../src/hex-document.c:436 +msgid "New document" +msgstr "Nowy dokument" + +#: ../src/hex-document.c:785 +#, c-format msgid "Page" msgstr "Strona" -#: src/hex-document.c:752 src/hex-document.c:877 +#: ../src/hex-document.c:791 ../src/hex-document.c:916 +#, c-format msgid "Hex dump generated by" msgstr "Zrzut szesnastkowy utworzony przez" -#: src/hex-document.c:762 +#: ../src/hex-document.c:802 msgid "Saving to HTML..." msgstr "Zapisywanie w formacie HTML..." -#: src/hex-document.c:800 +#: ../src/hex-document.c:839 +#, c-format msgid "Previous page" msgstr "Poprzednia strona" -#: src/hex-document.c:815 +#: ../src/hex-document.c:854 +#, c-format msgid "Next page" msgstr "Następna strona" -#: src/main.c:51 -msgid "The gnome binary editor" -msgstr "Edytor plików binarnych dla GNOME" - -#: src/main.c:66 -msgid "Could not initialize Bonobo!\n" -msgstr "Nie można zainicjować Bonobo!\n" +#: ../src/main.c:36 +msgid "X geometry specification (see \"X\" man page)." +msgstr "Określenie geometrii X (proszę zobaczyć stronę podręcznika \"X\")." -#: src/main.c:91 src/main.c:105 +#: ../src/main.c:36 +msgid "GEOMETRY" +msgstr "GEOMETRIA" + +#: ../src/main.c:37 +msgid "FILES" +msgstr "PLIKI" + +#: ../src/main.c:53 +msgid "- GTK+ binary editor" +msgstr "- edytor plików binarnych GTK+" + +#: ../src/main.c:57 +#, c-format +msgid "" +"%s\n" +"Run '%s --help' to see a full list of available command line options.\n" +msgstr "" +"%s\n" +"Wykonanie polecenia \"%s --help\" wyświetli pełną listę dostępnych opcji " +"wiesza poleceń.\n" + +#: ../src/main.c:80 ../src/main.c:93 #, c-format msgid "Invalid geometry string \"%s\"\n" -msgstr "Niepoprawny napis opisujący geometrię - \"%s\"\n" +msgstr "Nieprawidłowy ciąg geometrii \"%s\"\n" -#: src/preferences.c:94 +#: ../src/preferences.c:69 msgid "GHex Preferences" -msgstr "GHex - Preferencje" +msgstr "Preferencje programu GHex" -#: src/preferences.c:126 +#: ../src/preferences.c:101 msgid "_Maximum number of undo levels:" msgstr "_Maksymalna liczba cofnięć:" -#: src/preferences.c:146 +#: ../src/preferences.c:121 msgid "Undo levels" msgstr "Poziomy cofnięć" -#: src/preferences.c:146 +#: ../src/preferences.c:121 msgid "Select maximum number of undo levels" -msgstr "Ustala maksymalną liczbę cofnięć" +msgstr "Wybór maksymalnej liczby cofnięć" -#: src/preferences.c:150 -msgid "Show cursor offset in statusbar as:" -msgstr "Format wyświetlania wartości przesunięcia na pasku stanu:" +#: ../src/preferences.c:125 +msgid "_Show cursor offset in statusbar as:" +msgstr "Wyświetlanie przesunięcia _kursora na pasku stanu jako:" -#: src/preferences.c:166 +#: ../src/preferences.c:144 msgid "Hexadecimal" msgstr "Szesnastkowo" -#: src/preferences.c:168 +#: ../src/preferences.c:146 msgid "Custom" msgstr "Dowolnie" -#: src/preferences.c:177 +#: ../src/preferences.c:155 msgid "Enter the cursor offset format" -msgstr "Wprowadź format wyświetlania wartości przesunięcia" +msgstr "Proszę wprowadzić format przesunięcia kursora" -#: src/preferences.c:178 +#: ../src/preferences.c:156 msgid "Select the cursor offset format" -msgstr "Wybierz format wyświetlania wartości przesunięcia" +msgstr "Wybór format przesunięcia kursora" #. show offsets check button -#: src/preferences.c:188 -msgid "Show offsets column" -msgstr "Wyświetlanie kolumny z przesunięciem" +#: ../src/preferences.c:166 +msgid "Sh_ow offsets column" +msgstr "Wyświetlanie k_olumny przesunięć" -#: src/preferences.c:193 +#: ../src/preferences.c:171 msgid "Editing" -msgstr "Edycja" +msgstr "Modyfikowanie" #. display font -#: src/preferences.c:202 src/gnome-print-font-picker.c:1017 +#: ../src/preferences.c:180 msgid "Font" msgstr "Czcionka" #. default group type -#: src/preferences.c:228 +#: ../src/preferences.c:203 msgid "Default Group Type" msgstr "Domyślny typ grupowania" -#: src/preferences.c:244 +#: ../src/preferences.c:219 msgid "Display" msgstr "Wyświetlanie" #. paper selection -#: src/preferences.c:253 +#: ../src/preferences.c:228 msgid "Paper size" msgstr "Rozmiar papieru" #. data & header font selection -#: src/preferences.c:258 +#: ../src/preferences.c:233 msgid "Fonts" msgstr "Czcionki" -#: src/preferences.c:264 +#: ../src/preferences.c:239 msgid "_Data font:" -msgstr "Czcionka _danych" +msgstr "Czcionka _danych:" -#: src/preferences.c:283 +#: ../src/preferences.c:255 msgid "Data font" msgstr "Czcionka danych" -#: src/preferences.c:283 +#: ../src/preferences.c:255 msgid "Select the data font" msgstr "Wybór czcionki danych" -#: src/preferences.c:297 +#: ../src/preferences.c:269 msgid "Header fo_nt:" -msgstr "Czcionka _nagłówka" +msgstr "Czcionka _nagłówka:" -#: src/preferences.c:315 +#: ../src/preferences.c:284 msgid "Header font" msgstr "Czcionka nagłówka" -#: src/preferences.c:315 +#: ../src/preferences.c:284 msgid "Select the header font" msgstr "Wybór czcionki nagłówka" -#: src/preferences.c:341 +#: ../src/preferences.c:310 msgid "_Print shaded box over:" msgstr "_Drukowanie przyciemnionego prostokąta co:" -#: src/preferences.c:353 +#: ../src/preferences.c:322 msgid "Box size" msgstr "Rozmiar prostokąta" -#: src/preferences.c:353 +#: ../src/preferences.c:322 msgid "Select size of box (in number of lines)" -msgstr "Wybierz rozmiar prostokąta (w liniach)" +msgstr "Wybór rozmiar prostokąta (w wierszach)" -#: src/preferences.c:357 +#: ../src/preferences.c:326 msgid "lines (0 for no box)" msgstr "wierszy (0 wyłącza przyciemnianie)" -#: src/preferences.c:364 +#: ../src/preferences.c:333 msgid "Printing" msgstr "Drukowanie" -#: src/preferences.c:523 +#: ../src/preferences.c:451 ../src/ui.c:202 +#, c-format +msgid "" +"There was an error displaying help: \n" +"%s" +msgstr "" +"Wystąpił błąd podczas wyświetlania pomocy: \n" +"%s" + +#: ../src/preferences.c:503 msgid "Can not open desired font!" -msgstr "Nie można odnaleźć wymaganej czcionki!" +msgstr "Nie można otworzyć żądanej czcionki." -#: src/preferences.c:581 +#: ../src/preferences.c:564 msgid "" "The offset format string contains invalid format specifier.\n" "Only 'x', 'X', 'p', 'P', 'd' and 'o' are allowed." msgstr "" -"Format wyświetlania przesunięcia zawiera niepoprawne specyfikatory.\n" -"Poprawnymi specyfikatorami są: \"x\", \"X\", \"p\", \"P\", \"d\" oraz \"o\"." +"Ciąg formatu przesunięcia zawiera nieprawidłowe specyfikatory.\n" +"Dozwolone są tylko \"x\", \"X\", \"p\", \"P\", \"d\" i \"o\"." -#: src/print.c:53 +#: ../src/print.c:57 #, c-format msgid "Page: %i/%i" msgstr "Strona: %i/%i" -#: src/print.c:204 src/print.c:218 -#, c-format -msgid "" -"GHex could not find the font \"%s\".\n" -"GHex is unable to print without this font installed." -msgstr "" -"Nie można odnaleźć czcionki \"%s\".\n" -"Bez tej czcionki nie można wydrukować danych z programu GHex." - -#: src/session.c:29 -msgid "X geometry specification (see \"X\" man page)." -msgstr "" -"Napis opisujący geometrię w standardzie X (patrz strona podręcznikowa \"X\")." - -#: src/session.c:30 -msgid "GEOMETRY" -msgstr "GEOMETRIA" - -#: src/ui.c:74 +#: ../src/ui.c:55 msgid "hex data" msgstr "danych szesnastkowych" -#: src/ui.c:75 +#: ../src/ui.c:56 msgid "ASCII data" msgstr "danych ASCII" -#: src/ui.c:245 -msgid "GHex, a binary file editor" -msgstr "GHex, edytor plików binarnych" - -#: src/ui.c:247 -msgid "Released under the terms of GNU Public License" -msgstr "Rozpowszechniany na licencji GNU GPL." +#: ../src/ui.c:144 +msgid "" +"Copyright © 1998 - 2006 Jaka Močnik\n" +"Copyright © 2006 - 2010 GHex Contributors" +msgstr "" +"Copyright © 1998 - 2006 Jaka Močnik\n" +"Copyright © 2006 - 2010 współtwórcy programu GHex" -#: src/ui.c:270 -#, c-format +#: ../src/ui.c:151 msgid "" -"There was an error displaying help: \n" -"%s" +"This program is free software; you can redistribute it and/or modify it " +"under the terms of the GNU General Public License as published by the Free " +"Software Foundation; either version 2 of the License, or (at your option) " +"any later version." msgstr "" -"Przy wyświetlaniu pomocy wystąpił błąd:\n" -"%s" +"Niniejszy program jest wolnym oprogramowaniem; można go rozprowadzać dalej i/" +"lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej " +"przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według " +"wersji drugiej tej Licencji lub którejś z późniejszych wersji." + +#: ../src/ui.c:155 +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 " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " +"more details." +msgstr "" +"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - " +"jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI " +"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania " +"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU." -#: src/ui.c:374 +#: ../src/ui.c:159 +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 " +"Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" +msgstr "" +"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz " +"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie " +"- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, " +"Fifth Floor, Boston, MA 02110-1301 USA." + +#: ../src/ui.c:171 +msgid "A binary file editor" +msgstr "Edytor plików binarnych" + +#: ../src/ui.c:177 +msgid "About GHex" +msgstr "O programie GHex" + +#: ../src/ui.c:178 +msgid "translator-credits" +msgstr "Aviary.pl , 2012" + +#: ../src/ui.c:181 +msgid "GHex Website" +msgstr "Witryna programu GHex" + +#: ../src/ui.c:311 msgid "Select a file to open" -msgstr "Wybór pliku do odczytu" +msgstr "Wybór pliku do otwarcia" -#: src/ui.c:411 +#: ../src/ui.c:342 #, c-format msgid "Loaded file %s" msgstr "Wczytano plik %s" -#: src/ui.c:419 +#: ../src/ui.c:350 msgid "Can not open file!" -msgstr "Nie można otworzyć pliku!" +msgstr "Nie można otworzyć pliku." -#: src/ui.c:483 +#: ../src/ui.c:415 msgid "Select path and file name for the HTML source" -msgstr "Wybór ścieżki i nazwy pliku ze źródłem w HTML-u" +msgstr "Wybór ścieżki i nazwy pliku dla źródła HTML" -#: src/ui.c:518 +#: ../src/ui.c:447 msgid "You need to specify a base name for the HTML files." -msgstr "Należy określić bazową nazwę dla plików HTML." +msgstr "Należy podać podstawową nazwę dla plików HTML." -#: src/ui.c:529 src/ui.c:552 +#: ../src/ui.c:458 ../src/ui.c:484 msgid "You don't have the permission to write to the selected path.\n" -msgstr "Brak uprawnień do zapisu pod wybraną ścieżką.\n" +msgstr "Brak uprawnień do zapisu w wybranej ścieżce.\n" -#: src/ui.c:540 +#: ../src/ui.c:470 msgid "" "Saving to HTML will overwrite some files.\n" "Do you want to proceed?" msgstr "" -"Zapisanie w formacie HTML spowoduje nadpisanie pewnych plików.\n" -"Czy chcesz kontynuować?" +"Zapisanie w formacie HTML spowoduje zastąpienie pewnych plików.\n" +"Kontynuować?" -#: src/ui.c:687 +#: ../src/ui.c:738 #, c-format msgid "Really revert file %s?" -msgstr "Rzeczywiście przywrócić plik %s?" +msgstr "Na pewno przywrócić plik %s?" -#: src/ui.c:701 +#: ../src/ui.c:752 #, c-format msgid "Reverted buffer from file %s" msgstr "Przywrócono bufor z pliku %s" - -#: src/ui.c:809 -msgid "Print Hex Document" -msgstr "Wydruk dokumentu w postaci szesnastkowej" - -#: src/ui.c:814 -msgid "Pages" -msgstr "Strony" - -#: src/ui.c:839 -#, c-format -msgid "GHex (%s): Print Preview" -msgstr "GHex (%s): Podgląd wydruku" - -#: src/gnome-print-font-dialog.c:111 -msgid "_Insert a new preview phrase." -msgstr "_Wstaw nowy tekst podglądu." - -#: src/gnome-print-font-dialog.c:117 -msgid "Modify preview phrase..." -msgstr "Zmienia tekst podglądu..." - -#: src/gnome-print-font-dialog.c:171 -msgid "Preview" -msgstr "Podgląd" - -#: src/gnome-print-font-dialog.c:184 -msgid "_Modify preview phrase..." -msgstr "_Zmień tekst podglądu..." - -#: src/gnome-print-font-dialog.c:247 -msgid "Font Selection" -msgstr "Wybór czcionki" - -#: src/gnome-print-font-picker.c:91 -msgid "Sans Regular 12" -msgstr "Sans Regular 12" - -#: src/gnome-print-font-picker.c:92 -msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz" -msgstr "AaĄąBbCcĆćDdEeĘeFfGgHhIiJjKkLlŁłMmNnŃńOoÓóPpQqRrSsTtUuVvWwXxYyZzŹźŻż" - -#: src/gnome-print-font-picker.c:93 -msgid "Pick a Font" -msgstr "Wybierz czionkę" - -#: src/gnome-print-font-picker.c:178 -msgid "Title" -msgstr "Tytuł" - -#: src/gnome-print-font-picker.c:179 -msgid "The title of the selection dialog box" -msgstr "Tytuł okna dialogowego wyboru" - -#: src/gnome-print-font-picker.c:199 -msgid "Font name" -msgstr "Nazwa czcionki" - -#: src/gnome-print-font-picker.c:200 -msgid "Name of the selected font" -msgstr "Nazwa wybranej czcionki" - -#: src/gnome-print-font-picker.c:208 -msgid "Preview text" -msgstr "Tekst podlglądu" - -#: src/gnome-print-font-picker.c:209 -msgid "Preview text shown in the dialog" -msgstr "Tekst podglądu wyświetlany w oknie dialogowym" - -#: src/gnome-print-font-picker.c:217 -msgid "Use font in label" -msgstr "Użycie czcionki na etykiecie" - -#: src/gnome-print-font-picker.c:218 -msgid "Use font in the label in font info mode" -msgstr "Używa czcionki na etykiecie w trybie informacyjnym czcionki" - -#: src/gnome-print-font-picker.c:226 -msgid "Font size for label" -msgstr "Rozmiar czcionki dla etykiety" - -#: src/gnome-print-font-picker.c:227 -msgid "Font size for label in font info mode" -msgstr "Rozmiar czcionki dla etykiety w trybie informacyjnym czcionki" - -#: src/gnome-print-font-picker.c:237 -msgid "Show size" -msgstr "Wyświetlanie rozmiaru" - -#: src/gnome-print-font-picker.c:238 -msgid "Show size in font info mode" -msgstr "Wyświetla rozmiar w trybie informacyjnym czcionki" diff -Nru ghex-3.0.0/src/accessiblegtkhex.c ghex-3.3.90/src/accessiblegtkhex.c --- ghex-3.0.0/src/accessiblegtkhex.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/accessiblegtkhex.c 2012-02-21 01:13:58.000000000 +0000 @@ -193,7 +193,6 @@ AccessibleGtkHex *accessible_gtk_hex; GtkHex *gtk_hex; GtkAccessible *accessible; - GtkWidget *widget; g_return_if_fail (obj != NULL); @@ -210,8 +209,6 @@ accessible_gtk_hex->textutil = gail_text_util_new(); - widget = GTK_WIDGET (data); - g_signal_connect (G_OBJECT (gtk_hex), "data_changed", G_CALLBACK (_accessible_gtk_hex_changed_cb), NULL); diff -Nru ghex-3.0.0/src/chartable.c ghex-3.3.90/src/chartable.c --- ghex-3.0.0/src/chartable.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/chartable.c 2012-02-18 17:52:37.000000000 +0000 @@ -226,10 +226,10 @@ lbl = gtk_label_new (""); gtk_widget_show(lbl); - vbox = gtk_vbox_new(FALSE, 4); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show(vbox); - hbox = gtk_hbox_new (FALSE, 4); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_widget_show(hbox); gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); diff -Nru ghex-3.0.0/src/config.c ghex-3.3.90/src/config.c --- ghex-3.0.0/src/config.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/config.c 2012-02-21 06:05:15.000000000 +0000 @@ -43,91 +43,6 @@ gchar *def_font_name = NULL; gboolean show_offsets_column = TRUE; -void ghex_load_configuration () { - gchar *font_name; - PangoFontMetrics *new_metrics; - - /* Get the default font metrics */ - font_name = g_settings_get_string (settings, GHEX_PREF_FONT); - - if (NULL == font_name) - font_name = g_strdup (DEFAULT_FONT); - - if (def_metrics) - pango_font_metrics_unref (def_metrics); - - if (def_font_desc) - pango_font_description_free (def_font_desc); - - new_metrics = gtk_hex_load_font (font_name); - - if (!new_metrics) { - def_metrics = gtk_hex_load_font (DEFAULT_FONT); - def_font_desc = pango_font_description_from_string (font_name); - def_font_name = g_strdup (DEFAULT_FONT); - } - else { - def_metrics = new_metrics; - def_font_desc = pango_font_description_from_string (font_name); - def_font_name = g_strdup (font_name); - } - - g_free (font_name); - - /* Get the default group type -- SnM */ - def_group_type = g_settings_get_enum (settings, GHEX_PREF_GROUP); - - /* Sanity check for group type */ - if (def_group_type <= 0 ) - def_group_type = GROUP_BYTE; - - /* Get the max undo depth -- SnM */ - g_settings_get (settings, GHEX_PREF_MAX_UNDO_DEPTH, "u", &max_undo_depth); - - - /* Get the offset format -- SnM */ - - if (offset_fmt) - g_free (offset_fmt); - - offset_fmt = g_settings_get_string (settings, GHEX_PREF_OFFSET_FORMAT); - - /* Check if offset_fmt is NULL. Shouldnt happen if we get the default - * value from the gconf client -- SnM - */ - - if (NULL == offset_fmt) { - offset_fmt = g_strdup("%X"); - } - - /* Get the show offsets column value -- SnM */ - show_offsets_column = g_settings_get_boolean (settings, GHEX_PREF_OFFSETS_COLUMN); - - /* Get the shaded box size -- SnM */ - g_settings_get (settings, GHEX_PREF_BOX_SIZE, "u", &shaded_box_size); - - /* Get the data font name -- SnM */ - data_font_name = g_settings_get_string (settings, GHEX_PREF_DATA_FONT); - - /* Check if data_font_name is NULL. Should not happen if we get the - * default value from the gconf client -- SnM - */ - if (NULL == data_font_name) { - data_font_name = g_strdup ("Courier 10"); - } - - /* Get the header font name -- SnM */ - header_font_name = g_settings_get_string (settings, GHEX_PREF_HEADER_FONT); - - /* Check if the header_font_name is NULL. Should not happen if we get - * the default value from the gconf client -- SnM - */ - - if(NULL == header_font_name) { - header_font_name = g_strdup ("Helvetica 12"); - } -} - static void offsets_column_changed_cb (GSettings *settings, const gchar *key, @@ -275,18 +190,35 @@ g_signal_connect (settings, "changed::" GHEX_PREF_OFFSETS_COLUMN, G_CALLBACK (offsets_column_changed_cb), NULL); + offsets_column_changed_cb (settings, GHEX_PREF_OFFSETS_COLUMN, NULL); + g_signal_connect (settings, "changed::" GHEX_PREF_GROUP, G_CALLBACK (group_changed_cb), NULL); + group_changed_cb (settings, GHEX_PREF_GROUP, NULL); + g_signal_connect (settings, "changed::" GHEX_PREF_MAX_UNDO_DEPTH, G_CALLBACK (max_undo_depth_changed_cb), NULL); + max_undo_depth_changed_cb (settings, GHEX_PREF_MAX_UNDO_DEPTH, NULL); + g_signal_connect (settings, "changed::" GHEX_PREF_BOX_SIZE, G_CALLBACK (box_size_changed_cb), NULL); + box_size_changed_cb (settings, GHEX_PREF_BOX_SIZE, NULL); + + g_signal_connect (settings, "changed::" GHEX_PREF_OFFSET_FORMAT, G_CALLBACK (offset_format_changed_cb), NULL); + offset_format_changed_cb (settings, GHEX_PREF_OFFSET_FORMAT, NULL); + g_signal_connect (settings, "changed::" GHEX_PREF_FONT, G_CALLBACK (font_changed_cb), NULL); + font_changed_cb (settings, GHEX_PREF_FONT, NULL); + g_signal_connect (settings, "changed::" GHEX_PREF_DATA_FONT, G_CALLBACK (data_font_changed_cb), NULL); + + data_font_changed_cb (settings, GHEX_PREF_DATA_FONT, NULL); + g_signal_connect (settings, "changed::" GHEX_PREF_HEADER_FONT, G_CALLBACK (header_font_changed_cb), NULL); + header_font_changed_cb (settings, GHEX_PREF_HEADER_FONT, NULL); } diff -Nru ghex-3.0.0/src/configuration.h ghex-3.3.90/src/configuration.h --- ghex-3.0.0/src/configuration.h 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/configuration.h 2012-02-18 19:50:19.000000000 +0000 @@ -61,9 +61,6 @@ /* Initializes the gsettings client */ void ghex_init_configuration (void); -/* config stuff */ -void ghex_load_configuration(void); - G_END_DECLS #endif /* !__GHEX_CONFIGURATION_H__ */ diff -Nru ghex-3.0.0/src/converter.c ghex-3.3.90/src/converter.c --- ghex-3.0.0/src/converter.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/converter.c 2012-02-21 01:13:58.000000000 +0000 @@ -118,7 +118,7 @@ #define BUFFER_LEN 40 static GtkWidget * -create_converter_entry(const gchar *name, GtkWidget *table, +create_converter_entry(const gchar *name, GtkWidget *grid, GtkAccelGroup *accel_group, gint pos, gint base) { GtkWidget *label; @@ -131,7 +131,7 @@ /* label */ label = gtk_label_new_with_mnemonic(name); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, pos, pos+1); + gtk_grid_attach (GTK_GRID (grid), label, 0, pos, 1, 1); #if 0 accel_key = gtk_label_parse_uline(GTK_LABEL(label), name); #endif /* 0/1 */ @@ -150,7 +150,8 @@ gtk_widget_add_accelerator(entry, "grab_focus", accel_group, accel_key, GDK_MOD1_MASK, GTK_ACCEL_VISIBLE); #endif /* 0/1 */ - gtk_table_attach_defaults(GTK_TABLE(table), entry, 1, 2, pos, pos+1); + gtk_widget_set_hexpand (entry, TRUE); + gtk_grid_attach (GTK_GRID (grid), entry, 1, pos, 1, 1); gtk_widget_show(entry); if (GTK_IS_ACCESSIBLE (gtk_widget_get_accessible (entry))) { @@ -222,7 +223,7 @@ create_converter() { Converter *conv; - GtkWidget *table; + GtkWidget *grid; GtkAccelGroup *accel_group; gint i; @@ -236,28 +237,28 @@ g_signal_connect(G_OBJECT(conv->window), "response", G_CALLBACK(close_converter), conv->window); - table = gtk_table_new(6, 2, FALSE); - gtk_table_set_row_spacings(GTK_TABLE(table), 4); - gtk_table_set_col_spacings(GTK_TABLE(table), 4); - gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(conv->window))), table, + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (grid), 4); + gtk_grid_set_column_spacing (GTK_GRID (grid), 4); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (conv->window))), grid, TRUE, TRUE, 0); gtk_container_set_border_width(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(conv->window))), 4); gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(conv->window))), 2); - gtk_widget_show(table); + gtk_widget_show (grid); accel_group = gtk_accel_group_new(); /* entries */ - conv->entry[0] = create_converter_entry(_("_Binary:"), table, + conv->entry[0] = create_converter_entry (_("_Binary:"), grid, accel_group, 0, 2); - conv->entry[1] = create_converter_entry(_("_Octal:"), table, + conv->entry[1] = create_converter_entry (_("_Octal:"), grid, accel_group, 1, 8); - conv->entry[2] = create_converter_entry(_("_Decimal:"), table, + conv->entry[2] = create_converter_entry (_("_Decimal:"), grid, accel_group, 2, 10); - conv->entry[3] = create_converter_entry(_("_Hex:"), table, + conv->entry[3] = create_converter_entry (_("_Hex:"), grid, accel_group, 3, 16); - conv->entry[4] = create_converter_entry(_("_ASCII:"), table, + conv->entry[4] = create_converter_entry (_("_ASCII:"), grid, accel_group, 4, 0); /* get cursor button */ @@ -269,7 +270,7 @@ G_CALLBACK(get_cursor_val_cb), conv); g_signal_connect(G_OBJECT(conv->window), "key_press_event", G_CALLBACK(conv_key_press_cb), conv); - gtk_table_attach_defaults(GTK_TABLE(table), converter_get, 0, 2, 5, 6); + gtk_grid_attach (GTK_GRID (grid), converter_get, 0, 5, 2, 1); /* add the accelerators */ gtk_window_add_accel_group(GTK_WINDOW(conv->window), accel_group); diff -Nru ghex-3.0.0/src/findreplace.c ghex-3.3.90/src/findreplace.c --- ghex-3.0.0/src/findreplace.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/findreplace.c 2012-02-21 01:13:58.000000000 +0000 @@ -165,7 +165,7 @@ gtk_widget_show(frame); gtk_widget_show(dialog->f_gh); - sep = gtk_hseparator_new(); + sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog->window))), sep, FALSE, FALSE, 0); @@ -220,7 +220,7 @@ create_dialog_title(dialog->window, _("GHex (%s): Find Data")); - dialog->hbox = gtk_hbox_new(FALSE, 0); + dialog->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog->window))), dialog->hbox, TRUE, TRUE, 4); gtk_widget_show(dialog->hbox); @@ -250,7 +250,7 @@ TRUE, TRUE, 4); gtk_widget_show (dialog->tree); - dialog->vbox = gtk_vbox_new(FALSE, 0); + dialog->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start(GTK_BOX(dialog->hbox), dialog->vbox, FALSE, FALSE, 4); gtk_widget_show(dialog->vbox); @@ -273,7 +273,7 @@ gtk_widget_set_can_default(dialog->f_prev, TRUE); gtk_widget_show(dialog->f_prev); - sep = gtk_hseparator_new(); + sep = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_box_pack_start(GTK_BOX(dialog->vbox), sep, FALSE, FALSE, 4); gtk_widget_show(sep); @@ -809,7 +809,7 @@ if (ret != GTK_RESPONSE_NONE) { gchar *colour; - GdkColor gcol; + GdkRGBA rgba; AdvancedFind_ListData *data = g_new0(AdvancedFind_ListData, 1); GtkHex *gh = dialog->parent->gh; GtkTreeIter iter; @@ -820,10 +820,9 @@ display_error_dialog (dialog->parent, _("No string to search for!")); return; } - gtk_color_selection_get_current_color - (GTK_COLOR_SELECTION(dialog->addDialog->colour), &gcol); - colour = g_strdup_printf("#%02x%02x%02x", - gcol.red, gcol.green, gcol.blue); + gtk_color_selection_get_current_rgba (GTK_COLOR_SELECTION (dialog->addDialog->colour), + &rgba); + colour = gdk_rgba_to_string (&rgba); data->auto_highlight = gtk_hex_insert_autohighlight(gh, data->str, data->str_len, colour); gtk_list_store_append(dialog->list, &iter); gtk_list_store_set(dialog->list, &iter, diff -Nru ghex-3.0.0/src/ghex-window.c ghex-3.3.90/src/ghex-window.c --- ghex-3.0.0/src/ghex-window.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/ghex-window.c 2012-02-21 01:21:58.000000000 +0000 @@ -75,6 +75,8 @@ _("Can not open URI:\n%s"), err->message); g_error_free (err); + gtk_dialog_run (GTK_DIALOG (dlg)); + gtk_widget_destroy (dlg); continue; } @@ -510,6 +512,23 @@ win->contents = NULL; } +static gchar * +ghex_datadir (void) +{ + gchar *datadir; +#ifdef G_OS_WIN32 + gchar *dir; + + dir = g_win32_get_package_installation_directory_of_module (NULL); + datadir = g_build_filename (dir, "share", "ghex", NULL); + g_free (dir); +#else + datadir = g_strdup (GHEXDATADIR); +#endif + + return datadir; +} + static GObject * ghex_window_constructor (GType type, guint n_construct_properties, @@ -519,6 +538,7 @@ GHexWindow *window; GtkWidget *menubar; GError *error = NULL; + gchar *datadir; gchar *ui_path; object = G_OBJECT_CLASS (ghex_window_parent_class)->constructor (type, @@ -559,14 +579,18 @@ window->doc_list_action_group, 0); /* Load menu description from file */ - ui_path = g_build_filename (GHEXDATADIR, "ghex-ui.xml", NULL); + datadir = ghex_datadir (); + ui_path = g_build_filename (datadir, "ghex-ui.xml", NULL); if (!gtk_ui_manager_add_ui_from_file (window->ui_manager, ui_path, &error)) { - g_warning ("Failed to load ui: %s", error->message); + gchar *msg = g_strdup_printf (_("Failed to load UI: %s"), error->message); g_error_free (error); + display_error_dialog (window, msg); + g_free (msg); } g_free (ui_path); + g_free (datadir); - window->vbox = gtk_vbox_new (FALSE, 0); + window->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); /* Attach menu */ menubar = gtk_ui_manager_get_widget (window->ui_manager, "/MainMenu"); @@ -807,7 +831,6 @@ gboolean ghex_window_load(GHexWindow *win, const gchar *filename) { - gchar *full_path; HexDocument *doc; GtkWidget *gh; GtkWidget *vbox; @@ -818,18 +841,7 @@ g_return_val_if_fail(GHEX_IS_WINDOW(win), FALSE); g_return_val_if_fail(filename != NULL, FALSE); - if(*filename != '/') { - gchar *cwd; - - cwd = g_get_current_dir(); - full_path = g_strconcat(cwd, "/", filename, NULL); - g_free(cwd); - } - else - full_path = g_strdup(filename); - - doc = hex_document_new_from_file(full_path); - g_free(full_path); + doc = hex_document_new_from_file (filename); if(!doc) return FALSE; hex_document_set_max_undo(doc, max_undo_depth); @@ -847,7 +859,7 @@ G_CALLBACK(cursor_moved_cb), win); gtk_widget_show(gh); - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_set_border_width(GTK_CONTAINER(win), 4); gtk_widget_show(vbox); gtk_box_pack_start(GTK_BOX(vbox), gh, TRUE, TRUE, 4); @@ -1209,8 +1221,6 @@ HexDocument *doc; GtkWidget *file_sel; gboolean ret_val = TRUE; - const gchar *filename; - gboolean dir_flag = FALSE; GtkResponseType resp; if(win->gh == NULL) @@ -1232,38 +1242,14 @@ gtk_window_set_position (GTK_WINDOW (file_sel), GTK_WIN_POS_MOUSE); gtk_widget_show (file_sel); - do { - resp = gtk_dialog_run(GTK_DIALOG(file_sel)); - if(resp == GTK_RESPONSE_OK) { - filename = - gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_sel)); - if (g_file_test(filename,G_FILE_TEST_IS_DIR)) { - gint name_len; - gchar *dir_name; - - name_len = strlen (filename); - if (name_len < 1 || filename [name_len - 1] != '/') { - dir_name = g_strconcat (filename, "/", NULL); - } else { - dir_name = g_strdup (filename); - } - gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(file_sel), - dir_name); - g_free (dir_name); - dir_flag = TRUE; - } - else { - dir_flag = FALSE; - } - } - } while (resp == GTK_RESPONSE_OK && dir_flag); - + resp = gtk_dialog_run (GTK_DIALOG (file_sel)); if(resp == GTK_RESPONSE_OK) { FILE *file; gchar *flash; - int i; gchar *gtk_file_name, *path_end; + const gchar *filename; + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_sel)); if(access(filename, F_OK) == 0) { GtkWidget *mbox; @@ -1286,7 +1272,7 @@ } if(ret_val) { - if((file = fopen(filename, "w")) != NULL) { + if((file = fopen(filename, "wb")) != NULL) { if(hex_document_write_to_file(doc, file)) { if(doc->file_name) g_free(doc->file_name); @@ -1296,19 +1282,13 @@ doc->changed = FALSE; win->changed = FALSE; - for(i = strlen(doc->file_name); - (i >= 0) && (doc->file_name[i] != '/'); - i--) - ; - if(doc->file_name[i] == '/') - path_end = &doc->file_name[i+1]; - else - path_end = doc->file_name; + path_end = g_path_get_basename (doc->file_name); doc->path_end = g_filename_to_utf8(path_end, -1, NULL, NULL, NULL); ghex_window_set_doc_name(win, doc->path_end); gtk_file_name = g_filename_to_utf8(doc->file_name, -1, NULL, NULL, NULL); flash = g_strdup_printf(_("Saved buffer to file %s"), gtk_file_name); ghex_window_flash(win, flash); + g_free(path_end); g_free(gtk_file_name); g_free(flash); } diff -Nru ghex-3.0.0/src/gtkhex.c ghex-3.3.90/src/gtkhex.c --- ghex-3.0.0/src/gtkhex.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/gtkhex.c 2012-02-21 04:44:59.000000000 +0000 @@ -108,13 +108,6 @@ gdk_window_invalidate_rect (gtk_widget_get_window(w), NULL, FALSE); } -static gint widget_get_xt(GtkWidget *w) { - return gtk_widget_get_style(w)->xthickness; -} - -static gint widget_get_yt(GtkWidget *w) { - return gtk_widget_get_style(w)->ythickness; -} /* * ?_to_pointer translates mouse coordinates in hex/ascii view * to cursor coordinates. @@ -320,28 +313,40 @@ render_ac (GtkHex *gh, cairo_t *cr) { + GdkRGBA bg_color; + GdkRGBA fg_color; + GtkStateFlags state; + GtkStyleContext *context; gint cx, cy; static guchar c[2] = "\0\0"; if(!gtk_widget_get_realized(gh->adisp)) return; + context = gtk_widget_get_style_context (gh->adisp); + state = gtk_widget_get_state_flags (gh->adisp); + state |= GTK_STATE_FLAG_SELECTED; + if(get_acoords(gh, gh->cursor_pos, &cx, &cy)) { c[0] = gtk_hex_get_byte(gh, gh->cursor_pos); if(!is_displayable(c[0])) c[0] = '.'; - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->base[GTK_STATE_SELECTED]); + gtk_style_context_get_background_color (context, state, &bg_color); + gdk_cairo_set_source_rgba (cr, &bg_color); + if(gh->active_view == VIEW_ASCII) { cairo_rectangle (cr, cx, cy, gh->char_width, gh->char_height - 1); cairo_fill (cr); + gtk_style_context_get_color (context, state, &fg_color); } else { cairo_set_line_width (cr, 1.0); cairo_rectangle (cr, cx + 0.5, cy + 0.5, gh->char_width, gh->char_height - 1); cairo_stroke (cr); + gtk_style_context_get_color (context, state & ~GTK_STATE_FLAG_SELECTED, &fg_color); } - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->black); + gdk_cairo_set_source_rgba (cr, &fg_color); cairo_move_to (cr, cx, cy); pango_layout_set_text (gh->alayout, c, 1); pango_cairo_show_layout (cr, gh->alayout); @@ -352,12 +357,20 @@ render_xc (GtkHex *gh, cairo_t *cr) { + GdkRGBA bg_color; + GdkRGBA fg_color; + GtkStateFlags state; + GtkStyleContext *context; gint cx, cy, i; static guchar c[2]; if(!gtk_widget_get_realized(gh->xdisp)) return; + context = gtk_widget_get_style_context (gh->xdisp); + state = gtk_widget_get_state_flags (gh->xdisp); + state |= GTK_STATE_FLAG_SELECTED; + if(get_xcoords(gh, gh->cursor_pos, &cx, &cy)) { format_xbyte(gh, gh->cursor_pos, c); if(gh->lower_nibble) { @@ -369,17 +382,21 @@ i = 0; } - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->base[GTK_STATE_SELECTED]); + gtk_style_context_get_background_color (context, state, &bg_color); + gdk_cairo_set_source_rgba (cr, &bg_color); + if(gh->active_view == VIEW_HEX) { cairo_rectangle (cr, cx, cy, gh->char_width, gh->char_height - 1); cairo_fill (cr); + gtk_style_context_get_color (context, state, &fg_color); } else { cairo_set_line_width (cr, 1.0); cairo_rectangle (cr, cx + 0.5, cy + 0.5, gh->char_width, gh->char_height - 1); cairo_stroke (cr); + gtk_style_context_get_color (context, state & ~GTK_STATE_FLAG_SELECTED, &fg_color); } - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->black); + gdk_cairo_set_source_rgba (cr, &fg_color); cairo_move_to (cr, cx, cy); pango_layout_set_text (gh->xlayout, &c[i], 1); pango_cairo_show_layout (cr, gh->xlayout); @@ -416,16 +433,27 @@ /* would be nice if we could cache that */ GtkHex_AutoHighlight *nextList = gh->auto_highlight; + GtkStateFlags state; + GtkStyleContext *context; + + context = gtk_widget_get_style_context (gh->xdisp); + state = gtk_widget_get_state_flags (gh->xdisp); + + gtk_style_context_save (context); + state |= GTK_STATE_FLAG_SELECTED; + gtk_style_context_set_state (context, state); + + cairo_save (cr); while (curHighlight) { if (ABS(curHighlight->start - curHighlight->end) >= curHighlight->min_select) { + GdkRGBA bg_color; gint start, end; gint sl, el; gint cursor_off = 0; gint len; - GtkStateType state; gtk_hex_validate_highlight(gh, curHighlight); @@ -434,13 +462,12 @@ sl = curHighlight->start_line; el = curHighlight->end_line; - if (curHighlight->style) - { - // For an explanation of "style = gtk_style_attach(style, window)" see: - // http://library.gnome.org/devel/gtk/unstable/GtkStyle.html#gtk-style-attach - curHighlight->style = gtk_style_attach(curHighlight->style, gtk_widget_get_window(gh->xdisp)); + if (curHighlight->bg_color) { + gdk_cairo_set_source_rgba (cr, curHighlight->bg_color); + } else { + gtk_style_context_get_background_color (context, state, &bg_color); + gdk_cairo_set_source_rgba (cr, &bg_color); } - state = (gh->active_view == VIEW_HEX)?GTK_STATE_ACTIVE:GTK_STATE_INSENSITIVE; if (cursor_line == sl) { cursor_off = 2*(start%gh->cpl) + (start%gh->cpl)/gh->group_type; @@ -450,41 +477,32 @@ len = xcpl; len = len - cursor_off; if (len > 0) - gtk_paint_flat_box((curHighlight->style? - curHighlight->style : - gtk_widget_get_style(GTK_WIDGET(gh))), - cr, - state, - GTK_SHADOW_NONE, - gh->xdisp, NULL, - cursor_off*gh->char_width, - cursor_line*gh->char_height, - len*gh->char_width, gh->char_height); + cairo_rectangle (cr, + cursor_off * gh->char_width, + cursor_line * gh->char_height, + len * gh->char_width, + gh->char_height); } else if (cursor_line == el) { cursor_off = 2*(end%gh->cpl + 1) + (end%gh->cpl)/gh->group_type; if (cursor_off > 0) - gtk_paint_flat_box((curHighlight->style ? curHighlight->style : - gtk_widget_get_style(GTK_WIDGET(gh))), - cr, - state, GTK_SHADOW_NONE, - gh->xdisp, NULL, - 0, cursor_line*gh->char_height, - cursor_off*gh->char_width, gh->char_height); + cairo_rectangle (cr, + 0, + cursor_line * gh->char_height, + cursor_off * gh->char_width, + gh->char_height); } else if (cursor_line > sl && cursor_line < el) { - gtk_paint_flat_box((curHighlight->style ? curHighlight->style : - gtk_widget_get_style(GTK_WIDGET(gh))), - cr, - state, GTK_SHADOW_NONE, - gh->xdisp, NULL, - 0, cursor_line*gh->char_height, - xcpl*gh->char_width, gh->char_height); + cairo_rectangle (cr, + 0, + cursor_line * gh->char_height, + xcpl * gh->char_width, + gh->char_height); } - if (curHighlight->style) - gtk_style_detach(curHighlight->style); + + cairo_fill (cr); } curHighlight = curHighlight->next; while (curHighlight == NULL && nextList) @@ -493,6 +511,9 @@ nextList = nextList->next; } } + + cairo_restore (cr); + gtk_style_context_restore (context); } static void @@ -501,18 +522,28 @@ gint cursor_line) { GtkHex_Highlight *curHighlight = &gh->selection; - GtkHex_AutoHighlight *nextList = gh->auto_highlight; + GtkStateFlags state; + GtkStyleContext *context; + + context = gtk_widget_get_style_context (gh->adisp); + state = gtk_widget_get_state_flags (gh->adisp); + + gtk_style_context_save (context); + state |= GTK_STATE_FLAG_SELECTED; + gtk_style_context_set_state (context, state); + + cairo_save (cr); while (curHighlight) { if (ABS(curHighlight->start - curHighlight->end) >= curHighlight->min_select) { + GdkRGBA bg_color; gint start, end; gint sl, el; gint cursor_off = 0; gint len; - GtkStateType state; gtk_hex_validate_highlight(gh, curHighlight); @@ -521,13 +552,12 @@ sl = curHighlight->start_line; el = curHighlight->end_line; - if (curHighlight->style) - { - // For an explanation of "style = gtk_style_attach(style, window)" see: - // http://library.gnome.org/devel/gtk/unstable/GtkStyle.html#gtk-style-attach - curHighlight->style = gtk_style_attach(curHighlight->style, gtk_widget_get_window(gh->adisp)); + if (curHighlight->bg_color) { + gdk_cairo_set_source_rgba (cr, curHighlight->bg_color); + } else { + gtk_style_context_get_background_color (context, state, &bg_color); + gdk_cairo_set_source_rgba (cr, &bg_color); } - state = (gh->active_view == VIEW_ASCII)?GTK_STATE_ACTIVE:GTK_STATE_INSENSITIVE; if (cursor_line == sl) { cursor_off = start % gh->cpl; @@ -536,43 +566,32 @@ else len = gh->cpl - cursor_off; if (len > 0) - gtk_paint_flat_box((curHighlight->style ? curHighlight->style : - gtk_widget_get_style(GTK_WIDGET(gh))), - cr, - state, GTK_SHADOW_NONE, - gh->adisp, NULL, - cursor_off*gh->char_width, - cursor_line*gh->char_height, - len*gh->char_width, gh->char_height); + cairo_rectangle (cr, + cursor_off * gh->char_width, + cursor_line * gh->char_height, + len * gh->char_width, + gh->char_height); } else if (cursor_line == el) { cursor_off = end % gh->cpl + 1; if (cursor_off > 0) - gtk_paint_flat_box((curHighlight->style ? curHighlight->style : - gtk_widget_get_style(GTK_WIDGET(gh))), - cr, - state, GTK_SHADOW_NONE, - gh->adisp, NULL, - 0, cursor_line * gh->char_height, - cursor_off*gh->char_width, gh->char_height); + cairo_rectangle (cr, + 0, + cursor_line * gh->char_height, + cursor_off * gh->char_width, + gh->char_height); } else if (cursor_line > sl && cursor_line < el) { - gtk_paint_flat_box((curHighlight->style ? curHighlight->style : - gtk_widget_get_style(GTK_WIDGET(gh))), - cr, - state, GTK_SHADOW_NONE, - gh->adisp, NULL, - 0, cursor_line * gh->char_height, - gh->cpl*gh->char_width, gh->char_height); - } - if (curHighlight->style) - { - // For an explanation of "style = gtk_style_attach(style, window)" see: - // http://library.gnome.org/devel/gtk/unstable/GtkStyle.html#gtk-style-attach - curHighlight->style = gtk_style_attach(curHighlight->style, gtk_widget_get_window(gh->adisp)); + cairo_rectangle (cr, + 0, + cursor_line * gh->char_height, + gh->cpl * gh->char_width, + gh->char_height); } + + cairo_fill (cr); } curHighlight = curHighlight->next; while (curHighlight == NULL && nextList) @@ -581,6 +600,9 @@ nextList = nextList->next; } } + + cairo_restore (cr); + gtk_style_context_restore (context); } /* @@ -640,7 +662,11 @@ gint imax) { GtkWidget *w = gh->xdisp; + GdkRGBA bg_color; + GdkRGBA fg_color; GtkAllocation allocation; + GtkStateFlags state; + GtkStyleContext *context; gint i, cursor_line; gint xcpl = gh->cpl*2 + gh->cpl/gh->group_type; gint frm_len, tmp; @@ -648,17 +674,23 @@ if( (!gtk_widget_get_realized(GTK_WIDGET (gh))) || (gh->cpl == 0) ) return; + context = gtk_widget_get_style_context (w); + state = gtk_widget_get_state_flags (w); + + gtk_style_context_get_background_color (context, state, &bg_color); + gtk_style_context_get_color (context, state, &fg_color); + cursor_line = gh->cursor_pos / gh->cpl - gh->top_line; gtk_widget_get_allocation(w, &allocation); - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->base[GTK_STATE_NORMAL]); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, imin * gh->char_height, allocation.width, (imax - imin + 1) * gh->char_height); cairo_fill (cr); imax = MIN(imax, gh->vis_lines); imax = MIN(imax, gh->lines); - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->text[GTK_STATE_NORMAL]); + gdk_cairo_set_source_rgba (cr, &fg_color); frm_len = format_xblock(gh, gh->disp_buffer, (gh->top_line+imin)*gh->cpl, MIN((gh->top_line+imax+1)*gh->cpl, gh->document->file_size) ); @@ -685,24 +717,34 @@ gint imax) { GtkWidget *w = gh->adisp; + GdkRGBA bg_color; + GdkRGBA fg_color; GtkAllocation allocation; + GtkStateFlags state; + GtkStyleContext *context; gint i, tmp, frm_len; guint cursor_line; if( (!gtk_widget_get_realized(GTK_WIDGET(gh))) || (gh->cpl == 0) ) return; + context = gtk_widget_get_style_context (w); + state = gtk_widget_get_state_flags (w); + + gtk_style_context_get_background_color (context, state, &bg_color); + gtk_style_context_get_color (context, state, &fg_color); + cursor_line = gh->cursor_pos / gh->cpl - gh->top_line; gtk_widget_get_allocation(w, &allocation); - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->base[GTK_STATE_NORMAL]); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, imin * gh->char_height, allocation.width, (imax - imin + 1) * gh->char_height); cairo_fill (cr); imax = MIN(imax, gh->vis_lines); imax = MIN(imax, gh->lines); - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->text[GTK_STATE_NORMAL]); + gdk_cairo_set_source_rgba (cr, &fg_color); frm_len = format_ablock(gh, gh->disp_buffer, (gh->top_line+imin)*gh->cpl, MIN((gh->top_line+imax+1)*gh->cpl, gh->document->file_size) ); @@ -730,22 +772,32 @@ gint imax) { GtkWidget *w = gh->offsets; + GdkRGBA bg_color; + GdkRGBA fg_color; GtkAllocation allocation; + GtkStateFlags state; + GtkStyleContext *context; gint i; gchar offstr[9]; if(!gtk_widget_get_realized(GTK_WIDGET(gh))) return; + context = gtk_widget_get_style_context (w); + state = gtk_widget_get_state_flags (w); + + gtk_style_context_get_background_color (context, state, &bg_color); + gtk_style_context_get_color (context, state, &fg_color); + gtk_widget_get_allocation(w, &allocation); - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->base[GTK_STATE_INSENSITIVE]); + gdk_cairo_set_source_rgba (cr, &bg_color); cairo_rectangle (cr, 0, imin * gh->char_height, allocation.width, (imax - imin + 1) * gh->char_height); cairo_fill (cr); imax = MIN(imax, gh->vis_lines); imax = MIN(imax, gh->lines - gh->top_line - 1); - gdk_cairo_set_source_color (cr, >k_widget_get_style (GTK_WIDGET (gh))->text[GTK_STATE_NORMAL]); + gdk_cairo_set_source_rgba (cr, &fg_color); for(i = imin; i <= imax; i++) { sprintf(offstr, "%08X", (gh->top_line + i)*gh->cpl + gh->starting_offset); @@ -828,36 +880,43 @@ GtkHex *gh = GTK_HEX(widget); GtkRequisition sb_req; GtkAllocation allocation; + GtkBorder padding; + GtkStateFlags state; + GtkStyleContext *context; gint border = gtk_container_get_border_width(GTK_CONTAINER(widget)); gint x; + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); + gtk_style_context_get_padding (context, state, &padding); + x = border; gtk_widget_get_allocation(widget, &allocation); if(gh->show_offsets) { - gtk_paint_shadow(gtk_widget_get_style(widget), - cr, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - widget, "notebook", - border, border, 8*gh->char_width + 2*widget_get_xt(widget), - allocation.height - 2*border); - x += 8*gh->char_width + 2*widget_get_xt(widget); - } - - gtk_paint_shadow(gtk_widget_get_style(widget), - cr, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - widget, "notebook", - x, border, gh->xdisp_width + 2*widget_get_xt(widget), - allocation.height - 2*border); + gtk_render_frame (context, + cr, + border, + border, + 8 * gh->char_width + padding.left + padding.right, + allocation.height - 2 * border); + x += 8 * gh->char_width + padding.left + padding.right; + } + + gtk_render_frame (context, + cr, + x, + border, + gh->xdisp_width + padding.left + padding.right, + allocation.height - 2 * border); + /* Draw a frame around the ascii display + scrollbar */ gtk_widget_get_requisition(gh->scrollbar, &sb_req); - gtk_paint_shadow(gtk_widget_get_style(widget), - cr, - GTK_STATE_NORMAL, GTK_SHADOW_IN, - widget, "notebook", - allocation.width - border - gh->adisp_width - sb_req.width - 2*widget_get_xt(widget), border, - gh->adisp_width + 2*widget_get_xt(widget), - allocation.height - 2*border); + gtk_render_frame (context, + cr, + allocation.width - border - gh->adisp_width - sb_req.width - padding.left - padding.right, + border, + gh->adisp_width + sb_req.width + padding.left + padding.right, + allocation.height - 2 * border); } /* @@ -865,21 +924,38 @@ * lines we can display according to the current size of the widget */ static void recalc_displays(GtkHex *gh, guint width, guint height) { + gboolean scroll_to_cursor; + gdouble value; gint total_width = width; gint total_cpl, xcpl; gint old_cpl = gh->cpl; + GtkBorder padding; + GtkStateFlags state; + GtkStyleContext *context; GtkRequisition req; - gtk_widget_size_request(gh->scrollbar, &req); + context = gtk_widget_get_style_context (GTK_WIDGET (gh)); + state = gtk_widget_get_state_flags (GTK_WIDGET (gh)); + gtk_style_context_get_padding (context, state, &padding); + + /* + * Only change the value of the adjustment to put the cursor on screen + * if the cursor is currently within the displayed portion. + */ + scroll_to_cursor = (gh->cpl == 0) || + ((gh->cursor_pos / gh->cpl >= gtk_adjustment_get_value (gh->adj)) && + (gh->cursor_pos / gh->cpl <= gtk_adjustment_get_value (gh->adj) + gh->vis_lines - 1)); + + gtk_widget_get_preferred_size (gh->scrollbar, &req, NULL); gh->xdisp_width = 1; gh->adisp_width = 1; total_width -= 2*gtk_container_get_border_width(GTK_CONTAINER(gh)) + - 4*widget_get_xt(GTK_WIDGET(gh)) + req.width; + 2 * padding.left + 2 * padding.right + req.width; if(gh->show_offsets) - total_width -= 2*widget_get_xt(GTK_WIDGET(gh)) + 8*gh->char_width; + total_width -= padding.left + padding.right + 8 * gh->char_width; total_cpl = total_width / gh->char_width; @@ -912,32 +988,38 @@ gh->lines++; } - gh->vis_lines = ( (gint) (height - 2*gtk_container_get_border_width(GTK_CONTAINER(gh)) - 2*widget_get_yt(GTK_WIDGET(gh))) ) / ( (gint) gh->char_height ); + gh->vis_lines = ((gint) (height - 2 * gtk_container_get_border_width (GTK_CONTAINER (gh)) - padding.top - padding.bottom)) / ((gint) gh->char_height); - gh->adisp_width = gh->cpl*gh->char_width + 1; + gh->adisp_width = gh->cpl*gh->char_width; xcpl = gh->cpl*2 + (gh->cpl - 1)/gh->group_type; - gh->xdisp_width = xcpl*gh->char_width + 1; + gh->xdisp_width = xcpl*gh->char_width; if(gh->disp_buffer) g_free(gh->disp_buffer); gh->disp_buffer = g_malloc( (xcpl + 1) * (gh->vis_lines + 1) ); - /* adjust the scrollbar and display position to - new sizes */ - gtk_adjustment_set_value(gh->adj, MIN(gh->top_line*old_cpl / gh->cpl, gh->lines - gh->vis_lines)); - gtk_adjustment_set_value(gh->adj, MAX(0, gtk_adjustment_get_value(gh->adj))); - if((gh->cursor_pos/gh->cpl < gtk_adjustment_get_value(gh->adj)) || - (gh->cursor_pos/gh->cpl > gtk_adjustment_get_value(gh->adj) + gh->vis_lines - 1)) { - gtk_adjustment_set_value(gh->adj, MIN(gh->cursor_pos/gh->cpl, gh->lines - gh->vis_lines)); - gtk_adjustment_set_value(gh->adj, MAX(0, gtk_adjustment_get_value(gh->adj))); - } - gtk_adjustment_set_lower(gh->adj, 0); - gtk_adjustment_set_upper(gh->adj, gh->lines); - gtk_adjustment_set_step_increment(gh->adj, 1); - gtk_adjustment_set_page_increment(gh->adj, gh->vis_lines - 1); - gtk_adjustment_set_page_size(gh->adj, gh->vis_lines); - + /* calculate new display position */ + value = MIN (gh->top_line * old_cpl / gh->cpl, gh->lines - gh->vis_lines); + value = MAX (0, value); + + /* keep cursor on screen if it was on screen before */ + if (scroll_to_cursor && + ((gh->cursor_pos / gh->cpl < value) || + (gh->cursor_pos / gh->cpl > value + gh->vis_lines - 1))) { + value = MIN (gh->cursor_pos / gh->cpl, gh->lines - gh->vis_lines); + value = MAX (0, value); + } + + /* adjust the scrollbar and display position to new values */ + gtk_adjustment_configure (gh->adj, + value, /* value */ + 0, /* lower */ + gh->lines, /* upper */ + 1, /* step increment */ + gh->vis_lines - 1, /* page increment */ + gh->vis_lines /* page size */); + g_signal_emit_by_name(G_OBJECT(gh->adj), "changed"); g_signal_emit_by_name(G_OBJECT(gh->adj), "value_changed"); } @@ -1040,10 +1122,15 @@ static void hex_motion_cb(GtkWidget *w, GdkEventMotion *event, GtkHex *gh) { GtkAllocation allocation; + GdkDeviceManager *device_manager; + GdkDevice *pointer; gint x, y; gtk_widget_get_allocation(w, &allocation); - gdk_window_get_pointer(gtk_widget_get_window(w), &x, &y, NULL); + + device_manager = gdk_display_get_device_manager (gtk_widget_get_display (w)); + pointer = gdk_device_manager_get_client_pointer (device_manager); + gdk_window_get_device_position (gtk_widget_get_window (w), pointer, &x, &y, NULL); if(y < 0) gh->scroll_dir = -1; @@ -1131,10 +1218,15 @@ static void ascii_motion_cb(GtkWidget *w, GdkEventMotion *event, GtkHex *gh) { GtkAllocation allocation; + GdkDeviceManager *device_manager; + GdkDevice *pointer; gint x, y; gtk_widget_get_allocation(w, &allocation); - gdk_window_get_pointer(gtk_widget_get_window(w), &x, &y, NULL); + + device_manager = gdk_display_get_device_manager (gtk_widget_get_display (w)); + pointer = gdk_device_manager_get_client_pointer (device_manager); + gdk_window_get_device_position (gtk_widget_get_window (w), pointer, &x, &y, NULL); if(y < 0) gh->scroll_dir = -1; @@ -1166,6 +1258,8 @@ } static void show_offsets_widget(GtkHex *gh) { + GtkStyleContext *context; + gh->offsets = gtk_drawing_area_new(); /* Modify the font for the widget */ @@ -1177,6 +1271,10 @@ gtk_widget_set_events (gh->offsets, GDK_EXPOSURE_MASK); g_signal_connect (G_OBJECT(gh->offsets), "draw", G_CALLBACK (offsets_draw), gh); + + context = gtk_widget_get_style_context (GTK_WIDGET (gh->xdisp)); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_HEADER); + gtk_fixed_put(GTK_FIXED(gh), gh->offsets, 0, 0); gtk_widget_show(gh->offsets); } @@ -1407,6 +1505,7 @@ GtkHex_AutoHighlight *ahl, gint start, gint end) { + GdkRGBA rgba; gint length = gh->document->file_size; GtkHex_Highlight *new = g_malloc0(sizeof(GtkHex_Highlight)); @@ -1414,15 +1513,14 @@ new->start = CLAMP(MIN(start, end), 0, length); new->end = MIN(MAX(start, end), length); - new->style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(gh))); - g_object_ref(new->style); - new->valid = FALSE; new->min_select = 0; - gdk_color_parse(ahl->colour, &new->style->bg[GTK_STATE_ACTIVE]); - gdk_color_parse(ahl->colour, &new->style->bg[GTK_STATE_INSENSITIVE]); + if (gdk_rgba_parse (&rgba, ahl->colour)) + new->bg_color = gdk_rgba_copy (&rgba); + else + new->bg_color = NULL; new->prev = NULL; @@ -1446,7 +1544,8 @@ if (hl == ahl->highlights) ahl->highlights = hl->next; - if (hl->style) g_object_unref(hl->style); + if (hl->bg_color) + gdk_rgba_free (hl->bg_color); g_free(hl); bytes_changed(gh, start, end); @@ -1828,8 +1927,11 @@ static void gtk_hex_size_allocate(GtkWidget *w, GtkAllocation *alloc) { GtkHex *gh; GtkAllocation my_alloc; + GtkBorder padding; GtkRequisition sb_req; - gint border_width, xt, yt; + GtkStateFlags state; + GtkStyleContext *context; + gint border_width; gh = GTK_HEX(w); hide_cursor(gh); @@ -1845,17 +1947,19 @@ alloc->height); border_width = gtk_container_get_border_width(GTK_CONTAINER(w)); - xt = widget_get_xt(w); - yt = widget_get_yt(w); - my_alloc.x = border_width + xt; - my_alloc.y = border_width + yt; - my_alloc.height = MAX(alloc->height - 2*border_width - 2*yt, 1); + context = gtk_widget_get_style_context (w); + state = gtk_widget_get_state_flags (w); + gtk_style_context_get_padding (context, state, &padding); + + my_alloc.x = border_width + padding.left; + my_alloc.y = border_width + padding.top; + my_alloc.height = MAX (alloc->height - 2 * border_width - padding.top - padding.bottom, 1); if(gh->show_offsets) { my_alloc.width = 8*gh->char_width; gtk_widget_size_allocate(gh->offsets, &my_alloc); gtk_widget_queue_draw(gh->offsets); - my_alloc.x += 2*xt + my_alloc.width; + my_alloc.x += padding.left + padding.right + my_alloc.width; } gtk_widget_get_requisition(gh->scrollbar, &sb_req); @@ -1867,10 +1971,10 @@ my_alloc.width = sb_req.width; my_alloc.height = MAX(alloc->height - 2*border_width, 1); gtk_widget_size_allocate(gh->scrollbar, &my_alloc); - my_alloc.x -= gh->adisp_width + xt; - my_alloc.y = border_width + yt; + my_alloc.x -= gh->adisp_width + padding.left; + my_alloc.y = border_width + padding.top; my_alloc.width = gh->adisp_width; - my_alloc.height = MAX(alloc->height - 2*border_width - 2*yt, 1); + my_alloc.height = MAX (alloc->height - 2 * border_width - padding.top - padding.bottom, 1); gtk_widget_size_allocate(gh->adisp, &my_alloc); show_cursor(gh); @@ -1880,11 +1984,11 @@ gtk_hex_draw (GtkWidget *w, cairo_t *cr) { - draw_shadow (w, cr); - if (GTK_WIDGET_CLASS (parent_class)->draw) (* GTK_WIDGET_CLASS (parent_class)->draw) (w, cr); - + + draw_shadow (w, cr); + return TRUE; } @@ -1896,16 +2000,23 @@ static void gtk_hex_size_request(GtkWidget *w, GtkRequisition *req) { + GtkBorder padding; GtkHex *gh = GTK_HEX(w); GtkRequisition sb_req; + GtkStateFlags state; + GtkStyleContext *context; + + context = gtk_widget_get_style_context (w); + state = gtk_widget_get_state_flags (w); + gtk_style_context_get_padding (context, state, &padding); - gtk_widget_size_request(gh->scrollbar, &sb_req); - req->width = 4*widget_get_xt(w) + 2*gtk_container_get_border_width(GTK_CONTAINER(w)) + + gtk_widget_get_preferred_size (gh->scrollbar, &sb_req, NULL); + req->width = 2 * padding.left + 2 * padding.right + 2 * gtk_container_get_border_width (GTK_CONTAINER (w)) + sb_req.width + gh->char_width * (DEFAULT_CPL + (DEFAULT_CPL - 1) / gh->group_type); if(gh->show_offsets) - req->width += 2*widget_get_xt(w) + 8*gh->char_width; - req->height = DEFAULT_LINES * gh->char_height + 2*widget_get_yt(w) + + req->width += padding.left + padding.right + 8 * gh->char_width; + req->height = DEFAULT_LINES * gh->char_height + padding.top + padding.bottom + 2*gtk_container_get_border_width(GTK_CONTAINER(w)); } @@ -2004,6 +2115,9 @@ } static void gtk_hex_init(GtkHex *gh, gpointer klass) { + GtkCssProvider *provider; + GtkStyleContext *context; + gh->scroll_timeout = -1; gh->disp_buffer = NULL; @@ -2022,7 +2136,7 @@ gh->selecting = FALSE; gh->selection.start = gh->selection.end = 0; - gh->selection.style = NULL; + gh->selection.bg_color = NULL; gh->selection.min_select = 1; gh->selection.next = gh->selection.prev = NULL; gh->selection.valid = FALSE; @@ -2041,6 +2155,19 @@ gtk_widget_set_events(GTK_WIDGET(gh), GDK_KEY_PRESS_MASK); gtk_container_set_border_width(GTK_CONTAINER(gh), DISPLAY_BORDER); + context = gtk_widget_get_style_context (GTK_WIDGET (gh)); + provider = gtk_css_provider_new (); + gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider), + "GtkHex {\n" + " border-style: solid;\n" + " border-width: 1px;\n" + " padding: 1px;\n" + "}\n", -1, NULL); + gtk_style_context_add_provider (context, + GTK_STYLE_PROVIDER (provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + gh->adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); gh->xdisp = gtk_drawing_area_new(); @@ -2062,6 +2189,10 @@ G_CALLBACK(hex_motion_cb), gh); g_signal_connect(G_OBJECT(gh->xdisp), "scroll_event", G_CALLBACK(hex_scroll_cb), gh); + + context = gtk_widget_get_style_context (GTK_WIDGET (gh->xdisp)); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW); + gtk_fixed_put(GTK_FIXED(gh), gh->xdisp, 0, 0); gtk_widget_show(gh->xdisp); @@ -2085,6 +2216,10 @@ G_CALLBACK(ascii_motion_cb), gh); g_signal_connect(G_OBJECT(gh->adisp), "scroll_event", G_CALLBACK(ascii_scroll_cb), gh); + + context = gtk_widget_get_style_context (GTK_WIDGET (gh->adisp)); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW); + gtk_fixed_put(GTK_FIXED(gh), gh->adisp, 0, 0); gtk_widget_show(gh->adisp); @@ -2455,22 +2590,29 @@ void gtk_hex_set_geometry(GtkHex *gh, gint cpl, gint vis_lines) { gint width, height, xcpl; + GtkBorder padding; GtkRequisition req; + GtkStateFlags state; + GtkStyleContext *context; - gtk_widget_size_request(gh->scrollbar, &req); + gtk_widget_get_preferred_size (gh->scrollbar, &req, NULL); if(cpl <= 0 || vis_lines <= 0) return; + context = gtk_widget_get_style_context (GTK_WIDGET (gh)); + state = gtk_widget_get_state_flags (GTK_WIDGET (gh)); + gtk_style_context_get_padding (context, state, &padding); + xcpl = 2*cpl + (cpl - 1)/gh->group_type; width = xcpl*gh->char_width + cpl*gh->char_width; - width += 2*gtk_container_get_border_width(GTK_CONTAINER(gh)) + 4*widget_get_xt(GTK_WIDGET(gh)) + - req.width; + width += 2 * gtk_container_get_border_width (GTK_CONTAINER (gh)) + + 2 * padding.left + 2 * padding.right + req.width; if(gh->show_offsets) - width += 2*widget_get_xt(GTK_WIDGET(gh)) + 8*gh->char_width; + width += padding.left + padding.right + 8 * gh->char_width; height = vis_lines*gh->char_height; - height += 2*gtk_container_get_border_width(GTK_CONTAINER(gh)) + 2*widget_get_yt(GTK_WIDGET(gh)); + height += 2 * gtk_container_get_border_width (GTK_CONTAINER (gh)) + padding.top + padding.bottom; gtk_widget_set_size_request(GTK_WIDGET(gh), width, height); } diff -Nru ghex-3.0.0/src/gtkhex.h ghex-3.3.90/src/gtkhex.h --- ghex-3.0.0/src/gtkhex.h 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/gtkhex.h 2012-02-18 17:52:37.000000000 +0000 @@ -58,7 +58,7 @@ { gint start, end; gint start_line, end_line; - GtkStyle *style; /* NULL for parent style */ + GdkRGBA *bg_color; /* NULL to use the style color */ gint min_select; GtkHex_Highlight *prev, *next; diff -Nru ghex-3.0.0/src/hex-dialog.c ghex-3.3.90/src/hex-dialog.c --- ghex-3.0.0/src/hex-dialog.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/hex-dialog.c 2012-02-21 05:55:00.000000000 +0000 @@ -61,8 +61,8 @@ { N_("Unsigned 16 bit:"), HexConvert_US16 }, { N_("Signed 32 bit:"), HexConvert_S32 }, { N_("Unsigned 32 bit:"), HexConvert_US32 }, - { N_("32 bit float:"), HexConvert_32float }, - { N_("64 bit float:"), HexConvert_64float }, + { N_("Float 32 bit:"), HexConvert_32float }, + { N_("Float 64 bit:"), HexConvert_64float }, { N_("Hexadecimal:"), HexConvert_hex }, { N_("Octal:"), HexConvert_oct }, { N_("Binary:"), HexConvert_bin } @@ -126,20 +126,24 @@ } static void create_dialog_prop(HexDialogEntryTypes type, - HexDialog *dialog, GtkWidget *table, + HexDialog *dialog, + GtkWidget *grid, gint xpos, gint ypos) { GtkWidget *label; label = gtk_label_new(_(HexDialogEntries[type].name)); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label, xpos, xpos+1, ypos, ypos+1); + gtk_misc_set_alignment (GTK_MISC(label), 1.0, 0.5); + gtk_widget_set_hexpand (label, TRUE); + gtk_grid_attach (GTK_GRID (grid), label, + xpos, ypos, 1, 1); gtk_widget_show(label); dialog->entry[type] = gtk_entry_new(); gtk_editable_set_editable(GTK_EDITABLE(dialog->entry[type]), FALSE); - gtk_table_attach_defaults(GTK_TABLE(table), dialog->entry[type], xpos+1, - xpos+2, ypos, ypos+1); + gtk_widget_set_hexpand (dialog->entry[type], TRUE); + gtk_grid_attach (GTK_GRID (grid), dialog->entry[type], + xpos+1, ypos, 1, 1); gtk_widget_show(dialog->entry[type]); } @@ -162,35 +166,38 @@ GtkWidget *hex_dialog_getview(HexDialog *dialog) { - GtkWidget *vbox = gtk_vbox_new(FALSE, 0); + GtkWidget *vbox; GtkWidget *hbox; - GtkWidget *table = gtk_table_new(4, 6, FALSE); + GtkWidget *grid; GtkWidget *label; GtkAdjustment *adjuster; GtkWidget *spin; - gtk_widget_show(table); - gtk_widget_show(vbox); - gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, FALSE, 4); + grid = gtk_grid_new (); + gtk_grid_set_row_spacing (GTK_GRID (grid), 4); + gtk_grid_set_column_spacing (GTK_GRID (grid), 4); + gtk_widget_show (grid); + + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_vexpand (GTK_WIDGET (vbox), FALSE); + gtk_box_pack_start (GTK_BOX (vbox), grid, TRUE, FALSE, 4); + gtk_widget_show (vbox); + + create_dialog_prop (S8, dialog, grid, 0, 0); + create_dialog_prop (US8, dialog, grid, 0, 1); + create_dialog_prop (S16, dialog, grid, 0, 2); + create_dialog_prop (US16, dialog, grid, 0, 3); + + create_dialog_prop (S32, dialog, grid, 2, 0); + create_dialog_prop (US32, dialog, grid, 2, 1); + create_dialog_prop (FLOAT32, dialog, grid, 2, 2); + create_dialog_prop (FLOAT64, dialog, grid, 2, 3); + + create_dialog_prop (HEX, dialog, grid, 4, 0); + create_dialog_prop (OCT, dialog, grid, 4, 1); + create_dialog_prop (BIN, dialog, grid, 4, 2); - gtk_table_set_row_spacings(GTK_TABLE(table), 4); - gtk_table_set_col_spacings(GTK_TABLE(table), 4); - - create_dialog_prop(S8, dialog, table, 0, 0); - create_dialog_prop(US8, dialog, table, 0, 1); - create_dialog_prop(S16, dialog, table, 0, 2); - create_dialog_prop(US16, dialog, table, 0, 3); - - create_dialog_prop(S32, dialog, table, 2, 0); - create_dialog_prop(US32, dialog, table, 2, 1); - create_dialog_prop(FLOAT32, dialog, table, 2, 2); - create_dialog_prop(FLOAT64, dialog, table, 2, 3); - - create_dialog_prop(HEX, dialog, table, 4, 0); - create_dialog_prop(OCT, dialog, table, 4, 1); - create_dialog_prop(BIN, dialog, table, 4, 2); - - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, FALSE, 4); gtk_widget_show(hbox); @@ -208,15 +215,15 @@ gtk_box_pack_start(GTK_BOX(hbox), dialog->config_hex, TRUE, FALSE, 4); label = gtk_label_new(_("Stream Length:")); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label, 4, 5, 3, 4); + gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + gtk_grid_attach (GTK_GRID (grid), label, 4, 3, 1, 1); gtk_widget_show(label); adjuster = (GtkAdjustment *)gtk_adjustment_new(8.0, 1.0, 32.0, 1.0, 8.0, 0); spin = gtk_spin_button_new(adjuster, 1.0, 0); g_signal_connect(G_OBJECT(spin), "value-changed", G_CALLBACK(config_spinchange_cb), dialog); - gtk_table_attach_defaults(GTK_TABLE(table), spin, 5, 6, 3, 4); + gtk_grid_attach (GTK_GRID (grid), spin, 5, 3, 1, 1); gtk_widget_show(spin); return vbox; diff -Nru ghex-3.0.0/src/hex-document.c ghex-3.3.90/src/hex-document.c --- ghex-3.0.0/src/hex-document.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/hex-document.c 2012-02-18 17:48:11.000000000 +0000 @@ -444,7 +444,6 @@ { HexDocument *doc; gchar *path_end; - int i; doc = HEX_DOCUMENT (g_object_new (hex_document_get_type(), NULL)); g_return_val_if_fail (doc != NULL, NULL); @@ -456,14 +455,10 @@ doc->buffer = (guchar *)g_malloc(doc->buffer_size); /* find the start of the filename without path */ - for(i = strlen(doc->file_name); (i >= 0) && (doc->file_name[i] != '/'); i--) - ; - if(doc->file_name[i] == '/') - path_end = &doc->file_name[i+1]; - else - path_end = doc->file_name; - + path_end = g_path_get_basename (doc->file_name); doc->path_end = g_filename_to_utf8 (path_end, -1, NULL, NULL, NULL); + g_free (path_end); + if(hex_document_read(doc)) { doc_list = g_list_append(doc_list, doc); return doc; @@ -707,7 +702,7 @@ if(doc->file_name == NULL) return FALSE; - if((file = fopen(doc->file_name, "w")) != NULL) { + if((file = fopen(doc->file_name, "wb")) != NULL) { ret = hex_document_write_to_file(doc, file); fclose(file); if(ret) { diff -Nru ghex-3.0.0/src/main.c ghex-3.3.90/src/main.c --- ghex-3.0.0/src/main.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/main.c 2012-02-21 04:29:44.000000000 +0000 @@ -65,7 +65,6 @@ /* load preferences */ ghex_init_configuration(); - ghex_load_configuration(); /* accessibility setup */ setup_factory(); diff -Nru ghex-3.0.0/src/Makefile.am ghex-3.3.90/src/Makefile.am --- ghex-3.0.0/src/Makefile.am 2011-08-17 12:07:03.000000000 +0000 +++ ghex-3.3.90/src/Makefile.am 2012-02-18 18:02:03.000000000 +0000 @@ -67,3 +67,5 @@ $(GHEX_LIBS) CLEAN_FILES = $(BUILT_SOURCES) + +-include $(top_srcdir)/git.mk diff -Nru ghex-3.0.0/src/Makefile.in ghex-3.3.90/src/Makefile.in --- ghex-3.0.0/src/Makefile.in 2011-09-26 17:42:39.000000000 +0000 +++ ghex-3.3.90/src/Makefile.in 2012-02-21 06:09:20.000000000 +0000 @@ -816,6 +816,8 @@ echo "#include \"ghex-marshal.h\"" > $@ && \ $(GLIB_GENMARSHAL) $< --body --prefix=ghex_marshal >> $@ +-include $(top_srcdir)/git.mk + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru ghex-3.0.0/src/preferences.c ghex-3.3.90/src/preferences.c --- ghex-3.0.0/src/preferences.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/preferences.c 2012-02-21 01:13:58.000000000 +0000 @@ -52,7 +52,7 @@ PropertyUI * create_prefs_dialog() { - GtkWidget *vbox, *label, *frame, *box, *fbox, *flabel, *table; + GtkWidget *vbox, *label, *frame, *box, *fbox, *flabel, *grid; GtkAdjustment *undo_adj, *box_adj; GtkWidget *notebook; @@ -88,14 +88,14 @@ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(pui->pbox))), notebook); /* editing page */ - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show(vbox); /* max undo levels */ undo_adj = GTK_ADJUSTMENT(gtk_adjustment_new(MIN(max_undo_depth, MAX_MAX_UNDO_DEPTH), 0, MAX_MAX_UNDO_DEPTH, 1, 10, 0)); - box = gtk_hbox_new(FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show(box); label = gtk_label_new_with_mnemonic(_("_Maximum number of undo levels:")); @@ -110,7 +110,7 @@ gtk_box_pack_start(GTK_BOX(vbox), box, FALSE, TRUE, 8); /* cursor offset format */ - box = gtk_hbox_new(FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show(box); gtk_label_set_mnemonic_widget(GTK_LABEL(label), pui->undo_spin); @@ -173,7 +173,7 @@ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), vbox, label); /* display page */ - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show(vbox); /* display font */ @@ -181,7 +181,7 @@ gtk_container_set_border_width(GTK_CONTAINER(frame), 4); gtk_widget_show(frame); - fbox = gtk_hbox_new(0, 5); + fbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); pui->font_button = gtk_font_button_new(); gtk_font_button_set_font_name(GTK_FONT_BUTTON(pui->font_button), def_font_name); @@ -204,7 +204,7 @@ gtk_container_set_border_width(GTK_CONTAINER(frame), 4); gtk_widget_show(frame); - box = gtk_vbox_new(FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show(box); group = NULL; for(i = 0; i < 3; i++) { @@ -221,7 +221,7 @@ gtk_notebook_append_page (GTK_NOTEBOOK(notebook), vbox, label); /* printing page */ - vbox = gtk_vbox_new(FALSE, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show(vbox); /* paper selection */ @@ -234,14 +234,18 @@ gtk_container_set_border_width(GTK_CONTAINER(frame), 4); gtk_widget_show(frame); - table = gtk_table_new(2, 3, TRUE); - gtk_widget_show(table); + grid = gtk_grid_new (); + g_object_set (grid, + "orientation", GTK_ORIENTATION_VERTICAL, + "row-spacing", 6, + "column-spacing", 12, + NULL); + gtk_widget_show (grid); + label = gtk_label_new_with_mnemonic(_("_Data font:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, - GTK_FILL, GTK_FILL, - 4, 4); + gtk_container_add (GTK_CONTAINER (grid), label); pui->df_button = gtk_font_button_new_with_font(def_font_name); g_signal_connect (G_OBJECT (pui->df_button), "font_set", @@ -256,22 +260,15 @@ add_atk_relation (pui->df_button, label, ATK_RELATION_LABELLED_BY); } + gtk_widget_set_hexpand (pui->df_button, TRUE); gtk_widget_show(pui->df_button); - gtk_table_attach(GTK_TABLE(table), pui->df_button, 1, 2, 0, 1, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, - 4, 4); - label = gtk_label_new(""); - gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 2, 3, 0, 1, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, - 4, 4); + gtk_grid_attach_next_to (GTK_GRID (grid), pui->df_button, label, + GTK_POS_RIGHT, 1, 1); label = gtk_label_new_with_mnemonic(_("Header fo_nt:")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, - GTK_FILL, GTK_FILL, - 4, 4); + gtk_container_add (GTK_CONTAINER (grid), label); pui->hf_button = gtk_font_button_new_with_font(def_font_name); g_signal_connect (G_OBJECT (pui->hf_button), "font_set", G_CALLBACK (select_font_cb), pui); @@ -285,18 +282,17 @@ add_atk_relation (pui->hf_button, label, ATK_RELATION_LABELLED_BY); } + gtk_widget_set_hexpand (pui->hf_button, TRUE); gtk_widget_show(pui->hf_button); - gtk_table_attach(GTK_TABLE(table), pui->hf_button, 1, 2, 1, 2, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, - 4, 4); + gtk_grid_attach_next_to (GTK_GRID (grid), pui->hf_button, label, + GTK_POS_RIGHT, 1, 1); label = gtk_label_new(""); + gtk_widget_set_hexpand (label, TRUE); gtk_widget_show(label); - gtk_table_attach(GTK_TABLE(table), label, 2, 3, 1, 2, - GTK_EXPAND | GTK_SHRINK | GTK_FILL, GTK_FILL, - 4, 4); + gtk_grid_attach (GTK_GRID (grid), label, 2, 1, 1, 1); - gtk_container_add(GTK_CONTAINER(frame), table); + gtk_container_add (GTK_CONTAINER (frame), grid); gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, TRUE, 4); @@ -304,7 +300,7 @@ /* shaded box entry */ box_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, 1000, 1, 10, 0)); - box = gtk_hbox_new(FALSE, 0); + box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show(box); label = gtk_label_new_with_mnemonic(_("_Print shaded box over:")); diff -Nru ghex-3.0.0/src/ui.c ghex-3.3.90/src/ui.c --- ghex-3.0.0/src/ui.c 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/ui.c 2012-02-21 04:42:52.000000000 +0000 @@ -81,7 +81,7 @@ { GtkWidget *button, *pixmap, *label, *hbox; - hbox = gtk_hbox_new(FALSE, 2); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); label = gtk_label_new_with_mnemonic(text); @@ -127,9 +127,10 @@ * callbacks for global menus */ void -about_cb (GtkAction *action, - gpointer user_data) +about_cb (GtkAction *action, + GHexWindow *window) { + gchar *copyright; gchar *license_translated; const gchar *authors[] = { @@ -138,12 +139,10 @@ "Shivram Upadhyayula", "Rodney Dawes", "Jonathon Jongsma", + "Kalev Lember", NULL }; - const gchar *copyright = _("Copyright © 1998 - 2006 Jaka Mo\304\215nik\n" - "Copyright © 2006 - 2010 GHex Contributors"); - /* For documentation_credits */ #include "../help/ghex-docs.h" @@ -166,7 +165,11 @@ _(license[2]), NULL); - gtk_show_about_dialog (NULL, + /* Translators: these two strings here indicate the copyright time span, + e.g. 1998-2012. */ + copyright = g_strdup_printf (_("Copyright © %Id–%Id The GHex authors"), 1998, 2012); + + gtk_show_about_dialog (GTK_WINDOW (window), "authors", authors, "comments", _("A binary file editor"), "copyright", copyright, @@ -183,15 +186,19 @@ NULL); g_free (license_translated); + g_free (copyright); } void -help_cb (GtkAction *action, - gpointer user_data) +help_cb (GtkAction *action, + GHexWindow *window) { GError *error = NULL; - gtk_show_uri (NULL, "ghelp:ghex", gtk_get_current_event_time (), &error); + gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)), + "ghelp:ghex", + gtk_get_current_event_time (), + &error); if (error != NULL) { GtkWidget *dialog; @@ -428,24 +435,22 @@ resp = gtk_dialog_run(GTK_DIALOG(file_sel)); if(resp == GTK_RESPONSE_OK) { - gchar *html_path = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_sel))); + gchar *html_path; gchar *sep, *base_name, *check_path; GtkHex *view = win->gh; + html_path = g_path_get_dirname (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_sel))); + base_name = g_path_get_basename (gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_sel))); + gtk_widget_destroy(file_sel); - sep = html_path + strlen(html_path) - 1; - while(sep >= html_path && *sep != '/') - sep--; - if(sep >= html_path) - *sep = 0; - base_name = sep + 1; sep = strstr(base_name, ".htm"); if(sep) *sep = 0; if(*base_name == 0) { g_free(html_path); + g_free(base_name); display_error_dialog(win, _("You need to specify a base name for " "the HTML files.")); return; @@ -459,6 +464,7 @@ if(access(check_path, W_OK) != 0) { display_error_dialog(win, _("You don't have the permission to write to the selected path.\n")); g_free(html_path); + g_free(base_name); g_free(check_path); return; } @@ -475,6 +481,7 @@ gtk_widget_destroy(mbox); if(reply != GTK_RESPONSE_YES) { g_free(html_path); + g_free(base_name); g_free(check_path); return; } @@ -483,6 +490,7 @@ if(access(html_path, W_OK) != 0) { display_error_dialog(win, _("You don't have the permission to write to the selected path.\n")); g_free(html_path); + g_free(base_name); g_free(check_path); return; } @@ -492,6 +500,7 @@ hex_document_export_html(doc, html_path, base_name, 0, doc->file_size, view->cpl, view->vis_lines, view->group_type); g_free(html_path); + g_free(base_name); } else gtk_widget_destroy(GTK_WIDGET(file_sel)); diff -Nru ghex-3.0.0/src/ui.h ghex-3.3.90/src/ui.h --- ghex-3.0.0/src/ui.h 2011-09-10 21:18:10.000000000 +0000 +++ ghex-3.3.90/src/ui.h 2012-02-21 04:42:52.000000000 +0000 @@ -83,8 +83,8 @@ void type_dialog_cb (GtkAction *action, gpointer user_data); /* Help menu */ -void help_cb (GtkAction *action, gpointer user_data); -void about_cb (GtkAction *action, gpointer user_data); +void help_cb (GtkAction *action, GHexWindow *window); +void about_cb (GtkAction *action, GHexWindow *window); void file_list_activated_cb (GtkAction *action, gpointer user_data);