diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-07-14 11:20:50 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-07-14 11:20:50 +0000 |
| commit | 4fa9f2080e8d8fd8220976415b2bd7bde3ccc620 (patch) | |
| tree | ee97d97d541aa249e9c3a839b7418af7053fec26 /packages | |
| parent | 4afec386e30fba9df25eaa0457c1e3c20f5ca974 (diff) | |
| parent | 31775c318bdd3b8f62d281aa84e7ad166b78aa79 (diff) | |
merge of 'd39fcbb20e8ed63ddeb563f8bcffc41b528163cd'
and 'dff33d19f55f5e1289901a814a5e358b4a4a9981'
Diffstat (limited to 'packages')
83 files changed, 11934 insertions, 222 deletions
diff --git a/packages/abiword/abiword-plugins_2.6.4.bb b/packages/abiword/abiword-plugins_2.6.4.bb new file mode 100644 index 0000000000..94baeaf58e --- /dev/null +++ b/packages/abiword/abiword-plugins_2.6.4.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "AbiWord is a free word processing program similar to Microsoft(r) Word" +HOMEPAGE = "http://www.abiword.org" +SECTION = "x11/office" +LICENSE = "GPLv2" +DEPENDS = "asio boost loudmouth libwpd librsvg goffice poppler libglade" +RDEPENDS = "abiword" + +SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz \ + http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ +# file://abiword-cxx-for-ld-fix.patch;patch=1 \ + " + +DEFAULT_PREFERENCE = "2" + +inherit autotools + +PARALLEL_MAKE="" + +#export LDFLAGS += " -lstdc++ " + +EXTRA_OECONF = " --enable-shared=yes \ + --enable-static \ + --without-libwmf \ + --without-inter7eps \ + --with-abiword=${WORKDIR}/abiword-${PV} \ + --with-boost=${STAGING_DIR_HOST} \ + --with-boost-thread=boost_thread-mt \ + " + +PACKAGES_DYNAMIC = "abiword-plugin-*" + +python populate_packages_prepend () { + abiword_libdir = bb.data.expand('${libdir}/abiword-2.6/plugins', d) + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='') + do_split_packages(d, abiword_libdir, '^libAbi(.*)\.la$', 'abiword-plugin-%s-dev', 'Abiword plugin for %s', extra_depends='') +} + + +PACKAGES =+ "abiword-plugin-collab-glade" + +FILES_abiword-plugin-collab-glade += "${datadir}" +RDEPENDS_abiword-plugin-collab-glade = "abiword-plugin-collab" + +FILES_${PN}-dbg += "${libdir}/abiword-2.6/plugins/.debug" + diff --git a/packages/abiword/abiword_2.6.4.bb b/packages/abiword/abiword_2.6.4.bb new file mode 100644 index 0000000000..fe6399226f --- /dev/null +++ b/packages/abiword/abiword_2.6.4.bb @@ -0,0 +1,10 @@ +require abiword-2.5.inc + +PR = "r1" + +RCONFLICTS = "abiword-embedded" + +FILES_${PN} += "${datadir}/mime-info" +FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" +FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" + diff --git a/packages/angstrom/angstrom-led-config.bb b/packages/angstrom/angstrom-led-config.bb index a0a29cbb3c..83f5a1211b 100644 --- a/packages/angstrom/angstrom-led-config.bb +++ b/packages/angstrom/angstrom-led-config.bb @@ -1,11 +1,12 @@ DESCRIPTION = "Configuration files for runtime LED configuration" #PV = "${DISTRO_VERSION}" -PR = "r0" +PR = "r1" PACKAGE_ARCH = "${MACHINE_ARCH}" inherit update-rc.d INITSCRIPT_NAME = "led-config" +INITSCRIPT_PARAMS = "defaults 05" SRC_URI = "file://led-config \ file://leds \ diff --git a/packages/asio/.mtn2git_empty b/packages/asio/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/asio/.mtn2git_empty diff --git a/packages/asio/asio_1.1.1.bb b/packages/asio/asio_1.1.1.bb new file mode 100644 index 0000000000..89b363dd8a --- /dev/null +++ b/packages/asio/asio_1.1.1.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Asio" +HOMEPAGE = "http://asio.sf.net/" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "Boost Software License" + +SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${PN}-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} + diff --git a/packages/bind/bind-9.3.5-P1/.mtn2git_empty b/packages/bind/bind-9.3.5-P1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bind/bind-9.3.5-P1/.mtn2git_empty diff --git a/packages/bind/bind-9.3.5-P1/conf.patch b/packages/bind/bind-9.3.5-P1/conf.patch new file mode 100644 index 0000000000..202c5319e1 --- /dev/null +++ b/packages/bind/bind-9.3.5-P1/conf.patch @@ -0,0 +1,301 @@ +diff -urN bind-9.3.1.orig/conf/db.0 bind-9.3.1/conf/db.0 +--- bind-9.3.1.orig/conf/db.0 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.0 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,12 @@ ++; ++; BIND reverse data file for broadcast zone ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. +diff -urN bind-9.3.1.orig/conf/db.127 bind-9.3.1/conf/db.127 +--- bind-9.3.1.orig/conf/db.127 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.127 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,13 @@ ++; ++; BIND reverse data file for local loopback interface ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. ++1.0.0 IN PTR localhost. +diff -urN bind-9.3.1.orig/conf/db.empty bind-9.3.1/conf/db.empty +--- bind-9.3.1.orig/conf/db.empty 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.empty 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,14 @@ ++; BIND reverse data file for empty rfc1918 zone ++; ++; DO NOT EDIT THIS FILE - it is used for multiple zones. ++; Instead, copy it, edit named.conf, and use that copy. ++; ++$TTL 86400 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 86400 ) ; Negative Cache TTL ++; ++@ IN NS localhost. +diff -urN bind-9.3.1.orig/conf/db.local bind-9.3.1/conf/db.local +--- bind-9.3.1.orig/conf/db.local 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.local 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,13 @@ ++; ++; BIND data file for local loopback interface ++; ++$TTL 604800 ++@ IN SOA localhost. root.localhost. ( ++ 1 ; Serial ++ 604800 ; Refresh ++ 86400 ; Retry ++ 2419200 ; Expire ++ 604800 ) ; Negative Cache TTL ++; ++@ IN NS localhost. ++@ IN A 127.0.0.1 +diff -urN bind-9.3.1.orig/conf/db.root bind-9.3.1/conf/db.root +--- bind-9.3.1.orig/conf/db.root 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/db.root 2005-07-10 22:14:00.000000000 +0200 +@@ -0,0 +1,45 @@ ++ ++; <<>> DiG 9.2.3 <<>> ns . @a.root-servers.net. ++;; global options: printcmd ++;; Got answer: ++;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 18944 ++;; flags: qr aa rd; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 13 ++ ++;; QUESTION SECTION: ++;. IN NS ++ ++;; ANSWER SECTION: ++. 518400 IN NS A.ROOT-SERVERS.NET. ++. 518400 IN NS B.ROOT-SERVERS.NET. ++. 518400 IN NS C.ROOT-SERVERS.NET. ++. 518400 IN NS D.ROOT-SERVERS.NET. ++. 518400 IN NS E.ROOT-SERVERS.NET. ++. 518400 IN NS F.ROOT-SERVERS.NET. ++. 518400 IN NS G.ROOT-SERVERS.NET. ++. 518400 IN NS H.ROOT-SERVERS.NET. ++. 518400 IN NS I.ROOT-SERVERS.NET. ++. 518400 IN NS J.ROOT-SERVERS.NET. ++. 518400 IN NS K.ROOT-SERVERS.NET. ++. 518400 IN NS L.ROOT-SERVERS.NET. ++. 518400 IN NS M.ROOT-SERVERS.NET. ++ ++;; ADDITIONAL SECTION: ++A.ROOT-SERVERS.NET. 3600000 IN A 198.41.0.4 ++B.ROOT-SERVERS.NET. 3600000 IN A 192.228.79.201 ++C.ROOT-SERVERS.NET. 3600000 IN A 192.33.4.12 ++D.ROOT-SERVERS.NET. 3600000 IN A 128.8.10.90 ++E.ROOT-SERVERS.NET. 3600000 IN A 192.203.230.10 ++F.ROOT-SERVERS.NET. 3600000 IN A 192.5.5.241 ++G.ROOT-SERVERS.NET. 3600000 IN A 192.112.36.4 ++H.ROOT-SERVERS.NET. 3600000 IN A 128.63.2.53 ++I.ROOT-SERVERS.NET. 3600000 IN A 192.36.148.17 ++J.ROOT-SERVERS.NET. 3600000 IN A 192.58.128.30 ++K.ROOT-SERVERS.NET. 3600000 IN A 193.0.14.129 ++L.ROOT-SERVERS.NET. 3600000 IN A 198.32.64.12 ++M.ROOT-SERVERS.NET. 3600000 IN A 202.12.27.33 ++ ++;; Query time: 81 msec ++;; SERVER: 198.41.0.4#53(a.root-servers.net.) ++;; WHEN: Sun Feb 1 11:27:14 2004 ++;; MSG SIZE rcvd: 436 ++ +diff -urN bind-9.3.1.orig/conf/named.conf bind-9.3.1/conf/named.conf +--- bind-9.3.1.orig/conf/named.conf 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/named.conf 2005-07-10 22:33:46.000000000 +0200 +@@ -0,0 +1,49 @@ ++// This is the primary configuration file for the BIND DNS server named. ++// ++// If you are just adding zones, please do that in /etc/bind/named.conf.local ++ ++include "/etc/bind/named.conf.options"; ++ ++// prime the server with knowledge of the root servers ++zone "." { ++ type hint; ++ file "/etc/bind/db.root"; ++}; ++ ++// be authoritative for the localhost forward and reverse zones, and for ++// broadcast zones as per RFC 1912 ++ ++zone "localhost" { ++ type master; ++ file "/etc/bind/db.local"; ++}; ++ ++zone "127.in-addr.arpa" { ++ type master; ++ file "/etc/bind/db.127"; ++}; ++ ++zone "0.in-addr.arpa" { ++ type master; ++ file "/etc/bind/db.0"; ++}; ++ ++zone "255.in-addr.arpa" { ++ type master; ++ file "/etc/bind/db.255"; ++}; ++ ++// zone "com" { type delegation-only; }; ++// zone "net" { type delegation-only; }; ++ ++// From the release notes: ++// Because many of our users are uncomfortable receiving undelegated answers ++// from root or top level domains, other than a few for whom that behaviour ++// has been trusted and expected for quite some length of time, we have now ++// introduced the "root-delegations-only" feature which applies delegation-only ++// logic to all top level domains, and to the root domain. An exception list ++// should be specified, including "MUSEUM" and "DE", and any other top level ++// domains from whom undelegated responses are expected and trusted. ++// root-delegation-only exclude { "DE"; "MUSEUM"; }; ++ ++include "/etc/bind/named.conf.local"; +diff -urN bind-9.3.1.orig/conf/named.conf.local bind-9.3.1/conf/named.conf.local +--- bind-9.3.1.orig/conf/named.conf.local 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/named.conf.local 2005-07-10 22:14:06.000000000 +0200 +@@ -0,0 +1,8 @@ ++// ++// Do any local configuration here ++// ++ ++// Consider adding the 1918 zones here, if they are not used in your ++// organization ++//include "/etc/bind/zones.rfc1918"; ++ +diff -urN bind-9.3.1.orig/conf/named.conf.options bind-9.3.1/conf/named.conf.options +--- bind-9.3.1.orig/conf/named.conf.options 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/named.conf.options 2005-07-10 22:14:06.000000000 +0200 +@@ -0,0 +1,24 @@ ++options { ++ directory "/var/cache/bind"; ++ ++ // If there is a firewall between you and nameservers you want ++ // to talk to, you might need to uncomment the query-source ++ // directive below. Previous versions of BIND always asked ++ // questions using port 53, but BIND 8.1 and later use an unprivileged ++ // port by default. ++ ++ // query-source address * port 53; ++ ++ // If your ISP provided one or more IP addresses for stable ++ // nameservers, you probably want to use them as forwarders. ++ // Uncomment the following block, and insert the addresses replacing ++ // the all-0's placeholder. ++ ++ // forwarders { ++ // 0.0.0.0; ++ // }; ++ ++ auth-nxdomain no; # conform to RFC1035 ++ ++}; ++ +diff -urN bind-9.3.1.orig/conf/zones.rfc1918 bind-9.3.1/conf/zones.rfc1918 +--- bind-9.3.1.orig/conf/zones.rfc1918 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/conf/zones.rfc1918 2005-07-10 22:14:10.000000000 +0200 +@@ -0,0 +1,20 @@ ++zone "10.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++ ++zone "16.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "17.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "18.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "19.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "20.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "21.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "22.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "23.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "24.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "25.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "26.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "27.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "28.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "29.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "30.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++zone "31.172.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; ++ ++zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; }; +diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d +--- bind-9.3.1.orig/init.d 1970-01-01 01:00:00.000000000 +0100 ++++ bind-9.3.1/init.d 2005-07-10 23:09:58.000000000 +0200 +@@ -0,0 +1,63 @@ ++#!/bin/sh ++ ++PATH=/sbin:/bin:/usr/sbin:/usr/bin ++ ++# for a chrooted server: "-u bind -t /var/lib/named" ++# Don't modify this line, change or create /etc/default/bind9. ++OPTIONS="" ++ ++test -f /etc/default/bind9 && . /etc/default/bind9 ++ ++test -x /usr/sbin/rndc || exit 0 ++ ++case "$1" in ++ start) ++ echo -n "Starting domain name service: named" ++ ++ modprobe capability >/dev/null 2>&1 || true ++ ++ # dirs under /var/run can go away on reboots. ++ mkdir -p /var/run/bind/run ++ mkdir -p /var/cache/bind ++ chmod 775 /var/run/bind/run ++ chown root:bind /var/run/bind/run >/dev/null 2>&1 || true ++ ++ if [ ! -x /usr/sbin/named ]; then ++ echo "named binary missing - not starting" ++ exit 1 ++ fi ++ if start-stop-daemon --start --quiet --exec /usr/sbin/named \ ++ --pidfile /var/run/bind/run/named.pid -- $OPTIONS; then ++ if [ -x /sbin/resolvconf ] ; then ++ echo "nameserver 127.0.0.1" | /sbin/resolvconf -a lo ++ fi ++ fi ++ echo "." ++ ;; ++ ++ stop) ++ echo -n "Stopping domain name service: named" ++ if [ -x /sbin/resolvconf ]; then ++ /sbin/resolvconf -d lo ++ fi ++ /usr/sbin/rndc stop ++ echo "." ++ ;; ++ ++ reload) ++ /usr/sbin/rndc reload ++ ;; ++ ++ restart|force-reload) ++ $0 stop ++ sleep 2 ++ $0 start ++ ;; ++ ++ *) ++ echo "Usage: /etc/init.d/bind {start|stop|reload|restart|force-reload}" >&2 ++ exit 1 ++ ;; ++esac ++ ++exit 0 diff --git a/packages/bind/bind-9.3.5-P1/configure.in.patch b/packages/bind/bind-9.3.5-P1/configure.in.patch new file mode 100644 index 0000000000..78ae9271c6 --- /dev/null +++ b/packages/bind/bind-9.3.5-P1/configure.in.patch @@ -0,0 +1,14 @@ +--- bind-9.3.1/configure.in.orig 2005-07-10 21:21:18.000000000 +0200 ++++ bind-9.3.1/configure.in 2005-07-10 21:24:31.000000000 +0200 +@@ -1414,7 +1414,10 @@ + [AC_MSG_RESULT(no) + ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" + ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" +- ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"]) ++ ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1"], ++ ++ [AC_MSG_RESULT(assuming target platform has working inet_ntop) ++ ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP"]) + + + # On NetBSD 1.4.2 and maybe others, inet_pton() incorrectly accepts diff --git a/packages/bind/bind-9.3.5-P1/so_bsdcompat.patch b/packages/bind/bind-9.3.5-P1/so_bsdcompat.patch new file mode 100644 index 0000000000..03e34bf6a5 --- /dev/null +++ b/packages/bind/bind-9.3.5-P1/so_bsdcompat.patch @@ -0,0 +1,32 @@ +--- bind-9.3.5-P1/lib/isc/unix/socket.c.orig 2008-07-13 21:53:24.000000000 -0500 ++++ bind-9.3.5-P1/lib/isc/unix/socket.c 2008-07-13 21:57:06.000000000 -0500 +@@ -1423,7 +1423,7 @@ + { + isc_socket_t *sock = NULL; + isc_result_t ret; +-#if defined(USE_CMSG) || defined(SO_BSDCOMPAT) ++#if defined(USE_CMSG) + int on = 1; + #endif + char strbuf[ISC_STRERRORSIZE]; +@@ -1514,7 +1514,7 @@ + return (ISC_R_UNEXPECTED); + } + +-#ifdef SO_BSDCOMPAT ++/* #ifdef SO_BSDCOMPAT + RUNTIME_CHECK(isc_once_do(&bsdcompat_once, + clear_bsdcompat) == ISC_R_SUCCESS); + if (bsdcompat && setsockopt(sock->fd, SOL_SOCKET, SO_BSDCOMPAT, +@@ -1526,9 +1526,9 @@ + isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL, + ISC_MSG_FAILED, "failed"), + strbuf); +- /* Press on... */ ++ + } +-#endif ++#endif */ + + #ifdef SO_NOSIGPIPE + if (setsockopt(sock->fd, SOL_SOCKET, SO_NOSIGPIPE, diff --git a/packages/bind/bind_9.3.5-P1.bb b/packages/bind/bind_9.3.5-P1.bb new file mode 100644 index 0000000000..a1dff5ceaf --- /dev/null +++ b/packages/bind/bind_9.3.5-P1.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "ISC Internet Domain Name Server" +SECTION = "console/network" +HOMEPAGE = "http://www.isc.org/sw/bind/" +LICENSE = "BSD" +PR = "r0" + +DEPENDS = "openssl" + +SRC_URI = "ftp://ftp.isc.org/isc/bind9/9.3.5-P1/bind-9.3.5-P1.tar.gz \ + file://conf.patch;patch=1 \ + file://configure.in.patch;patch=1 \ + file://so_bsdcompat.patch;patch=1 \ + " + +EXTRA_OECONF = " --enable-ipv6=no --with-randomdev=/dev/random --disable-threads --sysconfdir=/etc/bind --localstatedir=/var --prefix=/usr" +inherit autotools update-rc.d + +INITSCRIPT_NAME = "bind" +INITSCRIPT_PARAMS = "defaults" + +do_install_append() { + rm "${D}/usr/bin/nslookup" + install -d "${D}/etc/bind" + install -d "${D}/etc/init.d" + install -m 644 ${S}/conf/* "${D}/etc/bind" + install -m 755 "${S}/init.d" "${D}/etc/init.d/bind" +} + +CONFFILES_${PN} = " \ + ${sysconfdir}/bind/named.conf \ + ${sysconfdir}/bind/named.conf.local \ + ${sysconfdir}/bind/named.conf.options \ + ${sysconfdir}/bind/db.0 \ + ${sysconfdir}/bind/db.127 \ + ${sysconfdir}/bind/db.empty \ + ${sysconfdir}/bind/db.local \ + ${sysconfdir}/bind/db.root \ + " diff --git a/packages/cacao/cacao-native.inc b/packages/cacao/cacao-native.inc index f4eee16cf6..fc86e684c5 100644 --- a/packages/cacao/cacao-native.inc +++ b/packages/cacao/cacao-native.inc @@ -17,13 +17,13 @@ EXTRA_OECONF = "\ --with-vm-zip=${datadir}/cacao/vm.zip \ \ --with-classpath-libdir=${libdir_jni}:${libdir} \ - --with-classpath-includedir=${incdir}/classpath \ + --with-classpath-includedir=${includedir}/classpath \ --with-classpath-classes=${datadir}/classpath/glibj.zip \ \ --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \ --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \ - --with-jni_md_h=${incdir}/classpath \ - --with-jni_h=${incdir}/classpath \ + --with-jni_md_h=${includedir}/classpath \ + --with-jni_h=${includedir}/classpath \ " # force usage of ecj-initial diff --git a/packages/cacao/cacao-native_0.98+hg20071001.bb b/packages/cacao/cacao-native_0.98+hg20071001.bb index 409d2c7858..99fd991c1e 100644 --- a/packages/cacao/cacao-native_0.98+hg20071001.bb +++ b/packages/cacao/cacao-native_0.98+hg20071001.bb @@ -3,3 +3,7 @@ require cacao-native.inc PR = "r1" SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518" + +# force usage of ecj-initial (but Java5-compatible class library) +export JAVAC = "${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip" + diff --git a/packages/cacao/cacao-native_0.99.1.bb b/packages/cacao/cacao-native_0.99.2.bb index 1cf0cb70cf..943a2890ea 100644 --- a/packages/cacao/cacao-native_0.99.1.bb +++ b/packages/cacao/cacao-native_0.99.2.bb @@ -2,6 +2,6 @@ require cacao-native.inc PR = "r0" -SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \ - " +SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d" + diff --git a/packages/cacao/cacao_0.99.1.bb b/packages/cacao/cacao_0.99.2.bb index a503c7d3d4..5618213d2d 100644 --- a/packages/cacao/cacao_0.99.1.bb +++ b/packages/cacao/cacao_0.99.2.bb @@ -3,7 +3,6 @@ require cacao.inc PR = "r0" SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \ - file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \ " # Quirks for Nokia N800: diff --git a/packages/cacao/cacaoh-native_0.99.1.bb b/packages/cacao/cacaoh-native_0.99.2.bb index 11735d4f31..11735d4f31 100644 --- a/packages/cacao/cacaoh-native_0.99.1.bb +++ b/packages/cacao/cacaoh-native_0.99.2.bb diff --git a/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch b/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch deleted file mode 100644 index dffc37b343..0000000000 --- a/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -r 8484332b813c configure.ac ---- a/configure.ac Sun Jun 22 18:19:54 2008 +0200 -+++ b/configure.ac Mon Jun 23 08:53:17 2008 +0200 -@@ -550,6 +550,7 @@ - - AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX - AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES -+AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES - - if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then - AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR -diff -r 8484332b813c m4/java-runtime-library.m4 ---- a/m4/java-runtime-library.m4 Sun Jun 22 18:19:54 2008 +0200 -+++ b/m4/java-runtime-library.m4 Mon Jun 23 08:53:17 2008 +0200 -@@ -93,20 +93,32 @@ - AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes]) - AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES) - -+dnl where are Java core library classes located at compilation time -+ -+AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[ -+AC_MSG_CHECKING(where Java core library classes are located at compile time) -+AC_ARG_WITH([build-java-runtime-library-classes], -+ [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])], -+ [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}], -+ [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]) -+AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}) -+AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time]) -+AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES) -+]) -+ - dnl define BOOTCLASSPATH for Makefiles - case "${WITH_JAVA_RUNTIME_LIBRARY}" in - cldc1.1 | gnuclasspath) -- BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)" -+ BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)" - ;; - *) -- BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)" -+ BOOTCLASSPATH="\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)" - ;; - esac - AC_SUBST(BOOTCLASSPATH) - ]) - -- --dnl where are Java runtime library native libraries installed -+dnl where are Java runtime library native libraries installed (at compilation time) - - AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[ - AC_MSG_CHECKING(where Java runtime library native libraries are installed) diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb index fafe0bbb88..ef43374aef 100644 --- a/packages/classpath/classpath_0.97.2.bb +++ b/packages/classpath/classpath_0.97.2.bb @@ -3,7 +3,7 @@ require classpath.inc SRC_URI += "\ file://netif_16.patch;patch=1;pnum=0 \ file://SimpleName.diff;patch=1;pnum=0 \ - file://javanet-local;patch=1;pnum=0 \ + file://javanet-local.patch;patch=1;pnum=0 \ " PR = "r1" diff --git a/packages/epdfview/epdfview_0.1.2.bb b/packages/epdfview/epdfview_0.1.2.bb deleted file mode 100644 index 92d4e4c30c..0000000000 --- a/packages/epdfview/epdfview_0.1.2.bb +++ /dev/null @@ -1,15 +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+" -PR="r3" - -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/packages/epdfview/epdfview_0.1.3.bb b/packages/epdfview/epdfview_0.1.3.bb deleted file mode 100644 index 397bef6fe8..0000000000 --- a/packages/epdfview/epdfview_0.1.3.bb +++ /dev/null @@ -1,15 +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+" -PR="r2" - -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/packages/epdfview/epdfview_0.1.4.bb b/packages/epdfview/epdfview_0.1.4.bb deleted file mode 100644 index 397bef6fe8..0000000000 --- a/packages/epdfview/epdfview_0.1.4.bb +++ /dev/null @@ -1,15 +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+" -PR="r2" - -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/packages/epdfview/epdfview_0.1.5.bb b/packages/epdfview/epdfview_0.1.5.bb deleted file mode 100644 index dee0e3aca1..0000000000 --- a/packages/epdfview/epdfview_0.1.5.bb +++ /dev/null @@ -1,15 +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="r2" - -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/packages/epdfview/epdfview_0.1.6.bb b/packages/epdfview/epdfview_0.1.6.bb index dee0e3aca1..3cf2e5f026 100644 --- a/packages/epdfview/epdfview_0.1.6.bb +++ b/packages/epdfview/epdfview_0.1.6.bb @@ -3,9 +3,11 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" LICENSE = "GPLv2" SECTION = "x11/applications" DEPENDS = "poppler gtk+ cups" -PR="r2" +PR = "r3" -SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2" +SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \ + file://poppler8.diff;patch=1 \ + " inherit autotools diff --git a/packages/epdfview/files/.mtn2git_empty b/packages/epdfview/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/epdfview/files/.mtn2git_empty diff --git a/packages/epdfview/files/poppler8.diff b/packages/epdfview/files/poppler8.diff new file mode 100644 index 0000000000..e4c4790c6d --- /dev/null +++ b/packages/epdfview/files/poppler8.diff @@ -0,0 +1,10395 @@ +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 @@ + <menu action="EditMenu"> + <menuitem name="Find" action="Find"/> + <separator /> ++ <menuitem name="PageModeScroll" action="PageModeScroll"/> ++ <menuitem name="PageModeText" action="PageModeText"/> ++ <separator /> + <menuitem name="Preferences" action="Preferences"/> + </menu> + <menu action="ViewMenu"> +@@ -38,7 +41,7 @@ + <menuitem name="About" action="About"/> + </menu> + </menubar> +- ++ + <toolbar name="ToolBar"> + <toolitem name="OpenFile" action="OpenFile"/> + <separator/> +@@ -49,7 +52,12 @@ + <toolitem name="ZoomOut" action="ZoomOut"/> + <toolitem name="ZoomFit" action="ZoomFit"/> + <toolitem name="ZoomWidth" action="ZoomWidth"/> ++ <separator/> ++ <toolitem name="PageModeScroll" action="PageModeScroll"/> ++ <toolitem name="PageModeText" action="PageModeText"/> + </toolbar> + + <accelerator name="SlashAccelerator" action="Slash"/> ++ <accelerator name="KPAddAccelerator" action="KPAdd"/> ++ <accelerator name="KPSubtractAccelerator" action="KPSubtract"/> + </ui> +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 <scott@netsplit.com>. ++# ++# 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 <http://www.freedesktop.org/software/pkgconfig>.])], ++ [$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 <jordi@emma-soft.com>\n" + "Language-Team: Catalan <ca@dodds.net>\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 <jordi@emma-soft.com>" + +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 <EMAIL@ADDRESS>, 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 <dragonlord@seznam.cz>\n" ++"Language-Team: Czech <none@none.org>\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 <dragonlord@seznam.cz>" ++ ++#: 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: <i>%s</i> will be replaced by the URI." ++msgstr "Poznámka: <i>%s</i> 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 "<b>Print Range</b>" ++msgstr "<b>Tisk oblasti<b>" ++ ++#: 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 "<b>Page Set</b>" ++msgstr "<b>Sada stran<b>" ++ ++#: 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 "<b>Copies</b>" ++msgstr "<b>Kopie<b>" ++ ++#: 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 "<b>Paper and Layout</b>" ++msgstr "<b>PapÃr a rozmÃstÄ›nÃ<b>" ++ ++#: 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 "<b>Output</b>" ++msgstr "<b>Výstup<b>" ++ ++#: 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 <moe@xfce.org>, 2006. ++# Enrico Tröger <enrico.troeger@uvena.de>, 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 17:47+0100\n" +-"PO-Revision-Date: 2006-05-13 00:40+0100\n" +-"Last-Translator: Moritz Heiber <moe@xfce.org>\n" +-"Language-Team: German <none@none.org>\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-04-16 15:33+0100\n" ++"Last-Translator: Enrico Tröger <enrico.troeger@uvena.de>\n" ++"Language-Team: German\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +@@ -75,11 +76,11 @@ + msgid "Unknown error (%d)." + msgstr "Unbekannter Fehler (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[DATEI] - PDF Dateien anschauen" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "PDF Betrachter" + +@@ -93,53 +94,59 @@ + msgid "Loading file %s..." + msgstr "Lade Datei %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 +-#, fuzzy, c-format ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format + msgid "of %d" +-msgstr "%d von %d" ++msgstr "von %d" + + #: src/MainPter.cxx:588 + #, c-format + msgid "Saving document to %s..." +-msgstr "" ++msgstr "Speiche Dokument als %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Fehler beim Laden der Datei" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Das angegebene Passwort ist ungültig für dieses Dokument." + +-#: src/MainPter.cxx:947 +-#, fuzzy ++#: src/MainPter.cxx:953 + msgid "Error Saving File" +-msgstr "Fehler beim Laden der Datei" ++msgstr "Fehler beim Speichern der Datei." + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Lade..." + +-#: src/PrintPter.cxx:295 +-msgid "Grayscale" ++#: src/PrintPter.cxx:252 ++msgid "A4" + msgstr "" + +-#: src/PrintPter.cxx:395 +-#, fuzzy ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Graustufen" ++ ++#: src/PrintPter.cxx:409 + msgid "Idle" +-msgstr "Inhalt" ++msgstr "Untätig" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" +-msgstr "" ++msgstr "Angehalten" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" +-msgstr "" ++msgstr "Drucke" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" +-msgstr "" ++msgstr "Unbekannt" + + #: src/PDFDocument.cxx:272 + #, c-format +@@ -154,248 +161,260 @@ + msgid "Find:" + msgstr "Suche:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Datei" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Bearbeiten" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Ansicht" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Gehe zu" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "_Hilfe" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Öffnen" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Öffne ein PDF Dokument" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Neu laden" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Lade das Dokument neu" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." +-msgstr "" ++msgstr "_Kopie speichern unter" + +-#: src/gtk/MainView.cxx:102 +-#, fuzzy ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" +-msgstr "Lade das Dokument neu" ++msgstr "Speichert eine Kopie des Dokuments" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." +-msgstr "" ++msgstr "_Drucken..." + +-#: src/gtk/MainView.cxx:107 +-#, fuzzy ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" +-msgstr "Lade das Dokument neu" ++msgstr "Druckt das Dokument" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Schließen" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Schließe dieses Fenster" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Suche" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Sucht im Dokument nach einem Wort" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." +-msgstr "" ++msgstr "Einstellungen..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" +-msgstr "" ++msgstr "Ändert die Programmeinstellungen" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" +-msgstr "Heranzoomen" ++msgstr "Hera_nzoomen" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Dokument vergrößern" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" +-msgstr "Herauszoomen" ++msgstr "Hera_uszoomen" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Dokument verkleinern" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" +-msgstr "Nach rechts rotieren" ++msgstr "Nach _rechts rotieren" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Das Dokument um 90 Grad im Uhrzeigersinn drehen" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" +-msgstr "Nach links rotieren" ++msgstr "Nach _links rotieren" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "Das Dokument um 90 Grad gegen den Uhrzeigersinn drehen" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Erste Seite" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Gehe zur ersten Seite" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_Nächste Seite" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Gehe zur ersten Seite" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "_Vorherige Seite" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Gehe zur vorherigen Seite" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "_Letzte Seite" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Gehe zur letzten Seite" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_Ãœber" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Credits anzeigen" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "" ++msgstr "_Vollbild" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" +-msgstr "" ++msgstr "In Vollbildmodus umschalten" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" +-msgstr "Werkzeugleiste anzeigen" ++msgstr "_Werkzeugleiste anzeigen" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Werkzeugleiste anzeigen oder verstecken" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" +-msgstr "Statusleiste anzeigen" ++msgstr "_Statusleiste anzeigen" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Statusleiste anzeigen oder verstecken" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" +-msgstr "Ãœbersicht anzeigen" ++msgstr "Ãœ_bersicht anzeigen" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Ãœbersicht des Dokuments anzeigen oder verstecken" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" +-msgstr "Zoom zur Fenstergröße" ++msgstr "Zoom zur _Fenstergröße" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Zoome das Dokument bis zur Größe des Fensters heran" + +-#: 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 "Zoom zur Fensterweite" ++msgstr "Zoom zur F_ensterweite" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Zoome das Dokument heran, bis es die Fensterbreite füllt" + +-#: 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 "PDF Datei öffnen" + +-#: 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 "" ++msgstr "Portable Document Format (PDF) Dateien" + +-#: src/gtk/MainView.cxx:310 src/gtk/MainView.cxx:424 ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 + msgid "All Files" +-msgstr "" ++msgstr "Alle Dateien" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Passwort" + +-#: src/gtk/MainView.cxx:386 +-#, fuzzy ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" +-msgstr "PDF Datei öffnen" ++msgstr "PDF Datei speichern" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Seite" + +-#: src/gtk/MainView.cxx:826 +-#, fuzzy ++#: src/gtk/MainView.cxx:868 + msgid "of 0" +-msgstr "0 von 0" ++msgstr "von 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Inhalt" + +-#: 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 "Fehler beim Erstellen des UI Managers: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Ein kleiner, schneller PDF Betrachter" + +-#: 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" +@@ -407,7 +426,7 @@ + "Lizenz, wie von der Free Software Foundation herausgegeben,\n" + "beachten; Entweder Version 2 oder jede nächsthöhere Version.\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" +@@ -420,7 +439,7 @@ + "FUNKTION mit ein. Für Details wird auf die GNU General Public Lizenz\n" + "verwiesen.\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" +@@ -434,152 +453,153 @@ + "Boston, MA 02111-1307\n" + "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 "Moritz Heiber <moe@xfce.org>" ++msgstr "" ++"Moritz Heiber <moe@xfce.org>,\n" ++"Enrico Tröger <enrico.troeger@uvena.de>" + + #: src/gtk/PreferencesView.cxx:32 + msgid "Preferences" +-msgstr "" ++msgstr "Einstellungen" + + #: src/gtk/PreferencesView.cxx:46 + msgid "External Commands" +-msgstr "" ++msgstr "Externe Befehle" + + #: src/gtk/PreferencesView.cxx:105 + msgid "Web _Browser:" +-msgstr "" ++msgstr "_Webbrowser:" + + #: src/gtk/PreferencesView.cxx:118 + #, c-format + msgid "Note: <i>%s</i> will be replaced by the URI." +-msgstr "" ++msgstr "Hinweis: <i>%s</i> wird durch die URL ersetzt." + + #: src/gtk/PrintView.cxx:51 + msgid "Print" +-msgstr "" ++msgstr "Drucken" + + #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 + msgid "Printer" +-msgstr "" ++msgstr "Drucker" + + #: src/gtk/PrintView.cxx:74 + msgid "Job" +-msgstr "" ++msgstr "Auftrag" + + #: src/gtk/PrintView.cxx:79 +-#, fuzzy + msgid "Paper" +-msgstr "Seite" ++msgstr "Papier" + + #: src/gtk/PrintView.cxx:359 + msgid "<b>Print Range</b>" +-msgstr "" ++msgstr "<b>Druckbereich</b>" + + #: src/gtk/PrintView.cxx:377 + msgid "_All pages" +-msgstr "" ++msgstr "_Alle Seiten" + + #: src/gtk/PrintView.cxx:380 + msgid "_Range:" +-msgstr "" ++msgstr "_Bereich:" + + #: src/gtk/PrintView.cxx:392 + msgid "<b>Page Set</b>" +-msgstr "" ++msgstr "<b>Seiteneinstellungen</b>" + + #: src/gtk/PrintView.cxx:408 + msgid "A_ll pages" +-msgstr "" ++msgstr "A_lle Seiten" + + #: src/gtk/PrintView.cxx:412 + msgid "O_dd pages" +-msgstr "" ++msgstr "_Ungerade Seiten" + + #: src/gtk/PrintView.cxx:416 + msgid "_Even pages" +-msgstr "" ++msgstr "_Gerade Seiten" + + #: src/gtk/PrintView.cxx:420 + msgid "<b>Copies</b>" +-msgstr "" ++msgstr "<b>Kopien</b>" + + #: src/gtk/PrintView.cxx:437 + msgid "N_umber of copies:" +-msgstr "" ++msgstr "An_zahl der Kopien:" + + #: src/gtk/PrintView.cxx:444 + msgid "C_ollate" +-msgstr "" ++msgstr "Kopien _sortieren" + + #: src/gtk/PrintView.cxx:465 + msgid "<b>Paper and Layout</b>" +-msgstr "" ++msgstr "<b>Papier und Anordnung</b>" + + #: src/gtk/PrintView.cxx:482 + msgid "Paper _Size:" +-msgstr "" ++msgstr "_Papiergröße:" + + #: src/gtk/PrintView.cxx:508 + msgid "Page _orientation:" +-msgstr "" ++msgstr "_Seitenausrichtung:" + + #: src/gtk/PrintView.cxx:539 + msgid "_Layout:" +-msgstr "" ++msgstr "A_nordnung:" + + #: src/gtk/PrintView.cxx:568 + msgid "<b>Output</b>" +-msgstr "" ++msgstr "<b>Ausgabe</b>" + + #: src/gtk/PrintView.cxx:585 + msgid "_Mode:" +-msgstr "" ++msgstr "_Modus: " + + #: src/gtk/PrintView.cxx:613 + msgid "_Resolution:" +-msgstr "" ++msgstr "A_uflösung:" + + #: src/gtk/PrintView.cxx:668 + msgid "State" +-msgstr "" ++msgstr "Status" + + #: src/gtk/PrintView.cxx:677 + msgid "Jobs" +-msgstr "" ++msgstr "Aufträge" + + #: src/gtk/PrintView.cxx:686 + msgid "Location" +-msgstr "" ++msgstr "Standort" + + #: src/gtk/PrintView.cxx:717 + msgid "Plain" +-msgstr "" ++msgstr "Einfach" + + #: src/gtk/PrintView.cxx:723 + msgid "2 pages in 1" +-msgstr "" ++msgstr "2 Seiten auf Eine" + + #: src/gtk/PrintView.cxx:729 + msgid "4 pages in 1" +-msgstr "" ++msgstr "4 Seiten auf Eine" + + #: src/gtk/PrintView.cxx:744 + msgid "Portrait" +-msgstr "" ++msgstr "Hochformat" + + #: src/gtk/PrintView.cxx:750 + msgid "Landscape" +-msgstr "" ++msgstr "Querformat" + + #: src/gtk/StockIcons.cxx:40 + msgid "Find _Next" +-msgstr "Suche vorwärts" ++msgstr "Suche _vorwärts" + + #: src/gtk/StockIcons.cxx:41 + msgid "Find _Previous" +-msgstr "Suche rückwärts" ++msgstr "Suche _rückwärts" +diff -Nurd epdfview-0.1.6-svn/po/el.po epdfview/po/el.po +--- epdfview-0.1.6-svn/po/el.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/el.po 2008-07-13 12:55:55.083198000 +0200 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: ePDFView 0.1.6\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-11-10 16:55+0200\n" + "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n" + "Language-Team: Greek <nls@tux.hellug.gr>\n" +@@ -77,11 +77,11 @@ + msgid "Unknown error (%d)." + msgstr "Άγνωστο σφάλμα (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[ΑΡΧΕΙΟ] - Ï€Ïοβολή εγγÏάφου PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "ΕφαÏμογή Î Ïοβολής PDF" + +@@ -95,7 +95,7 @@ + msgid "Loading file %s..." + msgstr "ΦόÏτωση αÏχείου %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "από %d" +@@ -105,39 +105,47 @@ + msgid "Saving document to %s..." + msgstr "Αποθήκευση εγγÏάφου στο %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Σφάλμα φόÏτωσης αÏχείου" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Ο κωδικός Ï€Ïόσβασης που εισάγατε δεν είναι ÎγκυÏος γι' αυτό το αÏχείο." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "Σφάλμα αποθήκευσης αÏχείου" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Γίνεται φόÏτωση..." + +-#: 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 "Κλίμακα του γκÏι" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "ΑδÏανής" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Διακόπηκε" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "ΕπεξεÏγασία" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Άγνωστο" + +@@ -154,244 +162,260 @@ + msgid "Find:" + msgstr "ΕÏÏεση:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_ΑÏχείο" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_ΕπεξεÏγασία" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Î Ïοβολή" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Μετάβαση" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "_Βοήθεια" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "Άν_οιγμα" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Άνοιγμα εγγÏάφου PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "Α_νανÎωση" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "ΑνανÎωση Ï„ÏÎχοντος εγγÏάφου" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "Απο_θήκευση ενός αντιγÏάφου..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "Αποθήκευση ενός αντιγÏάφου για το Ï„ÏÎχον ÎγγÏαφο" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_ΕκτÏπωση..." + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "ΕκτÏπωση Ï„ÏÎχοντος εγγÏάφου" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Κλείσιμο" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Κλείσιμο Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… παÏαθÏÏου" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_ΕÏÏεση" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "ΕÏÏεση μια λÎξης στο ÎγγÏαφο" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Î Ïοτιμήσεις..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Αλλαγή Ï€Ïοτιμήσεων της εφαÏμογής" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "_ΜεγÎθυνση" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "ΜεγÎθυνση εγγÏάφου" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "Σ_μίκÏυνση" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "ΣμίκÏυνση εγγÏάφου" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "ΠεÏιστÏοφή _δεξιά" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "ΠεÏιστÏοφή του εγγÏάφου 90 μοίÏες δεξιόστÏοφα" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "ΠεÏιστÏοφή _αÏιστεÏά" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "ΠεÏιστÏοφή του εγγÏάφου 90 μοίÏες αÏιστεÏόστÏοφα" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "Î _Ïώτη σελίδα" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Μετάβαση στην Ï€Ïώτη σελίδα" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_Επόμενη Σελίδα" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Μετάβαση στην επόμενη σελίδα" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Î Ïοη_γοÏμενη Σελίδα" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Μετάβαση στην Ï€ÏοηγοÏμενη σελίδα" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "Τε_λευταία Σελίδα" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Μετάβαση στην τελευταία σελίδα" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_ΠεÏί" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Εμφάνιση μνείας των δημιουÏγών της εφαÏμογής" + +-#: 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 "Εμφάνιση _εÏγαλειοθήκης" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Εμφάνιση ή απόκÏυψη της εÏγαλειοθήκης" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Εμφάνιση _γÏαμμής κατάστασης" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Εμφάνιση ή απόκÏυψη της γÏαμμής κατάστασης" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Εμφάνιση _πεÏιεχομÎνων" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Î Ïοβολή ή απόκÏυψη του πεÏιγÏάμματος του εγγÏάφου" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "ΣμίκÏυνση στην _σελίδα" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Î ÏοσαÏμογή του Ï„ÏÎχοντος εγγÏάφου στο παÏάθυÏο" + +-#: 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 "Î ÏοσαÏμογή στο _πλάτος της σελίδας" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "ΤαίÏιασμα του Ï„ÏÎχοντος εγγÏάφου στο πλάτος του παÏαθÏÏου" + +-#: 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 "Άνοιγμα αÏχείου 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 "ΑÏχεία 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 "Όλα τα αÏχεία" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Κωδικός Ï€Ïόσβασης" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "Αποθήκευση αÏχείου PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Σελίδα" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "από 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Κατάλογος" + +-#: 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 "Σφάλμα δημιουÏγίας διαχειÏιστή UI: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "ΕλαφÏιά εφαÏμογή Ï€Ïοβολής PDF" + +-#: 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 @@ + " Free Software Foundation, Îκδοση 2 , ή \n" + "(Ï€ÏοαιÏετικά) οποιαδήποτε νεότεÏη 'Îκδοση.\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" +@@ -415,7 +439,7 @@ + "αλλά ΧΩΡΙΣ ΚΑΜΜΙΑ ΑΠΟΛΥΤΩΣ ΕΓΓΥΗΣΗ για συγκεκÏιμÎνο σκοπό.\n" + "Δείτε για πεÏισσότεÏες λεπτομÎÏειες την GNU General Public License .\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" +@@ -425,11 +449,11 @@ + "μαζί με το Îαυτίλο. Αν όχι γÏάψτε στο Free Software Foundation, Inc., \n" + "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 "ΣταÏÏος ΓιαννοÏÏης <stavrosg2002@freemail.gr>" + +diff -Nurd epdfview-0.1.6-svn/po/es.po epdfview/po/es.po +--- epdfview-0.1.6-svn/po/es.po 2008-07-13 12:57:47.523198000 +0200 ++++ epdfview/po/es.po 2008-07-13 12:55:55.043198000 +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 <jordi@emma-soft.com>\n" + "Language-Team: Spanish <es@li.org>\n" +@@ -76,11 +76,11 @@ + msgid "Unknown error (%d)." + msgstr "Error desconocido (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[ARCHIVO] - muestra documentos PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "Visor de PDF" + +@@ -94,7 +94,7 @@ + msgid "Loading file %s..." + msgstr "Abriendo archivo %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,41 +104,49 @@ + msgid "Saving document to %s..." + msgstr "Guardando el documento en %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Error Cargando el Archivo" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "" + "La contraseña que has proporcionado no es una contraseña válida para este " + "archivo." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "Error Guardando el Archivo" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Cargando..." + +-#: 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 grises" + +-#: 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 "Procesando" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Desconocido" + +@@ -155,245 +163,261 @@ + msgid "Find:" + msgstr "Buscar:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Archivo" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Edición" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Ver" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Ir" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "A_yuda" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Abrir" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Abre un documento PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Recargar" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Abre de nuevo el documento actual" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_Guardar una copia..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "Guarda una copia de el documento actual" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_Imprimir" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "Imprime el documento actual" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Cerrar" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Cierra esta ventana" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Buscar" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Busca una palabra en el documento" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Preferencias..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Cambia las preferencia de la applicación" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "A_mpliar" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Amplia el documento" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "_Reducir" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Reduce el documento" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "Girar a la _derecha" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Gira el document 90 grados en la dirección de las agujas del reloj" + +-#: 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 la _izquierda" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "" + "Gira el documento 90 grados en la dirección contraria a las agujas del reloj" + +-#: 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 hacia la primera página" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_Siguiente página" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Va hacia la siguiente 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 hacia la página anterior" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "Ú_ltima página" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Va hacia la última página" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_Acerca de" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Muestra los créditos de la aplicación" + +-#: 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 "Muestr al barra de _herramientas" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Muestra o esconda la barra de herramientas" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Muestra la barra de _estado" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Muestra o esconde la barra de estado" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Muestra el Ã_ndice" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Muestra o esconde el Ãndice del documento" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "Ajuste ó_ptimo" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Hace que el documento llene la ventana" + +-#: 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 "Ajustar al _ancho de página" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Hace que el documento llene el ancho de la ventana" + +-#: 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 "Abre un archivo 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 "Archivos en Formato de Documento Transportable (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 "Todos los archivos" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Contraseña" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "Guarda un archivo 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 "Ãndice" + +-#: 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 construiendo el administrador de IU: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Un visor de PDF ligero" + +-#: 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" +@@ -405,7 +429,7 @@ + "la Free Software Foundation; ya sea en su versión 2 ó (a su criterio)\n" + "en una versión 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" +@@ -417,7 +441,7 @@ + "COMERCIALIDAD o IDONEIDAD PARA UN FIN DETERMINADO. Mire la \n" + "Licencia General GNU para más detalles.\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" +@@ -428,11 +452,11 @@ + "Inc.,\n" + "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 <jordi@emma-soft.com>" + +diff -Nurd epdfview-0.1.6-svn/po/fr.po epdfview/po/fr.po +--- epdfview-0.1.6-svn/po/fr.po 2008-07-13 12:57:47.523198000 +0200 ++++ epdfview/po/fr.po 2008-07-13 12:55:55.043198000 +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-19 02:00+0200\n" + "Last-Translator: <mr.moustache@laposte.net>\n" + "Language-Team: French <@>\n" +@@ -74,11 +74,11 @@ + msgid "Unknown error (%d)." + msgstr "Erreur inconnue (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[FICHIER] - Visualiser des documents PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "Visualisateur de PDF" + +@@ -92,7 +92,7 @@ + msgid "Loading file %s..." + msgstr "Chargement du fichier %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "sur %d" +@@ -102,39 +102,47 @@ + msgid "Saving document to %s..." + msgstr "Enregistrement du document sous %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Erreur au chargement du fichier" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Le mot de passe que vous avez fourni est incorrect pour ce fichier." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" +-msgstr "Erreur au chargement du fichier" ++msgstr "Erreur pendant la sauvegarde du fichier" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Chargement..." + +-#: 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 "Niveau de gris" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "En attente" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Arrêté" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Traitement en cours" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Inconnu" + +@@ -151,244 +159,260 @@ + msgid "Find:" + msgstr "Rechercher :" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Fichier" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Edition" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Afficher" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "A_ller à " + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "Ai_de" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Ouvrir" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Ouvrir un document PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Recharger" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Recharger le document courant" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_Enregistrer sous..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" +-msgstr "Recharger le document courant" ++msgstr "Sauvegarder le document courant" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_Imprimer" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" +-msgstr "Recharger le document courant" ++msgstr "Imprimer le document courant" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Fermer" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Fermer cette fenêtre" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Rechercher" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Rechercher un mot dans le document" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Préférences" + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Changer les préférences de l'application" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "_Agrandir" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Elargir le document" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "_Réduire" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Réduire le 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 "Rotation à _droite" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Rotation de 90 degrés dans le sens horaire" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "Rotation à _gauche" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "Rotation de 90 degrés dans le anti-horaire" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Première page" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Aller à la première page" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "Page _suivante" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Aller à la page suivante" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Page p_récédente" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Aller à la page précédente" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "_Dernière page" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Aller à la dernière page" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_A propos" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Afficher les informations sur l'application" + +-#: 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 "Afficher la barre d'_outils" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Afficher/Cacher la barre d'outils" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Afficher la _barre d'état" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Afficher/Cacher la barre d'état" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Afficher l'_index" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Afficher/Cacher l'index du document" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "Ajuster le document _dans la fenêtre" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Ajuster le document dans la fenêtre" + +-#: 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 "Ajuster à la largeur de la _fenêtre" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Ajuster à la largeur de la fenêtre" + +-#: 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 "Ouvrir un fichier 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 "Fichiers Portable Document Format (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 "Tous les fichiers" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Mot de passe" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" +-msgstr "Ouvrir un fichier PDF" ++msgstr "Enregistrer un fichier PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Page" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "sur 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Index" + +-#: 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 "Erreur à la création du gestionnaire d'UI: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Un visualisateur léger de PDF" + +-#: 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" +@@ -401,7 +425,7 @@ + "Free Software Foundation; (version 2 ou bien toute autre version ultérieure\n" + "choisie par vous).\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" +@@ -414,7 +438,7 @@ + "spécifique. Reportez-vous à la Licence Publique Générale GNU pour\n" + "plus de détails.\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" +@@ -425,11 +449,11 @@ + "Free Software Foundation, Inc.\n" + "59 Temple Place, Suite 330, Boston, MA 02111-1307, États-Unis.\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 "Mr_Moustache <mr.moustache@laposte.net>" + +diff -Nurd epdfview-0.1.6-svn/po/it.po epdfview/po/it.po +--- epdfview-0.1.6-svn/po/it.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/it.po 2008-07-13 12:55:55.073198000 +0200 +@@ -0,0 +1,592 @@ ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFView 0.1.6\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-03-18 20:33+0100\n" ++"PO-Revision-Date: 2008-03-18 00:00+0100\n" ++"Last-Translator: Fabio Vergnani <monghitri@aruba.it>\n" ++"Language-Team: Italian\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "Nessuna corrispondenza trovata!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Ricerca in corso in pagina %d di %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Nessun errore." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "File non trovato" ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Non riesco a leggere il catalogo della pagina." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "Il file PDF è danneggiato e non può essere recuperato." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "" ++"Il file è criptato e la password è sbagliata oppure non è stata fornita" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "Il file highlight non esiste oppure non è valido" ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Stampante non valida." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Errore durante la stampa" ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "Il file PDF non permette questa operazione." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Numero di pagina non valido." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "Errore di Input/Output nel file." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Errore sconosciuto (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FILE] - visualizza documenti PDF" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "Visualizzatore PDF" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Ricaricamento file %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Caricamento file %s..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "di %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Salvataggio documento in %s..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Errore nel caricamento del file" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "La password fornita non è corretta per questo file." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Errore nel salvataggio del file" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Caricamento in corso..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Scala di grigi" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "In attesa" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Fermata" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Stampa in corso" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Sconosciuto" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Errore nel caricamento del documento '%s'.\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Trova:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_File" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "_Modifica" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Visualizza" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "V_ai" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "A_iuto" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Apri" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Apre un documento PDF" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Ricarica" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Ricarica il documento corrente" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Salva una copia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Salva una copia del documento corrente" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "Stam_pa..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Stampa il documento corrente" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Chiudi" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Chiudi questa finestra" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "_Trova" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Trova una parola nel documento" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Preferenze..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Cambia le preferenze dell'applicazione" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "_Aumenta" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Ingrandisci il documento" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "_Riduci" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Rimpicciolisci il documento" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Ruota a _destra" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Ruota il documento di 90 gradi in senso orario" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Ruota a _sinistra" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Ruota il documento di 90 gradi in senso antiorario" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Prima Pagina" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "Va alla prima pagina" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "P_rossima Pagina" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "Va alla prossima pagina" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "P_agina Precedente" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "Va alla pagina precedente" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "_Ultima Pagina" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "Va all'ultima pagina" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "I_nformazioni" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Crediti" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "S_chermo intero" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Visualizza a schermo intero" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Mostra _barra degli strumenti" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Mostra o nasconde la barra degli strumenti" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "_Mostra barra di stato" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Mostra o nasconde la barra di stato" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Mostra _indice" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Mostra o nasconde l'indice del documento" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Zoom ada_tta" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Adatta il documento alla grandezza della finestra" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Zoom _larghezza" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Adatta il documento alla larghezza della finestra" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "Scorri" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "Mouse scorre la pagina" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "Seleziona testo" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr "Mouse seleziona testo" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "Apri file PDF" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Portable Document Format (PDF) Files" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Tutti i file" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Password" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Salva file PDF" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Pagina" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "di 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Indice" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Errore nella costruzione del gestore UI: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "Un visualizzatore PDF semplice e leggero" ++ ++#: 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 è software libero; è possibile redistribuirlo e/o modificarlo\n" ++"entro i termini della licenza GNU General Public License come pubblicata\n" ++"dalla Free Software Foundation; versione 2 della Licenza, o\n" ++"(a propria scelta) ogni versione successiva.\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 è distribuito nella speranza che possa essere utile,\n" ++"ma SENZA ALCUNA GARANZIA; senza neanche l'implicita garanzia di\n" ++"COMMERCIABILITÀ o IDONEITÀ AD UNO SCOPO PARTICOLARE. Consultare la\n" ++"GNU General Public License per maggiori dettagli.\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 "" ++"Insieme a ePDFView dovreste aver ricevuto una copia della GNU\n" ++"General Public License; in caso contrario scrivete a: 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 ++msgid "translator-credits" ++msgstr "Fabio Vergnani <monghitri@aruba.it>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Preferenze" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Comandi Esterni" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "_Navigatore Web" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Nota: <i>%s</i> sarà rimpiazzato dall'URI" ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Stampa" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Stampante" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Lavoro" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Carta" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Intervallo di stampa</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "_Tutte le pagine" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Intervallo:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Gruppi di pagine</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "T_utte le pagine" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "Pagine _dispari" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "Pagine p_ari" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Copie</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "Nu_mero di copie:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "Ra_gruppa" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Carta e disposizione</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "_Dimensione carta" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "_Orientamento pagina" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "D_isposizione_" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>Uscita</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Metodo" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Risoluzione" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "Stato" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Lavori" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Posizione" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Normale" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 pagine in 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 pagine in 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "Verticale" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Orizzontale" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Trova _Prossimo" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Trova P_recedente" +diff -Nurd epdfview-0.1.6-svn/po/ja.po epdfview/po/ja.po +--- epdfview-0.1.6-svn/po/ja.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/ja.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,597 @@ ++# Japanese translations for ePDFView package ++# ++# Copyright (C) 2006 Emma's Software ++# This file is distributed under the same license as the ePDFView package. ++# <jordi@emma-soft.com>, 2006. ++# ++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: 2006-04-12 21:17+0200\n" ++"Last-Translator: Jonny <jonny@csc.jp>\n" ++"Language-Team: nyu <nyu_8804@yahoo.co.jp>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "%d/%d を検索ä¸..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "エラーã¯ã‚ã‚Šã¾ã›ã‚“。" ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "ページカタãƒã‚°ã‚’èªã‚ã¾ã›ã‚“ã§ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "PDF ファイルãŒå£Šã‚Œã¦ã„ã¦ä¿®æ£ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "ファイルã¯æš—å·åŒ–ã•ã‚Œã¦ã„ã¾ã™ãŒã€æ£ã—ã„パスワードãŒå…¥åŠ›ã•ã‚Œã¦ã„ã¾ã›ã‚“。" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "ãƒã‚¤ãƒ©ã‚¤ãƒˆã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯å˜åœ¨ã—ã¦ã„ãªã„ã‹ä¸é©å½“ã§ã™ã€‚" ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "プリンタãŒä¸é©å½“ã§ã™ã€‚" ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "å°åˆ·ä¸ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚" ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "PDF ファイルã¯ã“ã®æ“作を許å¯ã—ã¦ã„ã¾ã›ã‚“。" ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "ページ番å·ãŒä¸é©å½“ã§ã™ã€‚" ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "ファイル I/O エラー。" ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼ (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[ファイル] - PDF ドã‚ュメントを表示ã™ã‚‹" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "PDF ビューア" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "ファイル %s ã‚’æ›´æ–°ã—ã¦ã„ã¾ã™..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "ファイル %s ã‚’èªã¿è¾¼ã‚“ã§ã„ã¾ã™..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "/%d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "ドã‚ュメントを %s ã«ä¿å˜ã—ã¦ã„ã¾ã™..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "ファイルèªã¿è¾¼ã¿ä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "入力ã—ãŸãƒ‘スワードã¯ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«ç”¨ã®ãƒ‘スワードã§ã¯ãªã„よã†ã§ã™ã€‚" ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "ファイルä¿å˜ä¸ã«ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "èªã¿è¾¼ã¿ä¸..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "A4" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "300 DPI" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "グレースケール" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "アイドリング" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "ä¸æ¢" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "処ç†ä¸" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "ä¸æ˜Ž" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"ドã‚ュメント '%s' ã®èªã¿è¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "検索:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "ファイル(_F)" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "編集(_E)" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "表示(_V)" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "移動(_G)" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "ヘルプ(_H)" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "é–‹ã(_O)" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "PDF ドã‚ュメントを開ã" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "æ›´æ–°(_R)" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "ドã‚ュメントを更新ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "別åã§ä¿å˜(_S)..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "ドã‚ュメントã®ã‚³ãƒ”ーをä¿å˜ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "å°åˆ·(_P)..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "ドã‚ュメントをå°åˆ·ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "é–‰ã˜ã‚‹(_C)" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "ウィンドウを閉ã˜ã‚‹" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "検索(_F)" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "ドã‚ュメントä¸ã®å˜èªžã‚’検索ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "è¨å®š..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "アプリケーションã®è¨å®šã‚’変更ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "拡大(_I)" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’拡大ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "縮å°(_O)" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’縮å°ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "å³ã«å›žè»¢(_R)" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’時計回り㫠90°回転ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "å·¦ã«å›žè»¢(_L)" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’å時計回り㫠90°回転ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "最åˆã®ãƒšãƒ¼ã‚¸(_F)" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "最åˆã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "次ã®ãƒšãƒ¼ã‚¸(_N)" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "次ã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "å‰ã®ãƒšãƒ¼ã‚¸(_P)" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "å‰ã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "最後ã®ãƒšãƒ¼ã‚¸(_L)" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "最後ã®ãƒšãƒ¼ã‚¸ã¸ç§»å‹•" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "æƒ…å ±(_A)" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "アプリケーションã®ã‚¯ãƒ¬ã‚¸ãƒƒãƒˆã‚’表示ã™ã‚‹" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "全画é¢è¡¨ç¤º(_U)" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "全画é¢è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "ツールãƒãƒ¼ã‚’表示(_T)" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "ツールãƒãƒ¼ã®è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "ステータスãƒãƒ¼ã‚’表示(_S)" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "ステータスãƒãƒ¼ã®è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "インデックスを表示(_N)" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "ドã‚ュメントアウトラインã®è¡¨ç¤ºã‚’切り替ãˆã‚‹" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "フィット(_F)" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’ウィンドウ全体ã«åˆã‚ã›ã‚‹" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "å¹…ã«åˆã‚ã›ã‚‹(_W)" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "ドã‚ュメントã®è¡¨ç¤ºã‚’ウィンドウ幅ã«åˆã‚ã›ã‚‹" ++ ++#: 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 "PDF ファイルを開ã" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "ãƒãƒ¼ã‚¿ãƒ–ルドã‚ュメントフォーマット（PDF) ファイル" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "パスワード" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "PDF ファイルをä¿å˜" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "ページ" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "/0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "インデックス" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "UI 生æˆãƒžãƒãƒ¼ã‚¸ãƒ£ã®ã‚¨ãƒ©ãƒ¼: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "è»½é‡ PDF ビューア" ++ ++#: 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 ã¯ãƒ•ãƒªãƒ¼ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã§ã™ã€‚ã‚ãªãŸã¯ã“れをã€Free Software Foundation\n" ++"ã«ã‚ˆã£ã¦ç™ºè¡Œã•ã‚ŒãŸ GNU 一般公衆利用許諾契約書 (ãƒãƒ¼ã‚¸ãƒ§ãƒ³ 2 ã‹ã€å¸Œæœ›\n" ++"ã«ã‚ˆã£ã¦ã¯ãれ以é™ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ã†ã¡ã©ã‚Œã‹) ã®å®šã‚ã‚‹æ¡ä»¶ã®ä¸‹ã§å†é ’布\n" ++"ã¾ãŸã¯æ”¹å¤‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\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 ã¯æœ‰ç”¨ã§ã‚ã‚‹ã“ã¨ã‚’願ã£ã¦é ’布ã•ã‚Œã¾ã™ãŒã€å…¨ãã®ç„¡ä¿è¨¼\n" ++"ã§ã™ã€‚商æ¥å¯èƒ½æ€§ã®ä¿è¨¼ã‚„特定ã®ç›®çš„ã¸ã®é©åˆæ€§ã¯ã€è¨€å¤–ã«ç¤ºã•ã‚ŒãŸ\n" ++"ã‚‚ã®ã‚‚å«ã‚å…¨ãå˜åœ¨ã—ã¾ã›ã‚“。詳ã—ã㯠GNU 一般公衆利用許諾契約書\n" ++"ã‚’ã”覧ãã ã•ã„。\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 "" ++"ã‚ãªãŸã¯ ePDFView ã¨å…±ã«ã€GNU 一般公衆利用許諾契約書ã®è¤‡è£½ç‰©ã‚’一部å—ã‘å–ã£" ++"ãŸ\n" ++"ã¯ãšã§ã™ã€‚ã‚‚ã—å—ã‘å–ã£ã¦ã„ãªã‘ã‚Œã°ã€the Free Software Foundation,Inc., 59\n" ++"Temple Place, Suite 330, Boston, MA 02111-1307 USA ã¾ã§è«‹æ±‚ã—ã¦ãã ã•ã„。\n" ++ ++#: src/gtk/MainView.cxx:1128 ++msgid "ePDFView" ++msgstr "ePDFView" ++ ++#: src/gtk/MainView.cxx:1135 ++msgid "translator-credits" ++msgstr "nyu <nyu_8804 at yahoo dot co dot jp>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "è¨å®š" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "外部コマンド" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "ウェブブラウザ(_B)" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Note: <i>%s</i> 㯠URI ã§ç½®ãæ›ãˆã‚‰ã‚Œã¾ã™ã€‚" ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "å°åˆ·" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "プリンタ" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "ジョブ" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "用紙" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>å°åˆ·ã™ã‚‹ç¯„囲</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "全ページ(_A)" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "範囲(_R):" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>ページセット</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "全ページ(_L)" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "奇数ページ(_D)" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "å¶æ•°ãƒšãƒ¼ã‚¸(_E)" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>コピー</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "コピーã®æ•°(_U):" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "ページをæƒãˆã‚‹(_O)" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>用紙ã¨ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆ</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "用紙サイズ(_S):" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "用紙ã®å‘ã(_O):" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "レイアウト(_L):" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>出力</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "モード(_M):" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "解åƒåº¦(_R):" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "状態" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "ジョブ" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "å ´æ‰€" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "通常" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "1 ç”»é¢ã« 2 ページ" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "1 ç”»é¢ã« 4 ページ" ++ ++#: 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 "次を検索(_N)" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "å‰ã‚’検索(_P)" +diff -Nurd epdfview-0.1.6-svn/po/LINGUAS epdfview/po/LINGUAS +--- epdfview-0.1.6-svn/po/LINGUAS 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/LINGUAS 2008-07-13 12:55:55.073198000 +0200 +@@ -1,2 +1,2 @@ + # Set of available languages. +-ca de el es fr pl ru vi zh_TW ++ca cs de el es fr ja it pl pt_BR pt_PT ru sv vi zh_CN zh_TW +diff -Nurd epdfview-0.1.6-svn/po/pl.po epdfview/po/pl.po +--- epdfview-0.1.6-svn/po/pl.po 2008-07-13 12:57:47.523198000 +0200 ++++ epdfview/po/pl.po 2008-07-13 12:55:55.073198000 +0200 +@@ -1,19 +1,22 @@ ++# translation of pl.po to + # epdfview Polish translation + # Copyright (C) 2006 Emma's Software + # This file is distributed under the same license as the epdfview package. + # Wojciech Myrda <vojcek@tlen.pl>, 2006. ++# Piotr Pacholak <obi.gts@o2.pl>, 2007. + # + msgid "" + msgstr "" +-"Project-Id-Version: ePDFView 0.1.5\n" ++"Project-Id-Version: pl\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" +-"PO-Revision-Date: 2006-05-13 00:40+0100\n" +-"Last-Translator: Wojciech Myrda <vojcek@tlen.pl>\n" +-"Language-Team: Polish <none@none.org>\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-06-25 16:05+0200\n" ++"Last-Translator: Piotr Pacholak <obi.gts@gmail.com>\n" ++"Language-Team: <pl@li.org>\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" ++"X-Generator: KBabel 1.11.4\n" + + #: src/FindPter.cxx:187 + msgid "No Results Found!" +@@ -38,7 +41,7 @@ + + #: src/IDocument.cxx:91 + msgid "The PDF file is damaged and can't be repaired." +-msgstr "Plik PDF jest uszkodzony i niemoże zostać naprawiony.." ++msgstr "Plik PDF jest uszkodzony i nie może zostać naprawiony.." + + #: src/IDocument.cxx:94 + msgid "The file is encrypted and the password was incorrect or not supplied." +@@ -47,7 +50,7 @@ + + #: src/IDocument.cxx:97 + msgid "Nonexistent or invalid highlight file." +-msgstr "Zaznaczony plik niestnieje lub jest nieprawidÅ‚owy." ++msgstr "Zaznaczony plik nie istnieje lub jest nieprawidÅ‚owy." + + #: src/IDocument.cxx:100 + msgid "Invalid printer." +@@ -74,11 +77,11 @@ + msgid "Unknown error (%d)." + msgstr "Nieznany bÅ‚Ä…d (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[PLIK] - przeglÄ…dnij pliki PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "PrzeglÄ…darka PDF" + +@@ -92,7 +95,7 @@ + msgid "Loading file %s..." + msgstr "Wczytywanie pliku %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "z %d" +@@ -102,39 +105,47 @@ + msgid "Saving document to %s..." + msgstr "Zapisywanie dokumentu do %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "BÅ‚Ä…d w wczytywaniu pliku" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Podane przez ciebie hasÅ‚o do tego pliku jest nieprawidÅ‚owe." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "BÅ‚Ä…d w zapisywaniu pliku" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Wczytywanie..." + +-#: 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 "Skala szaroÅ›ci" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "Bezczynny" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Zatrzymany" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Przetwarzanie" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Nieznany" + +@@ -144,251 +155,267 @@ + "Failed to load document '%s'.\n" + "%s\n" + msgstr "" +-"Niemożna wczytać dokumentu '%s'.\n" ++"Nie można wczytać dokumentu '%s'.\n" + "%s\n" + + #: src/gtk/FindView.cxx:51 + msgid "Find:" + msgstr "Znajdź:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_Plik" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Edytuj" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Widok" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" +-msgstr "_Przejdź" ++msgstr "P_rzejdź" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" +-msgstr "_Pomoc" ++msgstr "Pomo_c" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Otwórz" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Otwórz dokument PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_PrzeÅ‚aduj" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "PrzeÅ‚aduj obecny dokument" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_Zapisz KopiÄ™..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "Zapisz kopiÄ™ obecnego dokumentu" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_Drukuj..." + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "Wydrukuj obecny dokument" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" +-msgstr "_Zamknij" ++msgstr "Za_mknij" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Zamknij to okno" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Znajdź" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Znajdź sÅ‚owo w tym dokumencie" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Ustawienia" + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "ZmieÅ„ ustawienia aplikacji" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" +-msgstr "_Zbliż" ++msgstr "Po_wiÄ™ksz" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "PowiÄ™ksz dokument" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" +-msgstr "_Oddal" ++msgstr "Po_mniejsz" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Zmniejsz dokument" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" +-msgstr "Obruć w _prawo" ++msgstr "Obróć w _prawo" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" +-msgstr "Obruć dokument o 90 stopni zgodnie z wskazówkami zegara" ++msgstr "Obróć dokument o 90 stopni zgodnie z wskazówkami zegara" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" +-msgstr "Obruć w _lewo" ++msgstr "Obróć w _lewo" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" +-msgstr "Obruć dokument o 90 stopni przeciwnie do wskazówek zegara" ++msgstr "Obróć dokument o 90 stopni przeciwnie do wskazówek zegara" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" +-msgstr "_Pierwsza Strona" ++msgstr "Pie_rwsza Strona" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Przejdź do strony pierwszej" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "_NastÄ™pna Strona" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Przejdź do strony nastÄ™pnej" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "_Poprzednia Strona" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Przejdź do strony poprzedniej" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "_Ostatnia Strona" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Przejdź do strony ostatniej" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_O programie" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Pokaż informacjÄ™ o programie" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "_PeÅ‚ny ekran" ++msgstr "PeÅ‚ny _ekran" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" + msgstr "PeÅ‚ny ekran" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "Pokaż pasek _narzÄ™dzi" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Pokaż lub ukryj pasek narzÄ™dzi" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" +-msgstr "Pokaż pasek stanu" ++msgstr "Pokaż pasek s_tanu" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Pokaż lub ukryj pasek stanu" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Pokaż I_ndex" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Pokaż lub ukryj Index dokumentu" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "_Dopasuj do okna" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "PowiÄ™ksza obecny dokument do rozmiaru okna" + +-#: 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 "Dopasuj do _szerokoÅ›ci" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "PowiÄ™ksza obecny dokument do szerokoÅ›ci okna" + +-#: 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 "Otwórz plik 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 "Pliki (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 "Wszystkie Pliki" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "HasÅ‚o" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "Zapisz Plik PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Strona" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "z 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Index" + +-#: 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 "BÅ‚Ä…d podczas wczytywania menadżera UI: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Lekka przeglÄ…darka plików PDF" + +-#: 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" +@@ -400,7 +427,7 @@ + "opublikowanymi poprzez Free Software Foundation; zarówno wesjÄ… drugÄ… " + "Licencji,lub (wedle wÅ‚asnego uznania) wersjami późniejszymi.\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" +@@ -412,7 +439,7 @@ + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.PrzeglÄ…dnij GNU General " + "Public License by dowiedzieć siÄ™ wiÄ™cej.\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" +@@ -424,11 +451,11 @@ + "Boston, MA 02111-1307\n" + "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 "" + +@@ -451,7 +478,7 @@ + + #: src/gtk/PrintView.cxx:51 + msgid "Print" +-msgstr "Drukuj" ++msgstr "Wydrukuj" + + #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 + msgid "Printer" +@@ -479,19 +506,19 @@ + + #: src/gtk/PrintView.cxx:392 + msgid "<b>Page Set</b>" +-msgstr "<b>Wybrane Strony</b>" ++msgstr "<b>Wybrane strony</b>" + + #: src/gtk/PrintView.cxx:408 + msgid "A_ll pages" +-msgstr "_Wszystkie strony" ++msgstr "W_szystkie strony" + + #: src/gtk/PrintView.cxx:412 + msgid "O_dd pages" +-msgstr "Strony _Nieparzyste" ++msgstr "Strony _nieparzyste" + + #: src/gtk/PrintView.cxx:416 + msgid "_Even pages" +-msgstr "Strony parzyste" ++msgstr "Strony pa_rzyste" + + #: src/gtk/PrintView.cxx:420 + msgid "<b>Copies</b>" +@@ -503,7 +530,7 @@ + + #: src/gtk/PrintView.cxx:444 + msgid "C_ollate" +-msgstr "" ++msgstr "_Posegregowane" + + #: src/gtk/PrintView.cxx:465 + msgid "<b>Paper and Layout</b>" +diff -Nurd epdfview-0.1.6-svn/po/pt_BR.po epdfview/po/pt_BR.po +--- epdfview-0.1.6-svn/po/pt_BR.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/pt_BR.po 2008-07-13 12:55:55.043198000 +0200 +@@ -0,0 +1,597 @@ ++# Spanish translations for ePDFView package ++# Traducciones al español para el paquete ePDFView. ++# Copyright (C) 2006 Emma's Software ++# This file is distributed under the same license as the ePDFView package. ++# <jordi@emma-soft.com>, 2006. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFView 0.1.4\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2008-05-28 12:13-0300\n" ++"Last-Translator: \n" ++"Language-Team: Spanish <es@li.org>\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 "Não foram encontrados resultados!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Localizando na página %d de %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Nenhum erro." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "Arquivo não encontrado." ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Catálogo de página não pode ser lido." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "O arquivo PDF está corrompido e não pode ser recuperado." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "O arquivo está encriptado e a senha incorreta" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "O arquivo não existe ou é inválido." ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Impressora inválida." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Erro durante a impressão." ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "O arquivo PDF não permite esta operação." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Número de página inválido." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "Erro I/O do arquivo." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Erro desconhecido (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[ARQUIVO] - mostra documentos PDF" ++ ++#: src/main.cxx:72 ++#: src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "Visualizador de PDF" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Recarregando arquivo %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Carregando arquivo %s..." ++ ++#: src/MainPter.cxx:413 ++#: src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "de %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Salvando documento em %s..." ++ ++#: src/MainPter.cxx:832 ++#: src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Erro ao carregar" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "Senha incorreta para este arquivo." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Erro ao Salvar Arquivo" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Carregando..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "A4" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "300 DPI" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Escala de cinza" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "Escondido" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Parado" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Processando" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Desconhecido" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Falha ao abrir o documento '%s'.\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Localizar:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_Arquivo" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "_Editar" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Ver" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "_Ir" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "A_juda" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Abrir" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Abrir documento PDF" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Recarregar" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Recarregar arquivo PDF atual" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Salvar cópia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Salvar cópia do documento atual" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "_Imprimir" ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Imprimir documento atual" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Fechar" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Fechar esta janela" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "Locali_zar" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Localizar uma palavra no documento" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Preferências..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Alterar preferências do aplicativo" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "Au_mentar" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Aumentar o documento" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "Diminui_r" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Diminuir o documento" ++ ++#: src/gtk/MainView.cxx:133 ++#: src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Girar para a _direita" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Girar o documento 90 graus em sentido horário" ++ ++#: src/gtk/MainView.cxx:137 ++#: src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Girar para a _esquerda" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Girar o documento 90 graus em sentido anti-horário" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Primeira página" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "Ir para a primeira página" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "_Próxima página" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "Ir para a próxima página" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "Página _anterior" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "Ir para a página anterior" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "Ú_ltima página" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "Ir para a última página" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "_Sobre" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Mostrar créditos do aplicativo" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "T_ela cheia" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Mudar para janela cheia" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Mostrar barras de _ferramentas" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Mostrar ou esconder a barra de ferramentas" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "Mostrar barra de _status" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Mostrar ou esconder a barra de status" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Mostrar Ã_ndice" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Mostrar ou esconder o Ãndice do documento" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Aj_ustar à janela" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Ajustar documento à janela" ++ ++#: src/gtk/MainView.cxx:195 ++#: src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Ajustar à _largura da página" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Ajustar documento à largura da página" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "Rolar" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "Mouse rolar página" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "Selecionar Texto" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr " Mouse selecionar texto" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "Abrir arquivo PDF" ++ ++#: src/gtk/MainView.cxx:340 ++#: src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Arquivos em Portable Document Format (PDF)" ++ ++#: src/gtk/MainView.cxx:352 ++#: src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Todos os arquivos" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Senha" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Salvar arquivo PDF" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Página" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "de 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Ãndice" ++ ++#: src/gtk/MainView.cxx:991 ++#: src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Erro ao construir o administrador de IU: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "Visualizador leve de PDF" ++ ++#: 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 "O ePDFView é um software livre; você pode redistribuÃ-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU (GPL) como publicada pela Fundação do Software Livre; seja a versão 2 da Licença ou (se preferir) qualquer versão mais recente.\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 "O ePDFView é distribuÃdo na esperança de que seja útil, mas SEM NENHUMA GARANTIA; até mesmo sem a garantia implicada de COMERCIALIZAÇÃO ou de ADAPTAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a Licença Pública Geral GNU (GPL) para mais detalhes.\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 "Você deve ter recebido uma cópia da Licença Pública Geral GNU (GPL) junto com o ePDFView; se não, escreva para a Free Software Foundation, Inc. 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 ++msgid "translator-credits" ++msgstr "Fábio Antunes" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Preferências" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Comandos Externos" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "Navegador da _Web:" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Nota: O parámetro <i>%s</i> deve ser substituÃdo pela URL." ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Imprimir" ++ ++#: src/gtk/PrintView.cxx:69 ++#: src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Impressora" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Trabalho" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Página" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Escala de impressão</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "Tod_as as páginas" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Escala:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Conjunto de páginas</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "_Todas as páginas" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "Páginas _Ãmpares" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "Páginas pare_s" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Cópias</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "_Número de cópias:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "O_rganizar" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Página e disposição</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "_Tamanho da página:" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "_Orientação:" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "_Disposição:" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>SaÃda</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Modo:" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Resolução:" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "Estado" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Trabalhos" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Local" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Plano" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "Retrato" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Paisagem" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Localizar _Próxima" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Localizar _Anterior" ++ +diff -Nurd epdfview-0.1.6-svn/po/pt_PT.po epdfview/po/pt_PT.po +--- epdfview-0.1.6-svn/po/pt_PT.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/pt_PT.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,597 @@ ++# Portuguese translation for ePDFView package ++# Copyright (C) 2006 Emma's Software ++# This file is distributed under the same license as the ePDFView package. ++# <jordi@emma-soft.com>, 2006. ++# ++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-01-06 18:48+0100\n" ++"Last-Translator: Nuno Miguel <nunis@netcabo.pt>\n" ++"Language-Team: \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 "Nenhum Resultado Encontrado!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Procurando na página %d de %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Nenhum erro." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "Ficheiro não encontrado." ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Catálogo de página não pode ser lido." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "O ficheiro PDF está corrompido e não pode ser reparado." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "" ++"O ficheiro está encriptado e a senha está incorrecta ou não foi fornecida." ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "O ficheiro não existe ou é inválido." ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Impressora inválida." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Erro durante a impressão." ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "O ficheiro PDF não permite esta operação." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Número de página inválido." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "Erro E/S do ficheiro." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Erro desconhecido (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FICHEIRO] - mostra documentos PDF" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "Visualizador de PDF" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Recarregando ficheiro %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Carregando ficheiro %s..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "de %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Gravando documento em %s..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Erro ao Carregar Ficheiro" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "A senha que indicou não é inválida para este ficheiro." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Erro ao Gravar Ficheiro" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Carregando..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "A4" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "300 DPI" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "Escala de cinza" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "Ocioso" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Parado" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Processando" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Desconhecido" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Falha ao abrir o documento '%s'.\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Procurar:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_Ficheiro" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "_Editar" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Ver" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "_Ir" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "_Ajuda" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Abrir" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Abrir um documento PDF" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Recarregar" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Recarregar documento actual" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Gravar uma Cópia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Gravar uma cópia do documento actual" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "_Imprimir..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Imprimir o documento actual" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Fechar" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Fechar esta janela" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "_Procurar" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Localizar uma palavra no documento" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Preferências..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Alterar preferências da aplicação" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "A_mpliar" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Amplia o documento" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "_Reduzir" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Reduz o documento" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Girar para a _direita" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Girar o documento 90 graus em sentido horário" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Girar para a _esquerda" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Girar o documento 90 graus em sentido anti-horário" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Primeira Página" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "Ir para a primeira página" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "_Próxima Página" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "Ir para a próxima página" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "Página _Anterior" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "Ir para a página anterior" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "Ú_ltima Página" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "Ir para a última página" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "_Sobre" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Mostrar créditos da aplicação" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "Ecrã inteiro" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Mudar para ecrã completo" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Mostrar barras de _ferramentas" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Mostra ou esconde a barra de ferramentas" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "Mostrar barra de _estado" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Mostra ou esconde a barra de estado" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Mostrar Ã_ndice" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Mostra ou esconde o Ãndice do documento" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Aj_ustar à janela" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Ajusta documento à janela" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Ajustar à _largura da página" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Ajusta documento à largura da página" ++ ++#: src/gtk/MainView.cxx:202 ++msgid "Scroll" ++msgstr "Deslocamento" ++ ++#: src/gtk/MainView.cxx:203 ++msgid "Mouse scroll page" ++msgstr "Deslocamento de página com rato" ++ ++#: src/gtk/MainView.cxx:205 ++msgid "Select Text" ++msgstr "Seleccionar Texto" ++ ++#: src/gtk/MainView.cxx:206 ++msgid " Mouse select text" ++msgstr " Seleccionar texto com rato" ++ ++#: src/gtk/MainView.cxx:320 ++msgid "Open PDF File" ++msgstr "Abrir Ficheiro PDF" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Ficheiros em Portable Document Format (PDF)" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Todos os Ficheiros" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Senha" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Gravar ficheiro PDF" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Página" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "de 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Ãndice" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Erro ao construir o gestor de IU: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "Um visualizador leve de PDF" ++ ++#: 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 "" ++"O ePDFView é software livre; pode redistribuÃ-lo e/ou modificá-lo\n" ++"sob os termos da Licença Pública Geral GNU (GPL) como publicada\n" ++"pela Free Software Foundation; seja a versão 2 da Licença ou\n" ++"(se preferir) qualquer versão mais recente.\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 "" ++"O ePDFView é distribuÃdo na esperança de que seja útil,\n" ++"mas SEM NENHUMA GARANTIA; até mesmo sem a garantia implicada de\n" ++"COMERCIALIZAÇÃO ou de ADAPTAÇÃO A UM PROPÓSITO EM PARTICULAR. Veja a\n" ++"Licença Pública Geral GNU (GPL) para mais detalhes.\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 "" ++"Deve ter recebido uma cópia da Licença Pública Geral GNU (GPL)\n" ++"junto com o ePDFView; se não, escreva para a 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 ++msgid "translator-credits" ++msgstr "Nuno Miguel <nunis@netcabo.pt>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Preferências" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Comandos Externos" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "Navegador _Web:" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Nota: O parâmetro <i>%s</i> deve ser substituÃdo pelo URI." ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Imprimir" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Impressora" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Trabalho" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Página" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Intervalo de impressão</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "_Todas as páginas" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Intervalo:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Conjunto de páginas</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "_Todas as páginas" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "Páginas Ã_mpares" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "Páginas _pares" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Cópias</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "_Número de cópias:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "O_rganizar" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Página e Disposição</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "_Tamanho do Papel:" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "_Orientação de Página:" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "_Disposição:" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>SaÃda</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Modo:" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Resolução:" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "Estado" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Trabalhos" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Local" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Plano" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 páginas em 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "Retrato" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Paisagem" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Procurar _Próxima" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Localizar _Anterior" +diff -Nurd epdfview-0.1.6-svn/po/ru.po epdfview/po/ru.po +--- epdfview-0.1.6-svn/po/ru.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/ru.po 2008-07-13 12:55:55.083198000 +0200 +@@ -1,144 +1,152 @@ + # Russian translations for ePDFView package +-# áÎÇÌÉÊÓËÉÅ ÐÅÒÅ×ÏÄÙ ÄÌÑ ÐÁËÅÔÁ ePDFView. ++# ÐнглийÑкие переводы Ð´Ð»Ñ Ð¿Ð°ÐºÐµÑ‚Ð° ePDFView. + # Copyright (C) 2006 Emma's Software + # This file is distributed under the same license as the ePDFView package. + # <igor_vagulin@mail.ru>, 2006. + # + msgid "" + msgstr "" +-"Project-Id-Version: ePDFView 0.1.5\n" ++"Project-Id-Version: ePDFView 0.1.6\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" +-"PO-Revision-Date: 2006-07-08 13:31+0400\n" +-"Last-Translator: <igor_vagulin@mail.ru>\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-04-23 15:56+0300\n" ++"Last-Translator: Sergey Starosek <sergey.starosek@gmail.com>\n" + "Language-Team: Russian <ru@li.org>\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=KOI8-R\n" ++"Content-Type: text/plain; charset=utf-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" + "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + + #: src/FindPter.cxx:187 + msgid "No Results Found!" +-msgstr "òÅÚÕÌØÔÁÔÙ ÎÅ ÎÁÊÄÅÎÙ!" ++msgstr "Результаты не найдены!" + + #: src/FindPter.cxx:195 + #, c-format + msgid "Searching in page %d of %d..." +-msgstr "ðÏÉÓË ÎÁ ÓÔÒÁÎÉÃÅ %d ÉÚ %d..." ++msgstr "ПоиÑк на Ñтранице %d из %d..." + + #: src/IDocument.cxx:82 + msgid "No error." +-msgstr "âÅÚ ÏÛÉÂÏË." ++msgstr "Без ошибок." + + #: src/IDocument.cxx:85 + msgid "File not found." +-msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ." ++msgstr "Файл не найден." + + #: src/IDocument.cxx:88 + msgid "Couldn't read the page catalog." +-msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÉÎÆÏÒÍÁÃÉÉ Ï ÓÔÒÁÎÉÃÁÈ." ++msgstr "Ошибка при чтении информации о Ñтраницах." + + #: src/IDocument.cxx:91 + msgid "The PDF file is damaged and can't be repaired." +-msgstr "PDF ÆÁÊÌ ÐÏ×ÒÅÖÄ£Î É ÎÅ ÍÏÖÅÔ ÂÙÔØ ×ÏÓÓÔÁÎÏ×ÌÅÎ." ++msgstr "PDF файл повреждён и не может быть воÑÑтановлен." + + #: src/IDocument.cxx:94 + msgid "The file is encrypted and the password was incorrect or not supplied." +-msgstr "æÁÊÌ ÚÁÛÉÆÒÏ×ÁÎ. ðÁÒÏÌØ ÎÅ×ÅÒÅÎ ÉÌÉ ÎÅ ××ÅÄ£Î." ++msgstr "Файл зашифрован. Пароль неверен или не введён." + + #: src/IDocument.cxx:97 + msgid "Nonexistent or invalid highlight file." +-msgstr "æÁÊÌ ÐÏÄÓ×ÅÔËÉ(highlight file) ÎÅ ÓÕÝÅÓÔ×ÕÅÔ ÉÌÉ × Î£Í ÏÛÉÂËÉ." ++msgstr "Файл подÑветки(highlight file) не ÑущеÑтвует или в нём ошибки." + + #: src/IDocument.cxx:100 + msgid "Invalid printer." +-msgstr "ðÒÉÎÔÅÒ ÎÅ ÎÁÊÄÅÎ" ++msgstr "Принтер не найден" + + #: src/IDocument.cxx:103 + msgid "Error during printing." +-msgstr "ïÛÉÂËÁ ÐÅÞÁÔÉ." ++msgstr "Ошибка печати." + + #: src/IDocument.cxx:106 + msgid "The PDF file doesn't allow that operation." +-msgstr "ïÐÅÒÁÃÉÑ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÓÕÝÅÓÔ×ÌÅÎÁ ÄÌÑ ÜÔÏÇÏ PDF ÆÁÊÌÁ." ++msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ может быть оÑущеÑтвлена Ð´Ð»Ñ Ñтого PDF файла." + + #: src/IDocument.cxx:109 + msgid "Invalid page number." +-msgstr "îÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÓÔÒÁÎÉÃÙ." ++msgstr "Ðеверный номер Ñтраницы." + + #: src/IDocument.cxx:112 + msgid "File I/O error." +-msgstr "ïÛÉÂËÁ ××ÏÄÁ/×Ù×ÏÄÁ" ++msgstr "Ошибка ввода/вывода." + + #: src/IDocument.cxx:115 + #, c-format + msgid "Unknown error (%d)." +-msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ (%d)." ++msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" +-msgstr "[æáêì] - ÐÒÏÓÍÏÔÒ PDF ÄÏËÕÍÅÎÔÁ" ++msgstr "[ФÐЙЛ] - проÑмотр PDF документа" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" +-msgstr "ðÒÏÓÍÏÔÒ PDF" ++msgstr "ПроÑмотр PDF" + + #: src/MainPter.cxx:233 + #, c-format + msgid "Reloading file %s..." +-msgstr "ðÅÒÅÚÁÇÒÕÚËÁ ÆÁÊÌÁ %s..." ++msgstr "Перезагрузка файла %s..." + + #: src/MainPter.cxx:237 + #, c-format + msgid "Loading file %s..." +-msgstr "úÁÇÒÕÚËÁ ÆÁÌÁ %s..." ++msgstr "Загрузка фала %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" +-msgstr "ÉÚ %d" ++msgstr "из %d" + + #: src/MainPter.cxx:588 + #, c-format + msgid "Saving document to %s..." +-msgstr "äÏËÕÍÅÎÔ ÓÏÈÒÁÎÑÅÔØÓÑ × %s..." ++msgstr "Документ ÑохранÑетÑÑ Ð² %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" +-msgstr "ïÛÉÂËÁ ðÒÉ úÁÇÒÕÚËÅ æÁÊÌÁ" ++msgstr "Ошибка При Загрузке Файла" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." +-msgstr "÷×ÅÄ£ÎÙÊ ×ÁÍÉ ÐÁÒÏÌØ ÎÅ×ÅÒÅÎ ÄÌÑ ÜÔÏÇÏ ÆÁÊÌÁ" ++msgstr "Введёный вами пароль неверен Ð´Ð»Ñ Ñтого файла" + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" +-msgstr "ïÛÉÂËÁ ðÒÉ óÏÈÒÁÎÅÎÉÉ æÁÊÌÁ" ++msgstr "Ошибка При Сохранении Файла" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." +-msgstr "úÁÇÒÕÖÁÅÔØÓÑ..." ++msgstr "ЗагружаетÑÑ..." + +-#: 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 "ïÔÔÅÎËÉ ÓÅÒÏÇÏ" ++msgstr "Оттенки Ñерого" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" +-msgstr "ïÖÉÄÁÎÉÅ" ++msgstr "Ожидание" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" +-msgstr "ïÓÔÁÎÏ×ÌÅÎ" ++msgstr "ОÑтановлен" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" +-msgstr "ïÂÒÁÂÏÔËÁ" ++msgstr "Обработка" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" +-msgstr "îÅÉÚ×ÅÓÔÎÏ" ++msgstr "ÐеизвеÑтно" + + #: src/PDFDocument.cxx:272 + #, c-format +@@ -146,435 +154,452 @@ + "Failed to load document '%s'.\n" + "%s\n" + msgstr "" +-"ïÛÉÂËÁ ÐÒÉ ÚÁÇÒÕÚËÅ ÄÏËÕÍÅÎÔÁ '%s'.\n" ++"Ошибка при загрузке документа '%s'.\n" + "%s\n" + + #: src/gtk/FindView.cxx:51 + msgid "Find:" +-msgstr "îÁÊÔÉ:" ++msgstr "Ðайти:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" +-msgstr "_æÁÊÌ" ++msgstr "_Файл" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" +-msgstr "_ðÒÁ×ËÁ" ++msgstr "_Правка" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" +-msgstr "_÷ÉÄ" ++msgstr "_Вид" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" +-msgstr "ð_ÅÒÅÊÔÉ" ++msgstr "П_ерейти" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" +-msgstr "ð_ÏÍÏÝØ" ++msgstr "П_омощь" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" +-msgstr "_ïÔËÒÙÔØ" ++msgstr "_Открыть" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" +-msgstr "ïÔËÒÙÔØ PDF ÄÏËÕÍÅÎÔ" ++msgstr "Открыть PDF документ" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" +-msgstr "_ðÅÒÅÚÁÇÒÕÚÉÔØ" ++msgstr "_Перезагрузить" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" +-msgstr "ðÅÒÅÚÁÇÒÕÚÉÔØ ÔÅËÕÝÉÊ ÄÏËÕÍÅÎÔ" ++msgstr "Перезагрузить текущий документ" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." +-msgstr "_óÏÈÒÁÎÉÔØ ëÏÐÉÀ" ++msgstr "_Сохранить Копию" + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" +-msgstr "óÏÈÒÁÎÉÔØ ËÏÐÉÀ ÔÅËÕÝÅÇÏ ÄÏËÕÍÅÎÔÁ" ++msgstr "Сохранить копию текущего документа" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." +-msgstr "_ðÅÞÁÔØ" ++msgstr "_Печать" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" +-msgstr "òÁÓÐÅÞÁÔÁÔØ ÔÅËÕÝÉÊ ÄÏËÕÍÅÎÔ" ++msgstr "РаÑпечатать текущий документ" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" +-msgstr "_úÁËÒÙÔØ" ++msgstr "_Закрыть" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" +-msgstr "úÁËÒÙÔØ ÏËÎÏ" ++msgstr "Закрыть окно" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" +-msgstr "_îÁÊÔÉ" ++msgstr "_Ðайти" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" +-msgstr "îÁÊÔÉ ÓÌÏ×Ï × ÄÏËÕÍÅÎÔÅ" ++msgstr "Ðайти Ñлово в документе" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." +-msgstr "îÁÓÔÒÏÊËÉ..." ++msgstr "ÐаÑтройки..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" +-msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ ÎÁÓÔÒÏÊËÉ ÐÒÉÌÏÖÅÎÉÑ" ++msgstr "Редактировать наÑтройки приложениÑ" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" +-msgstr "õ×ÅÌÉÞÉÔØ ÍÁÓÛÔÁÂ" ++msgstr "Увеличить" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" +-msgstr "õ×ÅÌÉÞÉÔØ ÄÏËÕÍÅÎÔ" ++msgstr "Увеличить документ" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" +-msgstr "õÍÅÎØÛÉÔØ ÍÁÓÛÔÁÂ" ++msgstr "Уменьшить" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" +-msgstr "õÍÅÎØÛÉÔØ ÄÏËÕÍÅÎÔ" ++msgstr "Уменьшить документ" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" +-msgstr "ðÏ×ÅÒÎÕÔØ ÎÁÐÒÁ×Ï" ++msgstr "Повернуть направо" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" +-msgstr "ðÏ×ÅÒÎÕÔØ ÄÏËÕÍÅÎÔ ÎÁ 90 ÇÒÁÄÕÓÏ× ÐÏ ÞÁÓÏ×ÏÊ ÓÔÒÅÌËÅ" ++msgstr "Повернуть документ на 90 градуÑов по чаÑовой Ñтрелке" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" +-msgstr "ðÏ×ÅÒÎÕÔØ ÎÁÌÅ×Ï" ++msgstr "Повернуть налево" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" +-msgstr "ðÏ×ÅÒÎÕÔØ ÄÏËÕÍÅÎÔ ÎÁ 90 ÇÒÁÄÕÓÏ× ÐÒÏÔÉ× ÞÁÓÏ×ÏÊ ÓÔÒÅÌËÉ" ++msgstr "Повернуть документ на 90 градуÑов против чаÑовой Ñтрелки" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" +-msgstr "ðÅÒ×ÁÑ ÓÔÒÁÎÉÃÁ" ++msgstr "ÐŸÐµÑ€Ð²Ð°Ñ Ñтраница" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÅÒ×ÕÀ ÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на первую Ñтраницу" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" +-msgstr "óÌÅÄÕÀÝÁÑ ÓÔÒÁÎÉÃÁ" ++msgstr "СледующаÑ" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÓÌÅÄÕÀÝÕÀ ÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на Ñледующую Ñтраницу" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" +-msgstr "ðÒÅÄÙÄÕÝÁÑ ÓÔÒÁÎÉÃÁ" ++msgstr "ПредыдущаÑ" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÒÅÄÙÄÕÝÕÀ ÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на предыдущую Ñтраницу" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" +-msgstr "ðÏÓÌÅÄÎÑÑ ÓÔÒÁÎÉÃÁ" ++msgstr "ПоÑледнÑÑ Ñтраница" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" +-msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄΠÓÔÒÁÎÉÃÕ" ++msgstr "Перейти на поÑледнбб Ñтраницу" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" +-msgstr "ï ÐÒÏÇÒÁÍÍÅ" ++msgstr "О программе" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" +-msgstr "ðÏËÁÚÁÔØ ÏÐÉÓÁÎÉÅ ÐÒÏÇÒÁÍÍÙ" ++msgstr "Показать опиÑание программы" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "" ++msgstr "Полный Ñкран" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" +-msgstr "" ++msgstr "Переключить полноÑкранный режим" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" +-msgstr "ðÏËÁÚÁÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×" ++msgstr "Показать панель инÑтрументов" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" +-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÐÁÎÅÌØ ÉÎÓÔÒÕÍÅÎÔÏ×" ++msgstr "Показать или Ñкрыть панель инÑтрументов" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" +-msgstr "ðÏËÁÚÁÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ" ++msgstr "Показать Ñтроку ÑоÑтоÑниÑ" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" +-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÓÔÒÏËÕ ÓÏÓÔÏÑÎÉÑ" ++msgstr "Показать или Ñкрыть Ñтроку ÑоÑтоÑниÑ" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" +-msgstr "ðÏËÁÚÁÔØ ÏÇÌÁ×ÌÅÎÉÅ" ++msgstr "Показать оглавление" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" +-msgstr "ðÏËÁÚÁÔØ ÉÌÉ ÓËÒÙÔØ ÏÇÌÁ×ÌÅÎÉÅ" ++msgstr "Показать или Ñкрыть оглавление" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" +-msgstr "ðÏ ÷ÙÓÏÔÅ" ++msgstr "По Ð’Ñ‹Ñоте" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" +-msgstr "íÁÓÛÔÁ ÐÏ ÒÁÚÍÅÒÕ ÓÔÒÁÎÉÃÙ" ++msgstr "МаÑштаб по размеру Ñтраницы" + +-#: 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 "ðÏ ûÉÒÉÎÅ" ++msgstr "По Ширине" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" +-msgstr "íÁÓÛÔÁ ÐÏ ÛÉÒÉÎÅ ÓÔÒÁÎÉÃÙ" ++msgstr "МаÑштаб по ширине Ñтраницы" + +-#: 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 "ïÔËÒÙÔØ PDF ÆÁÊÌ" ++msgstr "Открыть 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 "PDF ÆÁÊÌÙ" ++msgstr "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 "÷ÓÅ æÁÊÌÙ" ++msgstr "Ð’Ñе Файлы" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" +-msgstr "ðÁÒÏÌØ" ++msgstr "Пароль" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" +-msgstr "óÏÈÒÁÎÉÔØ PDF æÁÊÌ" ++msgstr "Сохранить PDF Файл" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" +-msgstr "óÔÒÁÎÉÃÁ" ++msgstr "Страница" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" +-msgstr "ÉÚ 0" ++msgstr "из 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" +-msgstr "ïÇÌÁ×ÌÅÎÉÅ" ++msgstr "Оглавление" + +-#: 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 "ïÛÉÂËÁ ÐÒÉ ÉÎÃÉÁÌÉÚÁÃÉÉ: %s\n" ++msgstr "Ошибка при инциализации: %s\n" + +-#: src/gtk/MainView.cxx:1056 +-#, fuzzy ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" +-msgstr "ì£ÇËÁÑ ÐÒÏÇÒÁÍÍÁ ÄÌÑ ÐÒÏÓÍÏÔÒÁ PDF ÆÁÊÌÏ×" ++msgstr "БыÑÑ‚Ñ€Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра PDF файлов" + +-#: 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" + "the Free Software Foundation; either version 2 of the License, or\n" + "(at your option) any later version.\n" + msgstr "" +-"ePDFView Ñ×ÌÑÅÔÓÑ Ó×ÏÂÏÄÎÙÍ ÐÒÏÇÒÁÍÍÎÙÍ ÏÂÅÓÐÅÞÅÎÉÅÍ. \n" +-"÷Ù ×ÐÒÁ×Å ÒÁÓÐÒÏÓÔÒÁÎÑÔØ Å£ É/ÉÌÉ ÍÏÄÉÆÉÃÉÒÏ×ÁÔØ × ÓÏÏÔ×ÅÔÓÔ×ÉÉ Ó\n" +-"ÕÓÌÏ×ÉÑÍÉ ×ÅÒÓÉÉ 2 ÌÉÂÏ ÐÏ ×ÁÛÅÍÕ ×ÙÂÏÒÕ Ó ÕÓÌÏ×ÉÑÍÉ ÂÏÌÅÅ ÐÏÚÄÎÅÊ\n" +-"×ÅÒÓÉÉ óÔÁÎÄÁÒÔÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU, ÏÐÕÂÌÉËÏ×ÁÎÎÏÊ\n" ++"ePDFView ÑвлÑетÑÑ Ñвободным программным обеÑпечением. \n" ++"Ð’Ñ‹ вправе раÑпроÑтранÑÑ‚ÑŒ её и/или модифицировать в ÑоответÑтвии Ñ\n" ++"уÑловиÑми верÑии 2 либо по вашему выбору Ñ ÑƒÑловиÑми более поздней\n" ++"верÑии Стандартной ОбщеÑтвенной Лицензии GNU, опубликованной\n" + "Free Software Foundation. \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" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "GNU General Public License for more details.\n" + msgstr "" +-"íÙ ÒÁÓÐÒÏÓÔÒÁÎÑÅÍ ÄÁÎÎÕÀ ÐÒÏÇÒÁÍÍÕ × ÎÁÄÅÖÄÅ ÎÁ ÔÏ, ÞÔÏ ÏÎÁ\n" +-"ÂÕÄÅÔ ×ÁÍ ÐÏÌÅÚÎÏÊ, ÏÄÎÁËÏ îå ðòåäïóôá÷ìñåí îá îå³\n" +-"îéëáëéè çáòáîôéê, × ÔÏÍ ÞÉÓÌÅ çáòáîôéé ôï÷áòîïçï\n" +-"óïóôïñîéñ ðòé ðòïäáöå É ðòéçïäîïóôé äìñ\n" +-"éóðïìøúï÷áîéñ ÷ ëïîëòåôîùè ãåìñè. äÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ\n" +-"ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÏÚÎÁËÏÍØÔÅÓØ ÓÏ óÔÁÎÄÁÒÔÎÏÊ\n" +-"ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÅÊ GNU.\n" ++"Мы раÑпроÑтранÑем данную программу в надежде на то, что она\n" ++"будет вам полезной, однако ÐЕ ПРЕДОСТÐВЛЯЕМ ÐÐ ÐЕÐ\n" ++"ÐИКÐКИХ ГÐÐ ÐÐТИЙ, в том чиÑле ГÐÐ ÐÐТИИ ТОВÐÐ ÐОГО\n" ++"СОСТОЯÐИЯ ПРИ ПРОДÐЖЕ и ПРИГОДÐОСТИ ДЛЯ\n" ++"ИСПОЛЬЗОВÐÐИЯ Ð’ КОÐКРЕТÐЫХ ЦЕЛЯХ. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ\n" ++"подробной информации ознакомьтеÑÑŒ Ñо Стандартной\n" ++"ОбщеÑтвенной Лицензией GNU.\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" + "59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + msgstr "" +-"÷Ù ÄÏÌÖÎÙ ÂÙÌÉ ÐÏÌÕÞÉÔØ ËÏÐÉÀ óÔÁÎÄÁÒÔÎÏÊ ïÂÝÅÓÔ×ÅÎÎÏÊ ìÉÃÅÎÚÉÉ GNU\n" +-"×ÍÅÓÔÅ Ó ePDFView; ÅÓÌÉ ÎÅÔ, ÎÁÐÉÛÉÔÅ ÐÉÓØÍÏ × Free Software Foundation," ++"Ð’Ñ‹ должны были получить копию Стандартной ОбщеÑтвенной Лицензии GNU\n" ++"вмеÑте Ñ ePDFView; еÑли нет, напишите пиÑьмо в Free Software Foundation," + "Inc.,\n" +-"ÎÁ ÁÄÒÅÓ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" ++"на Ð°Ð´Ñ€ÐµÑ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n" + +-#: src/gtk/MainView.cxx:1076 ++#: src/gtk/MainView.cxx:1128 + msgid "ePDFView" +-msgstr "" ++msgstr "ePDFView" + +-#: src/gtk/MainView.cxx:1083 ++#: src/gtk/MainView.cxx:1135 + msgid "translator-credits" +-msgstr "Igor Vagulin <igor_vagulin@mail.ru>" ++msgstr "" ++"Igor Vagulin <igor_vagulin@mail.ru>\n" ++"Sergey Starosek <sergey.starosek@gmail.com>" + + #: src/gtk/PreferencesView.cxx:32 + msgid "Preferences" +-msgstr "îÁÓÔÒÏÊËÉ" ++msgstr "ÐаÑтройки" + + #: src/gtk/PreferencesView.cxx:46 + msgid "External Commands" +-msgstr "÷ÎÅÛÎÉÅ ðÒÏÇÒÁÍÍÙ" ++msgstr "Внешние Программы" + + #: src/gtk/PreferencesView.cxx:105 + msgid "Web _Browser:" +-msgstr "éÎÔÅÒÎÅÔ âÒÁÕÚÅÒ" ++msgstr "Интернет Браузер" + + #: src/gtk/PreferencesView.cxx:118 + #, c-format + msgid "Note: <i>%s</i> will be replaced by the URI." +-msgstr "úÁÍÅÔËÁ: <i>%s</i> ÂÕÄÅÔ ÚÁÍÅÎÅÎÏ ÎÁ URI." ++msgstr "Заметка: <i>%s</i> будет заменено на URI." + + #: src/gtk/PrintView.cxx:51 + msgid "Print" +-msgstr "ðÅÞÁÔØ" ++msgstr "Печать" + + #: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 + msgid "Printer" +-msgstr "ðÒÉÎÔÅÒ" ++msgstr "Принтер" + + #: src/gtk/PrintView.cxx:74 + msgid "Job" +-msgstr "úÁÄÁÎÉÅ" ++msgstr "Задание" + + #: src/gtk/PrintView.cxx:79 + msgid "Paper" +-msgstr "âÕÍÁÇÁ" ++msgstr "Бумага" + + #: src/gtk/PrintView.cxx:359 + msgid "<b>Print Range</b>" +-msgstr "<b>äÉÁÐÁÚÏÎ ðÅÞÁÔÉ</b>" ++msgstr "<b>Диапазон Печати</b>" + + #: src/gtk/PrintView.cxx:377 + msgid "_All pages" +-msgstr "_÷ÓÅ ÓÔÒÁÎÉÃÙ" ++msgstr "_Ð’Ñе Ñтраницы" + + #: src/gtk/PrintView.cxx:380 + msgid "_Range:" +-msgstr "_äÉÁÐÁÚÏÎ" ++msgstr "_Диапазон" + + #: src/gtk/PrintView.cxx:392 + msgid "<b>Page Set</b>" +-msgstr "" ++msgstr "<b>Ðабор Ñтраниц</b>" + + #: src/gtk/PrintView.cxx:408 + msgid "A_ll pages" +-msgstr "" ++msgstr "Ð’Ñе Ñтраницы" + + #: src/gtk/PrintView.cxx:412 + msgid "O_dd pages" +-msgstr "" ++msgstr "Ðечетные" + + #: src/gtk/PrintView.cxx:416 + msgid "_Even pages" +-msgstr "" ++msgstr "Четные" + + #: src/gtk/PrintView.cxx:420 + msgid "<b>Copies</b>" +-msgstr "<b>ëÏÐÉÉ</b>" ++msgstr "<b>Копии</b>" + + #: src/gtk/PrintView.cxx:437 + msgid "N_umber of copies:" +-msgstr "ëÏÌÉÞÅÓÔ×Ï ËÏÐÉÊ:" ++msgstr "КоличеÑтво копий:" + + #: src/gtk/PrintView.cxx:444 + msgid "C_ollate" +-msgstr "" ++msgstr "УпорÑдочить" + + #: src/gtk/PrintView.cxx:465 + msgid "<b>Paper and Layout</b>" +-msgstr "<b>óÔÒÁÎÉÃÁ É ÒÁÚÍÅÝÅÎÉÅ</b>" ++msgstr "<b>Страница и макет</b>" + + #: src/gtk/PrintView.cxx:482 + msgid "Paper _Size:" +-msgstr "òÁÚÍÅÒ ÂÕÍÁÇÉ" ++msgstr "Размер бумаги" + + #: src/gtk/PrintView.cxx:508 + msgid "Page _orientation:" +-msgstr "" ++msgstr "ОриентациÑ:" + + #: src/gtk/PrintView.cxx:539 + msgid "_Layout:" +-msgstr "òÁÚÍÅÔËÁ:" ++msgstr "Макет:" + + #: src/gtk/PrintView.cxx:568 + msgid "<b>Output</b>" +-msgstr "<b>÷Ù×ÏÄ</b>" ++msgstr "<b>Вывод</b>" + + #: src/gtk/PrintView.cxx:585 + msgid "_Mode:" +-msgstr "òÅÖÉÍ:" ++msgstr "Режим:" + + #: src/gtk/PrintView.cxx:613 + msgid "_Resolution:" +-msgstr "òÁÚÒÅÛÅÎÉÅ" ++msgstr "Разрешение" + + #: src/gtk/PrintView.cxx:668 + msgid "State" +-msgstr "óÏÓÔÏÑÎÉÅ" ++msgstr "СоÑтоÑние" + + #: src/gtk/PrintView.cxx:677 + msgid "Jobs" +-msgstr "úÁÄÁÎÉÑ" ++msgstr "ЗаданиÑ" + + #: src/gtk/PrintView.cxx:686 + msgid "Location" +-msgstr "" ++msgstr "РаÑположение" + + #: src/gtk/PrintView.cxx:717 + msgid "Plain" +-msgstr "" ++msgstr "Обычный" + + #: src/gtk/PrintView.cxx:723 + msgid "2 pages in 1" +-msgstr "2 ÓÔÒÁÎÉÃÙ ÎÁ 1" ++msgstr "2 Ñтраницы на 1" + + #: src/gtk/PrintView.cxx:729 + msgid "4 pages in 1" +-msgstr "2 ÓÔÒÁÎÉÃÙ ÎÁ 1" ++msgstr "4 Ñтраницы на 1" + + #: src/gtk/PrintView.cxx:744 + msgid "Portrait" +-msgstr "ëÎÉÖÎÙÊ" ++msgstr "Книга" + + #: src/gtk/PrintView.cxx:750 + msgid "Landscape" +-msgstr "áÌØÂÏÍÎÙÊ" ++msgstr "Ðльбом" + + #: src/gtk/StockIcons.cxx:40 + msgid "Find _Next" +-msgstr "îÁÊÔÉ _ÓÌÅÄÕÀÝÅÅ" ++msgstr "Ðайти _Ñледующее" + + #: src/gtk/StockIcons.cxx:41 + msgid "Find _Previous" +-msgstr "îÁÊÔÉ _ÐÒÅÄÙÄÕÝÅÅ" ++msgstr "Ðайти _предыдущее" +diff -Nurd epdfview-0.1.6-svn/po/sv.po epdfview/po/sv.po +--- epdfview-0.1.6-svn/po/sv.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/sv.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,597 @@ ++# Swedish translation for ePDFView. ++# Copyright (C) 2007 Free Software Foundation, Inc. ++# This file is distributed under the same license as the epdfview package. ++# Daniel Nylander <po@danielnylander.se>, 2007. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: ePDFviewer\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-06-10 16:45+0100\n" ++"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" ++"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=utf-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "Inga sökträffar hittades!" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "Söker pÃ¥ sida %d av %d..." ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "Inga fel." ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "Filen hittades inte." ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "Kunde inte läsa sidkatalogen." ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "PDF-filen är skadad och kan inte repareras." ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "Filen är krypterad och lösenordet var felaktigt eller angavs inte." ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "Icke-existerande eller ogiltig markeringsfil." ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "Ogiltig skrivare." ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "Fel vid utskrift." ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "PDF-filen tillÃ¥ter inte den Ã¥tgärden." ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "Ogiltigt sidnummer." ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "In/ut-fel." ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "Okänt fel (%d)." ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FIL] - visa PDF-dokument" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "PDF-visare" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "Läser om filen %s..." ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "Läs in filen %s..." ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "av %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "Sparar dokumentet till %s..." ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "Fel vid inläsning av fil" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "" ++"Lösenordet som du angav är inte ett giltigt lösenord för den här filen." ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "Fel vid sparning av fil" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "Läser in..." ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "GrÃ¥skala" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "Inaktiv" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "Stoppad" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "Behandlar" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "Okänt" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"Misslyckades med att läsa in dokumentet \"%s\".\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "Sök:" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "_Arkiv" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "R_edigera" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "_Visa" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "_GÃ¥" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "_Hjälp" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "_Öppna" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "Öppna ett PDF-dokument" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "_Uppdatera" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "Läs in det aktuella dokumentet igen" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "_Spara en kopia..." ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "Spara en kopia av det aktuella dokumentet" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "Skriv _ut..." ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "Skriv ut aktuellt dokument" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "_Stäng" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "Stäng det här fönstret" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "_Sök" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "Hitta ett ord i dokumentet" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "Inställningar..." ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "Ändra programmets inställningar" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "Zooma _in" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "Förstora dokumentet" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "Zooma _ut" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "Förminska dokumentet" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "Rotera Ã¥t _höger" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "Rotera dokumentet 90 grader medsols" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "Rotera Ã¥t _vänster" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "Rotera dokumentet 90 grader motsols" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "_Första sidan" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "GÃ¥ till första sidan" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "_Nästa sida" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "GÃ¥ till nästa sida" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "_FöregÃ¥ende sida" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "GÃ¥ till föregÃ¥ende sida" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "_Sista sidan" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "GÃ¥ till sista sidan" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "_Om" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "Visa information om programmet" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "_Helskärm" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "Växla helskärmsläge" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "Visa _verktygsrad" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "Visa eller dölj verktygsraden" ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "Visa _statusrad" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "Visa eller dölj statusraden" ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "Visa i_ndex" ++ ++# Kontur? ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "Visa eller dölj dokumentets sammandrag" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "Zooma till hela _fönstret" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "Gör sÃ¥ att det aktuella dokumentet fyller fönstret" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "Zooma till hela fönstrets _bredd" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "Gör sÃ¥ att det aktuella dokumentet fyller fönstrets bredd" ++ ++#: 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 "Öppna PDF-fil" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "Portable Document Format-filer (PDF)" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "Alla filer" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "Lösenord" ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "Spara PDF-fil" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "Sida" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "av 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "Index" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "Fel vid byggandet av gränssnittshanteraren: %s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "En resurssnÃ¥l PDF-visare" ++ ++#: 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 är fri programvara. Du kan distribuera det och/eller\n" ++"modifiera det under villkoren i GNU General Public License, publicerad\n" ++"av Free Software Foundation, antingen version 2 eller (om du sÃ¥ vill)\n" ++"nÃ¥gon senare version.\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 distribueras i hopp om att det ska vara användbart,\n" ++"men UTAN NÃ…GON SOM HELST GARANTI, även utan underförstÃ¥dd garanti\n" ++"om SÄLJBARHET eller LÄMPLIGHET FÖR NÃ…GOT SPECIELLT ÄNDAMÃ…L. Se GNU\n" ++"General Public License för ytterligare information.\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 "" ++"Du bör ha fÃ¥tt en kopia av GNU General Public License tillsammans\n" ++"med detta program. Om inte, skriv till 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 ++msgid "translator-credits" ++msgstr "Daniel Nylander <po@danielnylander.se>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "Inställningar" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "Externa kommandon" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "Webb_läsare:" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "Observera: <i>%s</i> kommer att ersättas av URI:n." ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "Skriv ut" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "Skrivare" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "Jobb" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "Papper" ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>Utskriftsintervall</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "_Alla sidor" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "_Intervall:" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>Sidinställningar</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "A_lla sidor" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "U_dda sidnummer" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "_Jämna sidnummer" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>Kopior</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "An_tal kopior:" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "S_ortera" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>Papper och layout</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "Pappersto_rlek:" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "Sid_orientering:" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "_Layout:" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>Utmatning</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "_Läge:" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "_Upplösning:" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "TillstÃ¥nd" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "Jobb" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "Plats" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "Vanligt" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "2 sidor pÃ¥ 1" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "4 sidor pÃ¥ 1" ++ ++#: src/gtk/PrintView.cxx:744 ++msgid "Portrait" ++msgstr "StÃ¥ende" ++ ++#: src/gtk/PrintView.cxx:750 ++msgid "Landscape" ++msgstr "Liggande" ++ ++#: src/gtk/StockIcons.cxx:40 ++msgid "Find _Next" ++msgstr "Sök _nästa" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "Sök _föregÃ¥ende" +diff -Nurd epdfview-0.1.6-svn/po/vi.po epdfview/po/vi.po +--- epdfview-0.1.6-svn/po/vi.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/vi.po 2008-07-13 12:55:55.073198000 +0200 +@@ -7,7 +7,7 @@ + msgstr "" + "Project-Id-Version: ePDFView 0.1.5\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-06-14 20:11+0100\n" + "Last-Translator: VnPenguin <vnpenguin@gmail.com>\n" + "Language-Team: Vietnamese <i18n@vnoss.org>\n" +@@ -74,11 +74,11 @@ + msgid "Unknown error (%d)." + msgstr "Lá»—i không xác định (%d)." + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[FILE] - xem tà i liệu PDF" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "Trình xem PDF" + +@@ -92,7 +92,7 @@ + msgid "Loading file %s..." + msgstr "Tải file %s..." + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "của %d" +@@ -102,39 +102,47 @@ + msgid "Saving document to %s..." + msgstr "Äang ghi tà i liệu và o %s..." + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "Lá»—i tải file" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "Máºt mã mà bạn cung cấp là không hợp lệ cho file nà y." + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "Lá»—i ghi file" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "Äang tải ..." + +-#: 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 "Kiểu Ä‘en trắng" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "Nghỉ" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "Dừng" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "Äang xá» lý" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "Không xác định" + +@@ -151,244 +159,260 @@ + msgid "Find:" + msgstr "Tìm kiếm:" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "_File" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "_Sá»a đổi" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "_Xem" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "_Chuyển trang" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "_Trợ giúp" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "_Mở file" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "Mở má»™t tà i liệu PDF" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "_Tải lại" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "Tải lại tà i liệu hiện tại" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "_LÆ°u má»™t bản..." + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "LÆ°u má»™t bản của tà i liệu hiện tại" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "_In ra..." + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "In tà i liệu hiện tại" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "_Äóng" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "Äóng cá»a sổ nà y" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "_Tìm" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "Tìm má»™t từ trong tà i liệu" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "Xác láºp..." + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "Thay đổi các xác láºp của ứng dụng" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "Phóng _to" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "Phóng to tà i liệu" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "Thu _nhá»" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "Thu nhá» tà i liệu" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "Quay _phải" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "Quay tà i liệu hiện tại 90 Ä‘á»™ theo chiá»u kim đồng hồ" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "Quay _trái" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "Quay tà i liệu hiện tại 90 Ä‘á»™ theo ngược chiá»u kim đồng hồ" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "_Trang đầu tiên" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "Äi đến trang đầu tiên" + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "Trang _kế" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "Äi đến trang kế tiếp" + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "Trang trÆ°á»›c" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "Äi đến trang trÆ°á»›c" + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "Trang cuối" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "Äi đến trang cuối" + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "_Vá»..." + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "Hiển thị danh sách đóng góp" + +-#: 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 "Hiển thị thanh công cụ" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "Hiển thị hoặc dấu thanh công cụ" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "Hiển thị thanh trạng thái" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "Hiển thị hoặc dấu thanh trạng thái" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "Hiển thị chỉ mục" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "Hiển thị hoặc dấu hình dáng bên ngoà i của tà i liệu" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "Hiệu chỉnh _hợp vá»›i cá»a sổ" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "Hiệu chỉnh tà i liệu hiện tại lấp đầy cá»a sổ" + +-#: 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 "Hiệu chỉnh theo bá» _rá»™ng trang" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "Hiệu chỉnh tà i liệu hiện tại hợp vá»›i bá» rá»™ng trang" + +-#: 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 "Mở file 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 "file 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 "Tất cả các file" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "Máºt mã" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "LÆ°u file PDF" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "Trang" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "0/0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "Chỉ mục" + +-#: 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 "Lá»—i khi tạo quản lý giao diện ngÆ°á»i dùng: %s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "Má»™t trình xem PDF nhá» gá»n" + +-#: 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" +@@ -400,7 +424,7 @@ + "bởi Free Software Foundation; phiên bản 2 hoặc (theo lá»±a chá»n của bạn)\n" + " bất kì phiên bản má»›i nà o.\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" +@@ -412,7 +436,7 @@ + "ngay cả cho MERCHANTABILITY hoặc FITNESS FOR A PARTICULAR PURPOSE.\n" + " Xem giấy phép GNU GPL để biết thêm chi tiết.\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" +@@ -422,11 +446,11 @@ + "ePDFView; nếu không, thì hãy liên lạc Free Software 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 "VnPenguin <vnpenguin@gmail.com>" + +diff -Nurd epdfview-0.1.6-svn/po/zh_CN.po epdfview/po/zh_CN.po +--- epdfview-0.1.6-svn/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 ++++ epdfview/po/zh_CN.po 2008-07-13 12:55:55.083198000 +0200 +@@ -0,0 +1,593 @@ ++# Simplified Chinese Messages for epdfview. ++# Copyright (C) 2007 Free Software Foundation, Inc. ++# This file is distributed under the same license as the epdfview package. ++# Changyan Xie <panchoat@gmail.com>, 2007. ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: epdfview 0.1.5\n" ++"Report-Msgid-Bugs-To: jordi@emma-soft.com\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2006-06-19 10:47+0800\n" ++"Last-Translator: Changyan Xie <panchoat@gmail.com>\n" ++"Language-Team: Changyan Xie <panchoat@gmail.com>\n" ++"MIME-Version: 1.0\n" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Transfer-Encoding: 8bit\n" ++"Plural-Forms: nplurals=1; plural=0;\n" ++ ++#: src/FindPter.cxx:187 ++msgid "No Results Found!" ++msgstr "找ä¸åˆ°ä»»ä½•ç»“æžœï¼" ++ ++#: src/FindPter.cxx:195 ++#, c-format ++msgid "Searching in page %d of %d..." ++msgstr "æ£åœ¨æŸ¥æ‰¾ %2$d 页ä¸çš„第 %1$d 页…" ++ ++#: src/IDocument.cxx:82 ++msgid "No error." ++msgstr "没有错误。" ++ ++#: src/IDocument.cxx:85 ++msgid "File not found." ++msgstr "找ä¸åˆ°æ–‡ä»¶ã€‚" ++ ++#: src/IDocument.cxx:88 ++msgid "Couldn't read the page catalog." ++msgstr "æ— æ³•è¯»å–页é¢åˆ†ç±»ã€‚" ++ ++#: src/IDocument.cxx:91 ++msgid "The PDF file is damaged and can't be repaired." ++msgstr "PDF 文件å—æŸè€Œä¸”æ— æ³•ä¿®å¤ã€‚" ++ ++#: src/IDocument.cxx:94 ++msgid "The file is encrypted and the password was incorrect or not supplied." ++msgstr "æ–‡ä»¶å·²åŠ å¯†è€Œä¸”å¯†ç 是ä¸æ£ç¡®æˆ–æ˜¯æ— æ³•æ供的。" ++ ++#: src/IDocument.cxx:97 ++msgid "Nonexistent or invalid highlight file." ++msgstr "ä¸å˜åœ¨æˆ–æ— æ•ˆçš„é«˜äº®åº¦æ–‡ä»¶ã€‚" ++ ++#: src/IDocument.cxx:100 ++msgid "Invalid printer." ++msgstr "æ— æ•ˆçš„æ‰“å°æœºã€‚" ++ ++#: src/IDocument.cxx:103 ++msgid "Error during printing." ++msgstr "打å°æ—¶å‘生错误" ++ ++#: src/IDocument.cxx:106 ++msgid "The PDF file doesn't allow that operation." ++msgstr "PDF 文件ä¸å…许该项æ“作。" ++ ++#: src/IDocument.cxx:109 ++msgid "Invalid page number." ++msgstr "æ— æ•ˆçš„é¡µç 。" ++ ++#: src/IDocument.cxx:112 ++msgid "File I/O error." ++msgstr "文件 I/O 错误。" ++ ++#: src/IDocument.cxx:115 ++#, c-format ++msgid "Unknown error (%d)." ++msgstr "ä¸æ˜Žçš„错误 (%d)。" ++ ++#: src/main.cxx:59 ++msgid "[FILE] - view PDF documents" ++msgstr "[FILE] - æµè§ˆ PDF 文件" ++ ++#: src/main.cxx:72 src/MainPter.cxx:153 ++msgid "PDF Viewer" ++msgstr "PDF æµè§ˆå™¨" ++ ++#: src/MainPter.cxx:233 ++#, c-format ++msgid "Reloading file %s..." ++msgstr "æ£åœ¨é‡æ–°è£…载文件 %s…" ++ ++#: src/MainPter.cxx:237 ++#, c-format ++msgid "Loading file %s..." ++msgstr "装载文件 %s…" ++ ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 ++#, c-format ++msgid "of %d" ++msgstr "之于 %d" ++ ++#: src/MainPter.cxx:588 ++#, c-format ++msgid "Saving document to %s..." ++msgstr "ä¿å˜æ–‡ä»¶è‡³ %s…" ++ ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 ++msgid "Error Loading File" ++msgstr "装载文件时å‘生错误" ++ ++#: src/MainPter.cxx:872 ++msgid "The password you have supplied is not a valid password for this file." ++msgstr "您æ供的密ç 对于æ¤æ–‡ä»¶æ— 效。" ++ ++#: src/MainPter.cxx:953 ++msgid "Error Saving File" ++msgstr "ä¿å˜æ–‡ä»¶æ—¶å‘生错误" ++ ++#: src/PagePter.cxx:338 ++msgid "Loading..." ++msgstr "装载…" ++ ++#: src/PrintPter.cxx:252 ++msgid "A4" ++msgstr "" ++ ++#: src/PrintPter.cxx:280 ++msgid "300 DPI" ++msgstr "" ++ ++#: src/PrintPter.cxx:308 ++msgid "Grayscale" ++msgstr "ç°åº¦" ++ ++#: src/PrintPter.cxx:409 ++msgid "Idle" ++msgstr "闲置" ++ ++#: src/PrintPter.cxx:412 ++msgid "Stopped" ++msgstr "å·²åœæ¢" ++ ++#: src/PrintPter.cxx:415 ++msgid "Processing" ++msgstr "处ç†ä¸" ++ ++#: src/PrintPter.cxx:418 ++msgid "Unknown" ++msgstr "未知" ++ ++#: src/PDFDocument.cxx:272 ++#, c-format ++msgid "" ++"Failed to load document '%s'.\n" ++"%s\n" ++msgstr "" ++"装载文件 '%s' 时失败。\n" ++"%s\n" ++ ++#: src/gtk/FindView.cxx:51 ++msgid "Find:" ++msgstr "查找：" ++ ++#: src/gtk/MainView.cxx:89 ++msgid "_File" ++msgstr "文件(_F)" ++ ++#: src/gtk/MainView.cxx:90 ++msgid "_Edit" ++msgstr "编辑(_E)" ++ ++#: src/gtk/MainView.cxx:91 ++msgid "_View" ++msgstr "æµè§ˆ(_V)" ++ ++#: src/gtk/MainView.cxx:92 ++msgid "_Go" ++msgstr "å‰å¾€(_G)" ++ ++#: src/gtk/MainView.cxx:93 ++msgid "_Help" ++msgstr "帮助(_H)" ++ ++#: src/gtk/MainView.cxx:95 ++msgid "_Open" ++msgstr "打开(_O)" ++ ++#: src/gtk/MainView.cxx:96 ++msgid "Open a PDF document" ++msgstr "打开 PDF 文件" ++ ++#: src/gtk/MainView.cxx:99 ++msgid "_Reload" ++msgstr "é‡æ–°è£…è½½(_R)" ++ ++#: src/gtk/MainView.cxx:100 ++msgid "Reload the current document" ++msgstr "é‡æ–°è£…载当å‰æ–‡ä»¶" ++ ++#: src/gtk/MainView.cxx:103 ++msgid "_Save a Copy..." ++msgstr "ä¿å˜å‰¯æœ¬(_S)…" ++ ++#: src/gtk/MainView.cxx:104 ++msgid "Save a copy of the current document" ++msgstr "ä¿å˜å½“å‰æ–‡ä»¶çš„副本" ++ ++#: src/gtk/MainView.cxx:108 ++msgid "_Print..." ++msgstr "打å°(_P)…" ++ ++#: src/gtk/MainView.cxx:109 ++msgid "Print the current document" ++msgstr "打å°å½“å‰æ–‡ä»¶" ++ ++#: src/gtk/MainView.cxx:113 ++msgid "_Close" ++msgstr "å…³é—(_C)" ++ ++#: src/gtk/MainView.cxx:114 ++msgid "Close this window" ++msgstr "å…³é—æ¤çª—å£" ++ ++#: src/gtk/MainView.cxx:117 ++msgid "_Find" ++msgstr "查找(_F)" ++ ++#: src/gtk/MainView.cxx:118 ++msgid "Find a word in the document" ++msgstr "在文件ä¸æŸ¥æ‰¾å—è¯" ++ ++#: src/gtk/MainView.cxx:121 ++msgid "Preferences..." ++msgstr "å好设定…" ++ ++#: src/gtk/MainView.cxx:122 ++msgid "Change the application's preferences" ++msgstr "改å˜åº”用软件的å好设定" ++ ++#: src/gtk/MainView.cxx:125 ++msgid "Zoom _In" ++msgstr "放大(_I)" ++ ++#: src/gtk/MainView.cxx:126 ++msgid "Enlarge the document" ++msgstr "放大文件" ++ ++#: src/gtk/MainView.cxx:129 ++msgid "Zoom _Out" ++msgstr "缩å°(_O)" ++ ++#: src/gtk/MainView.cxx:130 ++msgid "Shrink the document" ++msgstr "缩å°æ–‡ä»¶" ++ ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 ++msgid "Rotate _Right" ++msgstr "å‘å³æ—‹è½¬(_R)" ++ ++#: src/gtk/MainView.cxx:134 ++msgid "Rotate the document 90 degrees clockwise" ++msgstr "顺时针旋转文件 90 度" ++ ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 ++msgid "Rotate _Left" ++msgstr "å‘左旋转(_L)" ++ ++#: src/gtk/MainView.cxx:138 ++msgid "Rotate the document 90 degrees counter-clockwise" ++msgstr "逆时针旋转文件 90 度" ++ ++#: src/gtk/MainView.cxx:141 ++msgid "_First Page" ++msgstr "第一页(_F)" ++ ++#: src/gtk/MainView.cxx:142 ++msgid "Go to the first page" ++msgstr "å‰å¾€ç¬¬ä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:145 ++msgid "_Next Page" ++msgstr "下一页(_N)" ++ ++#: src/gtk/MainView.cxx:146 ++msgid "Go to the next page" ++msgstr "å‰å¾€ä¸‹ä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:149 ++msgid "_Previous Page" ++msgstr "上一页(_P)" ++ ++#: src/gtk/MainView.cxx:150 ++msgid "Go to the previous page" ++msgstr "å‰å¾€ä¸Šä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:153 ++msgid "_Last Page" ++msgstr "最åŽä¸€é¡µ(_L)" ++ ++#: src/gtk/MainView.cxx:154 ++msgid "Go to the last page" ++msgstr "å‰å¾€æœ€åŽä¸€é¡µ" ++ ++#: src/gtk/MainView.cxx:157 ++msgid "_About" ++msgstr "关于(_A)" ++ ++#: src/gtk/MainView.cxx:158 ++msgid "Display application's credits" ++msgstr "显示应用程åºçš„æ„Ÿè°¢" ++ ++#: src/gtk/MainView.cxx:175 ++msgid "F_ull screen" ++msgstr "å…¨å±(_F)" ++ ++#: src/gtk/MainView.cxx:176 ++msgid "Toggle full screen window" ++msgstr "开关全å±æ¨¡å¼" ++ ++#: src/gtk/MainView.cxx:179 ++msgid "Show _Toolbar" ++msgstr "显示工具æ (_T)" ++ ++#: src/gtk/MainView.cxx:180 ++msgid "Show or hide the toolbar" ++msgstr "显示或éšè—工具æ " ++ ++#: src/gtk/MainView.cxx:183 ++msgid "Show _Statusbar" ++msgstr "显示状æ€æ (_S)" ++ ++#: src/gtk/MainView.cxx:184 ++msgid "Show or hide the statusbar" ++msgstr "显示或éšè—状æ€æ " ++ ++#: src/gtk/MainView.cxx:187 ++msgid "Show I_ndex" ++msgstr "显示索引(_N)" ++ ++#: src/gtk/MainView.cxx:188 ++msgid "Show or hide the document's outline" ++msgstr "显示或éšè—文件外框" ++ ++#: src/gtk/MainView.cxx:191 ++msgid "Zoom to _Fit" ++msgstr "符åˆçª—å£(_F)" ++ ++#: src/gtk/MainView.cxx:192 ++msgid "Make the current document fill the window" ++msgstr "将当å‰æ–‡ä»¶å¡«æ»¡çª—å£" ++ ++#: src/gtk/MainView.cxx:195 src/gtk/StockIcons.cxx:44 ++msgid "Zoom to _Width" ++msgstr "符åˆå®½åº¦(_W)" ++ ++#: src/gtk/MainView.cxx:196 ++msgid "Make the current document fill the window width" ++msgstr "将当å‰æ–‡ä»¶ç¬¦åˆçª—å£å®½åº¦" ++ ++#: 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 "打开 PDF 文件" ++ ++#: src/gtk/MainView.cxx:340 src/gtk/MainView.cxx:454 ++msgid "Portable Document Format (PDF) Files" ++msgstr "å¯æºå¼æ–‡ä»¶æ ¼å¼ (PDF) 文件" ++ ++#: src/gtk/MainView.cxx:352 src/gtk/MainView.cxx:466 ++msgid "All Files" ++msgstr "所有文件" ++ ++#: src/gtk/MainView.cxx:404 ++msgid "Password" ++msgstr "密ç " ++ ++#: src/gtk/MainView.cxx:428 ++msgid "Save PDF File" ++msgstr "ä¿å˜ PDF 文件" ++ ++#: src/gtk/MainView.cxx:858 ++msgid "Page" ++msgstr "页é¢" ++ ++#: src/gtk/MainView.cxx:868 ++msgid "of 0" ++msgstr "之于 0" ++ ++#: src/gtk/MainView.cxx:921 ++msgid "Index" ++msgstr "索引" ++ ++#: src/gtk/MainView.cxx:991 src/gtk/MainView.cxx:1001 ++#, c-format ++msgid "Error building UI manager: %s\n" ++msgstr "建立 UI 管ç†å‘˜æ—¶å‘生错误：%s\n" ++ ++#: src/gtk/MainView.cxx:1108 ++msgid "A lightweight PDF viewer" ++msgstr "è½»é‡çº§çš„ PDF æµè§ˆå™¨" ++ ++#: 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 为自由软件；您å¯ä¾æ®è‡ªç”±è½¯ä»¶åŸºé‡‘会所å‘表的 GNU 通用公共授æƒ\n" ++"æ¡æ¬¾è§„定，就本程åºé‡æ–°åˆ†å‘与ï¼æˆ–ä¿®æ”¹ï¼›æ— è®ºæ‚¨ä¾æ®çš„是本授æƒçš„第二版或\n" ++"（您自行选择的）任何ç¨åŽå‘行的版本。\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 ç³»åŸºäºŽä½¿ç”¨ç›®çš„è€ŒåŠ ä»¥åˆ†å‘，然而ä¸è´Ÿä»»ä½•æ‹…ä¿è´£ä»»ï¼›äº¦æ— 对适售性\n" ++"或特定目的适用性所为的默示性担ä¿ã€‚详情请å‚ç…§ GNU 通用公共授æƒã€‚\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 "" ++"您应已收到附éšäºŽ ePDFView çš„ GNU 通用公共授æƒçš„å‰¯æœ¬ï¼›å¦‚æ— ï¼Œè¯·å†™ä¿¡è‡³\n" ++"自由软件基金会: \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 ++msgid "translator-credits" ++msgstr "è°¢é•¿é› <panchoat@gmail.com>" ++ ++#: src/gtk/PreferencesView.cxx:32 ++msgid "Preferences" ++msgstr "å好设定" ++ ++#: src/gtk/PreferencesView.cxx:46 ++msgid "External Commands" ++msgstr "外部命令" ++ ++#: src/gtk/PreferencesView.cxx:105 ++msgid "Web _Browser:" ++msgstr "网页æµè§ˆå™¨(_B)：" ++ ++#: src/gtk/PreferencesView.cxx:118 ++#, c-format ++msgid "Note: <i>%s</i> will be replaced by the URI." ++msgstr "注æ„：<i>%s</i> 将会被 URI 所å–代。" ++ ++#: src/gtk/PrintView.cxx:51 ++msgid "Print" ++msgstr "打å°" ++ ++#: src/gtk/PrintView.cxx:69 src/gtk/PrintView.cxx:659 ++msgid "Printer" ++msgstr "打å°æœº" ++ ++#: src/gtk/PrintView.cxx:74 ++msgid "Job" ++msgstr "工作" ++ ++#: src/gtk/PrintView.cxx:79 ++msgid "Paper" ++msgstr "çº¸å¼ " ++ ++#: src/gtk/PrintView.cxx:359 ++msgid "<b>Print Range</b>" ++msgstr "<b>打å°èŒƒå›´</b>" ++ ++#: src/gtk/PrintView.cxx:377 ++msgid "_All pages" ++msgstr "所有页é¢(_A)" ++ ++#: src/gtk/PrintView.cxx:380 ++msgid "_Range:" ++msgstr "范围(_R)：" ++ ++#: src/gtk/PrintView.cxx:392 ++msgid "<b>Page Set</b>" ++msgstr "<b>页é¢è®¾å®š</b>" ++ ++#: src/gtk/PrintView.cxx:408 ++msgid "A_ll pages" ++msgstr "所有页é¢(_L)" ++ ++#: src/gtk/PrintView.cxx:412 ++msgid "O_dd pages" ++msgstr "奇数页é¢(_D)" ++ ++#: src/gtk/PrintView.cxx:416 ++msgid "_Even pages" ++msgstr "å¶æ•°é¡µé¢(_E)" ++ ++#: src/gtk/PrintView.cxx:420 ++msgid "<b>Copies</b>" ++msgstr "<b>份数</b>" ++ ++#: src/gtk/PrintView.cxx:437 ++msgid "N_umber of copies:" ++msgstr "副本的数é‡ï¼š" ++ ++#: src/gtk/PrintView.cxx:444 ++msgid "C_ollate" ++msgstr "自动分页(_O)" ++ ++#: src/gtk/PrintView.cxx:465 ++msgid "<b>Paper and Layout</b>" ++msgstr "<b>çº¸å¼ å’Œç‰ˆé¢</b>" ++ ++#: src/gtk/PrintView.cxx:482 ++msgid "Paper _Size:" ++msgstr "çº¸å¼ å¤§å°(_S)：" ++ ++#: src/gtk/PrintView.cxx:508 ++msgid "Page _orientation:" ++msgstr "çº¸å¼ æ–¹å‘(_O)：" ++ ++#: src/gtk/PrintView.cxx:539 ++msgid "_Layout:" ++msgstr "版é¢(_L)" ++ ++#: src/gtk/PrintView.cxx:568 ++msgid "<b>Output</b>" ++msgstr "<b>输出</b>" ++ ++#: src/gtk/PrintView.cxx:585 ++msgid "_Mode:" ++msgstr "模å¼(_M)：" ++ ++#: src/gtk/PrintView.cxx:613 ++msgid "_Resolution:" ++msgstr "分辨率(_R)：" ++ ++#: src/gtk/PrintView.cxx:668 ++msgid "State" ++msgstr "状æ€" ++ ++#: src/gtk/PrintView.cxx:677 ++msgid "Jobs" ++msgstr "工作" ++ ++#: src/gtk/PrintView.cxx:686 ++msgid "Location" ++msgstr "ä½ç½®" ++ ++#: src/gtk/PrintView.cxx:717 ++msgid "Plain" ++msgstr "普通" ++ ++#: src/gtk/PrintView.cxx:723 ++msgid "2 pages in 1" ++msgstr "两页åˆä¸€" ++ ++#: src/gtk/PrintView.cxx:729 ++msgid "4 pages in 1" ++msgstr "四页åˆä¸€" ++ ++#: 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 "查找下一个(_N)" ++ ++#: src/gtk/StockIcons.cxx:41 ++msgid "Find _Previous" ++msgstr "查找上一个(_P)" +diff -Nurd epdfview-0.1.6-svn/po/zh_TW.po epdfview/po/zh_TW.po +--- epdfview-0.1.6-svn/po/zh_TW.po 2008-07-13 12:57:47.543198000 +0200 ++++ epdfview/po/zh_TW.po 2008-07-13 12:55:55.083198000 +0200 +@@ -1,14 +1,13 @@ + # Traditional Chinese Messages for epdfview. +-# Copyright (C) 2006 Free Software Foundation, Inc. + # This file is distributed under the same license as the epdfview package. +-# Wei-Lun Chao <william.chao@ossii.com.tw>, 2006. ++# Wei-Lun Chao <william.chao@ossii.com.tw>, 2006, 07. + # + msgid "" + msgstr "" +-"Project-Id-Version: epdfview 0.1.5\n" ++"Project-Id-Version: epdfview 0.1.6\n" + "Report-Msgid-Bugs-To: jordi@emma-soft.com\n" +-"POT-Creation-Date: 2007-02-26 17:47+0100\n" +-"PO-Revision-Date: 2006-06-19 10:47+0800\n" ++"POT-Creation-Date: 2008-04-14 13:27+0200\n" ++"PO-Revision-Date: 2007-04-20 12:47+0800\n" + "Last-Translator: Wei-Lun Chao <william.chao@ossii.com.tw>\n" + "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" + "MIME-Version: 1.0\n" +@@ -74,11 +73,11 @@ + msgid "Unknown error (%d)." + msgstr "ä¸æ˜Žçš„錯誤 (%d)。" + +-#: src/main.cxx:38 ++#: src/main.cxx:59 + msgid "[FILE] - view PDF documents" + msgstr "[FILE] - 檢視 PDF 文件" + +-#: src/main.cxx:51 src/MainPter.cxx:153 ++#: src/main.cxx:72 src/MainPter.cxx:153 + msgid "PDF Viewer" + msgstr "PDF 檢視器" + +@@ -92,7 +91,7 @@ + msgid "Loading file %s..." + msgstr "載入檔案 %s…" + +-#: src/MainPter.cxx:413 src/MainPter.cxx:886 ++#: src/MainPter.cxx:413 src/MainPter.cxx:892 + #, c-format + msgid "of %d" + msgstr "之於 %d" +@@ -102,39 +101,47 @@ + msgid "Saving document to %s..." + msgstr "儲å˜æ–‡ä»¶è‡³ %s…" + +-#: src/MainPter.cxx:826 src/MainPter.cxx:865 ++#: src/MainPter.cxx:832 src/MainPter.cxx:871 + msgid "Error Loading File" + msgstr "載入檔案時發生錯誤" + +-#: src/MainPter.cxx:866 ++#: src/MainPter.cxx:872 + msgid "The password you have supplied is not a valid password for this file." + msgstr "您æ供的密碼å°æ–¼æ¤æª”案無效。" + +-#: src/MainPter.cxx:947 ++#: src/MainPter.cxx:953 + msgid "Error Saving File" + msgstr "儲å˜æª”案時發生錯誤" + +-#: src/PagePter.cxx:292 ++#: src/PagePter.cxx:338 + msgid "Loading..." + msgstr "載入…" + +-#: 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 "ç°éšŽ" + +-#: src/PrintPter.cxx:395 ++#: src/PrintPter.cxx:409 + msgid "Idle" + msgstr "é–’ç½®" + +-#: src/PrintPter.cxx:398 ++#: src/PrintPter.cxx:412 + msgid "Stopped" + msgstr "å·²åœæ¢" + +-#: src/PrintPter.cxx:401 ++#: src/PrintPter.cxx:415 + msgid "Processing" + msgstr "處ç†ä¸" + +-#: src/PrintPter.cxx:404 ++#: src/PrintPter.cxx:418 + msgid "Unknown" + msgstr "未知" + +@@ -151,244 +158,260 @@ + msgid "Find:" + msgstr "尋找：" + +-#: src/gtk/MainView.cxx:87 ++#: src/gtk/MainView.cxx:89 + msgid "_File" + msgstr "檔案(_F)" + +-#: src/gtk/MainView.cxx:88 ++#: src/gtk/MainView.cxx:90 + msgid "_Edit" + msgstr "編輯(_E)" + +-#: src/gtk/MainView.cxx:89 ++#: src/gtk/MainView.cxx:91 + msgid "_View" + msgstr "檢視(_V)" + +-#: src/gtk/MainView.cxx:90 ++#: src/gtk/MainView.cxx:92 + msgid "_Go" + msgstr "å‰å¾€(_G)" + +-#: src/gtk/MainView.cxx:91 ++#: src/gtk/MainView.cxx:93 + msgid "_Help" + msgstr "求助(_H)" + +-#: src/gtk/MainView.cxx:93 ++#: src/gtk/MainView.cxx:95 + msgid "_Open" + msgstr "é–‹å•Ÿ(_O)" + +-#: src/gtk/MainView.cxx:94 ++#: src/gtk/MainView.cxx:96 + msgid "Open a PDF document" + msgstr "é–‹å•Ÿ PDF 文件" + +-#: src/gtk/MainView.cxx:97 ++#: src/gtk/MainView.cxx:99 + msgid "_Reload" + msgstr "é‡æ–°è¼‰å…¥(_R)" + +-#: src/gtk/MainView.cxx:98 ++#: src/gtk/MainView.cxx:100 + msgid "Reload the current document" + msgstr "é‡æ–°è¼‰å…¥ç›®å‰æ–‡ä»¶" + +-#: src/gtk/MainView.cxx:101 ++#: src/gtk/MainView.cxx:103 + msgid "_Save a Copy..." + msgstr "儲å˜è¤‡æœ¬(_S)…" + +-#: src/gtk/MainView.cxx:102 ++#: src/gtk/MainView.cxx:104 + msgid "Save a copy of the current document" + msgstr "儲å˜ç›®å‰æ–‡ä»¶çš„複本" + +-#: src/gtk/MainView.cxx:106 ++#: src/gtk/MainView.cxx:108 + msgid "_Print..." + msgstr "列å°(_P)…" + +-#: src/gtk/MainView.cxx:107 ++#: src/gtk/MainView.cxx:109 + msgid "Print the current document" + msgstr "列å°ç›®å‰æ–‡ä»¶" + +-#: src/gtk/MainView.cxx:111 ++#: src/gtk/MainView.cxx:113 + msgid "_Close" + msgstr "關閉(_C)" + +-#: src/gtk/MainView.cxx:112 ++#: src/gtk/MainView.cxx:114 + msgid "Close this window" + msgstr "關閉æ¤è¦–窗" + +-#: src/gtk/MainView.cxx:115 ++#: src/gtk/MainView.cxx:117 + msgid "_Find" + msgstr "尋找(_F)" + +-#: src/gtk/MainView.cxx:116 ++#: src/gtk/MainView.cxx:118 + msgid "Find a word in the document" + msgstr "在文件ä¸å°‹æ‰¾å—è©ž" + +-#: src/gtk/MainView.cxx:119 ++#: src/gtk/MainView.cxx:121 + msgid "Preferences..." + msgstr "å好è¨å®šâ€¦" + +-#: src/gtk/MainView.cxx:120 ++#: src/gtk/MainView.cxx:122 + msgid "Change the application's preferences" + msgstr "改變應用軟體的å好è¨å®š" + +-#: src/gtk/MainView.cxx:123 ++#: src/gtk/MainView.cxx:125 + msgid "Zoom _In" + msgstr "放大(_I)" + +-#: src/gtk/MainView.cxx:124 ++#: src/gtk/MainView.cxx:126 + msgid "Enlarge the document" + msgstr "放大文件" + +-#: src/gtk/MainView.cxx:127 ++#: src/gtk/MainView.cxx:129 + msgid "Zoom _Out" + msgstr "縮å°(_O)" + +-#: src/gtk/MainView.cxx:128 ++#: src/gtk/MainView.cxx:130 + msgid "Shrink the document" + msgstr "收縮文件" + +-#: src/gtk/MainView.cxx:131 src/gtk/StockIcons.cxx:43 ++#: src/gtk/MainView.cxx:133 src/gtk/StockIcons.cxx:43 + msgid "Rotate _Right" + msgstr "å‘å³æ—‹è½‰(_R)" + +-#: src/gtk/MainView.cxx:132 ++#: src/gtk/MainView.cxx:134 + msgid "Rotate the document 90 degrees clockwise" + msgstr "é †æ™‚é‡æ—‹è½‰æ–‡ä»¶ 90 度" + +-#: src/gtk/MainView.cxx:135 src/gtk/StockIcons.cxx:42 ++#: src/gtk/MainView.cxx:137 src/gtk/StockIcons.cxx:42 + msgid "Rotate _Left" + msgstr "å‘左旋轉(_L)" + +-#: src/gtk/MainView.cxx:136 ++#: src/gtk/MainView.cxx:138 + msgid "Rotate the document 90 degrees counter-clockwise" + msgstr "逆時é‡æ—‹è½‰æ–‡ä»¶ 90 度" + +-#: src/gtk/MainView.cxx:139 ++#: src/gtk/MainView.cxx:141 + msgid "_First Page" + msgstr "首é (_F)" + +-#: src/gtk/MainView.cxx:140 ++#: src/gtk/MainView.cxx:142 + msgid "Go to the first page" + msgstr "å‰å¾€ç¬¬ä¸€é " + +-#: src/gtk/MainView.cxx:143 ++#: src/gtk/MainView.cxx:145 + msgid "_Next Page" + msgstr "下é (_N)" + +-#: src/gtk/MainView.cxx:144 ++#: src/gtk/MainView.cxx:146 + msgid "Go to the next page" + msgstr "å‰å¾€ä¸‹ä¸€é " + +-#: src/gtk/MainView.cxx:147 ++#: src/gtk/MainView.cxx:149 + msgid "_Previous Page" + msgstr "上é (_P)" + +-#: src/gtk/MainView.cxx:148 ++#: src/gtk/MainView.cxx:150 + msgid "Go to the previous page" + msgstr "å‰å¾€ä¸Šä¸€é " + +-#: src/gtk/MainView.cxx:151 ++#: src/gtk/MainView.cxx:153 + msgid "_Last Page" + msgstr "末é (_L)" + +-#: src/gtk/MainView.cxx:152 ++#: src/gtk/MainView.cxx:154 + msgid "Go to the last page" + msgstr "å‰å¾€æœ€æœ«é " + +-#: src/gtk/MainView.cxx:155 ++#: src/gtk/MainView.cxx:157 + msgid "_About" + msgstr "關於(_A)" + +-#: src/gtk/MainView.cxx:156 ++#: src/gtk/MainView.cxx:158 + msgid "Display application's credits" + msgstr "顯示應用程å¼çš„é³´è¬" + +-#: src/gtk/MainView.cxx:166 ++#: src/gtk/MainView.cxx:175 + msgid "F_ull screen" +-msgstr "" ++msgstr "全螢幕(_U)" + +-#: src/gtk/MainView.cxx:167 ++#: src/gtk/MainView.cxx:176 + msgid "Toggle full screen window" +-msgstr "" ++msgstr "切æ›åˆ°å…¨èž¢å¹•è¦–窗" + +-#: src/gtk/MainView.cxx:170 ++#: src/gtk/MainView.cxx:179 + msgid "Show _Toolbar" + msgstr "顯示工具列(_T)" + +-#: src/gtk/MainView.cxx:171 ++#: src/gtk/MainView.cxx:180 + msgid "Show or hide the toolbar" + msgstr "顯示或隱è—工具列" + +-#: src/gtk/MainView.cxx:174 ++#: src/gtk/MainView.cxx:183 + msgid "Show _Statusbar" + msgstr "顯示狀態列(_S)" + +-#: src/gtk/MainView.cxx:175 ++#: src/gtk/MainView.cxx:184 + msgid "Show or hide the statusbar" + msgstr "顯示或隱è—狀態列" + +-#: src/gtk/MainView.cxx:178 ++#: src/gtk/MainView.cxx:187 + msgid "Show I_ndex" + msgstr "顯示索引(_N)" + +-#: src/gtk/MainView.cxx:179 ++#: src/gtk/MainView.cxx:188 + msgid "Show or hide the document's outline" + msgstr "顯示或隱è—文件外框" + +-#: src/gtk/MainView.cxx:182 ++#: src/gtk/MainView.cxx:191 + msgid "Zoom to _Fit" + msgstr "符åˆè¦–窗(_F)" + +-#: src/gtk/MainView.cxx:183 ++#: src/gtk/MainView.cxx:192 + msgid "Make the current document fill the window" + msgstr "將目å‰æ–‡ä»¶å¡«æ»¿è¦–窗" + +-#: 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 "符åˆå¯¬åº¦(_W)" + +-#: src/gtk/MainView.cxx:187 ++#: src/gtk/MainView.cxx:196 + msgid "Make the current document fill the window width" + msgstr "將目å‰æ–‡ä»¶å¡«æ»¿è¦–窗寬度" + +-#: 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 "é–‹å•Ÿ 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 "å¯æ”œå¼æ–‡ä»¶æ ¼å¼ (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 "所有檔案" + +-#: src/gtk/MainView.cxx:362 ++#: src/gtk/MainView.cxx:404 + msgid "Password" + msgstr "密碼" + +-#: src/gtk/MainView.cxx:386 ++#: src/gtk/MainView.cxx:428 + msgid "Save PDF File" + msgstr "å„²å˜ PDF 檔案" + +-#: src/gtk/MainView.cxx:816 ++#: src/gtk/MainView.cxx:858 + msgid "Page" + msgstr "é é¢" + +-#: src/gtk/MainView.cxx:826 ++#: src/gtk/MainView.cxx:868 + msgid "of 0" + msgstr "之於 0" + +-#: src/gtk/MainView.cxx:879 ++#: src/gtk/MainView.cxx:921 + msgid "Index" + msgstr "索引" + +-#: 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 "建立 UI 管ç†å“¡æ™‚發生錯誤：%s\n" + +-#: src/gtk/MainView.cxx:1056 ++#: src/gtk/MainView.cxx:1108 + msgid "A lightweight PDF viewer" + msgstr "輕é‡ç´šçš„ PDF 檢視器" + +-#: 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" +@@ -399,7 +422,7 @@ + "æ¢æ¬¾è¦å®šï¼Œå°±æœ¬ç¨‹å¼å†ç‚ºæ•£å¸ƒèˆ‡ï¼æˆ–修改；無論您ä¾æ“šçš„是本授權的第二版或\n" + "（您自行é¸æ“‡çš„）任何ç¨å¾Œç™¼è¡Œçš„版本。\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" +@@ -409,7 +432,7 @@ + "ePDFView ä¿‚åŸºæ–¼ä½¿ç”¨ç›®çš„è€ŒåŠ ä»¥æ•£å¸ƒï¼Œç„¶è€Œä¸è² 任何擔ä¿è²¬ä»»ï¼›äº¦ç„¡å°é©å”®æ€§\n" + "或特定目的é©ç”¨æ€§æ‰€ç‚ºçš„默示性擔ä¿ã€‚詳情請åƒç…§ GNU 通用公共授權。\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" +@@ -419,11 +442,11 @@ + "自由軟體基金會: \n" + "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 "趙惟倫 <william.chao@ossii.com.tw>" + +diff -Nurd epdfview-0.1.6-svn/src/Config.cxx epdfview/src/Config.cxx +--- epdfview-0.1.6-svn/src/Config.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/Config.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -40,7 +40,6 @@ + + // Forward declarations. + gchar *getConfigFileName (void); +-void makeDirWithParents (const gchar *); + + /// + /// @brief Constructs a new Config object. +@@ -502,42 +501,9 @@ + { + gchar *configDir = + g_build_filename (g_get_user_config_dir (), PACKAGE, NULL); +- makeDirWithParents (configDir); ++ g_mkdir_with_parents (configDir, 0700); + gchar *configFile = g_build_filename (configDir, "main.conf", NULL); + g_free (configDir); + + return configFile; + } +- +-/// +-/// @brief Creates the directory and all its parent directories. +-/// +-/// If the directory already exists it does nothing. +-/// +-/// @param path The directory to create. +-/// +-void +-makeDirWithParents (const gchar *path) +-{ +- // Get the list of directories to create. +- GList *dirs = NULL; +- gchar *dirName = g_strdup (path); +- while ( !g_file_test (dirName, G_FILE_TEST_EXISTS) ) +- { +- dirs = g_list_prepend (dirs, dirName); +- dirName = g_path_get_dirname (dirName); +- } +- +- // Now create all of them. +- GList *dir = g_list_first (dirs); +- while ( NULL != dir ) +- { +- if ( -1 == g_mkdir ((gchar *)dir->data, 0700) ) +- { +- g_warning ("Couldn't make directory '%s'\n", (gchar *)dir->data); +- } +- g_free (dir->data); +- dir = g_list_next (dir); +- } +- g_list_free (dirs); +-} +diff -Nurd epdfview-0.1.6-svn/src/DocumentPage.cxx epdfview/src/DocumentPage.cxx +--- epdfview-0.1.6-svn/src/DocumentPage.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/DocumentPage.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -17,6 +17,7 @@ + + #include <config.h> + #include <string.h> ++#include <gdk/gdk.h> + #include "epdfview.h" + + using namespace ePDFView; +@@ -28,6 +29,7 @@ + /// + DocumentPage::DocumentPage () + { ++ m_Selection = NULL; + m_Data = NULL; + m_HasSelection = FALSE; + m_Height = 0; +@@ -49,6 +51,9 @@ + delete link; + } + g_list_free (m_LinkList); ++ ++ if(m_Selection) ++ gdk_region_destroy(m_Selection); + } + + /// +@@ -79,6 +84,12 @@ + invertArea (m_SelectionX1, m_SelectionY1, m_SelectionX2, m_SelectionY2); + m_HasSelection = FALSE; + } ++ ++ if(NULL != m_Selection){ ++ invertRegion(m_Selection); ++ gdk_region_destroy(m_Selection); ++ m_Selection = NULL; ++ } + } + + /// +@@ -195,6 +206,20 @@ + } + } + ++void ++DocumentPage::invertRegion (GdkRegion* region) ++{ ++ int count; ++ GdkRectangle *rectangles; ++ gdk_region_get_rectangles(region, &rectangles, &count); ++ while(count--){ ++ GdkRectangle r = rectangles[count]; ++ invertArea(r.x, r.y, r.x + r.width, r.y + r.height); ++ } ++ g_free(rectangles); ++} ++ ++ + /// + /// @brief Allocates the memory for a new page. + /// +@@ -253,3 +278,13 @@ + + m_HasSelection = TRUE; + } ++ ++void ++DocumentPage::setSelection (GdkRegion *region) ++{ ++ clearSelection (); ++ ++ invertRegion (region); ++ ++ m_Selection = gdk_region_copy(region); ++} +diff -Nurd epdfview-0.1.6-svn/src/DocumentPage.h epdfview/src/DocumentPage.h +--- epdfview-0.1.6-svn/src/DocumentPage.h 2008-07-13 12:57:45.123198000 +0200 ++++ epdfview/src/DocumentPage.h 2008-07-13 12:55:52.573198000 +0200 +@@ -18,6 +18,8 @@ + #if !defined (__DOCUMENT_PAGE_H__) + #define __DOCUMENT_PAGE_H__ + ++typedef struct _GdkRegion GdkRegion; ++ + namespace ePDFView + { + /// +@@ -41,6 +43,7 @@ + gint getWidth (void); + gboolean newPage (gint width, gint height); + void setSelection (DocumentRectangle &selection, gdouble scale); ++ void setSelection (GdkRegion *region); + + protected: + /// The page's image. +@@ -61,7 +64,10 @@ + gint m_Width; + /// The list of links from the page. + GList *m_LinkList; +- ++ /// Selection region ++ GdkRegion *m_Selection; ++ ++ void invertRegion (GdkRegion*); + void invertArea (gint x1, gint y1, gint x2, gint y2); + }; + } +diff -Nurd epdfview-0.1.6-svn/src/gtk/MainView.cxx epdfview/src/gtk/MainView.cxx +--- epdfview-0.1.6-svn/src/gtk/MainView.cxx 2008-07-13 12:57:44.223198000 +0200 ++++ epdfview/src/gtk/MainView.cxx 2008-07-13 12:55:50.923198000 +0200 +@@ -76,6 +76,8 @@ + static void main_window_zoom_in_cb (GtkWidget *, gpointer); + static void main_window_zoom_out_cb (GtkWidget *, gpointer); + static void main_window_zoom_width_cb (GtkToggleAction *, gpointer); ++static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer); ++static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data); + + #if defined (HAVE_CUPS) + static void main_window_print_cb (GtkWidget *, gpointer); +@@ -128,11 +130,11 @@ + N_("Shrink the document"), + G_CALLBACK (main_window_zoom_out_cb) }, + +- { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), NULL, ++ { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>bracketright", + N_("Rotate the document 90 degrees clockwise"), + G_CALLBACK (main_window_rotate_right_cb) }, + +- { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), NULL, ++ { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<control>bracketleft", + N_("Rotate the document 90 degrees counter-clockwise"), + G_CALLBACK (main_window_rotate_left_cb) }, + +@@ -158,7 +160,14 @@ + + // Accelerator keys. + { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL, +- G_CALLBACK (main_window_find_cb) } ++ G_CALLBACK (main_window_find_cb) }, ++ ++ { "KPAdd", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL, ++ G_CALLBACK (main_window_zoom_in_cb) }, ++ ++ { "KPSubtract", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", ++ NULL, ++ G_CALLBACK (main_window_zoom_out_cb) } + }; + + static GtkToggleActionEntry g_ToggleEntries[] = +@@ -185,10 +194,19 @@ + + { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL, + N_("Make the current document fill the window width"), +- G_CALLBACK (main_window_zoom_width_cb), FALSE } ++ G_CALLBACK (main_window_zoom_width_cb), FALSE }, ++}; + ++static GtkRadioActionEntry g_PageScrollEntries[] = ++{ ++ { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL, ++ N_("Mouse scroll page"), (int)PagePterModeScroll }, ++ ++ { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL, ++ N_(" Mouse select text"), (int)PagePterModeSelectText }, + }; + ++ + //////////////////////////////////////////////////////////////// + // Interface Methods. + //////////////////////////////////////////////////////////////// +@@ -238,6 +256,9 @@ + GtkWidget *pageViewPaned = createPageView (); + gtk_box_pack_start (GTK_BOX (m_MainBox), pageViewPaned, TRUE, TRUE, 0); + gtk_widget_show (pageViewPaned); ++ // By default set focus to page view so user can navigate pdf document with ++ // keyboard right away without need to click to page view first ++ gtk_widget_grab_focus (m_PageView->getTopWidget ()); + // Add the find bar. + m_FindView = new FindView (); + gtk_box_pack_start (GTK_BOX (m_MainBox), m_FindView->getTopWidget (), +@@ -247,6 +268,10 @@ + // look weird. + m_StatusBar = gtk_statusbar_new (); + gtk_box_pack_start (GTK_BOX (m_MainBox), m_StatusBar, FALSE, FALSE, 0); ++ ++ // Signal for Zooming into the page per ctrl + scroll-wheel. ++ g_signal_connect (G_OBJECT (m_PageView->getTopWidget ()), "scroll-event", ++ G_CALLBACK (main_window_page_scrolled_cb), pter); + } + + MainView::~MainView () +@@ -272,6 +297,23 @@ + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (zoomWidth), active); + } + ++void ++MainView::activePageModeScroll (gboolean active) ++{ ++ GtkAction *action = ++ gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeScroll"); ++ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); ++} ++ ++ ++void ++MainView::activePageModeText (gboolean active) ++{ ++ GtkAction *action = ++ gtk_ui_manager_get_action (m_UIManager, "/ToolBar/PageModeText"); ++ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), active); ++} ++ + gchar * + MainView::openFileDialog (const gchar *lastFolder) + { +@@ -935,6 +977,9 @@ + gtk_action_group_add_toggle_actions (actionGroup, g_ToggleEntries, + G_N_ELEMENTS (g_ToggleEntries), + m_Pter); ++ gtk_action_group_add_radio_actions (actionGroup, g_PageScrollEntries, ++ G_N_ELEMENTS (g_PageScrollEntries), 0, ++ G_CALLBACK(main_window_set_page_mode), m_Pter); + m_UIManager = gtk_ui_manager_new (); + gtk_ui_manager_insert_action_group (m_UIManager, actionGroup, 0); + +@@ -1038,6 +1083,13 @@ + } + } + ++void ++MainView::copyTextToClibboard(const gchar* text) ++{ ++ GtkClipboard *clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY); ++ gtk_clipboard_set_text(clipboard, text, -1); ++} ++ + //////////////////////////////////////////////////////////////// + // GTK+ Callbacks. + //////////////////////////////////////////////////////////////// +@@ -1416,3 +1468,29 @@ + MainPter *pter = (MainPter *)data; + pter->zoomWidthActivated (gtk_toggle_action_get_active (action)); + } ++ ++void ++main_window_set_page_mode (GtkRadioAction *action, GtkRadioAction *current, gpointer data) ++{ ++ g_assert ( NULL != data && "The data parameter is NULL."); ++ ++ MainPter *pter = (MainPter *)data; ++ PagePterMode mode = (PagePterMode)gtk_radio_action_get_current_value(action); ++ pter->setPageMode (mode); ++} ++ ++void ++main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data) ++{ ++ g_assert ( NULL != data && "The data parameter is NULL."); ++ ++ MainPter *pter = (MainPter *)data; ++ // Only zoom when the CTRL-Button is down... ++ if ( !(event->state & GDK_CONTROL_MASK) ) return; ++ if ( event->direction == GDK_SCROLL_UP ) { ++ pter->zoomInActivated (); ++ } else if ( event->direction == GDK_SCROLL_DOWN ) { ++ pter->zoomOutActivated (); ++ } ++} ++ +diff -Nurd epdfview-0.1.6-svn/src/gtk/MainView.h epdfview/src/gtk/MainView.h +--- epdfview-0.1.6-svn/src/gtk/MainView.h 2008-07-13 12:57:44.233198000 +0200 ++++ epdfview/src/gtk/MainView.h 2008-07-13 12:55:50.923198000 +0200 +@@ -35,6 +35,8 @@ + + void activeZoomFit (gboolean active); + void activeZoomWidth (gboolean active); ++ void activePageModeScroll (gboolean active); ++ void activePageModeText (gboolean active); + gchar *openFileDialog (const gchar *lastFolder); + gchar *promptPasswordDialog (void); + gchar *saveFileDialog (const gchar *lastFolder, +@@ -68,6 +70,7 @@ + void setStatusBarText (const gchar *text); + void setZoomText (const gchar *text); + const gchar *getGoToPageText (void); ++ void copyTextToClibboard(const gchar* text); + IFindView *getFindView (void); + IPageView *getPageView (void); + IPreferencesView *getPreferencesView (void); +diff -Nurd epdfview-0.1.6-svn/src/gtk/PageView.cxx epdfview/src/gtk/PageView.cxx +--- epdfview-0.1.6-svn/src/gtk/PageView.cxx 2008-07-13 12:57:44.243198000 +0200 ++++ epdfview/src/gtk/PageView.cxx 2008-07-13 12:55:50.943198000 +0200 +@@ -184,6 +184,9 @@ + GdkCursor *cursor = NULL; + switch (cursorType) + { ++ case PAGE_VIEW_CURSOR_SELECT_TEXT: ++ cursor = gdk_cursor_new (GDK_XTERM); ++ break; + case PAGE_VIEW_CURSOR_LINK: + cursor = gdk_cursor_new (GDK_HAND2); + break; +@@ -524,6 +527,13 @@ + { + g_assert ( NULL != data && "The data parameter is NULL."); + ++ // don't scroll when the CRTL-Button is down, because then the page should ++ // actually be zoomed and not scrolled. Zooming is handelt by the MainView ++ // class. ++ if ( event->state & GDK_CONTROL_MASK ) ++ { ++ return FALSE; ++ } + PagePter *pter = (PagePter *)data; + GtkAdjustment *adjustment = + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget)); +@@ -553,11 +563,15 @@ + + GtkScrollType direction; + gboolean horizontal = FALSE; ++ gboolean returnValue = TRUE; + PagePter *pter = (PagePter *)data; + +- GtkAdjustment *adjustment = ++ GtkAdjustment *hadjustment = ++ gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (widget)); ++ gdouble hposition = gtk_adjustment_get_value (hadjustment); ++ GtkAdjustment *vadjustment = + gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget)); +- gdouble position = gtk_adjustment_get_value (adjustment); ++ gdouble vposition = gtk_adjustment_get_value (vadjustment); + + if ( event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK) ) + { +@@ -568,51 +582,96 @@ + { + case GDK_Left: + case GDK_KP_Left: ++ case GDK_h: ++ if ( hposition == hadjustment->lower ) ++ { ++ pter->scrollToPreviousPage (); ++ return TRUE; ++ } + direction = GTK_SCROLL_STEP_LEFT; + horizontal = TRUE; + break; + + case GDK_Right: + case GDK_KP_Right: ++ case GDK_l: ++ if ( hposition == ( hadjustment->upper - hadjustment->page_size) ) ++ { ++ pter->scrollToNextPage (); ++ return TRUE; ++ } + horizontal = TRUE; + direction = GTK_SCROLL_STEP_RIGHT; + break; + + case GDK_Up: + case GDK_KP_Up: ++ case GDK_k: ++ if ( vposition == vadjustment->lower ) ++ { ++ pter->scrollToPreviousPage (); ++ return TRUE; ++ } + direction = GTK_SCROLL_STEP_UP; + break; + + case GDK_Down: + case GDK_KP_Down: ++ case GDK_j: ++ if ( vposition == ( vadjustment->upper - vadjustment->page_size) ) ++ { ++ pter->scrollToNextPage (); ++ return TRUE; ++ } + direction = GTK_SCROLL_STEP_DOWN; + break; + + case GDK_Page_Up: + case GDK_KP_Page_Up: +- if ( position == adjustment->lower ) ++ if ( vposition == vadjustment->lower ) + { + pter->scrollToPreviousPage (); + return TRUE; + } +- direction = GTK_SCROLL_START; ++ direction = GTK_SCROLL_PAGE_UP; + break; + ++ case GDK_space: ++ case GDK_KP_Space: + case GDK_Page_Down: + case GDK_KP_Page_Down: +- if ( position == ( adjustment->upper - adjustment->page_size) ) ++ if ( vposition == ( vadjustment->upper - vadjustment->page_size) ) + { + pter->scrollToNextPage (); + return TRUE; + } ++ direction = GTK_SCROLL_PAGE_DOWN; ++ break; ++ ++ case GDK_Home: ++ case GDK_KP_Home: ++ direction = GTK_SCROLL_START; ++ break; ++ ++ case GDK_End: ++ case GDK_KP_End: + direction = GTK_SCROLL_END; + break; + +- default: ++ case GDK_Return: ++ case GDK_KP_Enter: ++ pter->scrollToNextPage (); ++ direction = GTK_SCROLL_START; ++ ++ case GDK_BackSpace: ++ pter->scrollToNextPage (); ++ direction = GTK_SCROLL_START; ++ ++ default: + return FALSE; + } + + g_signal_emit_by_name(G_OBJECT(widget), "scroll-child", +- direction, horizontal); +- return TRUE; ++ direction, horizontal, &returnValue); ++ return returnValue; + } +diff -Nurd epdfview-0.1.6-svn/src/IDocument.h epdfview/src/IDocument.h +--- epdfview-0.1.6-svn/src/IDocument.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IDocument.h 2008-07-13 12:55:52.473198000 +0200 +@@ -21,12 +21,14 @@ + /// This is the definition of the GQuark used for Document's errors. + #define EPDFVIEW_DOCUMENT_ERROR ePDFView::IDocument::getErrorQuark () + ++typedef struct _GdkRegion GdkRegion; ++ + namespace ePDFView + { + // Forward declarations. + class DocumentIndex; + class IDocumentObserver; +- class DocumentPage; ++ class DocumentPage; + + /// + /// @brief Defines the possible errors loading a document. +@@ -263,6 +265,9 @@ + virtual gboolean saveFile (const gchar *filename, + GError **error) = 0; + ++ virtual GdkRegion* getTextRegion (DocumentRectangle *rect) = 0; ++ virtual void setTextSelection (DocumentRectangle *rect) = 0; ++ + void attach (const IDocumentObserver *observer); + void detach (const IDocumentObserver *observer); + +diff -Nurd epdfview-0.1.6-svn/src/IDocumentLink.h epdfview/src/IDocumentLink.h +--- epdfview-0.1.6-svn/src/IDocumentLink.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IDocumentLink.h 2008-07-13 12:55:52.483198000 +0200 +@@ -33,7 +33,7 @@ + class IDocumentLink + { + public: +- IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y1); ++ IDocumentLink (gdouble x1, gdouble y1, gdouble x2, gdouble y2); + virtual ~IDocumentLink (void); + + virtual void activate (IDocument *document) = 0; +diff -Nurd epdfview-0.1.6-svn/src/IDocumentObserver.h epdfview/src/IDocumentObserver.h +--- epdfview-0.1.6-svn/src/IDocumentObserver.h 2008-07-13 12:57:45.023198000 +0200 ++++ epdfview/src/IDocumentObserver.h 2008-07-13 12:55:51.753198000 +0200 +@@ -150,6 +150,16 @@ + /// + virtual void notifySaveError (const GError *error) { } + ++ /// ++ /// @brief Someone select text in document. ++ /// ++ /// This function called when someone select some text ++ /// in document. ++ /// ++ /// @param text Selected text. ++ /// ++ virtual void notifyTextSelected (const gchar* text) { } ++ + protected: + /// + /// @brief Constructs a new IDocumentObserver object. +diff -Nurd epdfview-0.1.6-svn/src/IJob.cxx epdfview/src/IJob.cxx +--- epdfview-0.1.6-svn/src/IJob.cxx 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IJob.cxx 2008-07-13 12:55:52.483198000 +0200 +@@ -16,6 +16,7 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include "epdfview.h" ++#include <unistd.h> + + using namespace ePDFView; + +@@ -59,6 +60,7 @@ + delete job; + } + } ++ sleep(0); + } + + /// +diff -Nurd epdfview-0.1.6-svn/src/IMainView.h epdfview/src/IMainView.h +--- epdfview-0.1.6-svn/src/IMainView.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/IMainView.h 2008-07-13 12:55:52.473198000 +0200 +@@ -576,6 +576,10 @@ + /// + virtual void setOutline (DocumentOutline *outline) = 0; + ++ virtual void copyTextToClibboard(const gchar* text) = 0; ++ virtual void activePageModeScroll (gboolean active) = 0; ++ virtual void activePageModeText (gboolean active) = 0; ++ + protected: + /// + /// @brief Constructs a new main view. +diff -Nurd epdfview-0.1.6-svn/src/IPageView.h epdfview/src/IPageView.h +--- epdfview-0.1.6-svn/src/IPageView.h 2008-07-13 12:57:45.123198000 +0200 ++++ epdfview/src/IPageView.h 2008-07-13 12:55:52.573198000 +0200 +@@ -32,6 +32,8 @@ + PAGE_VIEW_CURSOR_NORMAL, + /// Drag cursor. + PAGE_VIEW_CURSOR_DRAG, ++ /// Text selection cursor. ++ PAGE_VIEW_CURSOR_SELECT_TEXT, + /// Link cursor. + PAGE_VIEW_CURSOR_LINK + }; +diff -Nurd epdfview-0.1.6-svn/src/main.cxx epdfview/src/main.cxx +--- epdfview-0.1.6-svn/src/main.cxx 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/main.cxx 2008-07-13 12:55:52.483198000 +0200 +@@ -25,6 +25,27 @@ + + using namespace ePDFView; + ++struct LoadFileInfo ++{ ++ gchar *fileName; ++ MainPter *mainPter; ++ PDFDocument *document; ++}; ++ ++static int ++loadFileFromCommandLine (gpointer data) ++{ ++ LoadFileInfo *info = static_cast<LoadFileInfo *> (data); ++ ++ info->mainPter->setOpenState (info->fileName, FALSE); ++ info->document->load (info->fileName, NULL); ++ ++ g_free (info->fileName); ++ delete info; ++ ++ return FALSE; ++} ++ + int + main (int argc, char **argv) + { +@@ -56,13 +77,15 @@ + MainView *mainView = new MainView (mainPter); + // Let know to the presenter which is its view. + mainPter->setView (mainView); +- // Enter the main loop and wait for user interaction. */ + // Now check if we have additional parameters. Any additional parameter + // will be a file name to open. + if ( argc > 1 ) + { +- mainPter->setOpenState (argv[1], FALSE); +- document->load (argv[1], NULL); ++ LoadFileInfo *info = new LoadFileInfo; ++ info->mainPter = mainPter; ++ info->document = document; ++ info->fileName = g_strdup (argv[1]); ++ g_idle_add (loadFileFromCommandLine, info); + } + + gtk_main(); +@@ -74,6 +97,8 @@ + // Save the configuration. + Config::getConfig().save (); + ++ g_option_context_free (optionContext); ++ + // All done!. + return EXIT_SUCCESS; + } +diff -Nurd epdfview-0.1.6-svn/src/MainPter.cxx epdfview/src/MainPter.cxx +--- epdfview-0.1.6-svn/src/MainPter.cxx 2008-07-13 12:57:45.023198000 +0200 ++++ epdfview/src/MainPter.cxx 2008-07-13 12:55:51.753198000 +0200 +@@ -695,6 +695,12 @@ + } + } + ++void ++MainPter::setPageMode (PagePterMode mode) ++{ ++ m_PagePter->setMode(mode); ++} ++ + /// + /// @brief The "Zoom In" was activated. + /// +@@ -995,3 +1001,9 @@ + G_UNLOCK (fileSaved); + } + #endif // DEBUG ++ ++void ++MainPter::notifyTextSelected (const gchar* text) ++{ ++ getView ().copyTextToClibboard(text); ++} +diff -Nurd epdfview-0.1.6-svn/src/MainPter.h epdfview/src/MainPter.h +--- epdfview-0.1.6-svn/src/MainPter.h 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/MainPter.h 2008-07-13 12:55:52.473198000 +0200 +@@ -40,6 +40,8 @@ + MainPter (IDocument *document); + ~MainPter (void); + ++ void setPageMode(PagePterMode mode); ++ + void setInitialState (void); + void setOpenState (const gchar *fileName, gboolean reload); + IMainView &getView (void); +@@ -84,6 +86,7 @@ + void notifyReload (void); + void notifySave (void); + void notifySaveError (const GError *error); ++ void notifyTextSelected (const gchar* text); + + #if defined (DEBUG) + void waitForFileLoaded (void); +diff -Nurd epdfview-0.1.6-svn/src/PagePter.cxx epdfview/src/PagePter.cxx +--- epdfview-0.1.6-svn/src/PagePter.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/PagePter.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -15,6 +15,7 @@ + // along with this program; if not, write to the Free Software + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ++#include <gdk/gdk.h> + #include "epdfview.h" + + using namespace ePDFView; +@@ -47,9 +48,9 @@ + /// The Y position of the pointer when the drag started. + gint y; + /// The horizontal position of the page view scroll when the drag started. +- gdouble scrollX; ++ int startX; + /// The vertical position of the page view scroll when the drag started. +- gdouble scrollY; ++ int startY; + }; + + // Global variables. +@@ -60,11 +61,13 @@ + /// + PagePter::PagePter (IDocument *document) + { ++ m_LastSelection = NULL; + m_Document = document; + m_Document->attach (this); + m_DragInfo = NULL; + m_NextPageScroll = PAGE_SCROLL_START; + m_PageView = NULL; ++ m_ScrollMode = PagePterModeScroll; + } + + /// +@@ -129,9 +132,12 @@ + m_DragInfo->y = y; + + IPageView &view = getView (); +- m_DragInfo->scrollX = view.getHorizontalScroll (); +- m_DragInfo->scrollY = view.getVerticalScroll (); +- view.setCursor (PAGE_VIEW_CURSOR_DRAG); ++ m_DragInfo->startX = x; ++ m_DragInfo->startY = y; ++ if(m_ScrollMode == PagePterModeScroll) ++ view.setCursor (PAGE_VIEW_CURSOR_DRAG); ++ else ++ view.setCursor (PAGE_VIEW_CURSOR_SELECT_TEXT); + } + } + } +@@ -149,8 +155,24 @@ + { + if ( 1 == button ) + { ++ if(m_LastSelection) ++ gdk_region_destroy(m_LastSelection); ++ m_LastSelection = NULL; ++ ++ if ( m_Document->isLoaded() && ++ m_ScrollMode == PagePterModeSelectText && ++ NULL != m_DragInfo ) ++ { ++ DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY, ++ m_DragInfo->x, m_DragInfo->y); ++ m_Document->setTextSelection(&rect); ++ } ++ + delete m_DragInfo; + m_DragInfo = NULL; ++ ++ refreshPage(PAGE_SCROLL_NONE, FALSE); ++ + getView ().setCursor (PAGE_VIEW_CURSOR_NORMAL); + } + } +@@ -181,10 +203,32 @@ + view.setCursor (PAGE_VIEW_CURSOR_NORMAL); + } + } +- else +- { +- view.scrollPage (m_DragInfo->scrollX, m_DragInfo->scrollY, +- x - m_DragInfo->x, y - m_DragInfo->y); ++ else{ ++ m_DragInfo->x = x; ++ m_DragInfo->y = y; ++ ++ if(m_ScrollMode == PagePterModeScroll){ ++ view.scrollPage (view.getHorizontalScroll (), view.getVerticalScroll (), ++ x - m_DragInfo->startX, y - m_DragInfo->startY); ++ } ++ else{ ++ if(!m_Document->isLoaded()) ++ return ; ++ ++ DocumentRectangle rect(m_DragInfo->startX, m_DragInfo->startY, ++ m_DragInfo->x, m_DragInfo->y); ++ ++ GdkRegion *region = m_Document->getTextRegion (&rect); ++ ++ if( !m_LastSelection || !gdk_region_equal(m_LastSelection, region)){ ++ if(m_LastSelection) ++ gdk_region_destroy(m_LastSelection); ++ m_LastSelection = gdk_region_copy(region); ++ DocumentPage *page = m_Document->getCurrentPage(); ++ if ( NULL != page ) ++ refreshPage (PAGE_SCROLL_NONE, FALSE); ++ } ++ } + } + } + +@@ -273,6 +317,8 @@ + if ( NULL != documentPage ) + { + g_WaitingForPage = FALSE; ++ if ( NULL != m_LastSelection ) ++ documentPage->setSelection(m_LastSelection); + view.showPage (documentPage, pageScroll); + } + else +@@ -364,6 +410,17 @@ + } + + /// ++/// @brief Sets the page mouse scroll mode ++/// ++/// @param mode Scroll mode to set. ++/// ++void ++PagePter::setMode (PagePterMode mode) ++{ ++ this->m_ScrollMode = mode; ++} ++ ++/// + /// @brief The page view has been resized. + /// + /// @param width The new with of the page view. +diff -Nurd epdfview-0.1.6-svn/src/PagePter.h epdfview/src/PagePter.h +--- epdfview-0.1.6-svn/src/PagePter.h 2008-07-13 12:57:45.053198000 +0200 ++++ epdfview/src/PagePter.h 2008-07-13 12:55:52.483198000 +0200 +@@ -23,6 +23,11 @@ + + namespace ePDFView + { ++ enum PagePterMode{ ++ PagePterModeScroll, ++ PagePterModeSelectText, ++ }; ++ + /// + /// @class PagePter. + /// @brief The page presenter. +@@ -53,6 +58,7 @@ + void setNextPageScroll (PageScroll next); + void setView (IMainView &view); + void viewResized (gint width, gint height); ++ void setMode(PagePterMode mode); + + protected: + /// The document whose page is shown. +@@ -63,7 +69,11 @@ + PageScroll m_NextPageScroll; + /// The page view. + IPageView *m_PageView; +- ++ /// Last text selection ++ GdkRegion *m_LastSelection; ++ /// What page presenter must do when user move mouse with button pressed. ++ PagePterMode m_ScrollMode; ++ + void refreshPage (PageScroll pageScroll, gboolean wasZoomed); + }; + } +diff -Nurd epdfview-0.1.6-svn/src/PDFDocument.cxx epdfview/src/PDFDocument.cxx +--- epdfview-0.1.6-svn/src/PDFDocument.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/PDFDocument.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -191,7 +191,7 @@ + /// @param filename The name of the file name to open. It must be an absolute + /// path. + /// @param password The password to use to open @a filename. +-/// @param error Location to store the error occurring or NULL to ignore ++/// @param error Location to store the error occurring or NULL to ignore + /// errors. + /// + /// @return TRUE if the file could be opened, FALSE otherwise. +@@ -257,7 +257,7 @@ + else + { + // OK, the glib's wrapper don't pass the error code directly +- // from Poppler. Instead returns G_FILE_ERROR_FAILED and a ++ // from Poppler. Instead returns G_FILE_ERROR_FAILED and a + // non translated string. + // Maybe I'm wrong (very probable) but that's a wrong way. + // So I'm reading the error code from the error string... +@@ -412,7 +412,7 @@ + poppler_page_get_size (popplerPage, NULL, &pageHeight); + // We'll already calculate the positions scaled. + gdouble scale = getZoom (); +- GList *pageLinks = poppler_page_get_link_mapping (popplerPage); ++ GList *pageLinks = poppler_page_get_link_mapping (popplerPage); + for (GList *pageLink = g_list_first (pageLinks) ; + NULL != pageLink ; + pageLink = g_list_next (pageLink) ) +@@ -440,7 +440,7 @@ + /// poppler_index_iter_new(). + /// + void +-PDFDocument::setOutline (DocumentOutline *outline, ++PDFDocument::setOutline (DocumentOutline *outline, + PopplerIndexIter *childrenList) + { + if ( NULL != childrenList ) +@@ -474,11 +474,11 @@ + #endif // HAVE_POPPLER_0_5_2 + + outline->addChild (child); +- PopplerIndexIter *childIter = ++ PopplerIndexIter *childIter = + poppler_index_iter_get_child (childrenList); + setOutline (child, childIter); + } +- } ++ } + while ( poppler_index_iter_next (childrenList) ); + + poppler_index_iter_free (childrenList); +@@ -490,7 +490,7 @@ + /// + /// Retrieves the width and height of a document's page before to scale, but + /// after rotation. +-/// ++/// + /// @param pageNum The page to get its size. + /// @param width The output pointer to save the page's width. + /// @param height The output pointer to save the page's height. +@@ -656,6 +656,107 @@ + return result; + } + ++static void ++repairEmpty(PopplerRectangle& rect) ++{ ++ //rect must have be least 1x1 ++ if(rect.y1 == rect.y2) ++ rect.y2++; ++ if(rect.x1 == rect.x2) ++ rect.x2++; ++} ++ ++void ++PDFDocument::setTextSelection (DocumentRectangle *rect) ++{ ++ g_assert(rect); ++ ++ PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1); ++ if(!page) ++ return; ++ ++ gdouble pageWidth, pageHeight; ++ poppler_page_get_size(page, &pageWidth, &pageHeight); ++ ++ //for get text we must exchange y coordinate, don't ask me where logic here. ++ PopplerRectangle textRect = { rect->getX1() / getZoom(), ++ (pageHeight - rect->getY2() / getZoom()), ++ rect->getX2() * getZoom() / getZoom(), ++ (pageHeight - rect->getY1() / getZoom())}; ++ repairEmpty(textRect); ++ ++#if defined (HAVE_POPPLER_0_6_0) ++ gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH, ++ &textRect); ++#else // !HAVE_POPPLER_0_6_0 ++ gchar *text = poppler_page_get_text(page, &textRect); ++#endif // HAVE_POPPLER_0_6_0 ++ if(!text) ++ goto cleanup; ++ ++ for ( GList *obs = g_list_first (m_Observers) ; ++ NULL != obs ; ++ obs = g_list_next (obs) ) ++ { ++ IDocumentObserver *observer = (IDocumentObserver*)obs->data; ++ observer->notifyTextSelected(text); ++ } ++ ++ cleanup: ++ if(page) ++ g_object_unref(page); ++ if(text) ++ g_free(text); ++} ++ ++GdkRegion* ++PDFDocument::getTextRegion (DocumentRectangle *r) ++{ ++ GdkRegion *res = NULL; ++ PopplerPage *page = poppler_document_get_page (m_Document, getCurrentPageNum()-1); ++ if(!page) ++ return NULL; ++ ++ //calulate rect ++ PopplerRectangle rect; ++ rect.x1 = r->getX1() / getZoom(); ++ rect.y1 = r->getY1() / getZoom(); ++ rect.x2 = r->getX2() / getZoom(); ++ rect.y2 = r->getY2() / getZoom(); ++ repairEmpty(rect); ++ ++ //calc selection size ++#if defined (HAVE_POPPLER_0_8_0) ++ GList *selections = poppler_page_get_selection_region(page, getZoom(), ++ POPPLER_SELECTION_GLYPH, &rect); ++ res = gdk_region_new(); ++ for (GList *selection = g_list_first (selections) ; ++ NULL != selection ; selection = g_list_next (selection)) { ++ PopplerRectangle *rectangle = (PopplerRectangle *)selection->data; ++ GdkRectangle rect; ++ ++ rect.x = (gint)rectangle->x1; ++ rect.y = (gint)rectangle->y1; ++ rect.width = (gint) (rectangle->x2 - rectangle->x1); ++ rect.height = (gint) (rectangle->y2 - rectangle->y1); ++ ++ gdk_region_union_with_rect (res, &rect); ++ } ++ poppler_page_selection_region_free (selections); ++#elif defined (HAVE_POPPLER_0_6_0) ++ res = poppler_page_get_selection_region(page, getZoom(), ++ POPPLER_SELECTION_GLYPH, &rect); ++#else // !HAVE_POPPLER_0_6_0 ++ res = poppler_page_get_selection_region(page, getZoom(), &rect); ++#endif // HAVE_POPPLER_0_6_0 ++ ++ //free some local data ++ g_object_unref(page); ++ ++ return res; ++} ++ ++ + /// + /// @brief Gets the document's page layout from Poppler's page layout. + /// +diff -Nurd epdfview-0.1.6-svn/src/PDFDocument.h epdfview/src/PDFDocument.h +--- epdfview-0.1.6-svn/src/PDFDocument.h 2008-07-13 12:57:45.063198000 +0200 ++++ epdfview/src/PDFDocument.h 2008-07-13 12:55:52.493198000 +0200 +@@ -54,6 +54,8 @@ + + DocumentPage *renderPage (gint pageNum); + gboolean saveFile (const gchar *fileName, GError **error); ++ GdkRegion* getTextRegion (DocumentRectangle* rect); ++ void setTextSelection (DocumentRectangle *rect); + + protected: + /// The PDF document. +diff -Nurd epdfview-0.1.6-svn/src/PrintPter.cxx epdfview/src/PrintPter.cxx +--- epdfview-0.1.6-svn/src/PrintPter.cxx 2008-07-13 12:57:45.043198000 +0200 ++++ epdfview/src/PrintPter.cxx 2008-07-13 12:55:52.473198000 +0200 +@@ -230,20 +230,27 @@ + ppdFindOption (printerPPD, "PageSize"); + view.clearPageSizeList (); + int pageSizeToSelect = 0; +- ppd_choice_t *pageSizeChoice = pageSizeOption->choices; +- for ( int currentSize = 0 ; +- currentSize < pageSizeOption->num_choices ; +- ++currentSize, ++pageSizeChoice ) ++ if ( 0 != pageSizeOption ) + { +- const gchar *sizeName = pageSizeChoice->text; +- const gchar *sizeValue = pageSizeChoice->choice; +- +- view.addPageSize (_(sizeName), sizeValue); +- if ( pageSizeChoice->marked ) ++ ppd_choice_t *pageSizeChoice = pageSizeOption->choices; ++ for ( int currentSize = 0 ; ++ currentSize < pageSizeOption->num_choices ; ++ ++currentSize, ++pageSizeChoice ) + { +- pageSizeToSelect = currentSize; ++ const gchar *sizeName = pageSizeChoice->text; ++ const gchar *sizeValue = pageSizeChoice->choice; ++ ++ view.addPageSize (_(sizeName), sizeValue); ++ if ( pageSizeChoice->marked ) ++ { ++ pageSizeToSelect = currentSize; ++ } + } + } ++ else ++ { ++ view.addPageSize (_("A4"), "A4"); ++ } + view.selectPageSize (pageSizeToSelect); + + // Get the resolutions. +@@ -251,29 +258,36 @@ + ppdFindOption (printerPPD, "Resolution"); + view.clearResolutionList (); + int resolutionToSelect = 0; +- ppd_choice_t *resolutionChoice = resolutionOption->choices; +- for ( int currentRes = 0 ; +- currentRes < resolutionOption->num_choices ; +- ++currentRes, ++resolutionChoice ) ++ if ( 0 != resolutionOption ) + { +- const gchar *resName = resolutionChoice->text; +- const gchar *resValue = resolutionChoice->choice; +- +- view.addResolution (_(resName), resValue); +- if ( resolutionChoice->marked ) ++ ppd_choice_t *resolutionChoice = resolutionOption->choices; ++ for ( int currentRes = 0 ; ++ currentRes < resolutionOption->num_choices ; ++ ++currentRes, ++resolutionChoice ) + { +- resolutionToSelect = currentRes; ++ const gchar *resName = resolutionChoice->text; ++ const gchar *resValue = resolutionChoice->choice; ++ ++ view.addResolution (_(resName), resValue); ++ if ( resolutionChoice->marked ) ++ { ++ resolutionToSelect = currentRes; ++ } + } + } ++ else ++ { ++ view.addResolution (_("300 DPI"), "300x300dpi"); ++ } + view.selectResolution (resolutionToSelect); + + // Get the color models. + ppd_option_t *colorModelOption = + ppdFindOption (printerPPD, "ColorModel"); + view.clearColorModelList (); ++ int colorModelToSelect = 0; + if ( NULL != colorModelOption ) + { +- int colorModelToSelect = 0; + ppd_choice_t *colorModelChoice = colorModelOption->choices; + for ( int currentColor = 0 ; + currentColor < colorModelOption->num_choices ; +@@ -288,12 +302,12 @@ + colorModelToSelect = currentColor; + } + } +- view.selectColorModel (colorModelToSelect); + } + else + { + view.addColorModel (_("Grayscale"), "Gray"); + } ++ view.selectColorModel (colorModelToSelect); + ppdClose (printerPPD); + } + } +diff -Nurd epdfview-0.1.6-svn/THANKS epdfview/THANKS +--- epdfview-0.1.6-svn/THANKS 2008-07-13 12:57:47.583198000 +0200 ++++ epdfview/THANKS 2008-07-13 12:55:55.133198000 +0200 +@@ -1,16 +1,34 @@ + I would like to give thanks to the following for their support and + contributions: + +- - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch. +- - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation. ++ - Alex Dedul <rotmer@gmail.com>, for his patch. ++ - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch and others. ++ - Daniel Nylander <po@danielnylander.se>, for his Swedish translation. ++ - Dragonlord <dragonlord@seznam.cz>, for his Czech translation. ++ - Fábio Antunes <fabio.antunes@hotmail.com>, for his Brazilian Portuguese translation. ++ - Fabio Vergnani <monghitri@aruba.it>, for his Italion translation. ++ - Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, for his vim keybindings patch. ++ - Igor Vagulin <igor_vagulin@mail.ru>, for his Russian translation and patches. ++ - Lester Godwin <lgodwin@pushcorp.com>, for his patches. + - LoneFox <>, for his patches. ++ - Michael Opitz <opitz.michael@gmail.com>, for his patches. + - Moritz Heiber <moe@xfce.org>, for his German translation. + - Mr_Moustache <mr.moustache@laposte.net>, for his French translation. ++ - Nuno Miguel <nunis@netcabo.pt>, for his European Portuguese translation. ++ - Nyu <nyu_8804@yahoo.co.jp>, for his Japanese translation. ++ - Panchoat <panchoat@gmail.com>, for his Simplified Chinese translation. ++ - Piotr Pacholak <obi_gl@o2.pl>, for corrections in the Polish translation. ++ - RafaÅ‚ MużyÅ‚o <galtgendo@o2.pl>, for his patches. ++ - Sergey Starosek <sergey.starosek@gmail.com>, for his Russian patches. + - Stavros Giannouris <stavrosg2002@freemail.gr>, for his Greek translation. ++ - Tilman Sauerbeck <tilman@code-monkey.de>, for his patches. + - tbm <tbm@home.nl>, for his patches. ++ - Valery Koval <Valery.Koval@innovinn.com>, for his patches. + - VnPenguin <vnpenguin@gmail.com>, for his Vietnamese translation. + - Wei-Lun Chao <chaoweilun@pcmail.com.tw>, for his Traditional Chinese translation. + - Wojciech Myrda <vojcek@tlen.pl>, for his Polish translation. + - Yuri Pankov <yuri.pankov@gmail.com>, for his patches. ++ - Yves-Alexis Perez <corsac@debian.org>, for his patches. ++ - zhou sf <sxzzsf@gmail.com>, for his patches. + + If you feel that you should be in this list and I didn't remember to add you in it, please send me an e-mail! :-) diff --git a/packages/evince/evince_2.23.4.bb b/packages/evince/evince_2.23.4.bb new file mode 100644 index 0000000000..f5303cabe3 --- /dev/null +++ b/packages/evince/evince_2.23.4.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, djvu." +LICENSE = "GPL" +SECTION = "x11/office" +DEPENDS = "gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gnome-vfs gconf libglade gnome-keyring " +RDEPENDS = "espgs gnome-icon-theme" +RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r2" + +inherit gnome pkgconfig gtk-icon-cache + +SRC_URI += " file://no-help-dir.patch;patch=1" + +EXTRA_OECONF = " --without-libgnome \ + --disable-thumbnailer \ + --disable-scrollkeeper \ + --enable-djvu \ + " +FILES_${PN}-dbg = "${libdir}/evince/backends/.debug" + diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 294b6afc22..548d5a5139 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,7 +3,7 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r12" +PR = "r14" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv7a = "1" @@ -11,8 +11,8 @@ DEFAULT_PREFERENCE_armv7a = "1" FFBRANCH_arm = "arm-neon" FFBRANCH ?= "master" -SRCREV = "1e8300e71f79963eacdad6b180d9a12c4f56318d" -SRCREV_arm = "749766cea9969418633abb77b6c8677a884dfcb9" +SRCREV = "dee1c2d60a67dc6411ed3fcbe26db5113cb1a371" +SRCREV_arm = "3ea1180b31078c276783f68e153ec54cfe567977" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " diff --git a/packages/gcc/gcc-cross_csl-arm-2007q3.bb b/packages/gcc/gcc-cross_csl-arm-2007q3.bb index cd10cfbdef..295353a0f8 100644 --- a/packages/gcc/gcc-cross_csl-arm-2007q3.bb +++ b/packages/gcc/gcc-cross_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require gcc-csl-arm-2007q3.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc-csl-arm-2007q3.inc b/packages/gcc/gcc-csl-arm-2007q3.inc index 601b4f0110..a3da6c9ca3 100644 --- a/packages/gcc/gcc-csl-arm-2007q3.inc +++ b/packages/gcc/gcc-csl-arm-2007q3.inc @@ -30,6 +30,7 @@ SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-20 # file://fortran-static-linking.patch;patch=1 \ # file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \ # file://gcc-new-makeinfo.patch;patch=1 \ + file://gcc-Os-fix.diff;patch=1 \ " diff --git a/packages/gcc/gcc-csl-arm-2007q3/gcc-Os-fix.diff b/packages/gcc/gcc-csl-arm-2007q3/gcc-Os-fix.diff new file mode 100644 index 0000000000..422091f2e7 --- /dev/null +++ b/packages/gcc/gcc-csl-arm-2007q3/gcc-Os-fix.diff @@ -0,0 +1,12 @@ +--- /tmp/arm.c 2008-07-12 21:44:16.000000000 +0200 ++++ gcc-4.2/gcc/config/arm/arm.c 2008-07-12 21:45:48.393198000 +0200 +@@ -11591,7 +11591,8 @@ + && count != 0 + && !current_function_calls_eh_return + && bit_count(saved_regs_mask) * 4 == count +- && !IS_INTERRUPT (func_type)) ++ && !IS_INTERRUPT (func_type) ++ && !cfun->tail_call_emit) + { + unsigned long mask; + mask = (1 << (arm_size_return_regs() / 4)) - 1; diff --git a/packages/gcc/gcc_csl-arm-2007q3.bb b/packages/gcc/gcc_csl-arm-2007q3.bb index 832167ca4e..4999c6a53e 100644 --- a/packages/gcc/gcc_csl-arm-2007q3.bb +++ b/packages/gcc/gcc_csl-arm-2007q3.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" require gcc-${PV}.inc require gcc-configure-target.inc diff --git a/packages/gnome/gnome-icon-theme_2.22.0.bb b/packages/gnome/gnome-icon-theme_2.22.0.bb new file mode 100644 index 0000000000..d458d9ba74 --- /dev/null +++ b/packages/gnome/gnome-icon-theme_2.22.0.bb @@ -0,0 +1,12 @@ +LICENSE = "GPL" +SECTION = "x11/gnome" +DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" +RDEPENDS = "hicolor-icon-theme" + +FILES_${PN} += "${datadir}/*" + +EXTRA_OECONF = "--disable-hicolor-check" + +inherit gnome + +PACKAGE_ARCH = "all" diff --git a/packages/hicolor-icon-theme/hicolor-icon-theme_0.10.bb b/packages/hicolor-icon-theme/hicolor-icon-theme_0.10.bb new file mode 100644 index 0000000000..a1cb41b846 --- /dev/null +++ b/packages/hicolor-icon-theme/hicolor-icon-theme_0.10.bb @@ -0,0 +1,9 @@ +SECTION = "unknown" +LICENSE = "GPL" +inherit gnome + +SRC_URI = "http://icon-theme.freedesktop.org/releases/${P}.tar.gz" + +PACKAGE_ARCH = "all" + +FILES_${PN} += "${datadir}/icons" diff --git a/packages/icon-naming-utils/.mtn2git_empty b/packages/icon-naming-utils/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/icon-naming-utils/.mtn2git_empty diff --git a/packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb b/packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb new file mode 100644 index 0000000000..68d0667670 --- /dev/null +++ b/packages/icon-naming-utils/icon-naming-utils-native_0.8.2.bb @@ -0,0 +1,9 @@ +LICENSE = "GPLv2" +DEPENDS = "libxml-simple-perl-native" +PR = "r1" + +SRC_URI = "http://tango.freedesktop.org/releases/icon-naming-utils-0.8.2.tar.gz" + +S = "${WORKDIR}/icon-naming-utils-${PV}" + +inherit autotools native diff --git a/packages/images/beagleboard-demo-image.bb b/packages/images/beagleboard-demo-image.bb index 6ac22916dd..e4b2427063 100644 --- a/packages/images/beagleboard-demo-image.bb +++ b/packages/images/beagleboard-demo-image.bb @@ -15,7 +15,8 @@ IMAGE_INSTALL = "\ angstrom-gpe-task-settings \ ${ANGSTROM_EXTRA_INSTALL} \ angstrom-zeroconf-audio \ - gpe-scap \ + angstrom-led-config \ + gpe-scap \ psplash \ e-wm exhibit \ xterm xmms epiphany-firefox-replacement \ diff --git a/packages/jamvm/jamvm-native.inc b/packages/jamvm/jamvm-native.inc new file mode 100644 index 0000000000..07eecb52b3 --- /dev/null +++ b/packages/jamvm/jamvm-native.inc @@ -0,0 +1,18 @@ +require jamvm.inc + +DEPENDS = "zlib-native classpath-native virtual/javac-native" + +PROVIDES_jamvm = "virtual/java-native" + +RPROVIDES_jamvm = "" + +# This uses 32 bit arm, so force the instruction set to arm, not thumb +ARM_INSTRUCTION_SET = "arm" + +inherit native + +S = "${WORKDIR}/jamvm-${PV}" + +do_install_append() { + ln -sf jamvm ${STAGING_BINDIR}/java +} diff --git a/packages/jamvm/jamvm-native_1.5.1.bb b/packages/jamvm/jamvm-native_1.5.1.bb new file mode 100644 index 0000000000..e174e2a312 --- /dev/null +++ b/packages/jamvm/jamvm-native_1.5.1.bb @@ -0,0 +1,4 @@ +require jamvm-native.inc + +PR = "r0" + diff --git a/packages/javasqlite/.mtn2git_empty b/packages/javasqlite/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/javasqlite/.mtn2git_empty diff --git a/packages/javasqlite/files/.mtn2git_empty b/packages/javasqlite/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/javasqlite/files/.mtn2git_empty diff --git a/packages/javasqlite/files/build-fix.patch b/packages/javasqlite/files/build-fix.patch new file mode 100644 index 0000000000..34befc0850 --- /dev/null +++ b/packages/javasqlite/files/build-fix.patch @@ -0,0 +1,378 @@ +Index: javasqlite-20080130/configure.in +=================================================================== +--- javasqlite-20080130.orig/configure.in 2008-01-07 19:21:33.000000000 +0100 ++++ javasqlite-20080130/configure.in 2008-07-13 15:54:47.000000000 +0200 +@@ -30,69 +30,25 @@ + ########## + # Find SQLite header file and library + # +-AC_ARG_WITH(sqlite, [ --with-sqlite=DIR use SQLite header/lib from DIR], +- SQLITE_DIR=$withval) +-if test ! -n "$SQLITE_DIR" -a -d "$SQLITE_DIR" ; then +- AC_MSG_WARN([SQLite2 directory $SQLITE_DIR does not exist]) ++AC_ARG_WITH(sqlite-incdir, [ --with-sqlite-incdir=DIR use SQLite header from DIR], ++ SQLITE_INCDIR=$withval) ++if test ! -n "$SQLITE_INCDIR" -a -d "$SQLITE_INCDIR" ; then ++ AC_MSG_WARN([SQLite2 directory $SQLITE_INCDIR does not exist]) + fi + +-if test -z "$SQLITE_DIR" ; then +- SQLITE_DIR="../sqlite /usr /usr/local /opt" ++AC_ARG_WITH(sqlite-libdir, [ --with-sqlite-libdir=DIR use SQLite lib from DIR], ++ SQLITE_LIBDIR=$withval) ++if test ! -n "$SQLITE_LIBDIR" -a -d "$SQLITE_LIBDIR" ; then ++ AC_MSG_WARN([SQLite2 directory $SQLITE_LIBDIR does not exist]) + fi + +-AC_MSG_CHECKING([for SQLite header and library]) +-SQLITE_INC=UNKNOWN +-SQLITE_LIB=UNKNOWN +-for i in $SQLITE_DIR ; do +- if test -r $i/sqlite.h ; then +- if test -r $i/libsqlite.la ; then +- SQLITE_INC="$i" +- SQLITE_LIB="$i/libsqlite.la" +- SQLITE_LIBDIR="$i" +- break +- elif test -r $i/libsqlite.a ; then +- SQLITE_INC="$i" +- SQLITE_LIB="$i/libsqlite.a" +- SQLITE_LIBDIR="$i" +- break +- fi +- elif test -r $i/include/sqlite.h ; then +- for lib in lib64 lib ; do +- if test -r $i/$lib/libsqlite.la ; then +- SQLITE_INC="$i/include" +- SQLITE_LIB="$i/$lib/libsqlite.la" +- SQLITE_LIBDIR="$i/$lib" +- break +- elif test -r $i/$lib/libsqlite.a ; then +- SQLITE_INC="$i/include" +- SQLITE_LIB="$i/$lib/libsqlite.a" +- SQLITE_LIBDIR="$i/$lib" +- break +- elif test -r $i/$lib/libsqlite.so ; then +- SQLITE_INC="$i/include" +- SQLITE_LIB="-lsqlite" +- SQLITE_LIBDIR="$i/$lib" +- break +- fi +- done +- if test "$SQLITE_LIB" != "UNKNOWN" ; then +- break +- fi +- fi +-done +-if test "$SQLITE_INC" = "UNKNOWN" -o "$SQLITE_LIB" = "UNKNOWN" ; then +- AC_MSG_RESULT(no) +- AC_MSG_WARN(SQLite2 header files and/or library not found) +- SQLITE_INC="" +- SQLITE_LIB="" +- HAVE_SQLITE2=0 +-else +- SQLITE_INC="-I${SQLITE_INC}" +- HAVE_SQLITE2=1 +- AC_MSG_RESULT(yes) +-fi ++SQLITE_INC="-I$SQLITE_INCDIR" ++SQLITE_LIB="-lsqlite" ++HAVE_SQLITE2=1 ++ + AC_SUBST(SQLITE_INC) + AC_SUBST(SQLITE_LIB) ++AC_SUBST(SQLITE_LIBDIR) + AC_SUBST(HAVE_SQLITE2) + + ########## +@@ -127,70 +83,28 @@ + ########## + # Find SQLite3 header file and library + # +-AC_ARG_WITH(sqlite3, +- [ --with-sqlite3=DIR use SQLite3 header/lib from DIR], +- SQLITE3_DIR=$withval) +-if test ! -n "$SQLITE3_DIR" -a -d "$SQLITE3_DIR" ; then +- AC_MSG_WARN([SQLite3 directory $SQLITE3_DIR does not exist]) ++AC_ARG_WITH(sqlite3-incdir, ++ [ --with-sqlite3-incdir=DIR use SQLite3 header from DIR], ++ SQLITE3_INCDIR=$withval) ++if test ! -n "$SQLITE3_INCDIR" -a -d "$SQLITE3_INCDIR" ; then ++ AC_MSG_WARN([SQLite3 directory $SQLITE3_INCDIR does not exist]) + fi + +-if test -z "$SQLITE3_DIR" ; then +- SQLITE3_DIR="../sqlite /usr /usr/local /opt" ++AC_ARG_WITH(sqlite3-libdir, ++ [ --with-sqlite3-libdir=DIR use SQLite3 lib from DIR], ++ SQLITE3_LIBDIR=$withval) ++if test ! -n "$SQLITE3_LIBDIR" -a -d "$SQLITE3_LIBDIR" ; then ++ AC_MSG_WARN([SQLite3 directory $SQLITE3_LIBDIR does not exist]) + fi + +-AC_MSG_CHECKING([for SQLite3 header and library]) +-SQLITE3_INC=UNKNOWN +-SQLITE3_LIB=UNKNOWN +-for i in $SQLITE3_DIR ; do +- if test -r $i/sqlite3.h ; then +- if test -r $i/libsqlite3.la ; then +- SQLITE3_INC="$i" +- SQLITE3_LIB="$i/libsqlite3.la" +- SQLITE3_LIBDIR="$i" +- break +- elif test -r $i/libsqlite3.a ; then +- SQLITE3_INC="$i" +- SQLITE3_LIB="$i/libsqlite3.a" +- SQLITE3_LIBDIR="$i" +- break +- fi +- elif test -r $i/include/sqlite3.h ; then +- for lib in lib64 lib ; do +- if test -r $i/$lib/libsqlite3.la ; then +- SQLITE3_INC="$i/include" +- SQLITE3_LIB="$i/$lib/libsqlite3.la" +- SQLITE3_LIBDIR="$i/$lib" +- break +- elif test -r $i/$lib/libsqlite3.a ; then +- SQLITE3_INC="$i/include" +- SQLITE3_LIB="$i/$lib/libsqlite3.a" +- SQLITE3_LIBDIR="$i/$lib" +- break +- elif test -r $i/$lib/libsqlite3.so ; then +- SQLITE3_INC="$i/include" +- SQLITE3_LIB="-lsqlite3" +- SQLITE3_LIBDIR="$i/$lib" +- break +- fi +- done +- if test "$SQLITE3_LIB" != "UNKNOWN" ; then +- break +- fi +- fi +-done +-if test "$SQLITE3_INC" = "UNKNOWN" -o "$SQLITE3_LIB" = "UNKNOWN" ; then +- AC_MSG_RESULT(no) +- AC_MSG_WARN(SQLite3 header files and/or library not found) +- SQLITE3_INC="" +- SQLITE3_LIB="" +- HAVE_SQLITE3=0 +-else +- SQLITE3_INC="-I${SQLITE3_INC}" +- HAVE_SQLITE3=1 +- AC_MSG_RESULT(yes) +-fi ++SQLITE3_INC="-I$SQLITE3_INCDIR" ++SQLITE3_LIB="-lsqlite3" ++ ++HAVE_SQLITE3=1 ++ + AC_SUBST(SQLITE3_INC) + AC_SUBST(SQLITE3_LIB) ++AC_SUBST(SQLITE3_LIBDIR) + AC_SUBST(HAVE_SQLITE3) + + ########## +@@ -310,52 +224,45 @@ + # + + AC_CHECK_PROG([READLINK], [readlink], [readlink], []) +-AC_ARG_WITH(jdk, [ --with-jdk=DIR use Java top directory DIR], +- JAVA_HOME=$withval) +-if test -z "$JAVA_HOME" ; then +- JAVA_HOME=`which javac` +- if test -n "$READLINK" ; then +- while test -L $JAVA_HOME ; do +- JAVA_HOME=`$READLINK $JAVA_HOME` +- done +- fi +- JAVA_HOME=`dirname $JAVA_HOME` +- JAVA_HOME=`dirname $JAVA_HOME` +- if test "x$JAR_DIR_UNSPEC" = "xyes" ; then +- JAR_DIR=$JAVA_HOME/jre/lib/ext +- AC_MSG_RESULT([will install sqlite.jar into $JAR_DIR]) +- fi +- if test "$prefix" = "/usr/local" ; then +- case "$target_cpu" in +- [i[3-6]86*]) +- NATIVE_LIB_DIR=$JAVA_HOME/jre/lib/i386 +- ;; +- *) +- NATIVE_LIB_DIR=$JAVA_HOME/jre/lib/$target_cpu +- ;; +- esac +- AC_MSG_RESULT([will install libsqlite_jni into $NATIVE_LIB_DIR]) +- fi +-fi +-if test ! -d "$JAVA_HOME" ; then +- AC_MSG_ERROR([JAVA_HOME directory not found, please use --with-jdk=DIR]) +-fi + +-if test -n "$JAVA_HOME" ; then +- JAVA_RUN=$JAVA_HOME/bin/java +- JAVAC=$JAVA_HOME/bin/javac +- JAVAH="$JAVA_HOME/bin/javah -jni" +- JAR=$JAVA_HOME/bin/jar +- JAVADOC=$JAVA_HOME/bin/javadoc +-else +- JAVA_RUN=`which java` +- JAVAC=`which javac` +- JAVAH="`which javah` -jni" +- JAR=`which jar` +- JAVADOC=`which javadoc` +- JAVA_HOME=`dirname $JAVAC` +- JAVA_HOME=`dirname $JAVA_HOME` +-fi ++AC_ARG_WITH([java], ++ [AS_HELP_STRING([--with-java], ++ [specify Java executable (default: java)])], ++ [], ++ [with_java=java]) ++ ++AC_ARG_WITH([javac], ++ [AS_HELP_STRING([--with-javac], ++ [specify Java Compiler executable (default: javac)])], ++ [], ++ [with_javac=javac]) ++ ++AC_ARG_WITH([javah], ++ [AS_HELP_STRING([--with-javah], ++ [specify Java Header generator executable (default: javah)])], ++ [], ++ [with_javah=javah]) ++ ++AC_ARG_WITH([jar], ++ [AS_HELP_STRING([--with-jar], ++ [specify Jar executable (default: jar)])], ++ [], ++ [with_jar=jar]) ++ ++AC_ARG_WITH([javadoc], ++ [AS_HELP_STRING([--with-javadoc], ++ [specify Javadoc executable (default: javadoc)])], ++ [], ++ [with_javadoc=javadoc]) ++ ++JAVA_RUN="$with_java" ++JAVAC="$with_javac $JAVACFLAGS" ++JAVAH="$with_javah -jni" ++JAR=$with_jar ++JAVADOC=$with_javadoc ++ ++JAVA_HOME=`dirname $JAVAC` ++JAVA_HOME=`dirname $JAVA_HOME` + + AC_SUBST(JAVAH) + AC_SUBST(JAVA_RUN) +@@ -363,22 +270,14 @@ + AC_SUBST(JAR) + AC_SUBST(JAVADOC) + ++AC_ARG_WITH([jni-incdir], ++ [AS_HELP_STRING([--with-jni-incdir], ++ [jni.h location (default: $inc/classpath)])], ++ [], ++ [with_jni_incdir=$inc/classpath]) ++ + # Set up the JNI include directory specification +-case $build_os in +- solaris*) +- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/solaris" +- ;; +- linux*) +- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux" +- ;; +- freebsd*) +- JNIINCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/freebsd" +- ;; +- *) +- JNIINCLUDE="-I${JAVA_HOME}/include -I${JAVA_HOME}/include/${build_os}" +- AC_MSG_WARN([setting generic JNI include file directives!]) +- ;; +-esac ++JNIINCLUDE=-I$with_jni_incdir + AC_MSG_RESULT([setting JNI include file directives: $JNIINCLUDE]) + + # Figure out JDK version +@@ -398,9 +297,12 @@ + JAVAC="$JAVAC -nowarn" + fi + +-if test "x$NATIVE_LIB_DIR" = "x" ; then +- NATIVE_LIB_DIR=$libdir +-fi ++AC_ARG_WITH([target-native-libdir], ++ [AS_HELP_STRING([--with-target-native-libdir], ++ [directory for JNI library on target device (default: \$libdir)])], ++ [], ++ [with_target_native_libdir=$libdir]) ++NATIVE_LIB_DIR=$with_target_native_libdir + + AC_SUBST(JNIINCLUDE) + AC_SUBST(JAR_DIR) +Index: javasqlite-20080130/Makefile.in +=================================================================== +--- javasqlite-20080130.orig/Makefile.in 2008-01-07 19:14:29.000000000 +0100 ++++ javasqlite-20080130/Makefile.in 2008-07-13 17:03:10.000000000 +0200 +@@ -2,7 +2,12 @@ + + prefix = @prefix@ + CC = @CC@ +-LIBTOOL = ./libtool ++LIBTOOL = wrong-libtool ++LIBTOOL_CC = $(LIBTOOL) --mode=compile --tag=CC ++LIBTOOL_LINK = $(LIBTOOL) --mode=link --tag=CC ++LIBTOOL_INSTALL = $(LIBTOOL) --mode=install --tag=CC ++SQLITE_LIBDIR = -L@SQLITE_LIBDIR@ ++SQLITE3_LIBDIR = -L@SQLITE_LIBDIR@ + SQLITE_INC = @SQLITE_INC@ + SQLITE_LIB = @SQLITE_LIB@ + SQLITE3_INC = @SQLITE3_INC@ +@@ -119,16 +124,16 @@ + SQLite.FunctionContext SQLite.Stmt SQLite.Blob + + sqlite_jni.lo: native/sqlite_jni.h native/sqlite_jni.c +- $(LIBTOOL) $(CC) -c $(CFLAGS) native/sqlite_jni.c ++ $(LIBTOOL_CC) $(CC) -c $(CFLAGS) native/sqlite_jni.c + + libsqlite_jni.la: sqlite_jni.lo +- $(LIBTOOL) $(CC) -o libsqlite_jni.la sqlite_jni.lo \ ++ $(LIBTOOL_LINK) $(CC) -o libsqlite_jni.la sqlite_jni.lo \ + -rpath $(NATIVE_LIB_DIR) $(LIBS) + + native/mkconst: native/mkconst.c +- $(LIBTOOL) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \ ++ $(LIBTOOL_LINK) $(CC) $(SQLITE_INC) $(SQLITE3_INC) \ + -DHAVE_SQLITE2=@HAVE_SQLITE2@ -DHAVE_SQLITE3=@HAVE_SQLITE3@ \ +- -o native/mkconst native/mkconst.c $(LIBS) ++ -o native/mkconst native/mkconst.c $(LIBS) $(SQLITE_LIBDIR) $(SQLITE3_LIBDIR) + + Makefile: Makefile.in configure config.status + ./config.status +@@ -173,4 +178,4 @@ + $(INSTALL) -d -m 755 $(DESTDIR)$(JAR_DIR) + $(INSTALL) -m 644 sqlite.jar $(DESTDIR)$(JAR_DIR) + $(INSTALL) -d -m 755 $(DESTDIR)$(NATIVE_LIB_DIR) +- $(LIBTOOL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR) ++ $(LIBTOOL_INSTALL) $(INSTALL) libsqlite_jni.la $(DESTDIR)$(NATIVE_LIB_DIR) +Index: javasqlite-20080130/SQLite/JDBCDriver.java +=================================================================== +--- javasqlite-20080130.orig/SQLite/JDBCDriver.java 2008-07-13 17:28:52.000000000 +0200 ++++ javasqlite-20080130/SQLite/JDBCDriver.java 2008-07-13 17:53:14.000000000 +0200 +@@ -13,7 +13,7 @@ + + static { + try { +- Class connClass = null; ++ Class<? extends Connection> connClass = null; + Class args[] = new Class[4]; + args[0] = Class.forName("java.lang.String"); + args[1] = args[0]; +@@ -49,7 +49,7 @@ + } + } + } +- connClass = Class.forName(cvers); ++ connClass = (Class<? extends Connection>) Class.forName(cvers); + makeConn = connClass.getConstructor(args); + java.sql.DriverManager.registerDriver(new JDBCDriver()); + } catch (java.lang.Exception e) { diff --git a/packages/javasqlite/javasqlite-mkconst-native_20080130.bb b/packages/javasqlite/javasqlite-mkconst-native_20080130.bb new file mode 100644 index 0000000000..e6f9a8e1ae --- /dev/null +++ b/packages/javasqlite/javasqlite-mkconst-native_20080130.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "mkcons program needed for javasqlite build" +HOMEPAGE = "http://www.ch-werner.de/javasqlite" +LICENSE = "BSD" + +DEPENDS = "sqlite-native sqlite3-native" + +SRC_URI = "\ + http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \ + file://build-fix.patch;patch=1" + +S = "${WORKDIR}/javasqlite-${PV}" + +inherit autotools native + +# Program names are there to fool configure checks +# because we actually do not need these. +EXTRA_OECONF = " \ + --with-sqlite-incdir=${STAGING_INCDIR} \ + --with-sqlite-libdir=${STAGING_LIBDIR} \ + --with-sqlite3-incdir=${STAGING_INCDIR} \ + --with-sqlite3-libdir=${STAGING_LIBDIR} \ + --with-jardir=${datadir_java} \ + --with-native-libdir=${libdir_jni} \ + --with-java='echo version 1.5' \ + --with-javac=true \ + --with-jar=true \ + --with-javah=true \ + --with-javadoc=true \ + " + +do_configurepre() { + sed -i -e "s|wrong-libtool|${BUILD_SYS}-libtool|" Makefile.in +} + +addtask configurepre after do_patch before do_configure + + +do_compile() { + oe_runmake native/mkconst +} + +do_install() { + : +} + +do_stage() { + install -d ${STAGING_BINDIR} + install -m 0755 native/.libs/mkconst ${STAGING_BINDIR}/javasqlite-mkconst-${PV} +} + +PACKAGES = "" + diff --git a/packages/javasqlite/javasqlite_20080130.bb b/packages/javasqlite/javasqlite_20080130.bb new file mode 100644 index 0000000000..a8ed2d5017 --- /dev/null +++ b/packages/javasqlite/javasqlite_20080130.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "JDBC driver for sqlite and sqlite3" +HOMEPAGE = "http://www.ch-werner.de/javasqlite" +LICENSE = "BSD" + +SRC_URI = "\ + http://www.ch-werner.de/javasqlite/javasqlite-${PV}.tar.gz \ + file://build-fix.patch;patch=1" + +DEPENDS = "virtual/javac-native fastjar-native classpath-native javasqlite-mkconst-native classpath sqlite sqlite3" +RDEPENDS_${PN} = "${PN}-jni" + +inherit autotools java + +# jamvm-native unfortunately contains non-generificed java/lang/reflect classes +# which are accessed in this package. Work around this by setting the bootclasspath +# explicitly. +export JAVACFLAGS="-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip -source 5.0" + +EXTRA_OECONF = " \ + --with-jni-incdir=${STAGING_INCDIR}/classpath \ + --with-jardir=${datadir_java} \ + --with-target-native-libdir=${libdir_jni} \ + --with-sqlite-incdir=${STAGING_INCDIR} \ + --with-sqlite-libdir=${STAGING_LIBDIR} \ + --with-sqlite3-incdir=${STAGING_INCDIR} \ + --with-sqlite3-libdir=${STAGING_LIBDIR} \ + --with-java=${STAGING_BINDIR_NATIVE}/java \ + --with-javac=${STAGING_BINDIR_NATIVE}/javac \ + --with-jar=${STAGING_BINDIR_NATIVE}/gjar \ + --with-javah=${STAGING_BINDIR_NATIVE}/gjavah \ + --with-javadoc=true \ + " + +do_configurepre() { + sed -i -e "s|wrong-libtool|${TARGET_SYS}-libtool|" Makefile.in +} + +addtask configurepre after do_patch before do_configure + +do_compile_prepend() { + # Injects a cross-compiled mkconst binary into the build + cp ${STAGING_BINDIR_NATIVE}/javasqlite-mkconst-${PV} native/mkconst + touch native/mkconst +} + +PACKAGES = "${PN}-jni" diff --git a/packages/lcd4linux/files/lcd4linux.init b/packages/lcd4linux/files/lcd4linux.init index 0972c9005e..c27ee37a1b 100644 --- a/packages/lcd4linux/files/lcd4linux.init +++ b/packages/lcd4linux/files/lcd4linux.init @@ -13,7 +13,7 @@ ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/lcd4linux +DAEMON=/usr/bin/lcd4linux NAME=lcd4linux DESC=lcd4linux diff --git a/packages/lcd4linux/lcd4linux_0.10.0.bb b/packages/lcd4linux/lcd4linux_0.10.0.bb index 4c164de709..fe73954fe5 100644 --- a/packages/lcd4linux/lcd4linux_0.10.0.bb +++ b/packages/lcd4linux/lcd4linux_0.10.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPLv2" DEPENDS = "libusb-compat ncurses readline virtual/libx11" PV = "0.10.0+0.10.1-RC2" -PR = "r3" +PR = "r4" SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \ file://libusb-compat.diff;patch=1 \ diff --git a/packages/libwpd/libwpd_0.8.14.bb b/packages/libwpd/libwpd_0.8.14.bb new file mode 100644 index 0000000000..f54cfe5822 --- /dev/null +++ b/packages/libwpd/libwpd_0.8.14.bb @@ -0,0 +1,12 @@ +LICENSE = "LGPL" +DESCRIPTION = "libwpd is a C++ library designed to help process WordPerfect documents." +HOMEPAGE = "http://libwpd.sourceforge.net/index.html" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz" +DEPENDS = "libgsf" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/meta/meta-toolchain-neuros.bb b/packages/meta/meta-toolchain-neuros.bb index 5905eceec1..f60fbf0063 100644 --- a/packages/meta/meta-toolchain-neuros.bb +++ b/packages/meta/meta-toolchain-neuros.bb @@ -1,8 +1,9 @@ # Toolchain for neuros-osd devices -PR = "r1" +PR = "r3" -TOOLCHAIN_HOST_TASK = "task-sdk-host" +TOOLCHAIN_HOST_TASK = "task-sdk-host \ + qmake2-sdk uicmoc4-sdk" require meta-toolchain.bb diff --git a/packages/miglayout/.mtn2git_empty b/packages/miglayout/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/miglayout/.mtn2git_empty diff --git a/packages/mml-widget/files/.mtn2git_empty b/packages/mml-widget/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mml-widget/files/.mtn2git_empty diff --git a/packages/mml-widget/files/mathview-gcc43x.diff b/packages/mml-widget/files/mathview-gcc43x.diff new file mode 100644 index 0000000000..4091051a76 --- /dev/null +++ b/packages/mml-widget/files/mathview-gcc43x.diff @@ -0,0 +1,53 @@ +--- /tmp/mathVariantAux.cc 2008-07-13 15:56:56.000000000 +0200 ++++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-13 15:57:46.893198000 +0200 +@@ -20,6 +20,8 @@ + + #include <cassert> + ++#include <string.h> ++ + #include "mathVariantAux.hh" + + static MathVariantAttributes vattr[] = { +--- /tmp/T1_FontDataBase.cc 2008-07-13 16:25:24.000000000 +0200 ++++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-13 16:25:47.123198000 +0200 +@@ -20,6 +20,7 @@ + #include <config.h> + #include <map> + #include <string> ++#include <string.h> + #include <stdlib.h> + #include <iostream> + #include <list> +--- /tmp/SMS.cc 2008-07-13 16:27:23.000000000 +0200 ++++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-13 16:27:41.543198000 +0200 +@@ -19,6 +19,7 @@ + #include <config.h> + + #include <sstream> ++#include <string.h> + #include "defs.h" + #include "AbstractLogger.hh" + #include "ValueConversion.hh" +--- /tmp/main.cc 2008-07-13 16:29:11.000000000 +0200 ++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-13 16:29:28.813198000 +0200 +@@ -20,7 +20,7 @@ + + #include <cassert> + #include <fstream> +- ++#include <string.h> + #include <popt.h> + + // needed for old versions of GCC, must come before String.hh! +--- /tmp/main.cc 2008-07-13 16:30:11.000000000 +0200 ++++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-13 16:30:33.183198000 +0200 +@@ -20,7 +20,7 @@ + + #include <cassert> + #include <fstream> +- ++#include <string.h> + #include <popt.h> + + // needed for old versions of GCC, must come before String.hh! diff --git a/packages/mml-widget/gtkmathview_0.7.6.bb b/packages/mml-widget/gtkmathview_0.7.6.bb index 7cb91b4ba3..55f4328f7e 100644 --- a/packages/mml-widget/gtkmathview_0.7.6.bb +++ b/packages/mml-widget/gtkmathview_0.7.6.bb @@ -9,10 +9,10 @@ inherit autotools pkgconfig EXTRA_OECONF = "--disable-binreloc" do_configure() { -oe_runconf + oe_runconf } do_stage() { -autotools_stage_all + autotools_stage_all } diff --git a/packages/mml-widget/gtkmathview_0.8.0.bb b/packages/mml-widget/gtkmathview_0.8.0.bb new file mode 100644 index 0000000000..2fe48ea872 --- /dev/null +++ b/packages/mml-widget/gtkmathview_0.8.0.bb @@ -0,0 +1,24 @@ +LICENSE = "GPL" +HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/" +DEPENDS = "t1lib gtk+ popt libxslt libxml2" + +SRC_URI = "http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz \ + file://mathview-gcc43x.diff;patch=1 \ + " + +inherit autotools +AUTOTOOLS_STAGE_PKGCONFIG = 1 + +EXTRA_OECONF = "--disable-binreloc" + +do_configure_prepend() { + sed -i -e s:AM_BINRELOC::g ${S}/configure.ac +} + +do_stage() { + autotools_stage_all + for i in ${PKG_CONFIG_DIR}/*math*.pc ; do + sed -i -e s:${STAGING_INCDIR}:'${libdir}':g $i + done +} + diff --git a/packages/perl/libxml-simple-perl-native_2.18.bb b/packages/perl/libxml-simple-perl-native_2.18.bb new file mode 100644 index 0000000000..bfdfc3de45 --- /dev/null +++ b/packages/perl/libxml-simple-perl-native_2.18.bb @@ -0,0 +1,7 @@ +SECTION = "libs" + +inherit native + +require libxml-simple-perl_${PV}.bb + +DEPENDS = "libxml-parser-perl-native perl-native" diff --git a/packages/perl/libxml-simple-perl_2.18.bb b/packages/perl/libxml-simple-perl_2.18.bb new file mode 100644 index 0000000000..6cab76bf1e --- /dev/null +++ b/packages/perl/libxml-simple-perl_2.18.bb @@ -0,0 +1,10 @@ +SECTION = "libs" +LICENSE = "Artistic" +DEPENDS += "libxml-parser-perl" +PR = "r0" + +SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Simple-${PV}.tar.gz" + +S = "${WORKDIR}/XML-Simple-${PV}" + +inherit cpan diff --git a/packages/poppler/poppler_0.8.4.bb b/packages/poppler/poppler_0.8.4.bb new file mode 100644 index 0000000000..3c1ec00183 --- /dev/null +++ b/packages/poppler/poppler_0.8.4.bb @@ -0,0 +1,6 @@ +require poppler.inc + +PR = "r0" + +EXTRA_OECONF_append = " --disable-abiword-output " + diff --git a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch b/packages/qmake/files/0001-fix-mkspecs.patch index e0ebe512c8..e0ebe512c8 100644 --- a/packages/qmake/qmake2-native/0001-fix-mkspecs.patch +++ b/packages/qmake/files/0001-fix-mkspecs.patch diff --git a/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch b/packages/qmake/files/0008-backport-qt-lib-infix.patch index f87576a07b..f87576a07b 100644 --- a/packages/qmake/qmake2-native/0008-backport-qt-lib-infix.patch +++ b/packages/qmake/files/0008-backport-qt-lib-infix.patch diff --git a/packages/qmake/qmake2-native/qt-config.patch b/packages/qmake/files/qt-config.patch index b2d86de2c5..b2d86de2c5 100644 --- a/packages/qmake/qmake2-native/qt-config.patch +++ b/packages/qmake/files/qt-config.patch diff --git a/packages/qmake/qmake2-native/use-lflags-last.patch b/packages/qmake/files/use-lflags-last.patch index 4197dbbf64..4197dbbf64 100644 --- a/packages/qmake/qmake2-native/use-lflags-last.patch +++ b/packages/qmake/files/use-lflags-last.patch diff --git a/packages/qmake/qmake2-native.inc b/packages/qmake/qmake2-native.inc index c609fefb81..f7bdd7836b 100644 --- a/packages/qmake/qmake2-native.inc +++ b/packages/qmake/qmake2-native.inc @@ -7,7 +7,6 @@ PR = "r2" QTVER = "qtopia-core-opensource-src-${QTVERSION}" -FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \ file://0001-fix-mkspecs.patch;patch=1 \ file://0008-backport-qt-lib-infix.patch;patch=1 \ @@ -18,7 +17,7 @@ S = "${WORKDIR}/${QTVER}" # we need the real target system here CROSS_SYS := "${TARGET_SYS}" -inherit autotools cross +inherit autotools export QTDIR = "${S}" EXTRA_OEMAKE = "-e" @@ -63,6 +62,3 @@ do_stage() { cp -PfR mkspecs ${CROSS_DATADIR}/qt4/ } -do_install() { - : -} diff --git a/packages/qmake/qmake2-native_2.10a.bb b/packages/qmake/qmake2-native_2.10a.bb index 89b2ae5a82..0e1aa2c61e 100644 --- a/packages/qmake/qmake2-native_2.10a.bb +++ b/packages/qmake/qmake2-native_2.10a.bb @@ -1,2 +1,11 @@ QTVERSION="4.3.3" +FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native" require ${PN}.inc + +inherit cross + +do_install() { + : +} + + diff --git a/packages/qmake/qmake2-sdk/.mtn2git_empty b/packages/qmake/qmake2-sdk/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/qmake/qmake2-sdk/.mtn2git_empty diff --git a/packages/qmake/qmake2-sdk/linux-oe-qmake.conf b/packages/qmake/qmake2-sdk/linux-oe-qmake.conf new file mode 100644 index 0000000000..f58481a693 --- /dev/null +++ b/packages/qmake/qmake2-sdk/linux-oe-qmake.conf @@ -0,0 +1 @@ +include(../linux-g++/qmake.conf) diff --git a/packages/qmake/qmake2-sdk_2.10a.bb b/packages/qmake/qmake2-sdk_2.10a.bb new file mode 100644 index 0000000000..b16159c8d9 --- /dev/null +++ b/packages/qmake/qmake2-sdk_2.10a.bb @@ -0,0 +1,17 @@ +QTVERSION="4.3.3" +require qmake2-native.inc + +inherit sdk + +do_install () { + install -d ${D}/${bindir} + install -m 0755 bin/qmake ${D}/${bindir}/qmake2 + install -m 0755 bin/qmake ${D}/${bindir}/qmake-qt4 + install -d ${D}/${datadir}/qt4 + cp -PfR mkspecs ${D}/${datadir}/qt4/ +} + + + + + diff --git a/packages/sqlite/sqlite-native_2.8.17.bb b/packages/sqlite/sqlite-native_2.8.17.bb new file mode 100644 index 0000000000..a3100fc60c --- /dev/null +++ b/packages/sqlite/sqlite-native_2.8.17.bb @@ -0,0 +1,16 @@ +# This is put at the top to override do_stage later +inherit native + +require sqlite_${PV}.bb + +DEPENDS = "readline-native ncurses-native" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/sqlite-${PV}" + +S = "${WORKDIR}/sqlite-${PV}" + +do_install() { + : +} + +PACKAGES = "" diff --git a/packages/sqlite/sqlite3-native.inc b/packages/sqlite/sqlite3-native.inc new file mode 100644 index 0000000000..d61551703f --- /dev/null +++ b/packages/sqlite/sqlite3-native.inc @@ -0,0 +1,13 @@ +inherit native + +require sqlite3.inc + +DEPENDS = "readline-native ncurses-native" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/sqlite3" + +do_install() { + : +} + +PACKAGES = "" diff --git a/packages/sqlite/sqlite3-native_3.5.6.bb b/packages/sqlite/sqlite3-native_3.5.6.bb new file mode 100644 index 0000000000..08208c4c74 --- /dev/null +++ b/packages/sqlite/sqlite3-native_3.5.6.bb @@ -0,0 +1 @@ +require sqlite3-native.inc diff --git a/packages/sqlitejdbc/.mtn2git_empty b/packages/sqlitejdbc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sqlitejdbc/.mtn2git_empty diff --git a/packages/sqlitejdbc/sqlitejdbc_041.bb b/packages/sqlitejdbc/sqlitejdbc_041.bb new file mode 100644 index 0000000000..c2ab0f9b23 --- /dev/null +++ b/packages/sqlitejdbc/sqlitejdbc_041.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "JDBC driver for sqlite" +LICENSE = "BSD" + +AUTHOR = "David Crawshaw" +HOMEPAGE = "http://www.zentus.com/sqlitejdbc/" + +SRC_URI = "\ + http://www.zentus.com/${PN}/dist/${PN}-v${PV}-src.tgz \ + " + +S = "${WORKDIR}/${PN}-v${PV}" + +inherit java-library + +DEPENDS = "classpath-native fastjar-native sqlite3 classpath" +RDEPENDS_${JPN} = "libsqlitejdbc-jni" + +do_unpackpost() { + mkdir build native +} + +addtask unpackpost after do_unpack before do_patch + +do_compile() { + javac -sourcepath src -d build `find src/org -name "*.java" -and -not -name "*Nested*"` + (cd src && find . -name "*.properties" -exec cp {} ../build/{} \;) + fastjar -C build -c -f ${JARFILENAME} . + + gjavah -classpath build -jni -o native/NativeDB.h org.sqlite.NativeDB + ${CC} ${CFLAGS} -c -o native/NativeDB.o src/org/sqlite/NativeDB.c -I${STAGING_INCDIR}/classpath -Inative + ${CC} ${CFLAGS} ${LDFLAGS} -shared -lsqlite3 -o libsqlitejdbc.so native/NativeDB.o + + ${STRIP} libsqlitejdbc.so +} + +do_install_append() { + oe_libinstall -so libsqlitejdbc ${D}${libdir_jni} +} + +do_install_append() { + oe_libinstall -so libsqlitejdbc ${STAGING_LIBDIR_JNI} +} + +PACKAGES += "libsqlitejdbc-jni" + +FILES_libsqlitejdbc-jni = "${libdir_jni}" diff --git a/packages/swfdec/swfdec-mozilla_0.7.2.bb b/packages/swfdec/swfdec-mozilla_0.7.2.bb index e6f198bdac..63499cfbd3 100644 --- a/packages/swfdec/swfdec-mozilla_0.7.2.bb +++ b/packages/swfdec/swfdec-mozilla_0.7.2.bb @@ -1,7 +1,10 @@ DESCRIPTION = "Swfdec plugin for browsers using NPAPI. Swfdec is a decoder/renderer for Macromedia Flash animations." LICENSE = "LGPL" -DEPENDS = "swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" +PR = "r1" + +DEPENDS = "gst-ffmpeg swfdec gstreamer libsoup-2.4 pango cairo liboil zlib libmad gtk+ alsa-lib" +RDEPENDS = "gst-ffmpeg" SRC_URI = "http://swfdec.freedesktop.org/download/swfdec-mozilla/0.7/${P}.tar.gz \ " diff --git a/packages/t1lib/t1lib_5.0.2.bb b/packages/t1lib/t1lib_5.0.2.bb index 3934016c1e..5da31f7d09 100644 --- a/packages/t1lib/t1lib_5.0.2.bb +++ b/packages/t1lib/t1lib_5.0.2.bb @@ -1,7 +1,8 @@ DESCRIPTION = "A Type1 Font Rastering Library" SECTION = "libs" PRIORITY = "optional" -PR = "r3" +DEPENDS = "virtual/libx11" +PR = "r4" LICENSE = "LGPL GPL" SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ file://configure.patch;patch=1 \ @@ -10,7 +11,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \ inherit autotools -EXTRA_OECONF = "--without-x --without-athena" +EXTRA_OECONF = "--with-x --without-athena" EXTRA_OEMAKE = "without_doc" do_configure() { @@ -19,9 +20,7 @@ do_configure() { } do_stage() { - oe_libinstall -so -C lib libt1 ${STAGING_LIBDIR} - install lib/t1lib/t1lib.h ${STAGING_INCDIR}/ - install lib/t1lib/t1libx.h ${STAGING_INCDIR}/ + autotools_stage_all } FILES_${PN} = "${bindir}/* ${libdir}/*.so* ${datadir}/t1lib/t1lib.config" diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index e940038453..9c9c3e43bb 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r69" +PR = "r70" inherit task diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb index 5663ff5a3d..cb4db34e64 100644 --- a/packages/tasks/task-boot.bb +++ b/packages/tasks/task-boot.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a device booting" -PR = "r43" +PR = "r44" inherit task diff --git a/packages/tasks/task-proper-tools.bb b/packages/tasks/task-proper-tools.bb index 1610854bc0..6e1cd5d895 100644 --- a/packages/tasks/task-proper-tools.bb +++ b/packages/tasks/task-proper-tools.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Full versions of tools provided by busybox" -PR = "r5" +PR = "r6" inherit task RDEPENDS_${PN} = "\ coreutils \ findutils \ - util-linux \ + util-linux-ng \ gawk \ sed \ wget \ diff --git a/packages/u-boot/u-boot-git/beagleboard/base.patch b/packages/u-boot/u-boot-git/beagleboard/base.patch index dedc34398f..d4f726c006 100644 --- a/packages/u-boot/u-boot-git/beagleboard/base.patch +++ b/packages/u-boot/u-boot-git/beagleboard/base.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 8bfc891..e9bf61a 100644 +index e557d0d..3eac691 100644 --- a/Makefile +++ b/Makefile @@ -141,7 +141,7 @@ ifeq ($(ARCH),ppc) @@ -11,7 +11,7 @@ index 8bfc891..e9bf61a 100644 endif ifeq ($(ARCH),i386) CROSS_COMPILE = i386-linux- -@@ -252,7 +252,7 @@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a +@@ -253,7 +253,7 @@ LIBBOARD = board/$(BOARDDIR)/lib$(BOARD).a LIBBOARD := $(addprefix $(obj),$(LIBBOARD)) # Add GCC lib @@ -20,7 +20,7 @@ index 8bfc891..e9bf61a 100644 # The "tools" are needed early, so put this first # Don't include stuff already done in $(LIBS) -@@ -2565,6 +2565,12 @@ SMN42_config : unconfig +@@ -2569,6 +2569,12 @@ SMN42_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm720t SMN42 siemens lpc2292 ######################################################################### @@ -1467,10 +1467,10 @@ index 0000000..2f94684 +#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c new file mode 100644 -index 0000000..0bdfb72 +index 0000000..7d9a566 --- /dev/null +++ b/board/omap3530beagle/omap3530beagle.c -@@ -0,0 +1,390 @@ +@@ -0,0 +1,388 @@ +/* + * (C) Copyright 2004-2008 + * Texas Instruments, <www.ti.com> @@ -1740,8 +1740,6 @@ index 0000000..0bdfb72 + *((uint *) 0x49058094) = 0x00000506; + *((uint *) 0x49056094) = 0xF060F000; + -+ /* set clksel_tv and clksel_dss1 */ -+ *((uint *) 0x48004E40) = 0x00001002; + return (0); +} + @@ -2323,19 +2321,60 @@ index 0000000..72f15f6 + .bss : { *(.bss) } + _end = .; +} -diff --git a/common/env_nand.c b/common/env_nand.c -index a48e98e..8b04a01 100644 ---- a/common/env_nand.c -+++ b/common/env_nand.c -@@ -231,6 +231,8 @@ int saveenv(void) - size_t total; - int ret = 0; +diff --git a/common/cmd_nand.c b/common/cmd_nand.c +index 9e38bf7..0ae362c 100644 +--- a/common/cmd_nand.c ++++ b/common/cmd_nand.c +@@ -37,6 +37,12 @@ int find_dev_and_part(const char *id, struct mtd_device **dev, + u8 *part_num, struct part_info **part); + #endif -+ nand_erase_options_t nand_erase_options; ++#if defined(CONFIG_OMAP) && (defined(CONFIG_OMAP3_BEAGLE)) ++extern void omap_nand_switch_ecc(nand_info_t *nand, int hardware); ++#else ++#define omap_nand_switch_ecc(x, y) do {} while(0) ++#endif + - nand_erase_options.length = CFG_ENV_RANGE; - nand_erase_options.quiet = 0; - nand_erase_options.jffs2 = 0; + static int nand_dump_oob(nand_info_t *nand, ulong off) + { + return 0; +@@ -222,7 +228,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) + strncmp(cmd, "dump", 4) != 0 && + strncmp(cmd, "read", 4) != 0 && strncmp(cmd, "write", 5) != 0 && + strcmp(cmd, "scrub") != 0 && strcmp(cmd, "markbad") != 0 && +- strcmp(cmd, "biterr") != 0 && ++ strcmp(cmd, "biterr") != 0 && strncmp(cmd, "ecc", 3) != 0 && + strcmp(cmd, "lock") != 0 && strcmp(cmd, "unlock") != 0 ) + goto usage; + +@@ -307,6 +313,19 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) + + } + ++ if (strncmp(cmd, "ecc", 3) == 0) { ++ if (argc < 2) ++ goto usage; ++ if (strncmp(argv[2], "hw", 2) == 0) ++ omap_nand_switch_ecc(nand, 1); ++ else if (strncmp(argv[2], "sw", 2) == 0) ++ omap_nand_switch_ecc(nand, 0); ++ else ++ goto usage; ++ ++ return 0; ++ } ++ + /* read write */ + if (strncmp(cmd, "read", 4) == 0 || strncmp(cmd, "write", 5) == 0) { + int read; +@@ -472,6 +491,7 @@ U_BOOT_CMD(nand, 5, 1, do_nand, + "nand scrub - really clean NAND erasing bad blocks (UNSAFE)\n" + "nand markbad off - mark bad block at offset (UNSAFE)\n" + "nand biterr off - make a bit error at offset (UNSAFE)\n" ++ "nand ecc [hw/sw] - switch the ecc calculation algorithm \n" + "nand lock [tight] [status] - bring nand to lock state or display locked pages\n" + "nand unlock [offset] [size] - unlock section\n"); + diff --git a/cpu/omap3/Makefile b/cpu/omap3/Makefile new file mode 100644 index 0000000..097447a @@ -4122,10 +4161,10 @@ index 7dab786..7782e9d 100644 udelay(1000); }else diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c -index 7e27ee1..e552e08 100644 +index d1423c1..a75c606 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c -@@ -303,7 +303,9 @@ static inline void *get_node_mem_nor(u32 off) +@@ -304,7 +304,9 @@ static inline void *get_node_mem_nor(u32 off) */ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) { @@ -4135,7 +4174,7 @@ index 7e27ee1..e552e08 100644 #if defined(CONFIG_CMD_FLASH) if (id->type == MTD_DEV_TYPE_NOR) -@@ -321,7 +323,9 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) +@@ -322,7 +324,9 @@ static inline void *get_fl_mem(u32 off, u32 size, void *ext_buf) static inline void *get_node_mem(u32 off) { @@ -4270,7 +4309,7 @@ index 0000000..7cdd58c +#endif diff --git a/include/asm-arm/arch-omap3/clocks_omap3.h b/include/asm-arm/arch-omap3/clocks_omap3.h new file mode 100644 -index 0000000..9bb4700 +index 0000000..fdb0c4c --- /dev/null +++ b/include/asm-arm/arch-omap3/clocks_omap3.h @@ -0,0 +1,101 @@ @@ -4319,7 +4358,7 @@ index 0000000..9bb4700 +/* PER DPLL */ +# define PER_M6X2 3 /* 288MHz: CM_CLKSEL1_EMU */ +# define PER_M5X2 4 /* 216MHz: CM_CLKSEL_CAM */ -+# define PER_M4X2 9 /* 96MHz : CM_CLKSEL_DSS-dss1 */ ++# define PER_M4X2 2 /* 432MHz : CM_CLKSEL_DSS-dss1 */ +# define PER_M3X2 16 /* 54MHz : CM_CLKSEL_DSS-tv */ + +# define CLSEL1_EMU_VAL ((CORE_M3X2 << 16) | (PER_M6X2 << 24) | (0x0a50)) @@ -5406,7 +5445,7 @@ index 0000000..37aaa08 +#endif /* MMC_HOST_DEF_H */ diff --git a/include/asm-arm/arch-omap3/mux.h b/include/asm-arm/arch-omap3/mux.h new file mode 100644 -index 0000000..33947b9 +index 0000000..ec4aeb0 --- /dev/null +++ b/include/asm-arm/arch-omap3/mux.h @@ -0,0 +1,757 @@ @@ -6046,8 +6085,8 @@ index 0000000..33947b9 + MUX_VAL(CP(HSUSB0_DATA7), (IEN | PTD | DIS | M0)) /*HSUSB0_DATA7*/\ + MUX_VAL(CP(I2C1_SCL), (IEN | PTU | EN | M0)) /*I2C1_SCL*/\ + MUX_VAL(CP(I2C1_SDA), (IEN | PTU | EN | M0)) /*I2C1_SDA*/\ -+ MUX_VAL(CP(I2C2_SCL), (IDIS | PTU | DIS | M4)) /*GPIO_168*/\ -+ MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M4)) /*GPIO_183*/\ ++ MUX_VAL(CP(I2C2_SCL), (IEN | PTU | EN | M0)) /*I2C2_SCL*/\ ++ MUX_VAL(CP(I2C2_SDA), (IEN | PTU | EN | M0)) /*I2C2_SDA*/\ + MUX_VAL(CP(I2C3_SCL), (IEN | PTU | EN | M0)) /*I2C3_SCL*/\ + MUX_VAL(CP(I2C3_SDA), (IEN | PTU | EN | M0)) /*I2C3_SDA*/\ + MUX_VAL(CP(I2C4_SCL), (IEN | PTU | EN | M0)) /*I2C4_SCL*/\ @@ -6376,7 +6415,7 @@ index 0000000..271b554 +#endif diff --git a/include/configs/omap3530beagle.h b/include/configs/omap3530beagle.h new file mode 100644 -index 0000000..fd21ab3 +index 0000000..20efbf3 --- /dev/null +++ b/include/configs/omap3530beagle.h @@ -0,0 +1,292 @@ @@ -6532,9 +6571,9 @@ index 0000000..fd21ab3 +/* Environment information */ +#define CONFIG_BOOTDELAY 10 + -+#define CONFIG_BOOTCOMMAND "mmcinit;fatload mmc 0 0x80300000 uImage; fatload mmc 0 0x81600000 rd-ext2.bin; bootm 0x80300000\0" ++#define CONFIG_BOOTCOMMAND "nand read 80200000 280000 400000 ; bootm 80200000" + -+#define CONFIG_BOOTARGS "setenv bootargs console=ttyS2,115200n8 ramdisk_size=3072 root=/dev/ram0 rw rootfstype=ext2 initrd=0x81600000,3M " ++#define CONFIG_BOOTARGS "setenv bootargs console=ttyS2,115200n8 noinitrd root=/dev/mtdblock4 rw rootfstype=jffs2" + +#define CONFIG_NETMASK 255.255.254.0 +#define CONFIG_IPADDR 128.247.77.90 diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index e900ab41db..81842921cc 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,8 +1,8 @@ require u-boot.inc -PR="r9" +PR="r10" SRCREV_davinci-sffsdr = "a524e112b424c6843800ea2f19d3a8cf01d0aa94" -SRCREV_beagleboard = "9b55a2536919f4de1bb1044e6eb8262c2f53bc96" +SRCREV_beagleboard = "bde63587622c4b830a27d1ddf7265843de9e994f" SRCREV_neuros-osd2 = "482dfe48845192c7f810bccfc93db93d0f1654f7" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " diff --git a/packages/uicmoc/files/qapplication.diff b/packages/uicmoc/files/qapplication.diff new file mode 100644 index 0000000000..4600f66bd3 --- /dev/null +++ b/packages/uicmoc/files/qapplication.diff @@ -0,0 +1,132 @@ +--- /tmp/qapplication_p.h 2008-07-14 11:39:24.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/src/gui/kernel/qapplication_p.h 2008-07-14 11:39:47.000000000 +0200 +@@ -344,7 +344,7 @@ + # endif + QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; } + void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect); +- void setScreenTransformation(QScreen *screen, int screen, int transformation); ++ void setScreenTransformation(QScreen *screen, int screenNo, int transformation); + #endif + + static QApplicationPrivate *instance() { return self; } +--- /tmp/qdrawhelper_p.h 2008-07-14 11:48:26.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper_p.h 2008-07-14 11:50:12.000000000 +0200 +@@ -1379,7 +1379,7 @@ + static inline quint32 qt_convertToRgb(SRC color); + + template <> +-static inline quint32 qt_convertToRgb(quint32 color) ++inline quint32 qt_convertToRgb(quint32 color) + { + const int r = qRed(color) >> (8 - qrgb::len_red); + const int g = qGreen(color) >> (8 - qrgb::len_green); +@@ -1394,7 +1394,7 @@ + } + + template <> +-static inline quint32 qt_convertToRgb(quint16 color) ++inline quint32 qt_convertToRgb(quint16 color) + { + return qt_convertToRgb(qt_colorConvert<quint32, quint16>(color, 0)); + } +@@ -1422,14 +1422,14 @@ + } Q_PACKED; + + template <> +-static inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy) ++inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy) + { + Q_UNUSED(dummy); + return qrgb_generic16(color); + } + + template <> +-static inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy) ++inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy) + { + Q_UNUSED(dummy); + return qrgb_generic16(qt_colorConvert<quint32, quint16>(color, 0)); +--- /tmp/qscreen_qws.cpp 2008-07-14 11:51:39.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/src/gui/embedded/qscreen_qws.cpp 2008-07-14 11:52:56.000000000 +0200 +@@ -828,13 +828,13 @@ + static inline quint8 qt_convertToGray4(SRC color); + + template <> +-static inline quint8 qt_convertToGray4(quint32 color) ++inline quint8 qt_convertToGray4(quint32 color) + { + return qGray(color) >> 4; + } + + template <> +-static inline quint8 qt_convertToGray4(quint16 color) ++inline quint8 qt_convertToGray4(quint16 color) + { + const int r = (color & 0xf800) >> 11; + const int g = (color & 0x07e0) >> 6; // only keep 5 bit +@@ -843,13 +843,13 @@ + } + + template <> +-static inline quint8 qt_convertToGray4(qrgb444 color) ++inline quint8 qt_convertToGray4(qrgb444 color) + { + return qt_convertToGray4(quint32(color)); + } + + template <> +-static inline quint8 qt_convertToGray4(qargb4444 color) ++inline quint8 qt_convertToGray4(qargb4444 color) + { + return qt_convertToGray4(quint32(color)); + } +@@ -969,25 +969,25 @@ + static inline quint8 qt_convertToMono(SRC color); + + template <> +-static inline quint8 qt_convertToMono(quint32 color) ++inline quint8 qt_convertToMono(quint32 color) + { + return qGray(color) >> 7; + } + + template <> +-static inline quint8 qt_convertToMono(quint16 color) ++inline quint8 qt_convertToMono(quint16 color) + { + return (qGray(qt_colorConvert<quint32, quint16>(color, 0)) >> 7); + } + + template <> +-static inline quint8 qt_convertToMono(qargb4444 color) ++inline quint8 qt_convertToMono(qargb4444 color) + { + return (qGray(quint32(color)) >> 7); + } + + template <> +-static inline quint8 qt_convertToMono(qrgb444 color) ++inline quint8 qt_convertToMono(qrgb444 color) + { + return (qGray(quint32(color)) >> 7); + } +--- /tmp/qdrawhelper.cpp 2008-07-14 11:56:25.000000000 +0200 ++++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper.cpp 2008-07-14 11:57:29.000000000 +0200 +@@ -3374,7 +3374,7 @@ + + #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN + template <> +-static inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src) ++inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src) + { + Q_ASSERT((quintptr(dest) & 0x3) == 0); + Q_ASSERT((quintptr(src) & 0x3) == 0); +@@ -3455,7 +3455,7 @@ + + #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN + template <> +-static inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src) ++inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src) + { + Q_ASSERT((quintptr(dest) & 0x3) == 0); + Q_ASSERT((quintptr(src) & 0x3) == 0); diff --git a/packages/uicmoc/uicmoc4-native.inc b/packages/uicmoc/uicmoc4-native.inc index c5adef71e4..8d7f3111dc 100644 --- a/packages/uicmoc/uicmoc4-native.inc +++ b/packages/uicmoc/uicmoc4-native.inc @@ -10,8 +10,6 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.ta file://configure-fix.patch;patch=1" S = "${WORKDIR}/qtopia-core-opensource-src-${PV}" -inherit native - EXTRA_OECONF = "-prefix ${STAGING_DIR_NATIVE}/qt4 \ -qt-libjpeg -qt-gif -system-zlib \ -no-nis -no-cups -no-exceptions \ diff --git a/packages/uicmoc/uicmoc4-native_4.3.1.bb b/packages/uicmoc/uicmoc4-native_4.3.1.bb index 1950f63068..dc969d4be1 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.1.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.1.bb @@ -1 +1,3 @@ require uicmoc4-native.inc + +inherit native diff --git a/packages/uicmoc/uicmoc4-native_4.3.3.bb b/packages/uicmoc/uicmoc4-native_4.3.3.bb index 1950f63068..dd1ac3d98d 100644 --- a/packages/uicmoc/uicmoc4-native_4.3.3.bb +++ b/packages/uicmoc/uicmoc4-native_4.3.3.bb @@ -1 +1,2 @@ require uicmoc4-native.inc +inherit native diff --git a/packages/uicmoc/uicmoc4-native_4.4.0.bb b/packages/uicmoc/uicmoc4-native_4.4.0.bb index 6d9c83eb75..6e13ccbf13 100644 --- a/packages/uicmoc/uicmoc4-native_4.4.0.bb +++ b/packages/uicmoc/uicmoc4-native_4.4.0.bb @@ -1,7 +1,10 @@ require uicmoc4-native.inc SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ - file://configure-fix.patch;patch=1" + file://configure-fix.patch;patch=1 \ + file://qapplication.diff;patch=1 " + S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" +inherit native diff --git a/packages/uicmoc/uicmoc4-sdk_4.4.0.bb b/packages/uicmoc/uicmoc4-sdk_4.4.0.bb new file mode 100644 index 0000000000..00aeb26564 --- /dev/null +++ b/packages/uicmoc/uicmoc4-sdk_4.4.0.bb @@ -0,0 +1,23 @@ +require uicmoc4-native.inc + +inherit sdk + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \ + file://configure-fix.patch;patch=1 \ + file://qapplication.diff;patch=1 " + +S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}" + +do_install_append() { + install -d ${D}/${bindir} + install -m 0755 bin/moc ${D}/${bindir}/moc4 + install -m 0755 bin/uic ${D}/${bindir}/uic4 + install -m 0755 bin/uic3 ${D}/${bindir}/uic34 + install -m 0755 bin/rcc ${D}/${bindir}/rcc4 + install -m 0755 bin/lrelease ${D}/${bindir}/lrelease4 + install -m 0755 bin/lupdate ${D}/${bindir}/lupdate4 + install -d ${D}/${datadir}/qt4/ + install -m 0644 tools/porting/src/q3porting.xml ${D}/${datadir}/qt4/ +} + + diff --git a/packages/util-linux-ng/util-linux-ng.inc b/packages/util-linux-ng/util-linux-ng.inc index fa02f35356..810c8e6e9f 100644 --- a/packages/util-linux-ng/util-linux-ng.inc +++ b/packages/util-linux-ng/util-linux-ng.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "zlib ncurses e2fsprogs-libs" +DEPENDS = "udev zlib ncurses e2fsprogs-libs" inherit autotools @@ -13,30 +13,23 @@ inherit autotools RC="" DEFAULT_PREFERENCE = "-1" -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v2.13/util-linux-ng-${PV}${RC}.tar.bz2" -# file://gcc34.patch;patch=1 \ -# file://MCONFIG \ -# file://make_include \ -# file://swapargs.h \ -# file://fdiskbsdlabel_thumb.diff;patch=1 \ -# file://umount.diff;patch=1 \ -# file://defines.h" +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/util-linux-ng/v${PV}/util-linux-ng-${PV}${RC}.tar.bz2" -PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile " +PACKAGES =+ "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-swaponoff util-linux-ng-losetup util-linux-ng-umount util-linux-ng-mount util-linux-ng-readprofile " FILES_${PN}-doc += "/usr/share/misc/getopt/getopt-*.*" -FILES_util-linux-fdisk = "/sbin/fdisk.${PN}" -FILES_util-linux-cfdisk = "/sbin/cfdisk" -FILES_util-linux-sfdisk = "/sbin/sfdisk" -FILES_util-linux-swaponoff = "/sbin/swapon.${PN} /sbin/swapoff.${PN}" -FILES_util-linux-losetup = "/sbin/losetup.${PN}" -FILES_util-linux-mount = "/bin/mount.${PN} ${sysconfdir}/default/mountall" -FILES_util-linux-umount = "/bin/umount.${PN}" -FILES_util-linux-readprofile = "/usr/sbin/readprofile" +FILES_util-linux-ng-fdisk = "/sbin/fdisk.${PN}" +FILES_util-linux-ng-cfdisk = "/sbin/cfdisk" +FILES_util-linux-ng-sfdisk = "/sbin/sfdisk" +FILES_util-linux-ng-swaponoff = "/sbin/swapon.${PN} /sbin/swapoff.${PN}" +FILES_util-linux-ng-losetup = "/sbin/losetup.${PN}" +FILES_util-linux-ng-mount = "/bin/mount.${PN} ${sysconfdir}/default/mountall" +FILES_util-linux-ng-umount = "/bin/umount.${PN}" +FILES_util-linux-ng-readprofile = "/usr/sbin/readprofile" -RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile " -RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" +RRECOMMENDS_${PN} = "util-linux-ng-fdisk util-linux-ng-cfdisk util-linux-ng-sfdisk util-linux-ng-mount util-linux-ng-readprofile " +RDEPENDS_${PN} = "util-linux-ng-umount util-linux-ng-swaponoff util-linux-ng-losetup" EXTRA_OECONF = "--disable-use-tty-group --disable-makeinstall-chown \ --enable-kill --enable-last --enable-mesg --enable-raw --enable-login-utils \ @@ -104,7 +97,6 @@ do_install () { mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN} mv ${D}${bindir}/renice ${D}${bindir}/renice.${PN} mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN} - return 0 mv ${D}${sbindir}/losetup ${D}${base_sbindir}/losetup.${PN} mv ${D}${sbindir}/swapon ${D}${base_sbindir}/swapon.${PN} @@ -112,19 +104,19 @@ do_install () { mv ${D}${bindir}/mount ${D}${base_bindir}/mount.${PN} mv ${D}${sbindir}/fdisk ${D}${base_sbindir}/fdisk.${PN} - mv ${D}${bindir}/agetty ${D}${base_sbindir}/ - mv ${D}${bindir}/blockdev ${D}${base_sbindir}/ - mv ${D}${bindir}/cfdisk ${D}${base_sbindir}/ - mv ${D}${bindir}/ctrlaltdel ${D}${base_sbindir}/ + mv ${D}${sbindir}/agetty ${D}${base_sbindir}/ + mv ${D}${sbindir}/blockdev ${D}${base_sbindir}/ + mv ${D}${sbindir}/cfdisk ${D}${base_sbindir}/ + mv ${D}${sbindir}/ctrlaltdel ${D}${base_sbindir}/ install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall - checklink swapon ${D}${base_sbindir}/swapoff ".${PN}" - checklink shutdown ${D}${base_sbindir}/reboot ".${PN}" - checklink shutdown ${D}${base_sbindir}/halt ".${PN}" - checklink shutdown ${D}${base_sbindir}/fastboot "" - checklink shutdown ${D}${base_sbindir}/fasthalt "" + ln -sf ${base_sbindir}/swapon ${D}${base_sbindir}/swapoff.${PN} + ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/reboot.${PN} + ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/halt.${PN} + ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fastboot + ln -sf ${base_sbindir}/shutdown ${D}${base_sbindir}/fasthalt } pkg_postinst_${PN} () { @@ -174,44 +166,44 @@ pkg_prerm_${PN} () { update-alternatives --remove wall wall.${PN} } -pkg_postinst_util-linux-fdisk () { +pkg_postinst_util-linux-ng-fdisk () { update-alternatives --install ${base_sbindir}/fdisk fdisk fdisk.${PN} 100 } -pkg_prerm_util-linux-fdisk () { +pkg_prerm_util-linux-ng-fdisk () { update-alternatives --remove fdisk fdisk.${PN} } -pkg_postinst_util-linux-mount () { +pkg_postinst_util-linux-ng-mount () { update-alternatives --install ${base_bindir}/mount mount mount.${PN} 100 } -pkg_prerm_util-linux-mount () { +pkg_prerm_util-linux-ng-mount () { update-alternatives --remove mount mount.${PN} } -pkg_postinst_util-linux-umount () { +pkg_postinst_util-linux-ng-umount () { update-alternatives --install ${base_bindir}/umount umount umount.${PN} 100 } -pkg_prerm_util-linux-umount () { +pkg_prerm_util-linux-ng-umount () { update-alternatives --remove umount umount.${PN} } -pkg_postinst_util-linux-losetup () { +pkg_postinst_util-linux-ng-losetup () { update-alternatives --install ${base_sbindir}/losetup losetup losetup.${PN} 100 } -pkg_prerm_util-linux-losetup () { +pkg_prerm_util-linux-ng-losetup () { update-alternatives --remove losetup losetup.${PN} } -pkg_postinst_util-linux-swaponoff () { +pkg_postinst_util-linux-ng-swaponoff () { update-alternatives --install ${base_sbindir}/swapoff swapoff swapoff.${PN} 100 update-alternatives --install ${base_sbindir}/swapon swapon swapon.${PN} 100 } -pkg_prerm_util-linux-swaponoff () { +pkg_prerm_util-linux-ng-swaponoff () { update-alternatives --remove swapoff swapoff.${PN} update-alternatives --remove swapon swapon.${PN} } diff --git a/packages/util-linux-ng/util-linux-ng_2.14.bb b/packages/util-linux-ng/util-linux-ng_2.14.bb new file mode 100644 index 0000000000..ed80268e22 --- /dev/null +++ b/packages/util-linux-ng/util-linux-ng_2.14.bb @@ -0,0 +1,3 @@ +require util-linux-ng.inc + +PR = "r1" |