Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

23 files changed, 814 insertions, 10410 deletions

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 97ccf5dfc3..d29ba4bfcf 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -84,7 +84,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data):
 
     # call md5(sum) and shasum
     try:
-        md5pipe = os.popen('md5sum ' + localpath)
+	md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath))
         md5data = (md5pipe.readline().split() or [ "" ])[0]
         md5pipe.close()
     except OSError:
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 78633b4750..7c0c52d6c8 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -5706,6 +5706,10 @@ sha256=d437b49f40f61e3ba5a3ed8edad783895dcbdfc3cd4cbe6ef37a56f7eea59573
 md5=cce9edb41b4a8308e0ef0eea24b5a1ab
 sha256=61d041afc953e0570ddae934179e92edf800f69f043d78058073806504e4137f
 
+[http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-0.1.7.tar.bz2]
+md5=1919bb19c16ef0a97d48b0a8303d3c7b
+sha256=0afbb0f348d4ba916cf58da48b4749b7cca6a9038136b27dc652161913704ae8
+
 [http://enlightenment.freedesktop.org/files/epeg-0.9.0.007.tar.gz]
 md5=383db51e46d13d986966459e4918d236
 sha256=bb12585b433fd0eca11865541bdb877166b9e53b0ea12624776f11cce3ce189b
@@ -5914,6 +5918,10 @@ sha256=c424e6dd5cc0d998a311f5c49835de9803da4dbcb74ca7fbda29c1b953bf6d6b
 md5=ad0e463ab1fe596fc52c03403a9b9f1e
 sha256=d8803313e2a0b3fa3fe20fe613ac3ec85ec6848d5d446dd02e9cc5be8194f65c
 
+[http://ftp.gnome.org/pub/GNOME/sources/evince/2.26/evince-2.26.2.tar.bz2]
+md5=ed8b9fb5c5d6feafd19f0114b736c9ef
+sha256=5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489
+
 [http://beagleboard.googlecode.com/files/evtest.c]
 md5=da26fda6df8835a7cb95182e1fabe912
 sha256=ba2bdf6887eb0ef606402d51a2f4e68510d68dec5afd9f4d30d787950dece770
@@ -18030,6 +18038,10 @@ sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
 md5=6c974df7a5a5b1579f72115e6b045bda
 sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
 
+[http://downloads.sourceforge.net/net-snmp/net-snmp-5.4.2.1.tar.gz]
+md5=984932520143f0c8bf7b7ce1fc9e1da1
+sha256=11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
+
 [http://download.berlios.de/net-tools/net-tools-1.60.tar.bz2]
 md5=888774accab40217dde927e21979c165
 sha256=7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b
@@ -20022,6 +20034,10 @@ sha256=796f210200129e478bcb0f9c40c09998f2c47b346d4c734d94756e84989fd8b3
 md5=8efe67bc46564512bd1de09fce5971ab
 sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8
 
+[http://poppler.freedesktop.org/poppler-0.11.3.tar.gz]
+md5=28f9dbdc74e9aadbf27aff16d06f4990
+sha256=2ec40a8d9d9b80ebebea594c407c31962845376287c19e37345371236ed180d5
+
 [http://poppler.freedesktop.org/poppler-0.5.4.tar.gz]
 md5=053fdfd70533ecce1a06353fa945f061
 sha256=ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
@@ -23042,6 +23058,10 @@ sha256=dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
 md5=4809dcf89e504d4039ed01c9f61c68d5
 sha256=3da4fccc40c7c8ad51dba5bc7ac29a3a53905d5f2de0761353214d7e359d4bfd
 
+[http://www.klake.org/~jt/sscep/sscep.tgz]
+md5=89ba368c8455c324d208e5f5965f8f8f
+sha256=e622c344f72c6d95e15db834efbf777392778b2854e58a5d8f5d20b668cf2a9b
+
 [http://downloads.sourceforge.net/fuse/sshfs-fuse-1.3.tar.gz]
 md5=40fe4a353d03b80f8b37e4b0cc6159d3
 sha256=f80f713105fc0747197b6e5d2440cd77205cb1febe25b7b4fe08809ab67ace26
@@ -24702,6 +24722,10 @@ sha256=dbc5d6921136711f08c197284ec67dc77232559e2e31429f8a30a1a102bd07f7
 md5=042c5243ce0253341fe920a8a863e37b
 sha256=6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94
 
+[http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-1.0.2.tar.bz2]
+md5=4f896ed631f9be0338df9c5a2145ef82
+sha256=f1b9388f4507185a4ac30bae3383d9e9bbb95075a14dd188c904cacdd8cf4e66
+
 [http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r0.patch]
 md5=c8193bc27642fa446d702cfdb9464c2a
 sha256=2101f292449cbacc277aecc5c649de895d501057f299e8e48a7ec50cfb0a200d
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index 861f7ef886..2d45425290 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -1,7 +1,7 @@
 #############################################################################
 #@TYPE: Distribution
 #@NAME: Micro
-#@DESCRIPTION: Micro Linux Distribution (glibc based)
+#@DESCRIPTION: Micro Linux Distribution (eglibc based)
 #@MAINTAINER: Martin Lund <mgl@doredevelopment.dk>
 #@COMMENT: This distribution configuration defines a truely tiny OE Linux  
 #@COMMENT: distribution. The matching buildable image target (micro-image)
@@ -79,7 +79,6 @@ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 # PREFERRED PROVIDERS
 #############################################################################
 PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
-PREFERRED_PROVIDER_virtual/libintl	= "glibc"
 
 #############################################################################
 # PREFERRED VERSIONS
diff --git a/contrib/python/generate-manifest-2.6.py b/contrib/python/generate-manifest-2.6.py
index d6fdcb456f..8d9272e4f1 100755
--- a/contrib/python/generate-manifest-2.6.py
+++ b/contrib/python/generate-manifest-2.6.py
@@ -164,7 +164,7 @@ if __name__ == "__main__":
     "lib-dynload/.debug ${bindir}/.debug ${libdir}/.debug" )
 
     m.addPackage( "python-devel", "Python Development Package", "python-core",
-    "${includedir} config" ) # package
+    "${includedir} ${libdir}/libpython2.6.so config" ) # package
 
     m.addPackage( "python-idle", "Python Integrated Development Environment", "python-core python-tkinter",
     "${bindir}/idle idlelib" ) # package
@@ -281,7 +281,7 @@ if __name__ == "__main__":
     "base64.* cookielib.* ftplib.* gopherlib.* hmac.* httplib.* mimetypes.* nntplib.* poplib.* smtplib.* telnetlib.* urllib.* urllib2.* urlparse.* uuid.* rfc822.* mimetools.*" )
 
     m.addPackage( "python-netserver", "Python Internet Protocol Servers", "python-core python-netclient",
-    "cgi.* BaseHTTPServer.* SimpleHTTPServer.* SocketServer.*" )
+    "cgi.* *HTTPServer.* SocketServer.*" )
 
     m.addPackage( "python-pickle", "Python Persistence Support", "python-core python-codecs python-io python-re",
     "pickle.* shelve.* lib-dynload/cPickle.so" )
diff --git a/recipes/epdfview/epdfview_0.1.6.bb b/recipes/epdfview/epdfview_0.1.7.bb
index 3cf2e5f026..1cd59f7394 100644
--- a/recipes/epdfview/epdfview_0.1.6.bb
+++ b/recipes/epdfview/epdfview_0.1.7.bb
@@ -3,10 +3,8 @@ HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/"
 LICENSE = "GPLv2"
 SECTION = "x11/applications"
 DEPENDS = "poppler gtk+ cups"
-PR = "r3"
 
 SRC_URI = "http://www.emma-soft.com/projects/epdfview/chrome/site/releases/epdfview-${PV}.tar.bz2 \
-           file://poppler8.diff;patch=1 \
 	  "
 
 inherit autotools
diff --git a/recipes/epdfview/files/poppler8.diff b/recipes/epdfview/files/poppler8.diff
deleted file mode 100644
index e4c4790c6d..0000000000
--- a/recipes/epdfview/files/poppler8.diff
+++ /dev/null
@@ -1,10395 +0,0 @@
-diff -Nurd epdfview-0.1.6-svn/configure.ac epdfview/configure.ac
---- epdfview-0.1.6-svn/configure.ac	2008-07-13 12:57:47.593198000 +0200
-+++ epdfview/configure.ac	2008-07-13 12:55:55.143198000 +0200
-@@ -27,7 +27,7 @@
- 
- dnl Check for libraries
- POPPLER_REQUIRED=0.5.0
--GLIB_REQUIRED=2.6.0
-+GLIB_REQUIRED=2.8.0
- GTK2_REQUIRED=2.6.0
- 
- PKG_CHECK_MODULES([GLIB], [gthread-2.0 >= $GLIB_REQUIRED])
-@@ -44,6 +44,14 @@
- if test "x$have_poppler_052" = "xyes"; then
-     AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
- fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
-+if test "x$have_poppler_060" = "xyes"; then
-+    AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
-+fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
-+if test "x$have_poppler_080" = "xyes"; then
-+    AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
-+fi
- 
- EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
- AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
-diff -Nurd epdfview-0.1.6-svn/data/epdfview-ui.xml epdfview/data/epdfview-ui.xml
---- epdfview-0.1.6-svn/data/epdfview-ui.xml	2008-07-13 12:57:47.093198000 +0200
-+++ epdfview/data/epdfview-ui.xml	2008-07-13 12:55:54.263198000 +0200
-@@ -11,6 +11,9 @@
-     <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.