From a5ade9dd96c1cc44fe2b0cdccddabc63407eff30 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 29 Aug 2009 14:42:42 -0700 Subject: base.bbclass: Pass in PATH to popen. On Mac OSX its not able to find md5sum if path is not passed to os.popen shell. Signed-off-by: Khem Raj --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 97ccf5dfc3..d29ba4bfcf 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -84,7 +84,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): # call md5(sum) and shasum try: - md5pipe = os.popen('md5sum ' + localpath) + md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError: -- cgit v1.2.3 From e6bdc929a0281e3bc5d69c099d37bf4d1f2bae23 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 29 Aug 2009 14:42:42 -0700 Subject: base.bbclass: Pass in PATH to popen. On Mac OSX its not able to find md5sum if path is not passed to os.popen shell. Signed-off-by: Khem Raj Acked-by: Koen Kooi --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 97ccf5dfc3..d29ba4bfcf 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -84,7 +84,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): # call md5(sum) and shasum try: - md5pipe = os.popen('md5sum ' + localpath) + md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError: -- cgit v1.2.3 From 713ba5f078eedf4c17b74cb4c06d3b418e60ba37 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 29 Aug 2009 15:15:36 +0000 Subject: micro.conf: Remove PREFERRED_PROVIDER_virtual/libintl This is set appropriately in toolchain configuration. It gives a possibility to cleanly override LIBC say to eglibc or glibc. Signed-off-by: Khem Raj Acked-by: Leon Woestenberg Acked-by: Henning Heinold --- conf/distro/micro.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index 861f7ef886..2d45425290 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -1,7 +1,7 @@ ############################################################################# #@TYPE: Distribution #@NAME: Micro -#@DESCRIPTION: Micro Linux Distribution (glibc based) +#@DESCRIPTION: Micro Linux Distribution (eglibc based) #@MAINTAINER: Martin Lund #@COMMENT: This distribution configuration defines a truely tiny OE Linux #@COMMENT: distribution. The matching buildable image target (micro-image) @@ -79,7 +79,6 @@ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" # PREFERRED PROVIDERS ############################################################################# PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" -PREFERRED_PROVIDER_virtual/libintl = "glibc" ############################################################################# # PREFERRED VERSIONS -- cgit v1.2.3 From cac4ab3d9c62a111caa8ed6a372b286cf30c2527 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 31 Aug 2009 12:22:42 +0200 Subject: poppler: add 0.11.3 (0.12rc) --- conf/checksums.ini | 4 ++++ recipes/poppler/poppler_0.11.3.bb | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 recipes/poppler/poppler_0.11.3.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 05d9a8c0cb..fd902aa1c0 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -20022,6 +20022,10 @@ sha256=796f210200129e478bcb0f9c40c09998f2c47b346d4c734d94756e84989fd8b3 md5=8efe67bc46564512bd1de09fce5971ab sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8 +[http://poppler.freedesktop.org/poppler-0.11.3.tar.gz] +md5=28f9dbdc74e9aadbf27aff16d06f4990 +sha256=2ec40a8d9d9b80ebebea594c407c31962845376287c19e37345371236ed180d5 + [http://poppler.freedesktop.org/poppler-0.5.4.tar.gz] md5=053fdfd70533ecce1a06353fa945f061 sha256=ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9 diff --git a/recipes/poppler/poppler_0.11.3.bb b/recipes/poppler/poppler_0.11.3.bb new file mode 100644 index 0000000000..b94b1cc6e0 --- /dev/null +++ b/recipes/poppler/poppler_0.11.3.bb @@ -0,0 +1,7 @@ +require poppler.inc + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_angstrom = "1" + +EXTRA_OECONF_append = " --disable-abiword-output " + -- cgit v1.2.3 From b1aad586d816f0610d3b47b60018b06d12b660d8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 31 Aug 2009 12:52:10 +0200 Subject: xf86-video-vesa: fixed RDEPENDS --- recipes/xorg-driver/xf86-video-vesa_2.2.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb index 5ec423a918..9fce612de4 100644 --- a/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb +++ b/recipes/xorg-driver/xf86-video-vesa_2.2.0.bb @@ -6,5 +6,5 @@ SRC_URI += "file://fix-includepath.patch;patch=1 \ #DESCRIPTION = "" -RDEPENDS += "xserver-xorg-module-int10 " -PR = "r1" +RDEPENDS += "xserver-xorg-module-libint10 " +PR = "r2" -- cgit v1.2.3 From aa19cf6294de673303e813a0baf69791220a668a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 31 Aug 2009 13:04:33 +0200 Subject: xserver-common 1.30: another set of updates 0024 moves functionality of /etc/X11/Xserver to separate file (except running X11 server) - this allows to use xserver-common package in systems where xinit is used to run X11 session as root (look at xserver-nodm-init package) 0025 moves xmodmap files to /etc/X11/xmodmap/ and installs xserver-common file created in previous patch. 0026 fixes path to default.xmodmap file --- ...e-nearly-whole-functionality-to-xserver-c.patch | 415 +++++++++++++++++++++ ...efile-move-modmaps-install-xserver-common.patch | 32 ++ ...98keymap-fixup-fixed-path-to-xmodmap-file.patch | 25 ++ recipes/xserver-common/xserver-common_1.30.bb | 5 +- 4 files changed, 476 insertions(+), 1 deletion(-) create mode 100644 recipes/xserver-common/xserver-common-1.30/0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch create mode 100644 recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch create mode 100644 recipes/xserver-common/xserver-common-1.30/0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch diff --git a/recipes/xserver-common/xserver-common-1.30/0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch b/recipes/xserver-common/xserver-common-1.30/0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch new file mode 100644 index 0000000000..d00e1a72d1 --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0024-Xserver-move-nearly-whole-functionality-to-xserver-c.patch @@ -0,0 +1,415 @@ +From dc0efcbc35a7e0c5b5f908fb4d27a76c4ee304ac Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz +Date: Mon, 31 Aug 2009 12:05:17 +0200 +Subject: [PATCH 1/1] Xserver: move nearly whole functionality to xserver-common + +/etc/X11/Xserver script now use /etc/X11/xserver-common one to get +values for XSERVER, ARGS, DPI variables. + +This split allows to use xserver-common for other X11 startup systems. +--- + X11/Xserver | 188 +-------------------------------------------------- + X11/xserver-common | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 192 insertions(+), 187 deletions(-) + create mode 100644 X11/xserver-common + +diff --git a/X11/Xserver b/X11/Xserver +index 583cd0d..d53e1c9 100755 +--- a/X11/Xserver ++++ b/X11/Xserver +@@ -1,194 +1,8 @@ + #!/bin/sh + # + +-XSERVER=Xfbdev +-BINDIR=/usr/bin ++. /etc/X11/xserver-common + +-if [ -f $BINDIR/Xepson ]; then +- XSERVER=Xepson +-fi +-if [ -f $BINDIR/Xorg ]; then +- XSERVER=Xorg +-fi +-if [ -f $BINDIR/Xomap ]; then +- XSERVER=Xomap +-fi +-if [ -f $BINDIR/Xw100 ]; then +- XSERVER=Xw100 +-fi +-if [ -f $BINDIR/Xvesa ]; then +- XSERVER=Xvesa +-fi +-if [ -f $BINDIR/Ximageon ]; then +- XSERVER=Ximageon +-fi +-if [ -f $BINDIR/Xglamo ]; then +- XSERVER=Xglamo +-fi +- +-if [ -f /etc/profile ]; then +- . /etc/profile +-fi +- +-. /etc/init.d/functions +- +-fallback_screen_arg() { +- geom=`fbset | grep geometry` +- w=`echo $geom | awk '{ print $2 }'` +- h=`echo $geom | awk '{ print $3 }'` +- b=`echo $geom | awk '{ print $6 }'` +- echo -n "${w}x${h}x${b}" +-} +- +-SCREEN_SIZE=`fallback_screen_arg` +-export USER=root +-export XSERVER_DEFAULT_ORIENTATION=normal +- +-ARGS="-br -pn $INPUT_EXTRA_ARGS" +-DPI="100" +-MOUSE="" +- +-# use ucb 1x00 touchscreen if present +-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then +- MOUSE="-mouse /dev/touchscreen/ucb1x00" +-fi +- +-# kdrive 1.4 onwards needs -mouse args +-# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically +-if [ -e "$TSLIB_TSDEVICE" ] ; then +- MOUSE="-mouse tslib" +-else +- if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then +- MOUSE="-mouse mouse" +- fi +-fi +- +-if [ -e /etc/default/xserver ] ; then +- . /etc/default/xserver +-else +- # start off server in conventional location. +- case `machine_id` in +- "aml_m8050") +- ARGS="$ARGS -screen 320x240@270" +- DPI="100" ;; +- "hp_ipaq_h3100" | "hp_ipaq_h3800") +- ARGS="$ARGS -rgba vrgb -screen 320x240@90" +- DPI="100" ;; +- "hp_ipaq_h3600" | "hp_ipaq_h3700" | "hp_ipaq_h3900") +- ARGS="$ARGS -rgba vbgr -screen 320x240@270" +- DPI="100" ;; +- "hp_ipaq_h5400" | "hp_ipaq_h2200") +- ARGS="$ARGS -rgba rgb" +- DPI="100" ;; +- "hp_ipaq_hx4700") +- DPI="200" ;; +- "ramses") +- # What is this "vt2" in aid of? +- ARGS="$ARGS -rgba vrgb -screen 320x240@90 vt2" +- DPI="100" ;; +- *poodle) +- ARGS="$ARGS -rgba vrgb -screen 320x240@270" +- DPI="100" ;; +- # both 'Sharp-Collie' and just 'Collie' have been reported +- *collie) +- ARGS="$ARGS -rgba vrgb -screen 320x240@270" +- DPI="100" ;; +- "sharp_shepherd" | "sharp_husky" | "sharp_corgi") +- ARGS="$ARGS -rgba rgb" +- DPI="200" ;; +- "sharp_spitz" | "sharp_akita" | "sharp_borzoi") +- export XSERVER_DEFAULT_ORIENTATION="normal" +- ARGS="$ARGS -rgba rgb -screen 480x640" +- DPI="200" ;; +- "simpad") +- ARGS="$ARGS -rgba rgb" +- DPI="100" ;; +- "generic_omap1510/1610/1710") +- MOUSE="-mouse /dev/input/event0" +- DPI="220" ;; +- "ti-osk") +- DPI="100" ;; +- "cellon_c8000_board") +- ARGS="$ARGS -screen ${SCREEN_SIZE},10,1" +- DPI="100" ;; +- "htc_magician") +- DPI="142" ;; +- "htc_universal") +- ARGS="$ARGS -screen 480x640@270" +- DPI="100" ;; +- "htc_tornado") +- ARGS="$ARGS -hide-cursor" +- DPI="100" ;; +- "generic_omap1510/1610/1710") +- ARGS="$ARGS -screen ${SCREEN_SIZE}" +- DPI="225" ;; +- "nokia_n800" | "nokia_rx-44" | "nokia_n770") +- ARGS="$ARGS -screen ${SCREEN_SIZE}" +- DPI="225" ;; +- "gta01" ) +- DPI="285" +- if [ "$XSERVER" != "Xorg" ] ; then +- ARGS="$ARGS -screen 480x640" +- fi +- ;; +- "gta02") +- DPI="285" +- if [ "$XSERVER" != "Xorg" ] ; then +- ARGS="$ARGS -screen ${SCREEN_SIZE}" +- fi +- ;; +- "motorola_ezx_platform") +- ARGS="$ARGS -screen 240x320" +- DPI="170" ;; +- "arm-integratorcp" | "arm-versatile_pb") +- ARGS="$ARGS -rgba vrgb" ;; +- "compulab_cm-x270") +- modprobe mbxfb +- ARGS="$ARGS -fb /dev/fb1" ;; +- "boundary_devices_neon_board") +- ARGS="$ARGS -screen ${SCREEN_SIZE}" +- DPI="100" ;; +- "hoeft&wessel_hw90350") +- ARGS="$ARGS -screen ${SCREEN_SIZE}" +- DPI="100" ;; +- "hoeft&wessel_hw90250") +- ARGS="$ARGS -screen 240x320@90" +- DPI="100" ;; +- "mini2440") +- ARGS="$ARGS -screen ${SCREEN_SIZE}" +- DPI="100" ;; +- "palm_treo_650") +- DPI="181" +- ARGS="$ARGS -screen 320x320 -hide-cursor" ;; +- "glofiish_m800") +- DPI="285" +- ARGS="$ARGS -screen ${SCREEN_SIZE} -hide-cursor vt1" ;; +- "freescale_mx21ads") +- # That's what /proc/cpuinfo shows as hardware on the chumby +- DPI="121" +- ARGS="$ARGS -screen 320x240 -hide-cursor" ;; +- +- # this is to rotate X display properly, tested with display TX09D71VM1CCA +- ronetix*pm9261* | ronetix*pm9263*) +- ARGS="$ARGS -screen 240/54x320/81@90x16" ;; +- # This is a fallback for PCs +- "") +- if [ -f $BINDIR/Xvesa ]; then +- ARGS="$ARGS -mode 0x0114" +- else +- # It is a device we do not know about, in which case we force +- # kdrive to use the current framebuffer geometry -- otherwise +- # it will default to trying to achieve 1024x768 +- if [ "$XSERVER" != "Xorg" ] ; then +- ARGS="$ARGS -screen ${SCREEN_SIZE}" +- fi +- fi +- esac +-fi +- +-if [ "$XSERVER" != "Xorg" ] ; then +- ARGS="$ARGS $MOUSE" +-fi + + echo "tslib: $TSLIB_TSDEVICE" + echo "exec $XSERVER $ARGS -dpi $DPI $*" +diff --git a/X11/xserver-common b/X11/xserver-common +new file mode 100644 +index 0000000..29d152f +--- /dev/null ++++ b/X11/xserver-common +@@ -0,0 +1,191 @@ ++#!/bin/sh ++# ++ ++XSERVER=Xfbdev ++BINDIR=/usr/bin ++ ++if [ -f $BINDIR/Xepson ]; then ++ XSERVER=Xepson ++fi ++if [ -f $BINDIR/Xorg ]; then ++ XSERVER=Xorg ++fi ++if [ -f $BINDIR/Xomap ]; then ++ XSERVER=Xomap ++fi ++if [ -f $BINDIR/Xw100 ]; then ++ XSERVER=Xw100 ++fi ++if [ -f $BINDIR/Xvesa ]; then ++ XSERVER=Xvesa ++fi ++if [ -f $BINDIR/Ximageon ]; then ++ XSERVER=Ximageon ++fi ++if [ -f $BINDIR/Xglamo ]; then ++ XSERVER=Xglamo ++fi ++ ++if [ -f /etc/profile ]; then ++ . /etc/profile ++fi ++ ++. /etc/init.d/functions ++ ++fallback_screen_arg() { ++ geom=`fbset | grep geometry` ++ w=`echo $geom | awk '{ print $2 }'` ++ h=`echo $geom | awk '{ print $3 }'` ++ b=`echo $geom | awk '{ print $6 }'` ++ echo -n "${w}x${h}x${b}" ++} ++ ++SCREEN_SIZE=`fallback_screen_arg` ++export USER=root ++export XSERVER_DEFAULT_ORIENTATION=normal ++ ++ARGS="-br -pn $INPUT_EXTRA_ARGS" ++DPI="100" ++MOUSE="" ++ ++# use ucb 1x00 touchscreen if present ++if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then ++ MOUSE="-mouse /dev/touchscreen/ucb1x00" ++fi ++ ++# kdrive 1.4 onwards needs -mouse args ++# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically ++if [ -e "$TSLIB_TSDEVICE" ] ; then ++ MOUSE="-mouse tslib" ++else ++ if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then ++ MOUSE="-mouse mouse" ++ fi ++fi ++ ++if [ -e /etc/default/xserver ] ; then ++ . /etc/default/xserver ++else ++ # start off server in conventional location. ++ case `machine_id` in ++ "aml_m8050") ++ ARGS="$ARGS -screen 320x240@270" ++ DPI="100" ;; ++ "hp_ipaq_h3100" | "hp_ipaq_h3800") ++ ARGS="$ARGS -rgba vrgb -screen 320x240@90" ++ DPI="100" ;; ++ "hp_ipaq_h3600" | "hp_ipaq_h3700" | "hp_ipaq_h3900") ++ ARGS="$ARGS -rgba vbgr -screen 320x240@270" ++ DPI="100" ;; ++ "hp_ipaq_h5400" | "hp_ipaq_h2200") ++ ARGS="$ARGS -rgba rgb" ++ DPI="100" ;; ++ "hp_ipaq_hx4700") ++ DPI="200" ;; ++ "ramses") ++ # What is this "vt2" in aid of? ++ ARGS="$ARGS -rgba vrgb -screen 320x240@90 vt2" ++ DPI="100" ;; ++ *poodle) ++ ARGS="$ARGS -rgba vrgb -screen 320x240@270" ++ DPI="100" ;; ++ # both 'Sharp-Collie' and just 'Collie' have been reported ++ *collie) ++ ARGS="$ARGS -rgba vrgb -screen 320x240@270" ++ DPI="100" ;; ++ "sharp_shepherd" | "sharp_husky" | "sharp_corgi") ++ ARGS="$ARGS -rgba rgb" ++ DPI="200" ;; ++ "sharp_spitz" | "sharp_akita" | "sharp_borzoi") ++ export XSERVER_DEFAULT_ORIENTATION="normal" ++ ARGS="$ARGS -rgba rgb -screen 480x640" ++ DPI="200" ;; ++ "simpad") ++ ARGS="$ARGS -rgba rgb" ++ DPI="100" ;; ++ "generic_omap1510/1610/1710") ++ MOUSE="-mouse /dev/input/event0" ++ DPI="220" ;; ++ "ti-osk") ++ DPI="100" ;; ++ "cellon_c8000_board") ++ ARGS="$ARGS -screen ${SCREEN_SIZE},10,1" ++ DPI="100" ;; ++ "htc_magician") ++ DPI="142" ;; ++ "htc_universal") ++ ARGS="$ARGS -screen 480x640@270" ++ DPI="100" ;; ++ "htc_tornado") ++ ARGS="$ARGS -hide-cursor" ++ DPI="100" ;; ++ "generic_omap1510/1610/1710") ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ DPI="225" ;; ++ "nokia_n800" | "nokia_rx-44" | "nokia_n770") ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ DPI="225" ;; ++ "gta01" ) ++ DPI="285" ++ if [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS -screen 480x640" ++ fi ++ ;; ++ "gta02") ++ DPI="285" ++ if [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ fi ++ ;; ++ "motorola_ezx_platform") ++ ARGS="$ARGS -screen 240x320" ++ DPI="170" ;; ++ "arm-integratorcp" | "arm-versatile_pb") ++ ARGS="$ARGS -rgba vrgb" ;; ++ "compulab_cm-x270") ++ modprobe mbxfb ++ ARGS="$ARGS -fb /dev/fb1" ;; ++ "boundary_devices_neon_board") ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ DPI="100" ;; ++ "hoeft&wessel_hw90350") ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ DPI="100" ;; ++ "hoeft&wessel_hw90250") ++ ARGS="$ARGS -screen 240x320@90" ++ DPI="100" ;; ++ "mini2440") ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ DPI="100" ;; ++ "palm_treo_650") ++ DPI="181" ++ ARGS="$ARGS -screen 320x320 -hide-cursor" ;; ++ "glofiish_m800") ++ DPI="285" ++ ARGS="$ARGS -screen ${SCREEN_SIZE} -hide-cursor vt1" ;; ++ "freescale_mx21ads") ++ # That's what /proc/cpuinfo shows as hardware on the chumby ++ DPI="121" ++ ARGS="$ARGS -screen 320x240 -hide-cursor" ;; ++ ++ # this is to rotate X display properly, tested with display TX09D71VM1CCA ++ ronetix*pm9261* | ronetix*pm9263*) ++ ARGS="$ARGS -screen 240/54x320/81@90x16" ;; ++ # This is a fallback for PCs ++ "") ++ if [ -f $BINDIR/Xvesa ]; then ++ ARGS="$ARGS -mode 0x0114" ++ else ++ # It is a device we do not know about, in which case we force ++ # kdrive to use the current framebuffer geometry -- otherwise ++ # it will default to trying to achieve 1024x768 ++ if [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ fi ++ fi ++ esac ++fi ++ ++if [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS $MOUSE" ++fi +-- +1.6.3.3 + diff --git a/recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch b/recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch new file mode 100644 index 0000000000..1389867f8c --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0025-Makefile-move-modmaps-install-xserver-common.patch @@ -0,0 +1,32 @@ +From 309ba3de37f0374c72c4569186e381a3272c24bc Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz +Date: Mon, 31 Aug 2009 12:47:05 +0200 +Subject: [PATCH 1/1] Makefile: move modmaps, install xserver-common + +--- + Makefile | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- xserver-common-1.30.orig/Makefile ++++ xserver-common-1.30/Makefile +@@ -15,16 +15,18 @@ endif + all: + + install-program: + for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done + install -d $(DESTDIR)$(PREFIX)/bin ++ install -d $(DESTDIR)/etc/X11/xmodmap + install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh + install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults + install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit + install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver ++ install -m 644 X11/xserver-common $(DESTDIR)/etc/X11/xserver-common + install -m 755 X11/Xsession $(DESTDIR)/etc/X11/Xsession +- install -m 644 X11/xmodmap/*.xmodmap $(DESTDIR)/etc/X11/ +- install -m 644 X11/xmodmap-* $(DESTDIR)/etc/X11/ ++ install -m 644 X11/xmodmap/* $(DESTDIR)/etc/X11/xmodmap/ ++ install -m 644 X11/xmodmap-* $(DESTDIR)/etc/X11/xmodmap/ + + clean: + + include $(BUILD)/Makefile.dpkg_ipkg diff --git a/recipes/xserver-common/xserver-common-1.30/0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch b/recipes/xserver-common/xserver-common-1.30/0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch new file mode 100644 index 0000000000..a667c5f889 --- /dev/null +++ b/recipes/xserver-common/xserver-common-1.30/0026-98keymap-fixup-fixed-path-to-xmodmap-file.patch @@ -0,0 +1,25 @@ +From 884521a985831e9f6eb231bc8dd96613ca90c636 Mon Sep 17 00:00:00 2001 +From: Marcin Juszkiewicz +Date: Mon, 31 Aug 2009 12:53:29 +0200 +Subject: [PATCH 1/1] 98keymap-fixup: fixed path to xmodmap file + +--- + X11/Xinit.d/98keymap-fixup | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/X11/Xinit.d/98keymap-fixup b/X11/Xinit.d/98keymap-fixup +index fcc84d9..6895e24 100755 +--- a/X11/Xinit.d/98keymap-fixup ++++ b/X11/Xinit.d/98keymap-fixup +@@ -3,7 +3,7 @@ + # kdrive 1.4 and up have a heisenbug where it may take multiple tries to apply a modmap + iter=0 + while [ $(xmodmap -pke | awk '{if ($2 == 36) { if ($4 == "Return") { print "good" } else {print "bad" }}}') = "bad" ] ; do +- xmodmap - Date: Mon, 31 Aug 2009 15:40:53 +0200 Subject: evince: add 2.26.2 --- conf/checksums.ini | 4 ++++ recipes/evince/evince_2.26.2.bb | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 recipes/evince/evince_2.26.2.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index fd902aa1c0..a7ae7e45b4 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5914,6 +5914,10 @@ sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b md5=ad0e463ab1fe596fc52c03403a9b9f1e sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c +[http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/evince-2.26.2.tar.bz2] +md5=ed8b9fb5c5d6feafd19f0114b736c9ef +sha256=5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489 + [http://beagleboard.googlecode.com/files/evtest.c] md5=da26fda6df8835a7cb95182e1fabe912 sha256=ba2bdf6887eb0ef606402d51a2f4e68510d68dec5afd9f4d30d787950dece770 diff --git a/recipes/evince/evince_2.26.2.bb b/recipes/evince/evince_2.26.2.bb new file mode 100644 index 0000000000..a3b18395e1 --- /dev/null +++ b/recipes/evince/evince_2.26.2.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." +LICENSE = "GPL" +SECTION = "x11/office" +DEPENDS = "nautilus gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gconf libglade gnome-keyring " +RDEPENDS = "espgs gnome-icon-theme" + +inherit gnome pkgconfig gtk-icon-cache + +SRC_URI += " file://no-help-dir.patch;patch=1" + +EXTRA_OECONF = " \ + --enable-thumbnailer \ + --enable-nautilus \ + --disable-scrollkeeper \ + --enable-djvu \ + --enable-pixbuf \ + " + +FILES_${PN}-dbg += "${libdir}/evince/backends/.debug" + +PACKAGES =+ "evince-nautilus-extension" + +FILES_${PN}-dbg += "${libdir}/evince/*/*/.debug" +FILES_evince-nautilus-extension = "${libdir}/nautilus/*/*so" + + -- cgit v1.2.3 From 2698abdc5e668ad51b3a3843a6c99462bb2d61e8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 31 Aug 2009 16:25:48 +0200 Subject: epdfview: update to 0.1.7 --- conf/checksums.ini | 4 + recipes/epdfview/epdfview_0.1.6.bb | 17 - recipes/epdfview/epdfview_0.1.7.bb | 15 + recipes/epdfview/files/poppler8.diff | 10395 --------------------------------- 4 files changed, 19 insertions(+), 10412 deletions(-) delete mode 100644 recipes/epdfview/epdfview_0.1.6.bb create mode 100644 recipes/epdfview/epdfview_0.1.7.bb delete mode 100644 recipes/epdfview/files/poppler8.diff diff --git a/conf/checksums.ini b/conf/checksums.ini index a7ae7e45b4..32a0630e96 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5706,6 +5706,10 @@ sha256=d437b49f40f61e3ba5a3ed8edad783895dcbdfc3cd4cbe6ef37a56f7eea59573 md5=cce9edb41b4a8308e0ef0eea24b5a1ab sha256=61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f +[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.7.tar.bz2] +md5=1919bb19c16ef0a97d48b0a8303d3c7b +sha256=0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8 + [http://enlightenment.freedesktop.org/files/epeg-0.9.0.007.tar.gz] md5=383db51e46d13d986966459e4918d236 sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b diff --git a/recipes/epdfview/epdfview_0.1.6.bb b/recipes/epdfview/epdfview_0.1.6.bb deleted file mode 100644 index 3cf2e5f026..0000000000 --- a/recipes/epdfview/epdfview_0.1.6.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "A minimal PDF viewer based on gtk and poppler" -HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" -LICENSE = "GPLv2" -SECTION = "x11/applications" -DEPENDS = "poppler gtk+ cups" -PR = "r3" - -SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \ - file://poppler8.diff;patch=1 \ - " - -inherit autotools - -do_compile_append () { - sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop -} - diff --git a/recipes/epdfview/epdfview_0.1.7.bb b/recipes/epdfview/epdfview_0.1.7.bb new file mode 100644 index 0000000000..1cd59f7394 --- /dev/null +++ b/recipes/epdfview/epdfview_0.1.7.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A minimal PDF viewer based on gtk and poppler" +HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" +LICENSE = "GPLv2" +SECTION = "x11/applications" +DEPENDS = "poppler gtk+ cups" + +SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \ + " + +inherit autotools + +do_compile_append () { + sed -i 's|\$.*prefix./|/usr/|' data/epdfview.desktop +} + diff --git a/recipes/epdfview/files/poppler8.diff b/recipes/epdfview/files/poppler8.diff deleted file mode 100644 index e4c4790c6d..0000000000 --- a/recipes/epdfview/files/poppler8.diff +++ /dev/null @@ -1,10395 +0,0 @@ -diff -Nurd epdfview-0.1.6-svn/configure.ac epdfview/configure.ac ---- epdfview-0.1.6-svn/configure.ac 2008-07-13 12:57:47.593198000 +0200 -+++ epdfview/configure.ac 2008-07-13 12:55:55.143198000 +0200 -@@ -27,7 +27,7 @@ - - dnl Check for libraries - POPPLER_REQUIRED=0.5.0 --GLIB_REQUIRED=2.6.0 -+GLIB_REQUIRED=2.8.0 - GTK2_REQUIRED=2.6.0 - - PKG_CHECK_MODULES([GLIB], [gthread-2.0 >= $GLIB_REQUIRED]) -@@ -44,6 +44,14 @@ - if test "x$have_poppler_052" = "xyes"; then - AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.]) - fi -+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes]) -+if test "x$have_poppler_060" = "xyes"; then -+ AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.]) -+fi -+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes]) -+if test "x$have_poppler_080" = "xyes"; then -+ AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.]) -+fi - - EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes]) - AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes") -diff -Nurd epdfview-0.1.6-svn/data/epdfview-ui.xml epdfview/data/epdfview-ui.xml ---- epdfview-0.1.6-svn/data/epdfview-ui.xml 2008-07-13 12:57:47.093198000 +0200 -+++ epdfview/data/epdfview-ui.xml 2008-07-13 12:55:54.263198000 +0200 -@@ -11,6 +11,9 @@ - - - -+ -+ -+ - - - -@@ -38,7 +41,7 @@ - - - -- -+ - - - -@@ -49,7 +52,12 @@ - - - -+ -+ -+ - - - -+ -+ - -diff -Nurd epdfview-0.1.6-svn/m4/Makefile.am epdfview/m4/Makefile.am ---- epdfview-0.1.6-svn/m4/Makefile.am 2008-07-13 12:57:43.883198000 +0200 -+++ epdfview/m4/Makefile.am 2008-07-13 12:55:50.603198000 +0200 -@@ -1,2 +1,2 @@ - # Process this file with automake to produce a Makefile.in file. --EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4 -+EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 pkg.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 cppunit.m4 cups.m4 -diff -Nurd epdfview-0.1.6-svn/m4/pkg.m4 epdfview/m4/pkg.m4 ---- epdfview-0.1.6-svn/m4/pkg.m4 1970-01-01 01:00:00.000000000 +0100 -+++ epdfview/m4/pkg.m4 2008-07-13 12:55:50.593198000 +0200 -@@ -0,0 +1,157 @@ -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# -+# Copyright © 2004 Scott James Remnant . -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+ -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG -+ -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# -+# Similar to PKG_CHECK_MODULES, make sure that the first instance of -+# this or PKG_CHECK_MODULES is called, or make sure to call -+# PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_ifval([$2], [$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+ -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$PKG_CONFIG"; then -+ if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ else -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], -+ [pkg_failed=yes]) -+ fi -+else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ -+if test $pkg_failed = yes; then -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ -+ ifelse([$4], , [AC_MSG_ERROR(dnl -+[Package requirements ($2) were not met: -+ -+$$1_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+_PKG_TEXT -+])], -+ [AC_MSG_RESULT([no]) -+ $4]) -+elif test $pkg_failed = untried; then -+ ifelse([$4], , [AC_MSG_FAILURE(dnl -+[The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+_PKG_TEXT -+ -+To get pkg-config, see .])], -+ [$4]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ ifelse([$3], , :, [$3]) -+fi[]dnl -+])# PKG_CHECK_MODULES -diff -Nurd epdfview-0.1.6-svn/po/ca.po epdfview/po/ca.po ---- epdfview-0.1.6-svn/po/ca.po 2008-07-13 12:57:47.543198000 +0200 -+++ epdfview/po/ca.po 2008-07-13 12:55:55.073198000 +0200 -@@ -8,7 +8,7 @@ - msgstr "" - "Project-Id-Version: ePDFView 0.1.4\n" - "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" --"POT-Creation-Date: 2007-02-26 17:47+0100\n" -+"POT-Creation-Date: 2008-04-14 13:27+0200\n" - "PO-Revision-Date: 2006-04-12 21:17+0200\n" - "Last-Translator: Jordi Fita \n" - "Language-Team: Catalan \n" -@@ -76,11 +76,11 @@ - msgid "Unknown error (%d)." - msgstr "Error desconegut (%d)." - --#: src/main.cxx:38 -+#: src/main.cxx:59 - msgid "[FILE] - view PDF documents" - msgstr "[FITXER] - mostra documents PDF" - --#: src/main.cxx:51 src/MainPter.cxx:153 -+#: src/main.cxx:72 src/MainPter.cxx:153 - msgid "PDF Viewer" - msgstr "Viso de PDF" - -@@ -94,7 +94,7 @@ - msgid "Loading file %s..." - msgstr "Obrint fitxer %s..." - --#: src/MainPter.cxx:413 src/MainPter.cxx:886 -+#: src/MainPter.cxx:413 src/MainPter.cxx:892 - #, c-format - msgid "of %d" - msgstr "de %d" -@@ -104,39 +104,47 @@ - msgid "Saving document to %s..." - msgstr "Desant el document a %s..." - --#: src/MainPter.cxx:826 src/MainPter.cxx:865 -+#: src/MainPter.cxx:832 src/MainPter.cxx:871 - msgid "Error Loading File" - msgstr "Error carregant fitxer" - --#: src/MainPter.cxx:866 -+#: src/MainPter.cxx:872 - msgid "The password you have supplied is not a valid password for this file." - msgstr "La contrsenya que heu donat no és vàlida per aquest fitxer." - --#: src/MainPter.cxx:947 -+#: src/MainPter.cxx:953 - msgid "Error Saving File" - msgstr "Error desant fitxer" - --#: src/PagePter.cxx:292 -+#: src/PagePter.cxx:338 - msgid "Loading..." - msgstr "Carregant..." - --#: src/PrintPter.cxx:295 -+#: src/PrintPter.cxx:252 -+msgid "A4" -+msgstr "" -+ -+#: src/PrintPter.cxx:280 -+msgid "300 DPI" -+msgstr "" -+ -+#: src/PrintPter.cxx:308 - msgid "Grayscale" - msgstr "Escala de gris" - --#: src/PrintPter.cxx:395 -+#: src/PrintPter.cxx:409 - msgid "Idle" - msgstr "Desocupada" - --#: src/PrintPter.cxx:398 -+#: src/PrintPter.cxx:412 - msgid "Stopped" - msgstr "Parada" - --#: src/PrintPter.cxx:401 -+#: src/PrintPter.cxx:415 - msgid "Processing" - msgstr "Processada" - --#: src/PrintPter.cxx:404 -+#: src/PrintPter.cxx:418 - msgid "Unknown" - msgstr "Desconegut" - -@@ -153,246 +161,262 @@ - msgid "Find:" - msgstr "Cercar:" - --#: src/gtk/MainView.cxx:87 -+#: src/gtk/MainView.cxx:89 - msgid "_File" - msgstr "_Fitxer" - --#: src/gtk/MainView.cxx:88 -+#: src/gtk/MainView.cxx:90 - msgid "_Edit" - msgstr "_Edita" - --#: src/gtk/MainView.cxx:89 -+#: src/gtk/MainView.cxx:91 - msgid "_View" - msgstr "_Visualitza" - --#: src/gtk/MainView.cxx:90 -+#: src/gtk/MainView.cxx:92 - msgid "_Go" - msgstr "Vé_s" - --#: src/gtk/MainView.cxx:91 -+#: src/gtk/MainView.cxx:93 - msgid "_Help" - msgstr "A_juda" - --#: src/gtk/MainView.cxx:93 -+#: src/gtk/MainView.cxx:95 - msgid "_Open" - msgstr "_Obre" - --#: src/gtk/MainView.cxx:94 -+#: src/gtk/MainView.cxx:96 - msgid "Open a PDF document" - msgstr "Obre un document PDF" - --#: src/gtk/MainView.cxx:97 -+#: src/gtk/MainView.cxx:99 - msgid "_Reload" - msgstr "_Actualitza" - --#: src/gtk/MainView.cxx:98 -+#: src/gtk/MainView.cxx:100 - msgid "Reload the current document" - msgstr "Torna a obrir el document actual" - --#: src/gtk/MainView.cxx:101 -+#: src/gtk/MainView.cxx:103 - msgid "_Save a Copy..." - msgstr "_Desa una còpia..." - --#: src/gtk/MainView.cxx:102 -+#: src/gtk/MainView.cxx:104 - msgid "Save a copy of the current document" - msgstr "Desa una còpia del document actual" - --#: src/gtk/MainView.cxx:106 -+#: src/gtk/MainView.cxx:108 - msgid "_Print..." - msgstr "_Imprimeix" - --#: src/gtk/MainView.cxx:107 -+#: src/gtk/MainView.cxx:109 - msgid "Print the current document" - msgstr "Imprimeix el document actual" - --#: src/gtk/MainView.cxx:111 -+#: src/gtk/MainView.cxx:113 - msgid "_Close" - msgstr "_Tanca" - --#: src/gtk/MainView.cxx:112 -+#: src/gtk/MainView.cxx:114 - msgid "Close this window" - msgstr "Tanca aquesta finestra" - --#: src/gtk/MainView.cxx:115 -+#: src/gtk/MainView.cxx:117 - msgid "_Find" - msgstr "_Cerca" - --#: src/gtk/MainView.cxx:116 -+#: src/gtk/MainView.cxx:118 - msgid "Find a word in the document" - msgstr "Cerca una paraula en el document" - --#: src/gtk/MainView.cxx:119 -+#: src/gtk/MainView.cxx:121 - msgid "Preferences..." - msgstr "Preferències" - --#: src/gtk/MainView.cxx:120 -+#: src/gtk/MainView.cxx:122 - msgid "Change the application's preferences" - msgstr "Canvia les preferències de l'aplicació" - --#: src/gtk/MainView.cxx:123 -+#: src/gtk/MainView.cxx:125 - msgid "Zoom _In" - msgstr "_Amplia" - --#: src/gtk/MainView.cxx:124 -+#: src/gtk/MainView.cxx:126 - msgid "Enlarge the document" - msgstr "Amplia el document" - --#: src/gtk/MainView.cxx:127 -+#: src/gtk/MainView.cxx:129 - msgid "Zoom _Out" - msgstr "_Redueix" - --#: src/gtk/MainView.cxx:128 -+#: src/gtk/MainView.cxx:130 - msgid "Shrink the document" - msgstr "Redueix el document" - --#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 -+#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 - msgid "Rotate _Right" - msgstr "Gira a la _dreta" - --#: src/gtk/MainView.cxx:132 -+#: src/gtk/MainView.cxx:134 - msgid "Rotate the document 90 degrees clockwise" - msgstr "Gira el document 90 graus en el sentit de les agulles del rellotge" - --#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 -+#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 - msgid "Rotate _Left" - msgstr "Gira a l'es_querra" - --#: src/gtk/MainView.cxx:136 -+#: src/gtk/MainView.cxx:138 - msgid "Rotate the document 90 degrees counter-clockwise" - msgstr "" - "Gira el document 90 grays en el sentit contrari al de les agulles del " - "rellotge" - --#: src/gtk/MainView.cxx:139 -+#: src/gtk/MainView.cxx:141 - msgid "_First Page" - msgstr "_Primera pàgina" - --#: src/gtk/MainView.cxx:140 -+#: src/gtk/MainView.cxx:142 - msgid "Go to the first page" - msgstr "Va a la primera pàgina" - --#: src/gtk/MainView.cxx:143 -+#: src/gtk/MainView.cxx:145 - msgid "_Next Page" - msgstr "_Següent pàgina" - --#: src/gtk/MainView.cxx:144 -+#: src/gtk/MainView.cxx:146 - msgid "Go to the next page" - msgstr "Va a la següent pàgina" - --#: src/gtk/MainView.cxx:147 -+#: src/gtk/MainView.cxx:149 - msgid "_Previous Page" - msgstr "Pàgina _anterior" - --#: src/gtk/MainView.cxx:148 -+#: src/gtk/MainView.cxx:150 - msgid "Go to the previous page" - msgstr "Va a la pàgina anterior" - --#: src/gtk/MainView.cxx:151 -+#: src/gtk/MainView.cxx:153 - msgid "_Last Page" - msgstr "_Darreta pàgina" - --#: src/gtk/MainView.cxx:152 -+#: src/gtk/MainView.cxx:154 - msgid "Go to the last page" - msgstr "Va a la darrera pàgina" - --#: src/gtk/MainView.cxx:155 -+#: src/gtk/MainView.cxx:157 - msgid "_About" - msgstr "_Quant a" - --#: src/gtk/MainView.cxx:156 -+#: src/gtk/MainView.cxx:158 - msgid "Display application's credits" - msgstr "Mostra els crèdits de l'aplicació" - --#: src/gtk/MainView.cxx:166 -+#: src/gtk/MainView.cxx:175 - msgid "F_ull screen" - msgstr "" - --#: src/gtk/MainView.cxx:167 -+#: src/gtk/MainView.cxx:176 - msgid "Toggle full screen window" - msgstr "" - --#: src/gtk/MainView.cxx:170 -+#: src/gtk/MainView.cxx:179 - msgid "Show _Toolbar" - msgstr "Mostra la barra d'_eines" - --#: src/gtk/MainView.cxx:171 -+#: src/gtk/MainView.cxx:180 - msgid "Show or hide the toolbar" - msgstr "Mostra o amaga la barra d'eines" - --#: src/gtk/MainView.cxx:174 -+#: src/gtk/MainView.cxx:183 - msgid "Show _Statusbar" - msgstr "Mostra la barra d'e_stat" - --#: src/gtk/MainView.cxx:175 -+#: src/gtk/MainView.cxx:184 - msgid "Show or hide the statusbar" - msgstr "Mostra o amaga la barra d'estat" - --#: src/gtk/MainView.cxx:178 -+#: src/gtk/MainView.cxx:187 - msgid "Show I_ndex" - msgstr "Mostra l'í_ndex" - --#: src/gtk/MainView.cxx:179 -+#: src/gtk/MainView.cxx:188 - msgid "Show or hide the document's outline" - msgstr "Mostra o amaga l'índex del document" - --#: src/gtk/MainView.cxx:182 -+#: src/gtk/MainView.cxx:191 - msgid "Zoom to _Fit" - msgstr "En_caixa" - --#: src/gtk/MainView.cxx:183 -+#: src/gtk/MainView.cxx:192 - msgid "Make the current document fill the window" - msgstr "Fa que el document ompli la finestra" - --#: src/gtk/MainView.cxx:186 src/gtk/StockIcons.cxx:44 -+#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 - msgid "Zoom to _Width" - msgstr "Encaixa l'a_mplada" - --#: src/gtk/MainView.cxx:187 -+#: src/gtk/MainView.cxx:196 - msgid "Make the current document fill the window width" - msgstr "Fa que el document ompli l'amplada de la finestra" - --#: src/gtk/MainView.cxx:278 -+#: src/gtk/MainView.cxx:202 -+msgid "Scroll" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:203 -+msgid "Mouse scroll page" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:205 -+msgid "Select Text" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:206 -+msgid " Mouse select text" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:320 - msgid "Open PDF File" - msgstr "Obre un fitxer PDF" - --#: src/gtk/MainView.cxx:298 src/gtk/MainView.cxx:412 -+#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 - msgid "Portable Document Format (PDF) Files" - msgstr "Fitxers en Format de Document Portable (PDF)" - --#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 -+#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 - msgid "All Files" - msgstr "Tots els fitxers" - --#: src/gtk/MainView.cxx:362 -+#: src/gtk/MainView.cxx:404 - msgid "Password" - msgstr "Contrasenya" - --#: src/gtk/MainView.cxx:386 -+#: src/gtk/MainView.cxx:428 - msgid "Save PDF File" - msgstr "Desa un fitxer PDF" - --#: src/gtk/MainView.cxx:816 -+#: src/gtk/MainView.cxx:858 - msgid "Page" - msgstr "Pàgina" - --#: src/gtk/MainView.cxx:826 -+#: src/gtk/MainView.cxx:868 - msgid "of 0" - msgstr "de 0" - --#: src/gtk/MainView.cxx:879 -+#: src/gtk/MainView.cxx:921 - msgid "Index" - msgstr "Índex" - --#: src/gtk/MainView.cxx:946 src/gtk/MainView.cxx:956 -+#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 - #, c-format - msgid "Error building UI manager: %s\n" - msgstr "Error construïnt l'administrado de UI: %s\n" - --#: src/gtk/MainView.cxx:1056 -+#: src/gtk/MainView.cxx:1108 - msgid "A lightweight PDF viewer" - msgstr "Un visor de PDF lleuger" - --#: src/gtk/MainView.cxx:1059 -+#: src/gtk/MainView.cxx:1111 - msgid "" - "ePDFView is free software; you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" -@@ -404,7 +428,7 @@ - "publicada per la Free Software Foundation; ja sigui la versió 2 de la\n" - "Llicència o bé (si ho preferiu) qualsevol altra versió posterior.\n" - --#: src/gtk/MainView.cxx:1063 -+#: src/gtk/MainView.cxx:1115 - msgid "" - "ePDFView is distributes in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -@@ -416,7 +440,7 @@ - "COMERCIABILITAT o ADEQUACIÓ PER UN PROPÒSIT PARTICULAR. Vegeu la\n" - "Llicència Pública General GNU per obtenir-ne més detalls.\n" - --#: src/gtk/MainView.cxx:1067 -+#: src/gtk/MainView.cxx:1119 - msgid "" - "You should have received a copy of the GNU General Public License\n" - "along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" -@@ -426,11 +450,11 @@ - "juntament amb ePDFView; en cas contrari, escriviu a la Free Software\n" - "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" - --#: src/gtk/MainView.cxx:1076 -+#: src/gtk/MainView.cxx:1128 - msgid "ePDFView" - msgstr "ePDFView" - --#: src/gtk/MainView.cxx:1083 -+#: src/gtk/MainView.cxx:1135 - msgid "translator-credits" - msgstr "Jordi Fita " - -diff -Nurd epdfview-0.1.6-svn/po/cs.po epdfview/po/cs.po ---- epdfview-0.1.6-svn/po/cs.po 1970-01-01 01:00:00.000000000 +0100 -+++ epdfview/po/cs.po 2008-07-13 12:55:55.043198000 +0200 -@@ -0,0 +1,604 @@ -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR Emma's Software -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: ePDFView 0.1.6\n" -+"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" -+"POT-Creation-Date: 2008-04-14 13:27+0200\n" -+"PO-Revision-Date: 2008-04-09 14:06+0100\n" -+"Last-Translator: Dragonlord \n" -+"Language-Team: Czech \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=utf-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+ -+#: src/FindPter.cxx:187 -+msgid "No Results Found!" -+msgstr "Nebyly nalezeny žádné výsledky!" -+ -+#: src/FindPter.cxx:195 -+#, fuzzy, c-format -+msgid "Searching in page %d of %d..." -+msgstr "Hledám na straně od %d do %d..." -+ -+#: src/IDocument.cxx:82 -+msgid "No error." -+msgstr "Žádná chyba." -+ -+#: src/IDocument.cxx:85 -+msgid "File not found." -+msgstr "Soubor nenalezen." -+ -+#: src/IDocument.cxx:88 -+msgid "Couldn't read the page catalog." -+msgstr "Nelze načíst katalog stran." -+ -+#: src/IDocument.cxx:91 -+msgid "The PDF file is damaged and can't be repaired." -+msgstr "PDF soubor je poškozen a nelze jej opravit." -+ -+#: src/IDocument.cxx:94 -+msgid "The file is encrypted and the password was incorrect or not supplied." -+msgstr "Soubor je zakódovaný a heslo nebylo správně nebo vůbec vloženo." -+ -+#: src/IDocument.cxx:97 -+#, fuzzy -+msgid "Nonexistent or invalid highlight file." -+msgstr "Soubor zvýraznění neexistuje nebo je neplatný." -+ -+#: src/IDocument.cxx:100 -+msgid "Invalid printer." -+msgstr "Neplatná tiskárna." -+ -+#: src/IDocument.cxx:103 -+msgid "Error during printing." -+msgstr "Chyba během tisku." -+ -+#: src/IDocument.cxx:106 -+msgid "The PDF file doesn't allow that operation." -+msgstr "PDF soubor nedovoluje tuto operaci." -+ -+#: src/IDocument.cxx:109 -+msgid "Invalid page number." -+msgstr "Chybný počet stran." -+ -+#: src/IDocument.cxx:112 -+#, fuzzy -+msgid "File I/O error." -+msgstr "I/O chyba souboru." -+ -+#: src/IDocument.cxx:115 -+#, c-format -+msgid "Unknown error (%d)." -+msgstr "Neznámá chyba (%d)." -+ -+#: src/main.cxx:59 -+msgid "[FILE] - view PDF documents" -+msgstr "[SOUBOR] - prohlížet PDF dokumenty" -+ -+#: src/main.cxx:72 src/MainPter.cxx:153 -+msgid "PDF Viewer" -+msgstr "Prohlížeč PDF souborů" -+ -+#: src/MainPter.cxx:233 -+#, c-format -+msgid "Reloading file %s..." -+msgstr "Nahrávám znovu soubor %s..." -+ -+#: src/MainPter.cxx:237 -+#, c-format -+msgid "Loading file %s..." -+msgstr "Načítám soubor %s..." -+ -+#: src/MainPter.cxx:413 src/MainPter.cxx:892 -+#, fuzzy, c-format -+msgid "of %d" -+msgstr "z %d" -+ -+#: src/MainPter.cxx:588 -+#, c-format -+msgid "Saving document to %s..." -+msgstr "Ukládám soubor do %s..." -+ -+#: src/MainPter.cxx:832 src/MainPter.cxx:871 -+msgid "Error Loading File" -+msgstr "Chyba načítání souboru" -+ -+#: src/MainPter.cxx:872 -+msgid "The password you have supplied is not a valid password for this file." -+msgstr "Vložené heslo není platné pro tento soubor." -+ -+#: src/MainPter.cxx:953 -+msgid "Error Saving File" -+msgstr "Chyba ukládání souboru" -+ -+#: src/PagePter.cxx:338 -+msgid "Loading..." -+msgstr "Načítám..." -+ -+#: src/PrintPter.cxx:252 -+msgid "A4" -+msgstr "" -+ -+#: src/PrintPter.cxx:280 -+msgid "300 DPI" -+msgstr "" -+ -+#: src/PrintPter.cxx:308 -+msgid "Grayscale" -+msgstr "Odstíny šedi" -+ -+#: src/PrintPter.cxx:409 -+msgid "Idle" -+msgstr "Zahálející" -+ -+#: src/PrintPter.cxx:412 -+msgid "Stopped" -+msgstr "Zastavený" -+ -+#: src/PrintPter.cxx:415 -+msgid "Processing" -+msgstr "Zpracovávám" -+ -+#: src/PrintPter.cxx:418 -+msgid "Unknown" -+msgstr "Neznámý" -+ -+#: src/PDFDocument.cxx:272 -+#, c-format -+msgid "" -+"Failed to load document '%s'.\n" -+"%s\n" -+msgstr "" -+"Chyba načítání dokumentu '%s'.\n" -+"%s\n" -+ -+#: src/gtk/FindView.cxx:51 -+msgid "Find:" -+msgstr "Hledat:" -+ -+#: src/gtk/MainView.cxx:89 -+msgid "_File" -+msgstr "_Soubor" -+ -+#: src/gtk/MainView.cxx:90 -+msgid "_Edit" -+msgstr "_Editovat" -+ -+#: src/gtk/MainView.cxx:91 -+msgid "_View" -+msgstr "_Pohled" -+ -+#: src/gtk/MainView.cxx:92 -+msgid "_Go" -+msgstr "_Jít na" -+ -+#: src/gtk/MainView.cxx:93 -+msgid "_Help" -+msgstr "_Nápověda" -+ -+#: src/gtk/MainView.cxx:95 -+msgid "_Open" -+msgstr "_Otevřít" -+ -+#: src/gtk/MainView.cxx:96 -+msgid "Open a PDF document" -+msgstr "Otevřít PDF dokument" -+ -+#: src/gtk/MainView.cxx:99 -+#, fuzzy -+msgid "_Reload" -+msgstr "_Aktualizovat" -+ -+#: src/gtk/MainView.cxx:100 -+msgid "Reload the current document" -+msgstr "Aktualizuje současný dokument" -+ -+#: src/gtk/MainView.cxx:103 -+msgid "_Save a Copy..." -+msgstr "_Uložit jako..." -+ -+#: src/gtk/MainView.cxx:104 -+msgid "Save a copy of the current document" -+msgstr "Uloží kopii současného dokumentu" -+ -+#: src/gtk/MainView.cxx:108 -+msgid "_Print..." -+msgstr "_Tisk..." -+ -+#: src/gtk/MainView.cxx:109 -+msgid "Print the current document" -+msgstr "Vytiskne současný dokument" -+ -+#: src/gtk/MainView.cxx:113 -+msgid "_Close" -+msgstr "_Zavřít" -+ -+#: src/gtk/MainView.cxx:114 -+msgid "Close this window" -+msgstr "Zavře toto okno" -+ -+#: src/gtk/MainView.cxx:117 -+msgid "_Find" -+msgstr "_Hledat" -+ -+#: src/gtk/MainView.cxx:118 -+msgid "Find a word in the document" -+msgstr "Hledání zadaných výrazů v dokumentu" -+ -+#: src/gtk/MainView.cxx:121 -+msgid "Preferences..." -+msgstr "Nastavení..." -+ -+#: src/gtk/MainView.cxx:122 -+msgid "Change the application's preferences" -+msgstr "Změny v nastavení aplikace" -+ -+#: src/gtk/MainView.cxx:125 -+msgid "Zoom _In" -+msgstr "Z_většit" -+ -+#: src/gtk/MainView.cxx:126 -+msgid "Enlarge the document" -+msgstr "Zvětší náhled dokumentu" -+ -+#: src/gtk/MainView.cxx:129 -+msgid "Zoom _Out" -+msgstr "Z_menšit" -+ -+#: src/gtk/MainView.cxx:130 -+msgid "Shrink the document" -+msgstr "Zmenší náhled dokumentu" -+ -+#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 -+msgid "Rotate _Right" -+msgstr "Otočit vp_ravo" -+ -+#: src/gtk/MainView.cxx:134 -+msgid "Rotate the document 90 degrees clockwise" -+msgstr "Otočí dokument o 90 stupňů po směru hodinových ručiček" -+ -+#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 -+msgid "Rotate _Left" -+msgstr "Otočit v_levo" -+ -+#: src/gtk/MainView.cxx:138 -+msgid "Rotate the document 90 degrees counter-clockwise" -+msgstr "Otočí dokument o 90 stupňů proti směru hodinových ručiček" -+ -+#: src/gtk/MainView.cxx:141 -+msgid "_First Page" -+msgstr "_První stranu" -+ -+#: src/gtk/MainView.cxx:142 -+msgid "Go to the first page" -+msgstr "Přeskočit na první stranu" -+ -+#: src/gtk/MainView.cxx:145 -+msgid "_Next Page" -+msgstr "_Další stranu" -+ -+#: src/gtk/MainView.cxx:146 -+msgid "Go to the next page" -+msgstr "Přejde na další stranu" -+ -+#: src/gtk/MainView.cxx:149 -+msgid "_Previous Page" -+msgstr "Př_edchozí stranu" -+ -+#: src/gtk/MainView.cxx:150 -+msgid "Go to the previous page" -+msgstr "Přejde na předchozí stranu" -+ -+#: src/gtk/MainView.cxx:153 -+msgid "_Last Page" -+msgstr "Po_slední stranu" -+ -+#: src/gtk/MainView.cxx:154 -+msgid "Go to the last page" -+msgstr "Přeskočí na poslední stranu" -+ -+#: src/gtk/MainView.cxx:157 -+msgid "_About" -+msgstr "_O programu" -+ -+#: src/gtk/MainView.cxx:158 -+msgid "Display application's credits" -+msgstr "Zobrazí informace o aplikaci" -+ -+#: src/gtk/MainView.cxx:175 -+msgid "F_ull screen" -+msgstr "Na celou obrazovku" -+ -+#: src/gtk/MainView.cxx:176 -+msgid "Toggle full screen window" -+msgstr "Přepne použití celé obrazovky" -+ -+#: src/gtk/MainView.cxx:179 -+msgid "Show _Toolbar" -+msgstr "Zobrazit panel i_kon" -+ -+#: src/gtk/MainView.cxx:180 -+msgid "Show or hide the toolbar" -+msgstr "Zobrazí nebo skryje panel s ikonami" -+ -+#: src/gtk/MainView.cxx:183 -+msgid "Show _Statusbar" -+msgstr "Zobrazit _informační panel" -+ -+#: src/gtk/MainView.cxx:184 -+msgid "Show or hide the statusbar" -+msgstr "Zobrazí nebo skryje spodní informační panel" -+ -+#: src/gtk/MainView.cxx:187 -+msgid "Show I_ndex" -+msgstr "Zobrazit os_novu" -+ -+#: src/gtk/MainView.cxx:188 -+msgid "Show or hide the document's outline" -+msgstr "Zobrazí nebo skryje osnovu dokumentu" -+ -+#: src/gtk/MainView.cxx:191 -+msgid "Zoom to _Fit" -+msgstr "Přizpůsobit _do okna" -+ -+#: src/gtk/MainView.cxx:192 -+msgid "Make the current document fill the window" -+msgstr "Přizpůsobí zvětšení dokumentu velikosti okna" -+ -+#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 -+msgid "Zoom to _Width" -+msgstr "Přizpůsobit šíř_ce okna" -+ -+#: src/gtk/MainView.cxx:196 -+msgid "Make the current document fill the window width" -+msgstr "Přizpůsobí zvětšení dokumentu šířce okna" -+ -+#: src/gtk/MainView.cxx:202 -+msgid "Scroll" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:203 -+msgid "Mouse scroll page" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:205 -+msgid "Select Text" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:206 -+msgid " Mouse select text" -+msgstr "" -+ -+#: src/gtk/MainView.cxx:320 -+msgid "Open PDF File" -+msgstr "Otevřít PDF soubor" -+ -+#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 -+msgid "Portable Document Format (PDF) Files" -+msgstr "Soubory PDF (Portable Document Format)" -+ -+#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 -+msgid "All Files" -+msgstr "Všechny soubory" -+ -+#: src/gtk/MainView.cxx:404 -+msgid "Password" -+msgstr "Heslo" -+ -+#: src/gtk/MainView.cxx:428 -+msgid "Save PDF File" -+msgstr "Uložit PDF soubor" -+ -+#: src/gtk/MainView.cxx:858 -+msgid "Page" -+msgstr "Strana" -+ -+#: src/gtk/MainView.cxx:868 -+#, fuzzy -+msgid "of 0" -+msgstr "z 0" -+ -+#: src/gtk/MainView.cxx:921 -+#, fuzzy -+msgid "Index" -+msgstr "Osnova" -+ -+#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 -+#, fuzzy, c-format -+msgid "Error building UI manager: %s\n" -+msgstr "Chyba sestavení UI manažera: %s\n" -+ -+#: src/gtk/MainView.cxx:1108 -+msgid "A lightweight PDF viewer" -+msgstr "Nenáročný prohlížeč PDF souborů" -+ -+#: src/gtk/MainView.cxx:1111 -+msgid "" -+"ePDFView is free software; you can redistribute it and/or modify\n" -+"it under the terms of the GNU General Public License as published by\n" -+"the Free Software Foundation; either version 2 of the License, or\n" -+"(at your option) any later version.\n" -+msgstr "" -+"ePDFView je svobodný software; může být distribuován a/nebo modifikován\n" -+"za podmínek GNU všeobecné veřejné licence podle znění publikovaného\n" -+"Free Software Foundation; buď ve verzi 2 této licence, nebo\n" -+"(podle vlastního uvážení) jakékoliv novější verze.\n" -+ -+#: src/gtk/MainView.cxx:1115 -+msgid "" -+"ePDFView is distributes in the hope that it will be useful,\n" -+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -+"GNU General Public License for more details.\n" -+msgstr "" -+"ePDFView je distribuován s úmyslem být užitečný,\n" -+"ovšem BEZ JAKÉKOLI ZÁRUKY; stejně tak bez zahrnuté záruky\n" -+"PRODEJNOSTI nebo VHODNOSTI NA URČITÝ ÚKOL. Podrobnosti\n" -+"lze nalézt v GNU všeobecné veřejné licenci.\n" -+ -+#: src/gtk/MainView.cxx:1119 -+msgid "" -+"You should have received a copy of the GNU General Public License\n" -+"along with ePDFView; if not, write to the Free Software Foundation,Inc.,\n" -+"59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -+msgstr "" -+"S ePDFView musí být dodávána kopie GNU všeobecné veřejné licence;\n" -+"pokud tomu tak není, obraťte se na Free Software Foundation,Inc.,\n" -+"59 temple Place, Suite 330, Boston, MA 02111-1307 USA\n" -+ -+#: src/gtk/MainView.cxx:1128 -+msgid "ePDFView" -+msgstr "ePDFView" -+ -+#: src/gtk/MainView.cxx:1135 -+#, fuzzy -+msgid "translator-credits" -+msgstr "Dragonlord " -+ -+#: src/gtk/PreferencesView.cxx:32 -+msgid "Preferences" -+msgstr "Konfigurace" -+ -+#: src/gtk/PreferencesView.cxx:46 -+msgid "External Commands" -+msgstr "Externí příkazy" -+ -+#: src/gtk/PreferencesView.cxx:105 -+msgid "Web _Browser:" -+msgstr "We_bový prohlížeč:" -+ -+#: src/gtk/PreferencesView.cxx:118 -+#, c-format -+msgid "Note: %s will be replaced by the URI." -+msgstr "Poznámka: %s bude nahrazeno URI." -+ -+#: src/gtk/PrintView.cxx:51 -+msgid "Print" -+msgstr "Tisk" -+ -+#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 -+msgid "Printer" -+msgstr "Tiskárna" -+ -+#: src/gtk/PrintView.cxx:74 -+#, fuzzy -+msgid "Job" -+msgstr "Úkol" -+ -+#: src/gtk/PrintView.cxx:79 -+msgid "Paper" -+msgstr "Papír" -+ -+#: src/gtk/PrintView.cxx:359 -+msgid "Print Range" -+msgstr "Tisk oblasti" -+ -+#: src/gtk/PrintView.cxx:377 -+msgid "_All pages" -+msgstr "Vš_e" -+ -+#: src/gtk/PrintView.cxx:380 -+msgid "_Range:" -+msgstr "Výbě_r:" -+ -+#: src/gtk/PrintView.cxx:392 -+msgid "Page Set" -+msgstr "Sada stran" -+ -+#: src/gtk/PrintView.cxx:408 -+msgid "A_ll pages" -+msgstr "Všech_ny" -+ -+#: src/gtk/PrintView.cxx:412 -+msgid "O_dd pages" -+msgstr "L_iché strany" -+ -+#: src/gtk/PrintView.cxx:416 -+msgid "_Even pages" -+msgstr "S_udé strany" -+ -+#: src/gtk/PrintView.cxx:420 -+msgid "Copies" -+msgstr "Kopie" -+ -+#: src/gtk/PrintView.cxx:437 -+msgid "N_umber of copies:" -+msgstr "_Počet kopií:" -+ -+#: src/gtk/PrintView.cxx:444 -+msgid "C_ollate" -+msgstr "Seřadi_t" -+ -+#: src/gtk/PrintView.cxx:465 -+msgid "Paper and Layout" -+msgstr "Papír a rozmístění" -+ -+#: src/gtk/PrintView.cxx:482 -+msgid "Paper _Size:" -+msgstr "_Velikost papíru:" -+ -+#: src/gtk/PrintView.cxx:508 -+msgid "Page _orientation:" -+msgstr "_Orientace strany:" -+ -+#: src/gtk/PrintView.cxx:539 -+msgid "_Layout:" -+msgstr "Ro_zmístění:" -+ -+#: src/gtk/PrintView.cxx:568 -+msgid "Output" -+msgstr "Výstup" -+ -+#: src/gtk/PrintView.cxx:585 -+msgid "_Mode:" -+msgstr "_Mód:" -+ -+#: src/gtk/PrintView.cxx:613 -+msgid "_Resolution:" -+msgstr "_Rozlišení:" -+ -+#: src/gtk/PrintView.cxx:668 -+msgid "State" -+msgstr "Stav" -+ -+#: src/gtk/PrintView.cxx:677 -+#, fuzzy -+msgid "Jobs" -+msgstr "Úkoly" -+ -+#: src/gtk/PrintView.cxx:686 -+msgid "Location" -+msgstr "Umístění" -+ -+#: src/gtk/PrintView.cxx:717 -+msgid "Plain" -+msgstr "Jednoduché" -+ -+#: src/gtk/PrintView.cxx:723 -+msgid "2 pages in 1" -+msgstr "2 strany na list" -+ -+#: src/gtk/PrintView.cxx:729 -+msgid "4 pages in 1" -+msgstr "4 strany na list" -+ -+#: src/gtk/PrintView.cxx:744 -+msgid "Portrait" -+msgstr "" -+ -+#: src/gtk/PrintView.cxx:750 -+msgid "Landscape" -+msgstr "" -+ -+#: src/gtk/StockIcons.cxx:40 -+msgid "Find _Next" -+msgstr "Najít _další" -+ -+#: src/gtk/StockIcons.cxx:41 -+msgid "Find _Previous" -+msgstr "Najít _předchozí" -diff -Nurd epdfview-0.1.6-svn/po/de.po epdfview/po/de.po ---- epdfview-0.1.6-svn/po/de.po 2008-07-13 12:57:47.543198000 +0200 -+++ epdfview/po/de.po 2008-07-13 12:55:55.083198000 +0200 -@@ -2,15 +2,16 @@ - # Copyright (C) 2006 Emma's Software - # This file is distributed under the same license as the epdfview package. - # Moritz Heiber , 2006. -+# Enrico Tröger , 2007. - # - msgid "" - msgstr "" --"Project-Id-Version: ePDFView 0.1.4\n" -+"Project-Id-Version: ePDFView 0.1.6\n" - "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" --"POT-Creation-Date: 2007-02-26 1