merge of '3587630593a79216e232d374599557752a9f4599'

     and '7c8aefb2dc76eb1b63e431ae3f5f37dbafad3425'

9 files changed, 10409 insertions, 63 deletions

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"